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

Delta Between Two Patch Sets: mobile/android/base/locales/en-US/sync_strings.dtd

Issue 29341317: Issue 3199 - "Firefox" string is displayed on several error messages (Closed)
Left Patch Set: Created May 12, 2016, 12:45 p.m.
Right Patch Set: Replacing one occurrence in sync_strings.dtd Created July 28, 2016, 9:34 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | mobile/locales/en-US/overrides/appstrings.properties » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
(no file at all)
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 <!-- Don't localize these. They're here until they have 5 <!-- Don't localize these. They're here until they have
6 a better place to live. --> 6 a better place to live. -->
7 <!ENTITY syncBrand.fullName.label "Firefox Sync"> 7 <!ENTITY syncBrand.fullName.label "Firefox Sync">
8 <!ENTITY syncBrand.shortName.label "Sync"> 8 <!ENTITY syncBrand.shortName.label "Sync">
9 9
10 <!-- Main titles. --> 10 <!-- Main titles. -->
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 when the user navigates to the Android > Accounts > {Firefox 241 when the user navigates to the Android > Accounts > {Firefox
242 Account} Screen. The link takes the user to the Firefox Account 242 Account} Screen. The link takes the user to the Firefox Account
243 status activity, which lets them manage their Firefox 243 status activity, which lets them manage their Firefox
244 Account. --> 244 Account. -->
245 <!ENTITY fxaccount_options_title '&syncBrand.shortName.label; Options'> 245 <!ENTITY fxaccount_options_title '&syncBrand.shortName.label; Options'>
246 <!ENTITY fxaccount_options_configure_title 'Configure &syncBrand.shortName.label ;'> 246 <!ENTITY fxaccount_options_configure_title 'Configure &syncBrand.shortName.label ;'>
247 247
248 <!-- Localization note: these error messages are shown after a request 248 <!-- Localization note: these error messages are shown after a request
249 has been made to the remote server, and an error of some type has 249 has been made to the remote server, and an error of some type has
250 been returned. --> 250 been returned. -->
251 <!ENTITY fxaccount_remote_error_UPGRADE_REQUIRED 'You need to upgrade Firefox'> 251 <!ENTITY fxaccount_remote_error_UPGRADE_REQUIRED 'You need to upgrade Adblock Br owser'>
252 252
253 <!-- Localization note: the format string will be fxaccount_sign_in_button_label , linkified. --> 253 <!-- Localization note: the format string will be fxaccount_sign_in_button_label , linkified. -->
254 <!ENTITY fxaccount_remote_error_ATTEMPT_TO_CREATE_AN_ACCOUNT_THAT_ALREADY_EXISTS _2 'Account already exists. &formatS1;'> 254 <!ENTITY fxaccount_remote_error_ATTEMPT_TO_CREATE_AN_ACCOUNT_THAT_ALREADY_EXISTS _2 'Account already exists. &formatS1;'>
255 <!ENTITY fxaccount_remote_error_ATTEMPT_TO_ACCESS_AN_ACCOUNT_THAT_DOES_NOT_EXIST 'Invalid email or password'> 255 <!ENTITY fxaccount_remote_error_ATTEMPT_TO_ACCESS_AN_ACCOUNT_THAT_DOES_NOT_EXIST 'Invalid email or password'>
256 <!ENTITY fxaccount_remote_error_INCORRECT_PASSWORD 'Invalid email or password'> 256 <!ENTITY fxaccount_remote_error_INCORRECT_PASSWORD 'Invalid email or password'>
257 <!ENTITY fxaccount_remote_error_ATTEMPT_TO_OPERATE_ON_AN_UNVERIFIED_ACCOUNT 'Acc ount is not verified'> 257 <!ENTITY fxaccount_remote_error_ATTEMPT_TO_OPERATE_ON_AN_UNVERIFIED_ACCOUNT 'Acc ount is not verified'>
258 <!ENTITY fxaccount_remote_error_CLIENT_HAS_SENT_TOO_MANY_REQUESTS 'Server busy, try again soon'> 258 <!ENTITY fxaccount_remote_error_CLIENT_HAS_SENT_TOO_MANY_REQUESTS 'Server busy, try again soon'>
259 <!ENTITY fxaccount_remote_error_SERVICE_TEMPORARILY_UNAVAILABLE_TO_DUE_HIGH_LOAD 'Server busy, try again soon'> 259 <!ENTITY fxaccount_remote_error_SERVICE_TEMPORARILY_UNAVAILABLE_TO_DUE_HIGH_LOAD 'Server busy, try again soon'>
260 <!ENTITY fxaccount_remote_error_UNKNOWN_ERROR 'There was a problem'> 260 <!ENTITY fxaccount_remote_error_UNKNOWN_ERROR 'There was a problem'>
261 <!ENTITY fxaccount_remote_error_COULD_NOT_CONNECT 'Cannot connect to network'> 261 <!ENTITY fxaccount_remote_error_COULD_NOT_CONNECT 'Cannot connect to network'>
262 <!ENTITY fxaccount_remote_error_ACCOUNT_LOCKED 'Account is locked. &formatS1;'> 262 <!ENTITY fxaccount_remote_error_ACCOUNT_LOCKED 'Account is locked. &formatS1;'>
263 263
264 <!ENTITY fxaccount_sync_sign_in_error_notification_title2 '&syncBrand.shortName. label; is not connected'> 264 <!ENTITY fxaccount_sync_sign_in_error_notification_title2 '&syncBrand.shortName. label; is not connected'>
265 <!-- Localization note: the format string below will be replaced 265 <!-- Localization note: the format string below will be replaced
266 with the Firefox Account's email address. --> 266 with the Firefox Account's email address. -->
267 <!ENTITY fxaccount_sync_sign_in_error_notification_text2 'Tap to sign in as &for matS;'> 267 <!ENTITY fxaccount_sync_sign_in_error_notification_text2 'Tap to sign in as &for matS;'>
268 268
269 <!ENTITY fxaccount_sync_finish_migrating_notification_title 'Finish upgrading &s yncBrand.shortName.label;?'> 269 <!ENTITY fxaccount_sync_finish_migrating_notification_title 'Finish upgrading &s yncBrand.shortName.label;?'>
270 <!-- Localization note: the format string below will be replaced 270 <!-- Localization note: the format string below will be replaced
271 with the Firefox Account's email address. --> 271 with the Firefox Account's email address. -->
272 <!ENTITY fxaccount_sync_finish_migrating_notification_text 'Tap to sign in as &f ormatS;'> 272 <!ENTITY fxaccount_sync_finish_migrating_notification_text 'Tap to sign in as &f ormatS;'>
LEFTRIGHT

Powered by Google App Engine
This is Rietveld