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

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

Issue 7111012: Return a new error code for multi-install updates if Group Policy settings blocking... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 6 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
« no previous file with comments | « chrome/app/chromium_strings.grd ('k') | chrome/browser/google/google_update.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 440 matching lines...) Expand 10 before | Expand all | Expand 10 after
451 </message> 451 </message>
452 <message name="IDS_INSTALL_MULTI_INSTALLATION_EXISTS" desc="Error during i nstall if a multi-install Google Chrome or Google Chrome Frame is present, there by preventing the installation of a single-install Google Chrome or Google Chrom e Frame."> 452 <message name="IDS_INSTALL_MULTI_INSTALLATION_EXISTS" desc="Error during i nstall if a multi-install Google Chrome or Google Chrome Frame is present, there by preventing the installation of a single-install Google Chrome or Google Chrom e Frame.">
453 A conflicting installation of Google Chrome or Google Chrome Frame was f ound on the system. Please uninstall it and try again. 453 A conflicting installation of Google Chrome or Google Chrome Frame was f ound on the system. Please uninstall it and try again.
454 </message> 454 </message>
455 <message name="IDS_INSTALL_CONFLICTING_CHANNEL_EXISTS" desc="Error during install if a version of Google Chrome on a different update channel exists when installing Google Chrome Frame."> 455 <message name="IDS_INSTALL_CONFLICTING_CHANNEL_EXISTS" desc="Error during install if a version of Google Chrome on a different update channel exists when installing Google Chrome Frame.">
456 A conflicting installation of Google Chrome was found on the system. Ple ase uninstall it and try again. 456 A conflicting installation of Google Chrome was found on the system. Ple ase uninstall it and try again.
457 </message> 457 </message>
458 <message name="IDS_INSTALL_READY_MODE_REQUIRES_CHROME" desc="Chrome Frame in ready mode requires Chrome."> 458 <message name="IDS_INSTALL_READY_MODE_REQUIRES_CHROME" desc="Chrome Frame in ready mode requires Chrome.">
459 Invalid arguments. Google Chrome Frame cannot be installed in ready mode without also installing Google Chrome. 459 Invalid arguments. Google Chrome Frame cannot be installed in ready mode without also installing Google Chrome.
460 </message> 460 </message>
461 <message name="IDS_INSTALL_INCONSISTENT_UPDATE_POLICY" desc="Error during install if the update policies settings in Group Policy are inconsistent.">
462 Google Chrome or Google Chrome Frame cannot be updated on account of inc onsistent Google Update Group Policy settings. Use the Group Policy Editor to se t the update policy override for the Google Chrome Binaries application and try again.
463 </message>
461 <!-- Options Dialog --> 464 <!-- Options Dialog -->
462 <message name="IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE" desc="The text in the options panel that describes how we use web services to improve browsing exp erience."> 465 <message name="IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE" desc="The text in the options panel that describes how we use web services to improve browsing exp erience.">
463 Google Chrome may use web services to improve your browsing experience. 466 Google Chrome may use web services to improve your browsing experience.
464 </message> 467 </message>
465 <message name="IDS_IMPORT_BOOKMARKS" desc="Explanatory text for the import ing progress dialog when importing a bookmarks.html file from the bookmark manag er"> 468 <message name="IDS_IMPORT_BOOKMARKS" desc="Explanatory text for the import ing progress dialog when importing a bookmarks.html file from the bookmark manag er">
466 Google Chrome is now importing Favorites/Bookmarks. 469 Google Chrome is now importing Favorites/Bookmarks.
467 </message> 470 </message>
468 <message name="IDS_OEM_MAIN_SHORTCUT_NAME" desc="Name of the desktop short cut to start the application for OEM pre-installations."> 471 <message name="IDS_OEM_MAIN_SHORTCUT_NAME" desc="Name of the desktop short cut to start the application for OEM pre-installations.">
469 Internet Browser 472 Internet Browser
470 </message> 473 </message>
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 <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."> 570 <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.">
568 Google Chrome Utility 571 Google Chrome Utility
569 </message> 572 </message>
570 <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."> 573 <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.">
571 Chrome Utility 574 Chrome Utility
572 </message> 575 </message>
573 </if> 576 </if>
574 </messages> 577 </messages>
575 </release> 578 </release>
576 </grit> 579 </grit>
OLDNEW
« no previous file with comments | « chrome/app/chromium_strings.grd ('k') | chrome/browser/google/google_update.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698