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

Side by Side Diff: chrome/app/chromium_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 | « 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 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 </message> 231 </message>
232 <if expr="pp_ifdef('chromeos')"> 232 <if expr="pp_ifdef('chromeos')">
233 <message name="IDS_PRODUCT_OS_NAME" desc="The Chrome OS application name "> 233 <message name="IDS_PRODUCT_OS_NAME" desc="The Chrome OS application name ">
234 Chromium OS 234 Chromium OS
235 </message> 235 </message>
236 <message name="IDS_SHORT_PRODUCT_OS_NAME" desc="The Chrome OS applicatio n short name"> 236 <message name="IDS_SHORT_PRODUCT_OS_NAME" desc="The Chrome OS applicatio n short name">
237 Chromium OS 237 Chromium OS
238 </message> 238 </message>
239 </if> 239 </if>
240 <if expr="is_win"> 240 <if expr="is_win">
241 <message name="IDS_PRODUCT_FRAME_NAME" desc="The Chrome Frame applicatio n name">
242 Chromium Frame
243 </message>
244 <message name="IDS_PRODUCT_APP_LAUNCHER_NAME" desc="The Chrome App Launc her application name"> 241 <message name="IDS_PRODUCT_APP_LAUNCHER_NAME" desc="The Chrome App Launc her application name">
245 Chromium App Launcher 242 Chromium App Launcher
246 </message> 243 </message>
247 <message name="IDS_WIN8_INFOBAR_DESKTOP_RESTART_FOR_APP_LIST" 244 <message name="IDS_WIN8_INFOBAR_DESKTOP_RESTART_FOR_APP_LIST"
248 desc="Infobar message to restart chrome in desktop mode to disp lay the App Launcher. Aplies to Windows 8 only"> 245 desc="Infobar message to restart chrome in desktop mode to disp lay the App Launcher. Aplies to Windows 8 only">
249 To use the app launcher, you must relaunch Chromium on the desktop. 246 To use the app launcher, you must relaunch Chromium on the desktop.
250 </message> 247 </message>
251 <message name="IDS_WIN8_INFOBAR_DESKTOP_RESTART_FOR_PACKAGED_APP" 248 <message name="IDS_WIN8_INFOBAR_DESKTOP_RESTART_FOR_PACKAGED_APP"
252 desc="Infobar message to restart chrome in desktop mode to laun ch a Chrome Packaged App. Aplies to Windows 8 only"> 249 desc="Infobar message to restart chrome in desktop mode to laun ch a Chrome Packaged App. Aplies to Windows 8 only">
253 To use Chrome apps, you must relaunch Chromium on the desktop. 250 To use Chrome apps, you must relaunch Chromium on the desktop.
254 </message> 251 </message>
255 <message name="IDS_WIN8_INFOBAR_DESKTOP_RESTART_TO_LAUNCH_APPS_YES_BUTTO N" 252 <message name="IDS_WIN8_INFOBAR_DESKTOP_RESTART_TO_LAUNCH_APPS_YES_BUTTO N"
256 desc="Infobar button 'yes' text to confirm that the user does wish to switch to desktop mode to use Chrome Apps"> 253 desc="Infobar button 'yes' text to confirm that the user does wish to switch to desktop mode to use Chrome Apps">
257 Relaunch Chromium 254 Relaunch Chromium
258 </message> 255 </message>
259 <message name="IDS_PRODUCT_BINARIES_NAME" desc="The Chrome Binaries appl ication name"> 256 <message name="IDS_PRODUCT_BINARIES_NAME" desc="The Chrome Binaries appl ication name">
260 Chromium Binaries 257 Chromium Binaries
261 </message> 258 </message>
262 <message name="IDS_VERSIONMISMATCH_HEADER">
263 Chromium Frame Update.
264 </message>
265 <message name="IDS_VERSIONMISMATCH">
266 Chromium Frame has been updated. Please relaunch your browser. Chromiu m version: <ph name="TODO_0001">%ls<ex>TODO</ex></ph>, Chromium Frame version: < ph name="TODO_0002">%ls<ex>TODO</ex></ph>
267 </message>
268 <message name="IDS_VERSIONUNKNOWN">
269 Unknown version.
270 </message>
271 <message name="IDS_CHROME_FRAME_MENU_ABOUT" desc="About Chrome Frame lab el">
272 About Chromium Frame...
273 </message>
274 <message name="IDS_CHROME_FRAME_READY_MODE_LEARN_MORE_URL" desc="Link to knowledge-base article about Chromium Frame Ready Mode">
275 http://www.google.com/support/chrome/bin/answer.py?hl=[GRITLANGCODE]&a mp;answer=161796
276 </message>
277 <message name="IDS_CHROME_FRAME_TURNDOWN_LEARN_MORE_URL" desc="Link to k nowledge-base article about Chromium Frame's turndown">
278 http://support.google.com/chrome/?p=ib_chromeframe
279 </message>
280 <message name="IDS_CHROME_FRAME_TURNDOWN_TEXT_IE_OLDER" desc="Text of Ch romium Frame turndown prompt for IE 6, 7, and 8">
281 This site is using the Chromium Frame plug-in which will soon be unsup ported. Please uninstall it and upgrade to a modern browser.
282 </message>
283 <message name="IDS_CHROME_FRAME_TURNDOWN_TEXT_IE_NEWER" desc="Text of Ch romium Frame turndown prompt for IE 9 and 10">
284 This site is using the Chromium Frame plug-in that will soon be unsupp orted. Please uninstall it and download a compatible browser.
285 </message>
286 <message name="IDS_SHORTCUT_NEW_WINDOW" desc="The text label of the New window shortcut context menu entry as of Windows 8"> 259 <message name="IDS_SHORTCUT_NEW_WINDOW" desc="The text label of the New window shortcut context menu entry as of Windows 8">
287 New window 260 New window
288 </message> 261 </message>
289 </if> 262 </if>
290 <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" > 263 <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" >
291 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. Chromium can say for sure that you reached &lt;strong&gt;<ph name="DOMAIN2">$1<ex>paypal.com</ex></ph>&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 intended t o reach. If you proceed, Chromium will not check for any further name mismatches . 264 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. Chromium can say for sure that you reached &lt;strong&gt;<ph name="DOMAIN2">$1<ex>paypal.com</ex></ph>&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 intended t o reach. If you proceed, Chromium will not check for any further name mismatches .
292 </message> 265 </message>
293 <message name="IDS_CERT_ERROR_EXPIRED_DETAILS" desc="Details for an expire d X509 certificate"> 266 <message name="IDS_CERT_ERROR_EXPIRED_DETAILS" desc="Details for an expire d X509 certificate">
294 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 Chromium cannot guarantee that you are communi cating with &lt;strong&gt;<ph name="DOMAIN2">$2<ex>paypal.com</ex></ph>&lt;/stro ng&gt; and not an attacker. Your computer's clock is currently set to <ph name=" CURRENT_TIME">$3<ex>Monday, July 18th, 2012 12:31PM</ex></ph>. Does that look ri ght? If not, you should correct the error and refresh this page. 267 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 Chromium cannot guarantee that you are communi cating with &lt;strong&gt;<ph name="DOMAIN2">$2<ex>paypal.com</ex></ph>&lt;/stro ng&gt; and not an attacker. Your computer's clock is currently set to <ph name=" CURRENT_TIME">$3<ex>Monday, July 18th, 2012 12:31PM</ex></ph>. Does that look ri ght? If not, you should correct the error and refresh this page.
295 </message> 268 </message>
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 </message> 485 </message>
513 <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."> 486 <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.">
514 An administrator has installed Chromium on this system, and it is availa ble for all users. The system-level Chromium will replace your user-level instal lation now. 487 An administrator has installed Chromium on this system, and it is availa ble for all users. The system-level Chromium will replace your user-level instal lation now.
515 </message> 488 </message>
516 <message name="IDS_INSTALL_HIGHER_VERSION" desc="Error displayed when high er version already exists."> 489 <message name="IDS_INSTALL_HIGHER_VERSION" desc="Error displayed when high er version already exists.">
517 This computer already has a more recent version of Chromium. If the soft ware is not working, please uninstall Chromium and try again. 490 This computer already has a more recent version of Chromium. If the soft ware is not working, please uninstall Chromium and try again.
518 </message> 491 </message>
519 <message name="IDS_INSTALL_HIGHER_VERSION_APP_LAUNCHER" desc="Error displa yed when higher version of the Chromium App Launcher already exists."> 492 <message name="IDS_INSTALL_HIGHER_VERSION_APP_LAUNCHER" desc="Error displa yed when higher version of the Chromium App Launcher already exists.">
520 This computer already has a more recent version of the Chromium componen ts. Please use a more recent installer. 493 This computer already has a more recent version of the Chromium componen ts. Please use a more recent installer.
521 </message> 494 </message>
522 <message name="IDS_INSTALL_SYSTEM_LEVEL_EXISTS" desc="Error displayed duri ng user level install if system level Chromium Frame is already installed.">
523 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.
524 </message>
525 <message name="IDS_INSTALL_FAILED" desc="Error displayed if installation f ails due to some unknown error."> 495 <message name="IDS_INSTALL_FAILED" desc="Error displayed if installation f ails due to some unknown error.">
526 Installation failed due to unspecified error. If Chromium is currently r unning, please close it and try again. 496 Installation failed due to unspecified error. If Chromium is currently r unning, please close it and try again.
527 </message> 497 </message>
528 <message name="IDS_SAME_VERSION_REPAIR_FAILED" desc="Error displayed if in stallation fails due to Chrome running."> 498 <message name="IDS_SAME_VERSION_REPAIR_FAILED" desc="Error displayed if in stallation fails due to Chrome running.">
529 Can not install the same Chromium version that is currently running. Ple ase close Chromium and try again. 499 Can not install the same Chromium version that is currently running. Ple ase close Chromium and try again.
530 </message> 500 </message>
531 <message name="IDS_SETUP_PATCH_FAILED" desc="Error message when setup.exe fails to patch itself."> 501 <message name="IDS_SETUP_PATCH_FAILED" desc="Error message when setup.exe fails to patch itself.">
532 Installation failed due to unspecified error. Please download Chromium a gain. 502 Installation failed due to unspecified error. Please download Chromium a gain.
533 </message> 503 </message>
534 <message name="IDS_INSTALL_OS_NOT_SUPPORTED" desc="Error displayed if OS i s not supported"> 504 <message name="IDS_INSTALL_OS_NOT_SUPPORTED" desc="Error displayed if OS i s not supported">
535 Chromium requires Windows Vista or Windows XP with SP2 or higher. 505 Chromium requires Windows Vista or Windows XP with SP2 or higher.
536 </message> 506 </message>
537 <message name="IDS_INSTALL_OS_ERROR" desc="Error displayed when any Window s API call fails and we do not have more specific information."> 507 <message name="IDS_INSTALL_OS_ERROR" desc="Error displayed when any Window s API call fails and we do not have more specific information.">
538 An operating system error occurred during installation. Please download Chromium again. 508 An operating system error occurred during installation. Please download Chromium again.
539 </message> 509 </message>
540 <message name="IDS_INSTALL_TEMP_DIR_FAILED" desc="Error displayed when we fail to create temporary directory during installation."> 510 <message name="IDS_INSTALL_TEMP_DIR_FAILED" desc="Error displayed when we fail to create temporary directory during installation.">
541 The installer couldn't create a temporary directory. Please check for fr ee disk space and permission to install software. 511 The installer couldn't create a temporary directory. Please check for fr ee disk space and permission to install software.
542 </message> 512 </message>
543 <message name="IDS_INSTALL_UNCOMPRESSION_FAILED" desc="Error when when we can not uncompress installation archive."> 513 <message name="IDS_INSTALL_UNCOMPRESSION_FAILED" desc="Error when when we can not uncompress installation archive.">
544 The installer failed to uncompress archive. Please download Chromium aga in. 514 The installer failed to uncompress archive. Please download Chromium aga in.
545 </message> 515 </message>
546 <message name="IDS_INSTALL_INVALID_ARCHIVE" desc="Error displayed when we can not open the installation archive."> 516 <message name="IDS_INSTALL_INVALID_ARCHIVE" desc="Error displayed when we can not open the installation archive.">
547 The installer archive is corrupted or invalid. Please download Chromium again. 517 The installer archive is corrupted or invalid. Please download Chromium again.
548 </message> 518 </message>
549 <message name="IDS_INSTALL_INSUFFICIENT_RIGHTS" desc="Error displayed when a non admin user tries to attempt system level install/uninstall."> 519 <message name="IDS_INSTALL_INSUFFICIENT_RIGHTS" desc="Error displayed when a non admin user tries to attempt system level install/uninstall.">
550 You do not have appropriate rights for system-level install. Try running the installer again as Administrator. 520 You do not have appropriate rights for system-level install. Try running the installer again as Administrator.
551 </message> 521 </message>
552 <message name="IDS_INSTALL_NO_PRODUCTS_TO_UPDATE" desc="Error displayed if the installer is not provided one or more products to install/update."> 522 <message name="IDS_INSTALL_NO_PRODUCTS_TO_UPDATE" desc="Error displayed if the installer is not provided one or more products to install/update.">
553 No installation of Chromium or Chromium Frame found to update. 523 No installation of Chromium found to update.
554 </message> 524 </message>
555 <message name="IDS_UNINSTALL_COMPLETE" desc="Text displayed on dialog that is shown when uninstall is complete and no reboot is required."> 525 <message name="IDS_UNINSTALL_COMPLETE" desc="Text displayed on dialog that is shown when uninstall is complete and no reboot is required.">
556 Uninstallation complete. 526 Uninstallation complete.
557 </message> 527 </message>
558 <message name="IDS_INSTALL_DIR_IN_USE" desc="Error during install if Chrom ium version is missing from registry but the installation directory exists and c an not be deleted."> 528 <message name="IDS_INSTALL_DIR_IN_USE" desc="Error during install if Chrom ium version is missing from registry but the installation directory exists and c an not be deleted.">
559 Chromium installation directory seems to be in use. Please reboot your c omputer and try again. 529 Chromium installation directory seems to be in use. Please reboot your c omputer and try again.
560 </message> 530 </message>
561 <message name="IDS_INSTALL_NON_MULTI_INSTALLATION_EXISTS" desc="Error duri ng install if a single-install Chromium or Chromium Frame is present, thereby pr eventing the installation of a multi-install Chromium or Chromium Frame."> 531 <message name="IDS_INSTALL_MULTI_INSTALLATION_EXISTS" desc="Error during i nstall if a multi-install Chromium is present, thereby preventing the installati on of a single-install Chromium.">
562 A conflicting installation of Chromium or Chromium Frame was found on th e system. Please uninstall it and try again. 532 A conflicting installation of Chromium was found on the system. Please u ninstall it and try again.
563 </message>
564 <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.">
565 A conflicting installation of Chromium or Chromium Frame was found on th e system. Please uninstall it and try again.
566 </message>
567 <message name="IDS_INSTALL_READY_MODE_REQUIRES_CHROME" desc="Chrome Frame in ready mode requires Chrome.">
568 Invalid arguments. Chromium Frame cannot be installed in ready mode with out also installing Chromium.
569 </message> 533 </message>
570 <message name="IDS_INSTALL_INCONSISTENT_UPDATE_POLICY" desc="This message does not apply to Chromium."> 534 <message name="IDS_INSTALL_INCONSISTENT_UPDATE_POLICY" desc="This message does not apply to Chromium.">
571 </message> 535 </message>
572 <!-- Options Dialog --> 536 <!-- Options Dialog -->
573 <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."> 537 <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.">
574 Chromium may use web services to improve your browsing experience. 538 Chromium may use web services to improve your browsing experience.
575 </message> 539 </message>
576 <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"> 540 <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">
577 Chromium is now importing Favorites/Bookmarks. 541 Chromium is now importing Favorites/Bookmarks.
578 </message> 542 </message>
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
1052 </message> 1016 </message>
1053 1017
1054 <!-- ProcessSingleton --> 1018 <!-- ProcessSingleton -->
1055 <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."> 1019 <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.">
1056 The profile appears to be in use by another Chromium process (<ph name=" PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2< ex>example.com</ex></ph>). Chromium has locked the profile so that it doesn't ge t corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium. 1020 The profile appears to be in use by another Chromium process (<ph name=" PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2< ex>example.com</ex></ph>). Chromium has locked the profile so that it doesn't ge t corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium.
1057 </message> 1021 </message>
1058 1022
1059 </messages> 1023 </messages>
1060 </release> 1024 </release>
1061 </grit> 1025 </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