mobile/android/base/strings.xml.in - Issue 29323321: Issue 2806 - Text changes for various pages within Menu > Settings > Ad blocking

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 29323321: Issue 2806 - Text changes for various pages within Menu > Settings > Ad blocking (Closed)

Patch Set: Created Aug. 6, 2015, 4:03 p.m.

Left:
Right:

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

Jump to:

View unified diff | Download patch

« no previous file with comments | « mobile/android/base/resources/xml/preferences.xml ('k') | no next file » | no next file with comments »

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 @ABBSTRINGSPATH@	10 #includesubst @ABBSTRINGSPATH@

(...skipping 514 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
525	525

526 <string name="colon">&colon;</string>	526 <string name="colon">&colon;</string>

527	527

528 <string name="remote_tabs_last_synced">&remote_tabs_last_synced;</string>	528 <string name="remote_tabs_last_synced">&remote_tabs_last_synced;</string>

529	529

530 <!-- Adblock Browser -->	530 <!-- Adblock Browser -->

531 <string name="abb_block_ads">&abb_block_ads;</string>	531 <string name="abb_block_ads">&abb_block_ads;</string>

532	532

533 <string name="abb_pref_category_adblocking">&abb_pref_category_adblocking;</st ring>	533 <string name="abb_pref_category_adblocking">&abb_pref_category_adblocking;</st ring>

534 <string name="abb_pref_category_adblocking_summary">&abb_pref_category_adblock ing_summary;</string>	534 <string name="abb_pref_category_adblocking_summary">&abb_pref_category_adblock ing_summary;</string>

	535 <string name="abb_pref_category_adblocking_summary_main">&abb_pref_category_ad blocking_summary_main;</string>

535	536

536 <string name="abb_pref_category_blocking">&abb_pref_category_blocking;</string >	537 <string name="abb_pref_category_blocking">&abb_pref_category_blocking;</string >

537	538

538 <string name="abb_pref_category_more_blocking">&abb_pref_category_more_blockin g;</string>	539 <string name="abb_pref_category_more_blocking">&abb_pref_category_more_blockin g;</string>

539 <string name="abb_pref_category_more_blocking_summary">&abb_pref_category_more _blocking_summary;</string>	540 <string name="abb_pref_category_more_blocking_summary">&abb_pref_category_more _blocking_summary;</string>

540	541

541 <string name="abb_pref_category_exceptions">&abb_pref_category_exceptions;</st ring>	542 <string name="abb_pref_category_exceptions">&abb_pref_category_exceptions;</st ring>

542	543

543 <string name="abb_pref_category_acceptable_ads">&abb_pref_category_acceptable_ ads;</string>	544 <string name="abb_pref_category_acceptable_ads">&abb_pref_category_acceptable_ ads;</string>

544 <string name="abb_pref_category_acceptable_ads_summary">&abb_pref_category_acc eptable_ads_summary;</string>	545 <string name="abb_pref_category_acceptable_ads_summary">&abb_pref_category_acc eptable_ads_summary;</string>

(...skipping 40 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
585 <string name="abb_adblocking_select_below">&abb_adblocking_select_below;</stri ng>	586 <string name="abb_adblocking_select_below">&abb_adblocking_select_below;</stri ng>

586 <string name="abb_adblocking_none_available">&abb_adblocking_none_available;</ string>	587 <string name="abb_adblocking_none_available">&abb_adblocking_none_available;</ string>

587 <string name="abb_adblocking_all_selected">&abb_adblocking_all_selected;</stri ng>	588 <string name="abb_adblocking_all_selected">&abb_adblocking_all_selected;</stri ng>

588 <string name="abb_adblocking_waiting">&abb_adblocking_waiting;</string>	589 <string name="abb_adblocking_waiting">&abb_adblocking_waiting;</string>

589	590

590 <!-- This is currently just a filler-text -->	591 <!-- This is currently just a filler-text -->

591 <string name="abb_pref_category_acceptable_ads_extra_summary">&abb_pref_catego ry_acceptable_ads_extra_summary;</string>	592 <string name="abb_pref_category_acceptable_ads_extra_summary">&abb_pref_catego ry_acceptable_ads_extra_summary;</string>

592	593

593 </resources>	594 </resources>

594	595

OLD	NEW