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

Side by Side Diff: chrome/app/chromium_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 | « 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 449 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 </message> 460 </message>
461 <message name="IDS_INSTALL_MULTI_INSTALLATION_EXISTS" desc="Error during i nstall if a multi-install Chromium or Chromium Frame is present, thereby prevent ing the installation of a single-install Chromium or Chromium Frame."> 461 <message name="IDS_INSTALL_MULTI_INSTALLATION_EXISTS" desc="Error during i nstall if a multi-install Chromium or Chromium Frame is present, thereby prevent ing the installation of a single-install Chromium or Chromium Frame.">
462 A conflicting installation of Chromium or Chromium Frame was found on th e system. Please uninstall it and try again. 462 A conflicting installation of Chromium or Chromium Frame was found on th e system. Please uninstall it and try again.
463 </message> 463 </message>
464 <message name="IDS_INSTALL_CONFLICTING_CHANNEL_EXISTS" desc="Error during install if a version of Chromium on a different update channel exists when insta lling Chromium Frame."> 464 <message name="IDS_INSTALL_CONFLICTING_CHANNEL_EXISTS" desc="Error during install if a version of Chromium on a different update channel exists when insta lling Chromium Frame.">
465 A conflicting installation of Chromium was found on the system. Please u ninstall it and try again. 465 A conflicting installation of Chromium was found on the system. Please u ninstall it and try again.
466 </message> 466 </message>
467 <message name="IDS_INSTALL_READY_MODE_REQUIRES_CHROME" desc="Chrome Frame in ready mode requires Chrome."> 467 <message name="IDS_INSTALL_READY_MODE_REQUIRES_CHROME" desc="Chrome Frame in ready mode requires Chrome.">
468 Invalid arguments. Chromium Frame cannot be installed in ready mode with out also installing Chromium. 468 Invalid arguments. Chromium Frame cannot be installed in ready mode with out also installing Chromium.
469 </message> 469 </message>
470 <message name="IDS_INSTALL_INCONSISTENT_UPDATE_POLICY" desc="This message does not apply to Chromium.">
471 </message>
470 <!-- Options Dialog --> 472 <!-- Options Dialog -->
471 <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."> 473 <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.">
472 Chromium may use web services to improve your browsing experience. 474 Chromium may use web services to improve your browsing experience.
473 </message> 475 </message>
474 <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"> 476 <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">
475 Chromium is now importing Favorites/Bookmarks. 477 Chromium is now importing Favorites/Bookmarks.
476 </message> 478 </message>
477 <message name="IDS_OEM_MAIN_SHORTCUT_NAME" desc="Name of the desktop short cut to start the application for OEM pre-installations."> 479 <message name="IDS_OEM_MAIN_SHORTCUT_NAME" desc="Name of the desktop short cut to start the application for OEM pre-installations.">
478 Internet Browser 480 Internet Browser
479 </message> 481 </message>
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
576 <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."> 578 <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.">
577 Chromium Utility 579 Chromium Utility
578 </message> 580 </message>
579 <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."> 581 <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.">
580 Chromium Utility 582 Chromium Utility
581 </message> 583 </message>
582 </if> 584 </if>
583 </messages> 585 </messages>
584 </release> 586 </release>
585 </grit> 587 </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