Side by Side Diff: mobile/android/base/locales/en-US/android_strings.dtd
Issue 29330952:
Issue 3127 - Merge conflicts, base 42.0.1 (Closed)
Patch Set:
Created Nov. 26, 2015, 11:01 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« mobile/android/base/home/HomeConfigPrefsBackend.java ('k')
|
mobile/android/base/resources/drawable-hdpi/url_bar_entry_default_pb.9.png » ('j')
|
no next file with comments »
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')
| OLD | NEW |
|---|---|
| 1 <!-- This Source Code Form is subject to the terms of the Mozilla Public | 1 <!-- This Source Code Form is subject to the terms of the Mozilla Public |
| 2 - License, v. 2.0. If a copy of the MPL was not distributed with this | 2 - License, v. 2.0. If a copy of the MPL was not distributed with this |
| 3 - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> | 3 - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> |
| 4 | 4 |
| 5 | 5 |
| 6 <!ENTITY no_space_to_start_error "There is not enough space available for &bran dShortName; to start."> | 6 <!ENTITY no_space_to_start_error "There is not enough space available for &bran dShortName; to start."> |
| 7 <!ENTITY error_loading_file "An error occurred when trying to load files requir ed to run &brandShortName;"> | 7 <!ENTITY error_loading_file "An error occurred when trying to load files requir ed to run &brandShortName;"> |
| 8 | 8 |
| 9 <!ENTITY onboard_start_message3 "Browse with &brandShortName;"> | 9 <!ENTITY onboard_start_message3 "Browse with &brandShortName;"> |
| 10 <!ENTITY onboard_start_subtext3 "Make your mobile Web browsing experience truly your own."> | 10 <!ENTITY onboard_start_subtext3 "Make your mobile Web browsing experience truly your own."> |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 182 <!ENTITY pref_home_updates_wifi "Only over Wi-Fi"> | 182 <!ENTITY pref_home_updates_wifi "Only over Wi-Fi"> |
| 183 <!ENTITY pref_home_suggested_sites "Show site suggestions"> | 183 <!ENTITY pref_home_suggested_sites "Show site suggestions"> |
| 184 <!ENTITY pref_home_suggested_sites_summary "Display shortcuts to sites on your h omepage that we think you might find interesting"> | 184 <!ENTITY pref_home_suggested_sites_summary "Display shortcuts to sites on your h omepage that we think you might find interesting"> |
| 185 | 185 |
| 186 <!-- Localization note: These are shown in the left sidebar on tablets --> | 186 <!-- Localization note: These are shown in the left sidebar on tablets --> |
| 187 <!ENTITY pref_header_customize "Customize"> | 187 <!ENTITY pref_header_customize "Customize"> |
| 188 <!ENTITY pref_header_display "Display"> | 188 <!ENTITY pref_header_display "Display"> |
| 189 <!ENTITY pref_header_privacy_short "Privacy"> | 189 <!ENTITY pref_header_privacy_short "Privacy"> |
| 190 <!ENTITY pref_header_help "Help"> | 190 <!ENTITY pref_header_help "Help"> |
| 191 <!ENTITY pref_header_language "Language"> | 191 <!ENTITY pref_header_language "Language"> |
| 192 <!ENTITY pref_header_vendor "&vendorShortName;"> | 192 <!-- We changed this to display the brand name instead of the vendor name |
| 193 in Adblock Browser --> | |
| 194 <!ENTITY pref_header_vendor "&brandShortName;"> | |
| 193 <!ENTITY pref_header_devtools "Developer tools"> | 195 <!ENTITY pref_header_devtools "Developer tools"> |
| 194 | 196 |
| 195 <!ENTITY pref_cookies_menu "Cookies"> | 197 <!ENTITY pref_cookies_menu "Cookies"> |
| 196 <!ENTITY pref_cookies_accept_all "Enabled"> | 198 <!ENTITY pref_cookies_accept_all "Enabled"> |
| 197 <!ENTITY pref_cookies_not_accept_foreign "Enabled, excluding 3rd party"> | 199 <!ENTITY pref_cookies_not_accept_foreign "Enabled, excluding 3rd party"> |
| 198 <!ENTITY pref_cookies_disabled "Disabled"> | 200 <!ENTITY pref_cookies_disabled "Disabled"> |
| 199 | 201 |
| 200 <!ENTITY pref_tracking_protection_title "Tracking protection"> | 202 <!ENTITY pref_tracking_protection_title "Tracking protection"> |
| 201 <!ENTITY pref_tracking_protection_summary3 "Enabled in Private Browsing"> | 203 <!ENTITY pref_tracking_protection_summary3 "Enabled in Private Browsing"> |
| 202 <!ENTITY pref_donottrack_title "Do not track"> | 204 <!ENTITY pref_donottrack_title "Do not track"> |
| (...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 697 <!ENTITY restriction_disallow_addons_title2 "Disable add-on installation"> | 699 <!ENTITY restriction_disallow_addons_title2 "Disable add-on installation"> |
| 698 <!ENTITY restriction_disallow_devtools_title2 "Disable developer tools"> | 700 <!ENTITY restriction_disallow_devtools_title2 "Disable developer tools"> |
| 699 <!ENTITY restriction_disallow_customize_home_title2 "Disable Home customization" > | 701 <!ENTITY restriction_disallow_customize_home_title2 "Disable Home customization" > |
| 700 <!ENTITY restriction_disallow_private_browsing_title2 "Disable Private Browsing" > | 702 <!ENTITY restriction_disallow_private_browsing_title2 "Disable Private Browsing" > |
| 701 <!ENTITY restriction_disallow_location_services_title2 "Disable Location Service s"> | 703 <!ENTITY restriction_disallow_location_services_title2 "Disable Location Service s"> |
| 702 <!ENTITY restriction_disallow_display_settings_title2 "Disable Display settings" > | 704 <!ENTITY restriction_disallow_display_settings_title2 "Disable Display settings" > |
| 703 <!ENTITY restriction_disallow_clear_history_title2 "Disable \'Clear browsing his tory\'"> | 705 <!ENTITY restriction_disallow_clear_history_title2 "Disable \'Clear browsing his tory\'"> |
| 704 <!ENTITY restriction_disallow_master_password_title2 "Disable master password"> | 706 <!ENTITY restriction_disallow_master_password_title2 "Disable master password"> |
| 705 <!ENTITY restriction_disallow_guest_browsing_title2 "Disable Guest Browsing"> | 707 <!ENTITY restriction_disallow_guest_browsing_title2 "Disable Guest Browsing"> |
| 706 | 708 |
| OLD | NEW |
« no previous file with comments
|
« mobile/android/base/home/HomeConfigPrefsBackend.java ('k')
|
mobile/android/base/resources/drawable-hdpi/url_bar_entry_default_pb.9.png » ('j')
|
no next file with comments »
