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

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

Issue 132583002: Installer string cleaning following Chrome Frame removal. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revised comment Created 6 years, 11 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/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 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 </message> 154 </message>
155 <if expr="pp_ifdef('chromeos')"> 155 <if expr="pp_ifdef('chromeos')">
156 <message name="IDS_PRODUCT_OS_NAME" desc="The Chrome OS application name "> 156 <message name="IDS_PRODUCT_OS_NAME" desc="The Chrome OS application name ">
157 Google Chrome OS 157 Google Chrome OS
158 </message> 158 </message>
159 <message name="IDS_SHORT_PRODUCT_OS_NAME" desc="The Chrome OS applicatio n short name"> 159 <message name="IDS_SHORT_PRODUCT_OS_NAME" desc="The Chrome OS applicatio n short name">
160 Chrome OS 160 Chrome OS
161 </message> 161 </message>
162 </if> 162 </if>
163 <if expr="is_win"> 163 <if expr="is_win">
164 <message name="IDS_PRODUCT_FRAME_NAME" desc="The Chrome Frame applicatio n name">
165 Google Chrome Frame
166 </message>
167 <message name="IDS_PRODUCT_APP_LAUNCHER_NAME" desc="The Chrome App Launc her application name"> 164 <message name="IDS_PRODUCT_APP_LAUNCHER_NAME" desc="The Chrome App Launc her application name">
168 Google Chrome App Launcher 165 Google Chrome App Launcher
169 </message> 166 </message>
170 <message name="IDS_WIN8_INFOBAR_DESKTOP_RESTART_FOR_APP_LIST" 167 <message name="IDS_WIN8_INFOBAR_DESKTOP_RESTART_FOR_APP_LIST"
171 desc="Infobar message to restart chrome in desktop mode to disp lay the App Launcher. Aplies to Windows 8 only"> 168 desc="Infobar message to restart chrome in desktop mode to disp lay the App Launcher. Aplies to Windows 8 only">
172 To use the app launcher, you must relaunch Google Chrome on the deskto p. 169 To use the app launcher, you must relaunch Google Chrome on the deskto p.
173 </message> 170 </message>
174 <message name="IDS_WIN8_INFOBAR_DESKTOP_RESTART_FOR_PACKAGED_APP" 171 <message name="IDS_WIN8_INFOBAR_DESKTOP_RESTART_FOR_PACKAGED_APP"
175 desc="Infobar message to restart chrome in desktop mode to laun ch a Chrome Packaged App. Aplies to Windows 8 only"> 172 desc="Infobar message to restart chrome in desktop mode to laun ch a Chrome Packaged App. Aplies to Windows 8 only">
176 To use Chrome apps, you must relaunch Google Chrome on the desktop. 173 To use Chrome apps, you must relaunch Google Chrome on the desktop.
177 </message> 174 </message>
178 <message name="IDS_WIN8_INFOBAR_DESKTOP_RESTART_TO_LAUNCH_APPS_YES_BUTTO N" 175 <message name="IDS_WIN8_INFOBAR_DESKTOP_RESTART_TO_LAUNCH_APPS_YES_BUTTO N"
179 desc="Infobar button 'yes' text to confirm that the user does wish to switch to desktop mode to use Chrome Apps"> 176 desc="Infobar button 'yes' text to confirm that the user does wish to switch to desktop mode to use Chrome Apps">
180 Relaunch Chrome 177 Relaunch Chrome
181 </message> 178 </message>
182 <message name="IDS_PRODUCT_BINARIES_NAME" desc="The Chrome Binaries appl ication name"> 179 <message name="IDS_PRODUCT_BINARIES_NAME" desc="The Chrome Binaries appl ication name">
183 Google Chrome Binaries 180 Google Chrome Binaries
184 </message> 181 </message>
185 <message name="IDS_VERSIONMISMATCH_HEADER">
186 Chrome Frame Update.
187 </message>
188 <message name="IDS_VERSIONMISMATCH">
189 Chrome Frame has been updated. Please relaunch your browser. Chrome ve rsion: <ph name="TODO_0001">%ls<ex>TODO</ex></ph>, Chrome Frame version: <ph nam e="TODO_0002">%ls<ex>TODO</ex></ph>
190 </message>
191 <message name="IDS_VERSIONUNKNOWN">
192 Unknown version.
193 </message>
194 <message name="IDS_CHROME_FRAME_MENU_ABOUT" desc="About Chrome Frame lab el">
195 About Chrome Frame...
196 </message>
197 <message name="IDS_CHROME_FRAME_READY_MODE_LEARN_MORE_URL" desc="Link to knowledge-base article about Chrome Frame Ready Mode">
198 http://www.google.com/support/chrome/bin/answer.py?hl=[GRITLANGCODE]&a mp;answer=161796
199 </message>
200 <message name="IDS_CHROME_FRAME_TURNDOWN_LEARN_MORE_URL" desc="Link to k nowledge-base article about Chrome Frame turndown">
201 http://support.google.com/chrome/?p=ib_chromeframe
202 </message>
203 <message name="IDS_CHROME_FRAME_TURNDOWN_TEXT_IE_OLDER" desc="Text of Ch rome Frame turndown prompt for IE 6, 7, and 8">
204 This site is using the retired Chrome Frame plug-in which no longer re ceives security and stability updates. Please uninstall it and upgrade to a mode rn browser.
205 </message>
206 <message name="IDS_CHROME_FRAME_TURNDOWN_TEXT_IE_NEWER" desc="Text of Ch rome Frame turndown prompt for IE 9 and 10">
207 This site is using the retired Chrome Frame plug-in which no longer re ceives security and stability updates. Please uninstall it and upgrade to a mode rn browser.
208 </message>
209 <message name="IDS_SHORTCUT_NEW_WINDOW" desc="The text label of the New window shortcut context menu entry as of Windows 8"> 182 <message name="IDS_SHORTCUT_NEW_WINDOW" desc="The text label of the New window shortcut context menu entry as of Windows 8">
210 New window 183 New window
211 </message> 184 </message>
212 </if> 185 </if>
213 <message name="IDS_CERT_ERROR_COMMON_NAME_INVALID_EXTRA_INFO_2" desc="2nd paragraph of extra information for an unsafe common name in an X509 certificate" > 186 <message name="IDS_CERT_ERROR_COMMON_NAME_INVALID_EXTRA_INFO_2" desc="2nd paragraph of extra information for an unsafe common name in an X509 certificate" >
214 In this case, the address listed in the certificate does not match the a ddress of the website your browser tried to go to. One possible reason for this is that your communications are being intercepted by an attacker who is presenti ng a certificate for a different website, which would cause a mismatch. Another possible reason is that the server is set up to return the same certificate for multiple websites, including the one you are attempting to visit, even though th at certificate is not valid for all of those websites. Google Chrome can say for sure that you reached &lt;strong&gt;<ph name="DOMAIN2">$1<ex>paypal.com</ex></p h>&lt;/strong&gt;, but cannot verify that that is the same site as &lt;strong&gt ;<ph name="DOMAIN">$2<ex>www.paypal.com</ex></ph>&lt;/strong&gt; which you inten ded to reach. If you proceed, Chrome will not check for any further name mismatc hes. 187 In this case, the address listed in the certificate does not match the a ddress of the website your browser tried to go to. One possible reason for this is that your communications are being intercepted by an attacker who is presenti ng a certificate for a different website, which would cause a mismatch. Another possible reason is that the server is set up to return the same certificate for multiple websites, including the one you are attempting to visit, even though th at certificate is not valid for all of those websites. Google Chrome can say for sure that you reached &lt;strong&gt;<ph name="DOMAIN2">$1<ex>paypal.com</ex></p h>&lt;/strong&gt;, but cannot verify that that is the same site as &lt;strong&gt ;<ph name="DOMAIN">$2<ex>www.paypal.com</ex></ph>&lt;/strong&gt; which you inten ded to reach. If you proceed, Chrome will not check for any further name mismatc hes.
215 </message> 188 </message>
216 <message name="IDS_CERT_ERROR_EXPIRED_DETAILS" desc="Details for an expire d X509 certificate"> 189 <message name="IDS_CERT_ERROR_EXPIRED_DETAILS" desc="Details for an expire d X509 certificate">
217 You attempted to reach &lt;strong&gt;<ph name="DOMAIN">$1<ex>paypal.com< /ex></ph>&lt;/strong&gt;, but the server presented an expired certificate. No in formation is available to indicate whether that certificate has been compromised since its expiration. This means Google Chrome cannot guarantee that you are co mmunicating with &lt;strong&gt;<ph name="DOMAIN2">$2<ex>paypal.com</ex></ph>&lt; /strong&gt; and not an attacker. Your computer's clock is currently set to <ph n ame="CURRENT_TIME">$3<ex>Monday, July 18th, 2012 12:31PM</ex></ph>. Does that lo ok right? If not, you should correct the error and refresh this page. 190 You attempted to reach &lt;strong&gt;<ph name="DOMAIN">$1<ex>paypal.com< /ex></ph>&lt;/strong&gt;, but the server presented an expired certificate. No in formation is available to indicate whether that certificate has been compromised since its expiration. This means Google Chrome cannot guarantee that you are co mmunicating with &lt;strong&gt;<ph name="DOMAIN2">$2<ex>paypal.com</ex></ph>&lt; /strong&gt; and not an attacker. Your computer's clock is currently set to <ph n ame="CURRENT_TIME">$3<ex>Monday, July 18th, 2012 12:31PM</ex></ph>. Does that lo ok right? If not, you should correct the error and refresh this page.
218 </message> 191 </message>
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 </message> 408 </message>
436 <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."> 409 <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.">
437 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. 410 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.
438 </message> 411 </message>
439 <message name="IDS_INSTALL_HIGHER_VERSION" desc="Error displayed when high er version already exists."> 412 <message name="IDS_INSTALL_HIGHER_VERSION" desc="Error displayed when high er version already exists.">
440 This computer already has a more recent version of Google Chrome. If the software is not working, please uninstall Google Chrome and try again. 413 This computer already has a more recent version of Google Chrome. If the software is not working, please uninstall Google Chrome and try again.
441 </message> 414 </message>
442 <message name="IDS_INSTALL_HIGHER_VERSION_APP_LAUNCHER" desc="Error displa yed when higher version of the Chrome App Launcher already exists."> 415 <message name="IDS_INSTALL_HIGHER_VERSION_APP_LAUNCHER" desc="Error displa yed when higher version of the Chrome App Launcher already exists.">
443 This computer already has a more recent version of the Google Chrome com ponents. Please use a more recent installer. 416 This computer already has a more recent version of the Google Chrome com ponents. Please use a more recent installer.
444 </message> 417 </message>
445 <message name="IDS_INSTALL_SYSTEM_LEVEL_EXISTS" desc="Error displayed duri ng user level install if system level Chrome Frame is already installed.">
446 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.
447 </message>
448 <message name="IDS_INSTALL_FAILED" desc="Error displayed if installation f ails due to some unknown error."> 418 <message name="IDS_INSTALL_FAILED" desc="Error displayed if installation f ails due to some unknown error.">
449 Installation failed due to unspecified error. If Google Chrome is curren tly running, please close it and try again. 419 Installation failed due to unspecified error. If Google Chrome is curren tly running, please close it and try again.
450 </message> 420 </message>
451 <message name="IDS_SAME_VERSION_REPAIR_FAILED" desc="Error displayed if in stallation fails due to Chrome running."> 421 <message name="IDS_SAME_VERSION_REPAIR_FAILED" desc="Error displayed if in stallation fails due to Chrome running.">
452 Can not install the same Google Chrome version that is currently running . Please close Google Chrome and try again. 422 Can not install the same Google Chrome version that is currently running . Please close Google Chrome and try again.
453 </message> 423 </message>
454 <message name="IDS_SETUP_PATCH_FAILED" desc="Error message when setup.exe fails to patch itself."> 424 <message name="IDS_SETUP_PATCH_FAILED" desc="Error message when setup.exe fails to patch itself.">
455 Installation failed due to unspecified error. Please download Google Chr ome again. 425 Installation failed due to unspecified error. Please download Google Chr ome again.
456 </message> 426 </message>
457 <message name="IDS_INSTALL_OS_NOT_SUPPORTED" desc="Error displayed if OS i s not supported"> 427 <message name="IDS_INSTALL_OS_NOT_SUPPORTED" desc="Error displayed if OS i s not supported">
458 Google Chrome requires Windows Vista or Windows XP with SP2 or higher. 428 Google Chrome requires Windows Vista or Windows XP with SP2 or higher.
459 </message> 429 </message>
460 <message name="IDS_INSTALL_OS_ERROR" desc="Error displayed when any Window s API call fails and we do not have more specific information."> 430 <message name="IDS_INSTALL_OS_ERROR" desc="Error displayed when any Window s API call fails and we do not have more specific information.">
461 An operating system error occurred during installation. Please download Google Chrome again. 431 An operating system error occurred during installation. Please download Google Chrome again.
462 </message> 432 </message>
463 <message name="IDS_INSTALL_TEMP_DIR_FAILED" desc="Error displayed when we fail to create temporary directory during installation."> 433 <message name="IDS_INSTALL_TEMP_DIR_FAILED" desc="Error displayed when we fail to create temporary directory during installation.">
464 The installer couldn't create a temporary directory. Please check for fr ee disk space and permission to install software. 434 The installer couldn't create a temporary directory. Please check for fr ee disk space and permission to install software.
465 </message> 435 </message>
466 <message name="IDS_INSTALL_UNCOMPRESSION_FAILED" desc="Error when when we can not uncompress installation archive."> 436 <message name="IDS_INSTALL_UNCOMPRESSION_FAILED" desc="Error when when we can not uncompress installation archive.">
467 The installer failed to uncompress archive. Please download Google Chrom e again. 437 The installer failed to uncompress archive. Please download Google Chrom e again.
468 </message> 438 </message>
469 <message name="IDS_INSTALL_INVALID_ARCHIVE" desc="Error displayed when we can not open the installation archive."> 439 <message name="IDS_INSTALL_INVALID_ARCHIVE" desc="Error displayed when we can not open the installation archive.">
470 The installer archive is corrupted or invalid. Please download Google Ch rome again. 440 The installer archive is corrupted or invalid. Please download Google Ch rome again.
471 </message> 441 </message>
472 <message name="IDS_INSTALL_INSUFFICIENT_RIGHTS" desc="Error displayed when a non admin user tries to attempt system level install/uninstall."> 442 <message name="IDS_INSTALL_INSUFFICIENT_RIGHTS" desc="Error displayed when a non admin user tries to attempt system level install/uninstall.">
473 You do not have appropriate rights for system-level install. Try running the installer again as Administrator. 443 You do not have appropriate rights for system-level install. Try running the installer again as Administrator.
474 </message> 444 </message>
475 <message name="IDS_INSTALL_NO_PRODUCTS_TO_UPDATE" desc="Error displayed if the installer is not provided one or more products to install/update."> 445 <message name="IDS_INSTALL_NO_PRODUCTS_TO_UPDATE" desc="Error displayed if the installer is not provided one or more products to install/update.">
476 No installation of Google Chrome or Google Chrome Frame found to update. 446 No installation of Google Chrome found to update.
477 </message> 447 </message>
478 <message name="IDS_UNINSTALL_COMPLETE" desc="Text displayed on dialog that is shown when uninstall is complete and no reboot is required."> 448 <message name="IDS_UNINSTALL_COMPLETE" desc="Text displayed on dialog that is shown when uninstall is complete and no reboot is required.">
479 Uninstallation complete. 449 Uninstallation complete.
480 </message> 450 </message>
481 <message name="IDS_INSTALL_DIR_IN_USE" desc="Error during install if Googl e Chrome version is missing from registry but the installation directory exists and can not be deleted."> 451 <message name="IDS_INSTALL_DIR_IN_USE" desc="Error during install if Googl e Chrome version is missing from registry but the installation directory exists and can not be deleted.">
482 Google Chrome installation directory seems to be in use. Please reboot y our computer and try again. 452 Google Chrome installation directory seems to be in use. Please reboot y our computer and try again.
483 </message> 453 </message>
484 <message name="IDS_INSTALL_NON_MULTI_INSTALLATION_EXISTS" desc="Error duri ng install if a single-install Google Chrome or Google Chrome Frame is present, thereby preventing the installation of a multi-install Google Chrome or Google C hrome Frame."> 454 <message name="IDS_INSTALL_MULTI_INSTALLATION_EXISTS" desc="Error during i nstall if a multi-install Google Chrome is present, thereby preventing the insta llation of a single-install Google Chrome.">
485 A conflicting installation of Google Chrome or Google Chrome Frame was f ound on the system. Please uninstall it and try again. 455 A conflicting installation of Google Chrome was found on the system. Ple ase uninstall it and try again.
486 </message>
487 <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.">
488 A conflicting installation of Google Chrome or Google Chrome Frame was f ound on the system. Please uninstall it and try again.
489 </message>
490 <message name="IDS_INSTALL_READY_MODE_REQUIRES_CHROME" desc="Chrome Frame in ready mode requires Chrome.">
491 Invalid arguments. Google Chrome Frame cannot be installed in ready mode without also installing Google Chrome.
492 </message> 456 </message>
493 <message name="IDS_INSTALL_INCONSISTENT_UPDATE_POLICY" desc="Error during install if the update policies settings in Group Policy are inconsistent."> 457 <message name="IDS_INSTALL_INCONSISTENT_UPDATE_POLICY" desc="Error during install if the update policies settings in Group Policy are inconsistent.">
494 Google Chrome or Google Chrome Frame cannot be updated due to inconsiste nt Google Update Group Policy settings. Use the Group Policy Editor to set the u pdate policy override for the Google Chrome Binaries application and try again; see http://goo.gl/uJ9gV for details. 458 Google Chrome cannot be updated due to inconsistent Google Update Group Policy settings. Use the Group Policy Editor to set the update policy override f or the Google Chrome Binaries application and try again; see http://goo.gl/uJ9gV for details.
495 </message> 459 </message>
496 <!-- Options Dialog --> 460 <!-- Options Dialog -->
497 <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."> 461 <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.">
498 Google Chrome may use web services to improve your browsing experience. 462 Google Chrome may use web services to improve your browsing experience.
499 </message> 463 </message>
500 <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"> 464 <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">
501 Google Chrome is now importing Favorites/Bookmarks. 465 Google Chrome is now importing Favorites/Bookmarks.
502 </message> 466 </message>
503 <message name="IDS_OEM_MAIN_SHORTCUT_NAME" desc="Name of the desktop short cut to start the application for OEM pre-installations."> 467 <message name="IDS_OEM_MAIN_SHORTCUT_NAME" desc="Name of the desktop short cut to start the application for OEM pre-installations.">
504 Internet Browser 468 Internet Browser
(...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after
976 </message> 940 </message>
977 941
978 <!-- ProcessSingleton --> 942 <!-- ProcessSingleton -->
979 <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."> 943 <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.">
980 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. 944 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.
981 </message> 945 </message>
982 946
983 </messages> 947 </messages>
984 </release> 948 </release>
985 </grit> 949 </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