diff options
author | mhm@chromium.org <mhm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-30 16:22:00 +0000 |
---|---|---|
committer | mhm@chromium.org <mhm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-30 16:22:00 +0000 |
commit | 335fb4f3221673af83ecae7414b666bfecf42e2b (patch) | |
tree | 9bcd05e81deaca0ffe31612fe99def30fb9bd4c8 /chrome/app | |
parent | 644a39b80d0c77fb9cf6c3763069d603c183fb79 (diff) | |
download | chromium_src-335fb4f3221673af83ecae7414b666bfecf42e2b.zip chromium_src-335fb4f3221673af83ecae7414b666bfecf42e2b.tar.gz chromium_src-335fb4f3221673af83ecae7414b666bfecf42e2b.tar.bz2 |
Revert 17288 - Test failures.
TBR=ben
Review URL: http://codereview.chromium.org/115968
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17289 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r-- | chrome/app/generated_resources.grd | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index ae9d389..a317bad 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -2985,16 +2985,16 @@ each locale. --> <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> Options </message> <message name="IDS_OPTIONS_GENERAL_TAB_LABEL" desc="The title of the General tab"> - General + Basics </message> - <message name="IDS_OPTIONS_CONTENT_TAB_LABEL" desc="The title of the User Data tab"> - User Data + <message name="IDS_OPTIONS_CONTENT_TAB_LABEL" desc="The title of the Tweaks tab"> + Minor Tweaks </message> <message name="IDS_OPTIONS_USER_DATA_TAB_LABEL" desc="The title of the User Data tab"> User Data </message> <message name="IDS_OPTIONS_ADVANCED_TAB_LABEL" desc="The title of the Advanced tab"> - Advanced + Under the Hood </message> <message name="IDS_OPTIONS_LEARN_MORE_LABEL" desc="In the options dialog, we have links to the support web pages where the user can learn more about a feature."> Learn more @@ -3063,7 +3063,7 @@ each locale. --> </message> <message name="IDS_OPTIONS_DOWNLOADLOCATION_GROUP_NAME" desc="The title of the download location group"> - Downloads + Download location: </message> <message name="IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_BUTTON" desc="The label of the 'Browse...' button"> Br&owse... @@ -3127,6 +3127,10 @@ each locale. --> Reset to default theme </message> + <message name="IDS_OPTIONS_FONTSANDLANGUAGES_GROUP_NAME" desc="The label of the 'Fonts and Languages' group"> + Fonts and Languages: + </message> + <message name="IDS_OPTIONS_PROXIES_LABEL" desc="The info label for the 'Proxy settings' button"> Set up a proxy to connect to the network. </message> |