diff options
| author | yusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-24 14:16:39 +0000 |
|---|---|---|
| committer | yusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-24 14:16:39 +0000 |
| commit | b098eca316ffe0da9c630939d18fdb741a2f40d2 (patch) | |
| tree | daf20eb59de69d4539ffd43e169af9fd14078374 /chrome/app | |
| parent | e0935cc22a6c10461b004b9f3c0b0f7f4d52c137 (diff) | |
| download | chromium_src-b098eca316ffe0da9c630939d18fdb741a2f40d2.zip chromium_src-b098eca316ffe0da9c630939d18fdb741a2f40d2.tar.gz chromium_src-b098eca316ffe0da9c630939d18fdb741a2f40d2.tar.bz2 | |
Add IDS_ABOUT_CROS_VERSION_LICENSE support back to chrome://chrome.
BUG=118348,119499
TEST=manually checked the following configurations: 1) Google Chrome for Chromebook (with USE=chrome_internal), 2) Chromium for Goobuntu with GYP_DEFINES=chromeos=1, 3) Chromium for Goobuntu without the GYP_DEFINES.
TEST=git try -b linux_chromeos -c
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=128152
Review URL: http://codereview.chromium.org/9705092
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128738 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chromium_strings.grd | 15 | ||||
| -rw-r--r-- | chrome/app/google_chrome_strings.grd | 13 |
2 files changed, 9 insertions, 19 deletions
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd index 2e5c9cb7..89d65d3 100644 --- a/chrome/app/chromium_strings.grd +++ b/chrome/app/chromium_strings.grd @@ -292,17 +292,12 @@ be available for now. --> <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> + <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 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="$1"></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 name="IDS_ABOUT_CROS_VERSION_LICENSE" desc="Additional text displayed beneath the Chromium open source URLs for Chrome OS."> + Chromium OS is made possible by additional <ph name="BEGIN_LINK_CROS_OSS"><a target="_blank" href="$1"></ph>open source software<ph name="END_LINK_CROS_OSS"></a></ph>. </message> </if> <message name="IDS_ABOUT_TERMS_OF_SERVICE" desc="The terms of service label in the About box."> diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd index 20a7b2b..75f5498 100644 --- a/chrome/app/google_chrome_strings.grd +++ b/chrome/app/google_chrome_strings.grd @@ -216,17 +216,12 @@ Chrome supports. --> <message name="IDS_ABOUT_OLD_VERSION_LICENSE" desc="The label below the copyright message, containing the URLs."> Google Chrome 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."> - Google Chrome 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> + <message name="IDS_ABOUT_VERSION_LICENSE" desc="The label below the copyright message, containing the URLs."> + Google Chrome 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 expr="pp_ifdef('chromeos')"> - <message name="IDS_ABOUT_VERSION_LICENSE" desc="The label below the copyright message, containing the URLs."> - Chrome OS is made possible by additional <ph name="BEGIN_LINK_OSS"><a target="_blank" href="$1"></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 Chrome OS."> - Chrome 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>. + Chrome OS is made possible by additional <ph name="BEGIN_LINK_CROS_OSS"><a target="_blank" href="$1"></ph>open source software<ph name="END_LINK_CROS_OSS"></a></ph>. </message> </if> <message name="IDS_ABOUT_TERMS_OF_SERVICE" desc="The terms of service label in the About box."> |