Delta Between Two Patch Sets: mobile/android/base/strings.xml.in
Issue 29341117:
Issue 3766 - Restore default ABP bookmarks
Left Patch Set:
Created May 10, 2016, 10:41 a.m.
Right Patch Set: Removing default bookmarks
Created May 10, 2016, 3:36 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« mobile/android/base/locales/en-US/android_strings.dtd ('k')
|
mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/StringHelper.java » ('j')
|
no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| 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 461 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 472 <string name="remote_tabs_panel_moved_link">&remote_tabs_panel_moved_link;</st ring> | 472 <string name="remote_tabs_panel_moved_link">&remote_tabs_panel_moved_link;</st ring> |
| 473 <string name="remote_tabs_never_synced">&remote_tabs_never_synced;</string> | 473 <string name="remote_tabs_never_synced">&remote_tabs_never_synced;</string> |
| 474 | 474 |
| 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_aboutBrowser;</s tring> |
| 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 --> | 485 <!-- Icon is automatically generated from R.drawable.bookmarkdefaults_favicon_ adblockplus --> |
| 486 <string name="bookmarkdefaults_title_adblockplus">&bookmarks_adblockplus;</str ing> | 486 <string name="bookmarkdefaults_title_adblockplus">&bookmarks_adblockplus;</str ing> |
| 487 <string name="bookmarkdefaults_url_adblockplus">https://adblockplus.org</strin g> | 487 <string name="bookmarkdefaults_url_adblockplus">https://adblockplus.org</strin g> |
| 488 | 488 |
| 489 <!-- Icon is automatically generated from R.drawable.bookmarkdefaults_favicon_ acceptableads --> | 489 <!-- Icon is automatically generated from R.drawable.bookmarkdefaults_favicon_ acceptableads --> |
| 490 <string name="bookmarkdefaults_title_acceptableads">&bookmarks_acceptableads;< /string> | 490 <string name="bookmarkdefaults_title_acceptableads">&bookmarks_acceptableads;< /string> |
| 491 <string name="bookmarkdefaults_url_acceptableads">https://acceptableads.org</s tring> | 491 <string name="bookmarkdefaults_url_acceptableads">https://acceptableads.org</s tring> |
| 492 | |
| 493 <!-- Icon is automatically generated from R.drawable.bookmarkdefaults_favicon_ adblockbrowserbetacommunity --> | |
| 494 <string name="bookmarkdefaults_title_adblockbrowserbetacommunity">&bookmarks_a dblockbrowserbetacommunity;</string> | |
| 495 <string name="bookmarkdefaults_url_adblockbrowserbetacommunity">https://adbloc kplus.org/redirect?link=adblock_browser_android_beta_community</string> | |
| 492 | 496 |
| 493 <!-- Site identity popup --> | 497 <!-- Site identity popup --> |
| 494 <string name="identity_connection_secure">&identity_connection_secure;</string > | 498 <string name="identity_connection_secure">&identity_connection_secure;</string > |
| 495 <string name="identity_connection_insecure">&identity_connection_insecure;</st ring> | 499 <string name="identity_connection_insecure">&identity_connection_insecure;</st ring> |
| 496 <string name="identity_login_insecure">&identity_login_insecure;</string> | 500 <string name="identity_login_insecure">&identity_login_insecure;</string> |
| 497 | 501 |
| 498 <string name="mixed_content_blocked_all">&mixed_content_blocked_all1;</string> | 502 <string name="mixed_content_blocked_all">&mixed_content_blocked_all1;</string> |
| 499 <string name="mixed_content_blocked_some">&mixed_content_blocked_some1;</strin g> | 503 <string name="mixed_content_blocked_some">&mixed_content_blocked_some1;</strin g> |
| 500 <string name="mixed_content_display_loaded">&mixed_content_display_loaded1;</s tring> | 504 <string name="mixed_content_display_loaded">&mixed_content_display_loaded1;</s tring> |
| 501 <string name="mixed_content_protection_disabled">&mixed_content_protection_dis abled1;</string> | 505 <string name="mixed_content_protection_disabled">&mixed_content_protection_dis abled1;</string> |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 663 <string name="abb_adblocking_select_below">&abb_adblocking_select_below;</stri ng> | 667 <string name="abb_adblocking_select_below">&abb_adblocking_select_below;</stri ng> |
| 664 <string name="abb_adblocking_none_available">&abb_adblocking_none_available;</ string> | 668 <string name="abb_adblocking_none_available">&abb_adblocking_none_available;</ string> |
| 665 <string name="abb_adblocking_all_selected">&abb_adblocking_all_selected;</stri ng> | 669 <string name="abb_adblocking_all_selected">&abb_adblocking_all_selected;</stri ng> |
| 666 <string name="abb_adblocking_waiting">&abb_adblocking_waiting;</string> | 670 <string name="abb_adblocking_waiting">&abb_adblocking_waiting;</string> |
| 667 | 671 |
| 668 <!-- This is currently just a filler-text --> | 672 <!-- This is currently just a filler-text --> |
| 669 <string name="abb_pref_category_acceptable_ads_extra_summary">&abb_pref_catego ry_acceptable_ads_extra_summary;</string> | 673 <string name="abb_pref_category_acceptable_ads_extra_summary">&abb_pref_catego ry_acceptable_ads_extra_summary;</string> |
| 670 | 674 |
| 671 </resources> | 675 </resources> |
| 672 | 676 |
| LEFT | RIGHT |
