Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(409)

Side by Side Diff: chrome/android/java/strings/android_chrome_strings.grd

Issue 840893002: Upstream the sign out and add an account dialogs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Year Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/signin/SignOutDialogFragment.java ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <grit current_release="1" latest_public_release="0"> 2 <grit current_release="1" latest_public_release="0">
3 <outputs> 3 <outputs>
4 <output filename="values-am/android_chrome_strings.xml" lang="am" type="andr oid" /> 4 <output filename="values-am/android_chrome_strings.xml" lang="am" type="andr oid" />
5 <output filename="values-ar/android_chrome_strings.xml" lang="ar" type="andr oid" /> 5 <output filename="values-ar/android_chrome_strings.xml" lang="ar" type="andr oid" />
6 <output filename="values-bg/android_chrome_strings.xml" lang="bg" type="andr oid" /> 6 <output filename="values-bg/android_chrome_strings.xml" lang="bg" type="andr oid" />
7 <output filename="values-ca/android_chrome_strings.xml" lang="ca" type="andr oid" /> 7 <output filename="values-ca/android_chrome_strings.xml" lang="ca" type="andr oid" />
8 <output filename="values-cs/android_chrome_strings.xml" lang="cs" type="andr oid" /> 8 <output filename="values-cs/android_chrome_strings.xml" lang="cs" type="andr oid" />
9 <output filename="values-da/android_chrome_strings.xml" lang="da" type="andr oid" /> 9 <output filename="values-da/android_chrome_strings.xml" lang="da" type="andr oid" />
10 <output filename="values-de/android_chrome_strings.xml" lang="de" type="andr oid" /> 10 <output filename="values-de/android_chrome_strings.xml" lang="de" type="andr oid" />
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 <message desc="Checkbox allowing users to forgoe an additional prompts fro m a web page. [CHAR-LIMIT=None]" name="IDS_SUPPRESS_JS_MODAL_DIALOGS"> 325 <message desc="Checkbox allowing users to forgoe an additional prompts fro m a web page. [CHAR-LIMIT=None]" name="IDS_SUPPRESS_JS_MODAL_DIALOGS">
326 Prevent this page from creating additional dialogs 326 Prevent this page from creating additional dialogs
327 </message> 327 </message>
328 <message desc="Content description for the input javascript modal dialog p rompt. [CHAR-LIMIT=32]" name="IDS_ACCESSIBILITY_JS_MODAL_DIALOG_PROMPT"> 328 <message desc="Content description for the input javascript modal dialog p rompt. [CHAR-LIMIT=32]" name="IDS_ACCESSIBILITY_JS_MODAL_DIALOG_PROMPT">
329 Prompt 329 Prompt
330 </message> 330 </message>
331 <message desc="Dialog box title for viewing security certificates. [CHAR-L IMIT=32]" name="IDS_CERTTITLE"> 331 <message desc="Dialog box title for viewing security certificates. [CHAR-L IMIT=32]" name="IDS_CERTTITLE">
332 Certificate Viewer 332 Certificate Viewer
333 </message> 333 </message>
334 334
335 <!-- Sign-in strings -->
336 <message name="IDS_ADD_ACCOUNT_TITLE" desc="Add account message for add go ogle account dialog [CHAR-LIMIT=40]">
newt (away) 2015/01/07 22:00:59 "Title for add Google account dialog"
aruslan 2015/01/07 22:11:48 Done.
337 Add a Google Account
338 </message>
339 <message name="IDS_ADD_ACCOUNT_MESSAGE" desc="Continue button for add goog le account dialog">
newt (away) 2015/01/07 22:00:59 fix description
aruslan 2015/01/07 22:11:49 Done.
340 You have not yet set up a Google Account on this device
341 </message>
342 <message name="IDS_ADD_ACCOUNT_CONTINUE" desc="Continue button for add goo gle account dialog [CHAR-LIMIT=20]">
343 Continue
344 </message>
345 <message name="IDS_SIGNOUT_TITLE" desc="Title for sign out google account dialog">
newt (away) 2015/01/07 22:00:59 fix description
aruslan 2015/01/07 22:11:49 Done.
346 Sign out of Chrome
347 </message>
348 <message name="IDS_SIGNOUT_MESSAGE" desc="Message to display for sign out google account dialog">
newt (away) 2015/01/07 22:00:59 "... sign out of Chrome dialog"
aruslan 2015/01/07 22:11:49 Done.
349 The data stored on this device as well as the data stored in your Google Account will remain in both places. However, new data or changes you make to yo ur data will not be synchronized between them.
350 </message>
351 <message name="IDS_SIGNOUT_MANAGED_ACCOUNT_MESSAGE" desc="Message to displ ay for sign out google account dialog when the account has enterprise management , and all user data will be erased">
newt (away) 2015/01/07 22:00:59 "... sign out of Chrome ..."
aruslan 2015/01/07 22:11:49 Done.
352 You are signing out of an account managed by <ph name="DOMAIN_NAME">%1$s <ex>google.com</ex></ph>. This will delete the Chrome data stored on this device , but the data will remain in your Google Account.
353 </message>
354
335 <!-- Sync error strings --> 355 <!-- Sync error strings -->
336 <message desc="Sync error string for generic error. [CHAR-LIMIT=80]" name= "IDS_SYNC_ERROR_GENERIC"> 356 <message desc="Sync error string for generic error. [CHAR-LIMIT=80]" name= "IDS_SYNC_ERROR_GENERIC">
337 Sync error 357 Sync error
338 </message> 358 </message>
339 <message desc="Sync error string for when the needs to update the sign-in details [CHAR-LIMIT=80]" name="IDS_SYNC_ERROR_GA"> 359 <message desc="Sync error string for when the needs to update the sign-in details [CHAR-LIMIT=80]" name="IDS_SYNC_ERROR_GA">
340 Please update your sign-in details. 360 Please update your sign-in details.
341 </message> 361 </message>
342 <message desc="Sync error string for network connection. [CHAR-LIMIT=80]" name="IDS_SYNC_ERROR_CONNECTION"> 362 <message desc="Sync error string for network connection. [CHAR-LIMIT=80]" name="IDS_SYNC_ERROR_CONNECTION">
343 Could not connect to the sync server. 363 Could not connect to the sync server.
344 </message> 364 </message>
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
669 689
670 <!-- Fullscreen --> 690 <!-- Fullscreen -->
671 <message name="IDS_FULLSCREEN_API_NOTIFICATION" desc="Notification message when a site has entered fullscreen and the directions of how to exit."> 691 <message name="IDS_FULLSCREEN_API_NOTIFICATION" desc="Notification message when a site has entered fullscreen and the directions of how to exit.">
672 This site has gone fullscreen. 692 This site has gone fullscreen.
673 Drag from top to exit. 693 Drag from top to exit.
674 </message> 694 </message>
675 695
676 </messages> 696 </messages>
677 </release> 697 </release>
678 </grit> 698 </grit>
OLDNEW
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/signin/SignOutDialogFragment.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698