| Index: chrome/app/chromium_strings.grd
|
| diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
|
| index 68e1b5a1cc3bf851a33400853bf46cf2059c5273..d3c5537af2b3b0c587b539e8d7aacdaff02297c3 100644
|
| --- a/chrome/app/chromium_strings.grd
|
| +++ b/chrome/app/chromium_strings.grd
|
| @@ -215,25 +215,36 @@ be available for now. -->
|
| <message name="IDS_BROWSER_WINDOW_TITLE_FORMAT_NO_LOGO" desc="The format for titles displayed when the window has no distributor logo displayed">
|
| <ph name="PAGE_TITLE">$1<ex>Google</ex></ph>
|
| </message>
|
| + <message name="IDS_GET_HELP_USING_CHROME" desc="Text of the button which takes the user to the Chrome help page.">
|
| + Not used in Chromium. Placeholder to keep resources in sync.
|
| + </message>
|
| <message name="IDS_ABOUT_VERSION_COMPANY_NAME" desc="Company name on the about pages">
|
| The Chromium Authors
|
| </message>
|
| <message name="IDS_ABOUT_VERSION_COPYRIGHT" desc="Copyright information on the about pages">
|
| Copyright © 2006-2012 The Chromium Authors. All Rights Reserved.
|
| </message>
|
| - <message name="IDS_ABOUT_VERSION_LICENSE" desc="The label below the copyright message, containing the URLs.">
|
| + <message name="IDS_ABOUT_OLD_VERSION_LICENSE" desc="The label below the copyright message, containing the URLs.">
|
| Chromium is made possible by the <ph name="BEGIN_LINK_CHROMIUM">BEGIN_LINK_CHR</ph>Chromium<ph name="END_LINK_CHROMIUM">END_LINK_CHR</ph> open source project and other <ph name="BEGIN_LINK_OSS">BEGIN_LINK_OSS</ph>open source software<ph name="END_LINK_OSS">END_LINK_OSS</ph>.
|
| </message>
|
| + <if expr="not pp_ifdef('chromeos')">
|
| + <message name="IDS_ABOUT_VERSION_LICENSE" desc="The label below the copyright message, containing the URLs.">
|
| + Chromium is made possible by the <ph name="BEGIN_LINK_CHROMIUM"><a target="_blank" href="$1"></ph>Chromium<ph name="END_LINK_CHROMIUM"></a></ph> open source project and other <ph name="BEGIN_LINK_OSS"><a target="_blank" href="$2"></ph>open source software<ph name="END_LINK_OSS"></a></ph>.
|
| + </message>
|
| + </if>
|
| <if expr="pp_ifdef('chromeos')">
|
| + <message name="IDS_ABOUT_VERSION_LICENSE" desc="The label below the copyright message, containing the URLs.">
|
| + Chromium OS is made possible by additional <ph name="BEGIN_LINK_OSS"><a target="_blank" href="$2"></ph>open source software<ph name="END_LINK_OSS"></a></ph>.
|
| + </message>
|
| <message name="IDS_ABOUT_CROS_VERSION_LICENSE" desc="Additional text displayed beneath the Chromium open source URLs for Chromium OS.">
|
| Chromium OS is made possible by additional <ph name="BEGIN_LINK_CROS_OSS">BEGIN_LINK_CROS_OSS</ph>open source software<ph name="END_LINK_CROS_OSS">END_LINK_CROS_OSS</ph>.
|
| </message>
|
| </if>
|
| <message name="IDS_ABOUT_TERMS_OF_SERVICE" desc="The terms of service label in the About box.">
|
| - Not used in Chromium. Placeholder to keep resource maps in synch.
|
| + Not used in Chromium. Placeholder to keep resource maps in sync.
|
| </message>
|
| <message name="IDS_TERMS_OF_SERVICE" desc="The Terms of Service link text in the About box. Used in IDS_ABOUT_TERMS_OF_SERVICE.">
|
| - Not used in Chromium. Placeholder to keep resource maps in synch.
|
| + Not used in Chromium. Placeholder to keep resource maps in sync.
|
| </message>
|
| <message name="IDS_ACCNAME_APP" desc="The accessible name for the app menu.">
|
| Chromium
|
| @@ -562,6 +573,12 @@ Chromium is unable to recover your settings.
|
| <message name="IDS_UPGRADE_SUCCESSFUL_RELAUNCH" desc="Status label: Successfully updated">
|
| Relaunch Chromium to finish updating
|
| </message>
|
| + <message name="IDS_UPGRADE_UP_TO_DATE" desc="Status label: Already up to date">
|
| + Chromium is up to date.
|
| + </message>
|
| + <message name="IDS_UPGRADE_UPDATING" desc="Status label: Updating in the background">
|
| + Updating Chromium in the background...
|
| + </message>
|
| <if expr="pp_ifdef('chromeos')">
|
| <message name="IDS_UPGRADE_ALREADY_UP_TO_DATE" desc="Status label: Already up to date">
|
| Chromium is up to date
|
|
|