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

Side by Side Diff: chrome/app/google_chrome_strings.grd

Issue 123693003: Revise user-data-dir switch handling; avoid crashes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleanup. Created 6 years, 10 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 | Annotate | Revision Log
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!-- This file contains definitions of strings that are specific to 2 <!-- This file contains definitions of strings that are specific to
3 Google Chrome. These strings will be translated for each locale that Google 3 Google Chrome. These strings will be translated for each locale that Google
4 Chrome supports. --> 4 Chrome supports. -->
5 5
6 <grit base_dir="." latest_public_release="0" current_release="1" 6 <grit base_dir="." latest_public_release="0" current_release="1"
7 source_lang_id="en" enc_check="möl"> 7 source_lang_id="en" enc_check="möl">
8 <outputs> 8 <outputs>
9 <output filename="grit/google_chrome_strings.h" type="rc_header"> 9 <output filename="grit/google_chrome_strings.h" type="rc_header">
10 <emit emit_type='prepend'></emit> 10 <emit emit_type='prepend'></emit>
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 <if expr="is_macosx"> 414 <if expr="is_macosx">
415 <message name="IDS_PASSWORDS_PAGE_AUTHENTICATION_PROMPT" desc="Text for the dialog box that prompts the user for their OS account password before reveal ing plaintext passwords on the password page."> 415 <message name="IDS_PASSWORDS_PAGE_AUTHENTICATION_PROMPT" desc="Text for the dialog box that prompts the user for their OS account password before reveal ing plaintext passwords on the password page.">
416 Google Chrome is trying to show passwords. 416 Google Chrome is trying to show passwords.
417 </message> 417 </message>
418 </if> 418 </if>
419 <if expr="is_win"> 419 <if expr="is_win">
420 <message name="IDS_PASSWORDS_PAGE_AUTHENTICATION_PROMPT" desc="Text for the dialog box that prompts the user for their OS account password before reveal ing plaintext passwords on the password page."> 420 <message name="IDS_PASSWORDS_PAGE_AUTHENTICATION_PROMPT" desc="Text for the dialog box that prompts the user for their OS account password before reveal ing plaintext passwords on the password page.">
421 Google Chrome is trying to show passwords. Type your Windows password to allow this. 421 Google Chrome is trying to show passwords. Type your Windows password to allow this.
422 </message> 422 </message>
423 </if> 423 </if>
424 <message name="IDS_CANT_WRITE_USER_DIRECTORY_EXIT_BUTTON" desc="Text on bu tton of dialog that closes Chrome if we can't create a directory for this user." >
425 Exit Chrome
426 </message>
427 <message name="IDS_MACHINE_LEVEL_INSTALL_CONFLICT" desc="Error message to display when user tries to run user level Chromium even though machine level Chr omium is already installed."> 424 <message name="IDS_MACHINE_LEVEL_INSTALL_CONFLICT" desc="Error message to display when user tries to run user level Chromium even though machine level Chr omium is already installed.">
428 An administrator has installed Google Chrome on this system, and it is a vailable for all users. The system-level Google Chrome will replace your user-le vel installation now. 425 An administrator has installed Google Chrome on this system, and it is a vailable for all users. The system-level Google Chrome will replace your user-le vel installation now.
429 </message> 426 </message>
430 <message name="IDS_INSTALL_HIGHER_VERSION" desc="Error displayed when high er version already exists."> 427 <message name="IDS_INSTALL_HIGHER_VERSION" desc="Error displayed when high er version already exists.">
431 This computer already has a more recent version of Google Chrome. If the software is not working, please uninstall Google Chrome and try again. 428 This computer already has a more recent version of Google Chrome. If the software is not working, please uninstall Google Chrome and try again.
432 </message> 429 </message>
433 <message name="IDS_INSTALL_HIGHER_VERSION_APP_LAUNCHER" desc="Error displa yed when higher version of the Chrome App Launcher already exists."> 430 <message name="IDS_INSTALL_HIGHER_VERSION_APP_LAUNCHER" desc="Error displa yed when higher version of the Chrome App Launcher already exists.">
434 This computer already has a more recent version of the Google Chrome com ponents. Please use a more recent installer. 431 This computer already has a more recent version of the Google Chrome com ponents. Please use a more recent installer.
435 </message> 432 </message>
436 <message name="IDS_INSTALL_FAILED" desc="Error displayed if installation f ails due to some unknown error."> 433 <message name="IDS_INSTALL_FAILED" desc="Error displayed if installation f ails due to some unknown error.">
(...skipping 538 matching lines...) Expand 10 before | Expand all | Expand 10 after
975 </message> 972 </message>
976 973
977 <!-- ProcessSingleton --> 974 <!-- ProcessSingleton -->
978 <message name="IDS_PROFILE_IN_USE_LINUX" desc="Message shown when the brow ser cannot start because the profile is in use on a different host."> 975 <message name="IDS_PROFILE_IN_USE_LINUX" desc="Message shown when the brow ser cannot start because the profile is in use on a different host.">
979 The profile appears to be in use by another Google Chrome process (<ph n ame="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME ">$2<ex>example.com</ex></ph>). Chrome has locked the profile so that it doesn' t get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome. 976 The profile appears to be in use by another Google Chrome process (<ph n ame="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME ">$2<ex>example.com</ex></ph>). Chrome has locked the profile so that it doesn' t get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome.
980 </message> 977 </message>
981 978
982 </messages> 979 </messages>
983 </release> 980 </release>
984 </grit> 981 </grit>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698