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

Side by Side Diff: chrome/app/chromium_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 | « no previous file | chrome/app/google_chrome_strings.grd » ('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 distribution specific. 2 <!-- This file contains definitions of strings that are distribution specific.
3 These strings will not be translated and only english versions will 3 These strings will not be translated and only english versions will
4 be available for now. --> 4 be available for now. -->
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/chromium_strings.h" type="rc_header"> 9 <output filename="grit/chromium_strings.h" type="rc_header">
10 <emit emit_type='prepend'></emit> 10 <emit emit_type='prepend'></emit>
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 </message> 368 </message>
369 <message name="IDS_INSTALL_HIGHER_VERSION" desc="Error displayed when high er version already exists."> 369 <message name="IDS_INSTALL_HIGHER_VERSION" desc="Error displayed when high er version already exists.">
370 This computer already has a more recent version of Chromium. If the soft ware is not working, please uninstall Chromium and try again. 370 This computer already has a more recent version of Chromium. If the soft ware is not working, please uninstall Chromium and try again.
371 </message> 371 </message>
372 <message name="IDS_INSTALL_HIGHER_VERSION_CF" desc="Error displayed when h igher version already exists."> 372 <message name="IDS_INSTALL_HIGHER_VERSION_CF" desc="Error displayed when h igher version already exists.">
373 This computer already has a more recent version of Chromium Frame. If th e software is not working, please uninstall Chromium Frame and try again. 373 This computer already has a more recent version of Chromium Frame. If th e software is not working, please uninstall Chromium Frame and try again.
374 </message> 374 </message>
375 <message name="IDS_INSTALL_HIGHER_VERSION_CB_CF" desc="Error displayed whe n higher version of Chromium and Chromium Frame already exists"> 375 <message name="IDS_INSTALL_HIGHER_VERSION_CB_CF" desc="Error displayed whe n higher version of Chromium and Chromium Frame already exists">
376 This computer already has a more recent version of Chromium and Chromium Frame. If the software is not working, please uninstall both Chromium and Chrom ium Frame and try again. 376 This computer already has a more recent version of Chromium and Chromium Frame. If the software is not working, please uninstall both Chromium and Chrom ium Frame and try again.
377 </message> 377 </message>
378 <message name="IDS_INSTALL_SYSTEM_LEVEL_EXISTS" desc="Error displayed duri ng user level install if system level Chromium is already installed."> 378 <message name="IDS_INSTALL_SYSTEM_LEVEL_EXISTS" desc="Error displayed duri ng user level install if system level Chromium Frame is already installed.">
379 Chromium is already installed and available to all users of this compute r. If you want to install Chromium at the user level, you must first uninstall t he system-level version installed by an administrator. 379 Chromium Frame is already installed and available to all users of this c omputer. If you want to install Chromium Frame at the user level, you must first uninstall the system-level version installed by an administrator.
380 </message> 380 </message>
381 <message name="IDS_INSTALL_FAILED" desc="Error displayed if installation f ails due to some unknown error."> 381 <message name="IDS_INSTALL_FAILED" desc="Error displayed if installation f ails due to some unknown error.">
382 Installation failed due to unspecified error. If Chromium is currently r unning, please close it and try again. 382 Installation failed due to unspecified error. If Chromium is currently r unning, please close it and try again.
383 </message> 383 </message>
384 <message name="IDS_SAME_VERSION_REPAIR_FAILED" desc="Error displayed if in stallation fails due to Chrome running."> 384 <message name="IDS_SAME_VERSION_REPAIR_FAILED" desc="Error displayed if in stallation fails due to Chrome running.">
385 Can not install the same Chromium version that is currently running. Ple ase close Chromium and try again. 385 Can not install the same Chromium version that is currently running. Ple ase close Chromium and try again.
386 </message> 386 </message>
387 <message name="IDS_SAME_VERSION_REPAIR_FAILED_CF" desc="Error displayed if installation fails due to Chrome running."> 387 <message name="IDS_SAME_VERSION_REPAIR_FAILED_CF" desc="Error displayed if installation fails due to Chrome running.">
388 Can not install the same Chromium Frame version that is currently runnin g. Please close Chromium Frame and try again. 388 Can not install the same Chromium Frame version that is currently runnin g. Please close Chromium Frame and try again.
389 </message> 389 </message>
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 <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."> 540 <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.">
541 Chromium Utility 541 Chromium Utility
542 </message> 542 </message>
543 <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."> 543 <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.">
544 Chromium Utility 544 Chromium Utility
545 </message> 545 </message>
546 </if> 546 </if>
547 </messages> 547 </messages>
548 </release> 548 </release>
549 </grit> 549 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/app/google_chrome_strings.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698