From 91a79239222020a645e69e6db55d24e4d5bb2ca9 Mon Sep 17 00:00:00 2001
From: "derat@chromium.org"
 <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 10 Nov 2010 18:15:08 +0000
Subject: chromeos: Update help URLs.

This also moves some untranslatable URL strings out of .grd
files and into code so we don't duplicate them per-language.

BUG=chromium-os:8117
TEST=trybots; also built and ran the chrome os version

Review URL: http://codereview.chromium.org/4495001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65683 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/app/generated_resources.grd       |  3 ---
 chrome/app/resources/locale_settings.grd | 25 -------------------------
 2 files changed, 28 deletions(-)

(limited to 'chrome/app')

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index b151a2b..a5dc74c 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6864,9 +6864,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_AUTOFILL_HELP_LABEL" desc="The label of the Help link on the Autofill dialog.">
         About Autofill
       </message>
-      <message name="IDS_AUTOFILL_HELP_URL" desc="The url of the Help link on the Autofill dialog.">
-        http://www.google.com/support/chrome/bin/answer.py?answer=142893&amp;hl=[GRITLANGCODE]
-      </message>
 
       <message name="IDS_THEMES_GROUP_NAME" desc="The title of the themes group">
         Themes:
diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd
index ad67dd8..864d189 100644
--- a/chrome/app/resources/locale_settings.grd
+++ b/chrome/app/resources/locale_settings.grd
@@ -377,11 +377,6 @@
         25
       </message>
 
-      <!-- The URL for the "Learn more" page for the Privacy section under Options. -->
-      <message name="IDS_PAGE_INFO_HELP_CENTER" translateable="false">
-        http://www.google.com/support/chrome/bin/answer.py?hl=[GRITLANGCODE]&amp;answer=95617
-      </message>
-
       <!-- The width and height of the Page Info bubble characters and lines (See above). -->
       <message name="IDS_PAGEINFOBUBBLE_WIDTH_CHARS" use_name_for_id="true">
         50
@@ -530,11 +525,6 @@
         http://tools.google.com/chrome/intl/[GRITLANGCODE]/welcome.html
       </message>
 
-      <!-- The URL for the "Learn more" page for the Privacy section under Options. -->
-      <message name="IDS_LEARN_MORE_PRIVACY_URL" translateable="false">
-        http://www.google.com/support/chrome/bin/answer.py?answer=114836&amp;hl=[GRITLANGCODE]
-      </message>
-
       <!-- The URL for the "Learn more" page for the Chrome Web Apps section under Options.-->
       <message name="IDS_LEARN_MORE_BACKGROUND_MODE_URL" translateable="false">
         http://www.google.com/support/chrome/bin/answer.py?answer=188022&amp;hl=[GRITLANGCODE]
@@ -545,11 +535,6 @@
         http://www.google.com/support/chrome/bin/answer.py?answer=96817&amp;hl=[GRITLANGCODE]
       </message>
 
-      <!-- The URL for the "Learn more" privacy page for the Geolocation permission infobar. -->
-      <message name="IDS_LEARN_MORE_GEOLOCATION_URL" translateable="false">
-        http://www.google.com/support/chrome/bin/answer.py?answer=142065&amp;hl=[GRITLANGCODE]
-      </message>
-
       <!-- The width and height of the bookmark manager in characters and lines -->
       <!-- (See above). -->
       <message name="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS" use_name_for_id="true">
@@ -617,11 +602,6 @@
         8
       </message>
 
-      <!-- The URL for the "Aw snap" page. -->
-      <message name="IDS_CRASH_REASON_URL" translateable="false">
-        http://www.google.com/support/chrome/bin/answer.py?answer=95669&amp;hl=[GRITLANGCODE]
-      </message>
-
       <!-- The default width and min height for the 'download_in_progress' dialog. -->
       <message name="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS" use_name_for_id="true">
         67
@@ -675,11 +655,6 @@
         9
       </message>
 
-      <!-- The URL for About Google Translate. -->
-      <message name="IDS_ABOUT_GOOGLE_TRANSLATE_URL" translateable="false">
-        http://www.google.com/support/chrome/bin/answer.py?answer=173424&amp;hl=[GRITLANGCODE]
-      </message>
-
       <!-- The width and height of the Content Settings Exceptions dialog box in -->
       <!-- characters and lines (See above). -->
       <message name="IDS_CONTENT_EXCEPTION_DIALOG_WIDTH_CHARS" use_name_for_id="true">
-- 
cgit v1.1