Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

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

Issue 29341117: Issue 3766 - Restore default ABP bookmarks
Patch Set: Created May 10, 2016, 10:41 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
OLDNEW
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 464 matching lines...) Expand 10 before | Expand all | Expand 10 after
475 <string name="filepicker_title">&filepicker_title;</string> 475 <string name="filepicker_title">&filepicker_title;</string>
476 <string name="filepicker_audio_title">&filepicker_audio_title;</string> 476 <string name="filepicker_audio_title">&filepicker_audio_title;</string>
477 <string name="filepicker_image_title">&filepicker_image_title;</string> 477 <string name="filepicker_image_title">&filepicker_image_title;</string>
478 <string name="filepicker_video_title">&filepicker_video_title;</string> 478 <string name="filepicker_video_title">&filepicker_video_title;</string>
479 479
480 <!-- Default bookmarks. We used to use bookmark titles shared with XUL from mo bile's 480 <!-- Default bookmarks. We used to use bookmark titles shared with XUL from mo bile's
481 profile/bookmarks.inc (see bug 964946). Don't expose the URLs to L10N. -- > 481 profile/bookmarks.inc (see bug 964946). Don't expose the URLs to L10N. -- >
482 <string name="bookmarkdefaults_title_aboutfirefox">&bookmarks_about_browser;</ string> 482 <string name="bookmarkdefaults_title_aboutfirefox">&bookmarks_about_browser;</ string>
483 <string name="bookmarkdefaults_url_aboutfirefox">about:</string> 483 <string name="bookmarkdefaults_url_aboutfirefox">about:</string>
484 484
485 <!-- Icon is automatically generated from R.drawable.bookmarkdefaults_favicon_ adblockplus -->
486 <string name="bookmarkdefaults_title_adblockplus">&bookmarks_adblockplus;</str ing>
487 <string name="bookmarkdefaults_url_adblockplus">https://adblockplus.org</strin g>
488
489 <!-- Icon is automatically generated from R.drawable.bookmarkdefaults_favicon_ acceptableads -->
490 <string name="bookmarkdefaults_title_acceptableads">&bookmarks_acceptableads;< /string>
491 <string name="bookmarkdefaults_url_acceptableads">https://acceptableads.org</s tring>
492
485 <!-- Site identity popup --> 493 <!-- Site identity popup -->
486 <string name="identity_connection_secure">&identity_connection_secure;</string > 494 <string name="identity_connection_secure">&identity_connection_secure;</string >
487 <string name="identity_connection_insecure">&identity_connection_insecure;</st ring> 495 <string name="identity_connection_insecure">&identity_connection_insecure;</st ring>
488 <string name="identity_login_insecure">&identity_login_insecure;</string> 496 <string name="identity_login_insecure">&identity_login_insecure;</string>
489 497
490 <string name="mixed_content_blocked_all">&mixed_content_blocked_all1;</string> 498 <string name="mixed_content_blocked_all">&mixed_content_blocked_all1;</string>
491 <string name="mixed_content_blocked_some">&mixed_content_blocked_some1;</strin g> 499 <string name="mixed_content_blocked_some">&mixed_content_blocked_some1;</strin g>
492 <string name="mixed_content_display_loaded">&mixed_content_display_loaded1;</s tring> 500 <string name="mixed_content_display_loaded">&mixed_content_display_loaded1;</s tring>
493 <string name="mixed_content_protection_disabled">&mixed_content_protection_dis abled1;</string> 501 <string name="mixed_content_protection_disabled">&mixed_content_protection_dis abled1;</string>
494 502
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
655 <string name="abb_adblocking_select_below">&abb_adblocking_select_below;</stri ng> 663 <string name="abb_adblocking_select_below">&abb_adblocking_select_below;</stri ng>
656 <string name="abb_adblocking_none_available">&abb_adblocking_none_available;</ string> 664 <string name="abb_adblocking_none_available">&abb_adblocking_none_available;</ string>
657 <string name="abb_adblocking_all_selected">&abb_adblocking_all_selected;</stri ng> 665 <string name="abb_adblocking_all_selected">&abb_adblocking_all_selected;</stri ng>
658 <string name="abb_adblocking_waiting">&abb_adblocking_waiting;</string> 666 <string name="abb_adblocking_waiting">&abb_adblocking_waiting;</string>
659 667
660 <!-- This is currently just a filler-text --> 668 <!-- This is currently just a filler-text -->
661 <string name="abb_pref_category_acceptable_ads_extra_summary">&abb_pref_catego ry_acceptable_ads_extra_summary;</string> 669 <string name="abb_pref_category_acceptable_ads_extra_summary">&abb_pref_catego ry_acceptable_ads_extra_summary;</string>
662 670
663 </resources> 671 </resources>
664 672
OLDNEW

Powered by Google App Engine
This is Rietveld