mobile/android/base/strings.xml.in - Issue 5365916275572736: Issue 2351 - Add a custom menu item for whitelisting the current site

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments.

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Side by Side Diff: mobile/android/base/strings.xml.in

Issue 5365916275572736: Issue 2351 - Add a custom menu item for whitelisting the current site (Closed)

Patch Set: Minimally invasive approach Created May 6, 2015, 12:12 a.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View unified diff | Download patch

« adblockplus/Api.jsm ('K') | « mobile/android/base/resources/menu/browser_app_menu.xml ('k') | mobile/android/thirdparty/org/adblockplus/browser/AddOnBridge.java » ('j') | mobile/android/thirdparty/org/adblockplus/browser/AddOnBridge.java » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 #filter substitution	1 #filter substitution

2 <?xml version="1.0" encoding="utf-8"?>	2 <?xml version="1.0" encoding="utf-8"?>

3 <!-- This Source Code Form is subject to the terms of the Mozilla Public	3 <!-- This Source Code Form is subject to the terms of the Mozilla Public

4 - License, v. 2.0. If a copy of the MPL was not distributed with this	4 - License, v. 2.0. If a copy of the MPL was not distributed with this

5 - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->	5 - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

6	6

7 <!DOCTYPE resources [	7 <!DOCTYPE resources [

8 #includesubst @BRANDPATH@	8 #includesubst @BRANDPATH@

9 #includesubst @STRINGSPATH@	9 #includesubst @STRINGSPATH@

10 #includesubst @SYNCSTRINGSPATH@	10 #includesubst @SYNCSTRINGSPATH@

(...skipping 79 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
90 <string name="history_yesterday_section">&history_yesterday_section;</string>	90 <string name="history_yesterday_section">&history_yesterday_section;</string>

91 <string name="history_week_section">&history_week_section2;</string>	91 <string name="history_week_section">&history_week_section2;</string>

92 <string name="history_older_section">&history_older_section2;</string>	92 <string name="history_older_section">&history_older_section2;</string>

93	93

94 <string name="share">&share;</string>	94 <string name="share">&share;</string>

95 <string name="share_title">&share_title;</string>	95 <string name="share_title">&share_title;</string>

96 <string name="share_image_failed">&share_image_failed;</string>	96 <string name="share_image_failed">&share_image_failed;</string>

97 <string name="save_as_pdf">&save_as_pdf;</string>	97 <string name="save_as_pdf">&save_as_pdf;</string>

98 <string name="find_in_page">&find_in_page;</string>	98 <string name="find_in_page">&find_in_page;</string>

99 <string name="desktop_mode">&desktop_mode;</string>	99 <string name="desktop_mode">&desktop_mode;</string>

	100 <string name="block_ads">&block_ads;</string>

100 <string name="page">&page;</string>	101 <string name="page">&page;</string>

101 <string name="tools">&tools;</string>	102 <string name="tools">&tools;</string>

102	103

103 <string name="find_text">&find_text;</string>	104 <string name="find_text">&find_text;</string>

104 <string name="find_prev">&find_prev;</string>	105 <string name="find_prev">&find_prev;</string>

105 <string name="find_next">&find_next;</string>	106 <string name="find_next">&find_next;</string>

106 <string name="find_close">&find_close;</string>	107 <string name="find_close">&find_close;</string>

107	108

108 <string name="media_sending_to">&media_sending_to;</string>	109 <string name="media_sending_to">&media_sending_to;</string>

109 <string name="media_play">&media_play;</string>	110 <string name="media_play">&media_play;</string>

(...skipping 372 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
482 <string name="abb_adblocking_all_selected">No more available subscriptions</st ring>	483 <string name="abb_adblocking_all_selected">No more available subscriptions</st ring>

483 <string name="abb_adblocking_waiting">Fetching available subscriptions...</str ing>	484 <string name="abb_adblocking_waiting">Fetching available subscriptions...</str ing>

484	485

485 <!-- This is currently just a filler-text -->	486 <!-- This is currently just a filler-text -->

486 <string name="abb_pref_category_acceptable_ads_extra_summary">We\'d like to en courage websites to use starightforward, unobtrusive	487 <string name="abb_pref_category_acceptable_ads_extra_summary">We\'d like to en courage websites to use starightforward, unobtrusive

487 advertising. That\'s why we established strict guidelines to identify acceptable ads, which are shown under default settings. If you	488 advertising. That\'s why we established strict guidelines to identify acceptable ads, which are shown under default settings. If you

488 still wanto to block every ad you can disable this in a few seconds.</string>	489 still wanto to block every ad you can disable this in a few seconds.</string>

489	490

490 </resources>	491 </resources>

491	492

OLD	NEW