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

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

Issue 8570006: Allow updates to user-level products when system-level products are present. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed robert's nit Created 9 years, 1 month 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
« no previous file with comments | « chrome/app/chromium_strings.grd ('k') | chrome/installer/setup/setup_main.cc » ('j') | 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 <!-- 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 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 </message> 342 </message>
343 <message name="IDS_INSTALL_HIGHER_VERSION" desc="Error displayed when high er version already exists."> 343 <message name="IDS_INSTALL_HIGHER_VERSION" desc="Error displayed when high er version already exists.">
344 This computer already has a more recent version of Google Chrome. If the software is not working, please uninstall Google Chrome and try again. 344 This computer already has a more recent version of Google Chrome. If the software is not working, please uninstall Google Chrome and try again.
345 </message> 345 </message>
346 <message name="IDS_INSTALL_HIGHER_VERSION_CF" desc="Error displayed when h igher version of Chrome Frame already exists"> 346 <message name="IDS_INSTALL_HIGHER_VERSION_CF" desc="Error displayed when h igher version of Chrome Frame already exists">
347 This computer already has a more recent version of Google Chrome Frame. If the software is not working, please uninstall Google Chrome Frame and try aga in. 347 This computer already has a more recent version of Google Chrome Frame. If the software is not working, please uninstall Google Chrome Frame and try aga in.
348 </message> 348 </message>
349 <message name="IDS_INSTALL_HIGHER_VERSION_CB_CF" desc="Error displayed whe n higher version of Chrome and Chrome Frame already exists"> 349 <message name="IDS_INSTALL_HIGHER_VERSION_CB_CF" desc="Error displayed whe n higher version of Chrome and Chrome Frame already exists">
350 This computer already has a more recent version of Google Chrome and Goo gle Chrome Frame. If the software is not working, please uninstall both Google C hrome and Google Chrome Frame and try again. 350 This computer already has a more recent version of Google Chrome and Goo gle Chrome Frame. If the software is not working, please uninstall both Google C hrome and Google Chrome Frame and try again.
351 </message> 351 </message>
352 <message name="IDS_INSTALL_SYSTEM_LEVEL_EXISTS" desc="Error displayed duri ng user level install if system level Chromium is already installed."> 352 <message name="IDS_INSTALL_SYSTEM_LEVEL_EXISTS" desc="Error displayed duri ng user level install if system level Chrome Frame is already installed.">
353 Google Chrome is already installed and available to all users of this co mputer. If you want to install Google Chrome at the user level, you must first u ninstall the system-level version installed by an administrator. 353 Google Chrome Frame is already installed and available to all users of t his computer. If you want to install Google Chrome Frame at the user level, you must first uninstall the system-level version installed by an administrator.
354 </message> 354 </message>
355 <message name="IDS_INSTALL_FAILED" desc="Error displayed if installation f ails due to some unknown error."> 355 <message name="IDS_INSTALL_FAILED" desc="Error displayed if installation f ails due to some unknown error.">
356 Installation failed due to unspecified error. If Google Chrome is curren tly running, please close it and try again. 356 Installation failed due to unspecified error. If Google Chrome is curren tly running, please close it and try again.
357 </message> 357 </message>
358 <message name="IDS_SAME_VERSION_REPAIR_FAILED" desc="Error displayed if in stallation fails due to Chrome running."> 358 <message name="IDS_SAME_VERSION_REPAIR_FAILED" desc="Error displayed if in stallation fails due to Chrome running.">
359 Can not install the same Google Chrome version that is currently running . Please close Google Chrome and try again. 359 Can not install the same Google Chrome version that is currently running . Please close Google Chrome and try again.
360 </message> 360 </message>
361 <message name="IDS_SAME_VERSION_REPAIR_FAILED_CF" desc="Error displayed if installation fails due to Chrome Frame already running."> 361 <message name="IDS_SAME_VERSION_REPAIR_FAILED_CF" desc="Error displayed if installation fails due to Chrome Frame already running.">
362 Can not install the same Google Chrome Frame version that is currently r unning. Please close Google Chrome Frame and try again. 362 Can not install the same Google Chrome Frame version that is currently r unning. Please close Google Chrome Frame and try again.
363 </message> 363 </message>
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 <message name="IDS_UTILITY_APP_NAME" desc="The utility application's nam e. Should contain the Chrome application name (IDS_PRODUCT_NAME). Example: Goog le Chrome Utility."> 515 <message name="IDS_UTILITY_APP_NAME" desc="The utility application's nam e. Should contain the Chrome application name (IDS_PRODUCT_NAME). Example: Goog le Chrome Utility.">
516 Google Chrome Utility 516 Google Chrome Utility
517 </message> 517 </message>
518 <message name="IDS_SHORT_UTILITY_APP_NAME" desc="The utility application 's short name, used for the Mac's application menu, activity monitor, etc. Examp le: Chrome Utility, not Google Chrome Utility."> 518 <message name="IDS_SHORT_UTILITY_APP_NAME" desc="The utility application 's short name, used for the Mac's application menu, activity monitor, etc. Examp le: Chrome Utility, not Google Chrome Utility.">
519 Chrome Utility 519 Chrome Utility
520 </message> 520 </message>
521 </if> 521 </if>
522 </messages> 522 </messages>
523 </release> 523 </release>
524 </grit> 524 </grit>
OLDNEW
« no previous file with comments | « chrome/app/chromium_strings.grd ('k') | chrome/installer/setup/setup_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698