Fix a lot of casing and ellipsis bugs on options dialog buttons

chrome/app/generated_resources.grd

 <?xml version="1.0" encoding="UTF-8"?>
 
 <!-- This file contains definitions of resources that will be translated for
 each locale. -->
 
 <grit base_dir="." latest_public_release="0" current_release="1"
       source_lang_id="en" enc_check="möl">
   <outputs>
     <output filename="grit/generated_resources.h" type="rc_header">
       <emit emit_type='prepend'></emit>
@@ skipping 406 matching lines @@
           Show &amp;Controls
         </message>
 
         <message name="IDS_CONTENT_CONTEXT_FULLSCREEN" desc="The name of the Fullscreen command for the video element in the content area context menu">
           &amp;Full Screen
         </message>
         <message name="IDS_CONTENT_CONTEXT_SAVESCREENSHOTAS" desc="The name of the Copy Screenshot As command the video element in the content area context menu">
           Save &amp;Screenshot...
         </message>
         <message name="IDS_CONTENT_CONTEXT_SAVEVIDEOAS" desc="The name of the Save Video As command in the content area context menu">
-         Sa&amp;ve video as...
+          Sa&amp;ve video as...
         </message>
         <message name="IDS_CONTENT_CONTEXT_COPYVIDEOLOCATION" desc="The name of the Copy Video Location command in the content area context menu">
           C&amp;opy video URL
         </message>
         <message name="IDS_CONTENT_CONTEXT_OPENVIDEONEWTAB" desc="The name of the Open Video in New Tab command in the content area context menu">
           &amp;Open video in new tab
         </message>
 
         <message name="IDS_CONTENT_CONTEXT_SAVEAUDIOAS" desc="The name of the Save Audio As command in the content area context menu">
           Sa&amp;ve audio as...
@@ skipping 716 matching lines @@
         &amp;Add...
       </message>
       <message name="IDS_SEARCH_ENGINES_EDITOR_REMOVE_BUTTON"
                desc="Text of the remove button in the search engines editor">
         &amp;Remove
       </message>
       <message name="IDS_SEARCH_ENGINES_EDITOR_EDIT_BUTTON"
                desc="Text of the edit button in the search engines editor">
         Edit...
       </message>
-      <message name="IDS_SEARCH_ENGINES_EDITOR_MAKE_DEFAULT_BUTTON"
-               desc="Text of the button that makes the selected endint the default search engine">
-        Make Default
-      </message>
+      <if expr="pp_ifdef('use_titlecase')">
+        <message name="IDS_SEARCH_ENGINES_EDITOR_MAKE_DEFAULT_BUTTON"
+                 desc="In Title Case: Text of the button that makes the selected endint the default search engine">
+          Make Default
+        </message>
+      </if>
+      <if expr="not pp_ifdef('use_titlecase')">
+        <message name="IDS_SEARCH_ENGINES_EDITOR_MAKE_DEFAULT_BUTTON"
+                 desc="In sentence case: Text of the button that makes the selected endint the default search engine">
+          Make default
+        </message>
+      </if>
       <message name="IDS_SEARCH_ENGINES_EDITOR_EDIT_WINDOW_TITLE"
                desc="Text of the window title when editing a search engine">
         Edit Search Engine
       </message>
       <message name="IDS_SEARCH_ENGINES_EDITOR_NEW_WINDOW_TITLE"
                desc="Text of the window title when adding a search engine">
         Add Search Engine
       </message>
       <message name="IDS_SEARCH_ENGINES_INVALID_TITLE_TT"
                desc="Text of tooltip shown in the keyword editor when the title is invalid">
@@ skipping 3469 matching lines @@
       </message>
       <message name="IDS_PASSWORDS_PAGE_VIEW_SITE_COLUMN" desc="Password table view Site column title">
         Site
       </message>
       <message name="IDS_PASSWORDS_PAGE_VIEW_USERNAME_COLUMN" desc="Password table view Username column title">
         Username
       </message>
       <message name="IDS_PASSWORDS_PAGE_VIEW_REMOVE_BUTTON" desc="Passwords page view's 'Remove' button text">
         Remove
       </message>
-      <message name="IDS_PASSWORDS_PAGE_VIEW_REMOVE_ALL_BUTTON" desc="Passwords page view's 'Remove all' button text">
-        Remove All
-      </message>
       <message name="IDS_PASSWORDS_PAGE_VIEW_TEXT_DELETE_ALL_PASSWORDS" desc ="Passwords page view's confirmation message before removing all stored passwords">
         Are you sure you want to remove all passwords?
       </message>
       <message name="IDS_PASSWORDS_PAGE_VIEW_CAPTION_DELETE_ALL_PASSWORDS" desc="Passwords page view's remove all confirmation message box window title">
         Remove all passwords
       </message>
-      <message name="IDS_PASSWORDS_PAGE_VIEW_SHOW_BUTTON" desc="Text for passwords page view's button to show a stored password">
-        Show password
-      </message>
-      <message name="IDS_PASSWORDS_PAGE_VIEW_HIDE_BUTTON" desc="Text for passwords page view's button to hide a stored password">
-        Hide password
-      </message>
-      <message name="IDS_EXCEPTIONS_PAGE_VIEW_REMOVE_BUTTON" desc="Exceptions page view's 'Remove' button text">
-        Remove
-      </message>
-      <message name="IDS_EXCEPTIONS_PAGE_VIEW_REMOVE_ALL_BUTTON" desc="Exceptions page view's 'Remove all' button text">
-        Remove All
-      </message>
+
+      <if expr="not pp_ifdef('use_titlecase')">
+        <message name="IDS_PASSWORDS_PAGE_VIEW_REMOVE_ALL_BUTTON" desc="Passwords page view's 'Remove all' button text">

[stuartmorgan, 2011/01/07 17:06:58]

Should these 3(6) descriptions have the "In <foo> case" annotation?

[Evan Stade, 2011/01/07 19:32:28]

welllll, I'm not sure how useful it actually is to the translators. We have a
ton of strings where it's not explicitly mentioned. We should probably be
consistent but I'd lean towards that meaning we should remove all "In foo case:"
prefixes. What do you think?

+          Remove all
+        </message>
+        <message name="IDS_PASSWORDS_PAGE_VIEW_SHOW_BUTTON" desc="Text for passwords page view's button to show a stored password">
+          Show password
+        </message>
+        <message name="IDS_PASSWORDS_PAGE_VIEW_HIDE_BUTTON" desc="Text for passwords page view's button to hide a stored password">
+          Hide password
+        </message>
+      </if>
+      <if expr="pp_ifdef('use_titlecase')">
+        <message name="IDS_PASSWORDS_PAGE_VIEW_REMOVE_ALL_BUTTON" desc="Passwords page view's 'Remove all' button text">
+          Remove All
+        </message>
+        <message name="IDS_PASSWORDS_PAGE_VIEW_SHOW_BUTTON" desc="Text for passwords page view's button to show a stored password">
+          Show Password
+        </message>
+        <message name="IDS_PASSWORDS_PAGE_VIEW_HIDE_BUTTON" desc="Text for passwords page view's button to hide a stored password">
+          Hide Password
+        </message>
+      </if>
 
       <!-- Confirm MessageBox Dialog -->
       <message name="IDS_CONFIRM_MESSAGEBOX_YES_BUTTON_LABEL" desc="Confirm MessageBox Dialog's 'Yes' button text">
         Yes
       </message>
       <message name="IDS_CONFIRM_MESSAGEBOX_NO_BUTTON_LABEL" desc="Confirm MessageBox Dialog's 'No' button text">
         No
       </message>
 
       <!-- Password Manager -->
@@ skipping 259 matching lines @@
       </message>
       <message name="IDS_BUGREPORT_NO_DESCRIPTION" desc="Message shown when no text is entered before hitting send feedback">
         Please tell us what is happening before sending the feedback.
       </message>
       <message name="IDS_BUGREPORT_NO_SAVED_SCREENSHOTS_HELP" desc="Message shown when no screenshots are available for selection">
         You can select saved screenshots from here. Currently there are no screenshots available. You can press Ctrl + the "Overview Mode" key together to take a screenshot. The last three screenshots that you have taken will appear here.
       </message>
       <message name="IDS_BUGREPORT_ISSUE_WITH" desc="Label for issue with">
         Where are you having problems? (required)
       </message>
+      <message name="IDS_BUGREPORT_CHOOSE_ISSUE" desc="Report a bug/problem type: Choose issue with">
+        (choose an issue below)
+      </message>
       <if expr="not pp_ifdef('use_titlecase')">
-        <message name="IDS_BUGREPORT_SEND_REPORT" desc="Text for OK button on dialog">
-          Send Feedback
+        <message name="IDS_BUGREPORT_SEND_REPORT" desc="In sentence case: Text for OK button on dialog">
+          Send feedback
         </message>
-        <message name="IDS_BUGREPORT_SEND_PHISHING_REPORT" desc="Text for report phishing button">
+        <message name="IDS_BUGREPORT_SEND_PHISHING_REPORT" desc="In sentence case: Text for report phishing button">
           Open phishing report
         </message>
-        <message name="IDS_BUGREPORT_CHOOSE_ISSUE" desc="In Title Case: Report a bug/problem type: Choose issue with">
-          (choose an issue below)
-        </message>
-        <message name="IDS_BUGREPORT_PAGE_FORMATTING" desc="In Title Case: Report a bug/problem type: Page formatting or layout">
+        <message name="IDS_BUGREPORT_PAGE_FORMATTING" desc="In sentence case: Report a bug/problem type: Page formatting or layout">
           Page formatting or layout
         </message>
-        <message name="IDS_BUGREPORT_PAGE_LOAD" desc="In Title Case: Report a bug/problem type: Pages not loading">
+        <message name="IDS_BUGREPORT_PAGE_LOAD" desc="In sentence case: Report a bug/problem type: Pages not loading">
           Pages not loading
         </message>
-        <message name="IDS_BUGREPORT_PLUGINS" desc="In Title Case: Report a bug/problem type: Plug-ins">
+        <message name="IDS_BUGREPORT_PLUGINS" desc="In sentence case: Report a bug/problem type: Plug-ins">
           Plug-ins (e.g. Adobe Flash Player, Quicktime, etc)
         </message>
-        <message name="IDS_BUGREPORT_TABS" desc="In Title Case: Report a bug/problem type: Tabs or windows">
+        <message name="IDS_BUGREPORT_TABS" desc="In sentence case: Report a bug/problem type: Tabs or windows">
           Tabs or windows
         </message>
-        <message name="IDS_BUGREPORT_NETWORK" desc="In Title Case: Report a bug/problem type: Network connection">
+        <message name="IDS_BUGREPORT_NETWORK" desc="In sentence case: Report a bug/problem type: Network connection">
           Network connection
         </message>
-        <message name="IDS_BUGREPORT_CONNECTIVITY" desc="In Title Case: Report a bug/problem type: Connectivity issues">
+        <message name="IDS_BUGREPORT_CONNECTIVITY" desc="In Setence Case: Report a bug/problem type: Connectivity issues">
           Network connection
         </message>
-        <message name="IDS_BUGREPORT_STANDBY_RESUME" desc="In Title Case: Report a bug/problem type: Standby or Resume">
+        <message name="IDS_BUGREPORT_STANDBY_RESUME" desc="In sentence case: Report a bug/problem type: Standby or Resume">
           Standby or Resume
         </message>
-        <message name="IDS_BUGREPORT_SYNC" desc="In Title Case: Report a bug/problem type: Synced preferences">
+        <message name="IDS_BUGREPORT_SYNC" desc="In sentence case: Report a bug/problem type: Synced preferences">
           Synced preferences
         </message>
-        <message name="IDS_BUGREPORT_CRASHES" desc="In Title Case: Report a bug/problem type: Crashes">
+        <message name="IDS_BUGREPORT_CRASHES" desc="In sentence case: Report a bug/problem type: Crashes">
           Crashes
         </message>
-        <message name="IDS_BUGREPORT_EXTENSIONS" desc="In Title Case: Report a bug/problem type: Extensions or apps">
+        <message name="IDS_BUGREPORT_EXTENSIONS" desc="In sentence case: Report a bug/problem type: Extensions or apps">
           Extensions or apps
         </message>
-        <message name="IDS_BUGREPORT_OTHER" desc="In Title Case: Report a bug/problem type: Other">
+        <message name="IDS_BUGREPORT_OTHER" desc="In sentence case: Report a bug/problem type: Other">
           Other
         </message>
-        <message name="IDS_BUGREPORT_GENERAL" desc="Report a bug/problem type: General feedback/other">
+        <message name="IDS_BUGREPORT_GENERAL" desc="In sentence case: Report a bug/problem type: General feedback/other">
           General feedback/other
         </message>
-        <message name="IDS_BUGREPORT_PREVIEW_REPORT" desc="Text for the preview report button on dialog">
+        <message name="IDS_BUGREPORT_PREVIEW_REPORT" desc="In sentence case: Text for the preview report button on dialog">
           Preview report
         </message>
       </if>
       <if expr="pp_ifdef('use_titlecase')">
         <message name="IDS_BUGREPORT_SEND_REPORT" desc="Text for the send report button on dialog">
           Send Feedback
         </message>
         <message name="IDS_BUGREPORT_SEND_PHISHING_REPORT" desc="Text for report phishing button">
-          Open phishing report
-        </message>
-        <message name="IDS_BUGREPORT_CHOOSE_ISSUE" desc="In Title Case: Report a bug/problem type: Choose issue with">
-          (choose an issue below)
+          Open Phishing Report
         </message>
         <message name="IDS_BUGREPORT_PAGE_FORMATTING" desc="In Title Case: Report a bug/problem type: Page formatting or layout">
-          Page formatting or layout
+          Page Formatting or Layout
         </message>
         <message name="IDS_BUGREPORT_PAGE_LOAD" desc="In Title Case: Report a bug/problem type: Pages not loading">
-          Pages not loading
+          Pages not Loading
         </message>
         <message name="IDS_BUGREPORT_PLUGINS" desc="In Title Case: Report a bug/problem type: Plug-ins">
           Plug-ins (e.g. Adobe Flash Player, Quicktime, etc)
         </message>
         <message name="IDS_BUGREPORT_TABS" desc="In Title Case: Report a bug/problem type: Tabs or windows">
-          Tabs or windows
+          Tabs or Windows
         </message>
         <message name="IDS_BUGREPORT_NETWORK" desc="In Title Case: Report a bug/problem type: Network connection">
-          Network connection
+          Network Connection
         </message>
         <message name="IDS_BUGREPORT_SYNC" desc="In Title Case: Report a bug/problem type: Synced preferences">
-          Synced preferences
+          Synced Preferences
         </message>
         <message name="IDS_BUGREPORT_CRASHES" desc="In Title Case: Report a bug/problem type: Crashes">
           Crashes
         </message>
         <message name="IDS_BUGREPORT_EXTENSIONS" desc="In Title Case: Report a bug/problem type: Extensions or apps">
-          Extensions or apps
+          Extensions or Apps
         </message>
         <message name="IDS_BUGREPORT_OTHER" desc="In Title Case: Report a bug/problem type: Other">
           Other
         </message>
       </if>
 
       <!-- Clear Browsing Data -->
       <message name="IDS_CLEAR_BROWSING_DATA_TITLE" desc="Dialog title">
         Clear Browsing Data
       </message>
@@ skipping 123 matching lines @@
         <message name="IDS_COOKIES_CLEAR_WHEN_CLOSE_CHKBOX" desc="A checkbox in the Content Settings dialog for removing all cookies on when browser is closed.">
           Clear cookies and other site data when I close my browser
         </message>
       </if>
       <if expr="os == 'darwin'">
         <message name="IDS_COOKIES_CLEAR_WHEN_CLOSE_CHKBOX" desc="A checkbox in the Content Settings dialog for removing all cookies on when browser is quit (Mac).">
           Clear cookies and other site data when I quit my browser
         </message>
       </if>
 
-      <message name="IDS_COOKIES_SHOW_COOKIES_BUTTON" desc="A button in the Content Settings dialog for showing cookies and other stored site data.">
-        Show cookies and other site data...
-      </message>
       <message name="IDS_IMAGES_TAB_LABEL" desc="Label for Images tab on Content Settings dialog">
         Images
       </message>
       <message name="IDS_IMAGES_HEADER" desc="Header for image exception management page on Content Settings dialog">
         Image Exceptions
       </message>
       <message name="IDS_IMAGES_SETTING_LABEL" desc="A label on top of images tab on Content Settings dialog">
         Image Settings:
       </message>
       <message name="IDS_IMAGES_LOAD_RADIO" desc="A radio button in the Content Settings dialog for allowing all images to be loaded.">
@@ skipping 154 matching lines @@
       </message>
       <message name="IDS_EXCEPTIONS_BLOCK_BUTTON" desc="A label to display in the exception page's action column when a site's content setting is blocked for a given domain.">
         Block
       </message>
       <message name="IDS_EXCEPTIONS_OTR_IN_ITALICS" desc="A label informing the user that incognito-only exceptions are displayed in italics">
         Exceptions displayed in italics only apply to this incognito session.
       </message>
       <message name="IDS_EXCEPTIONS_OTR_LABEL" desc="A label informing the user that the table below the label shows incognito-only exceptions">
         Exceptions below only apply to the current incognito session.
       </message>
-      <message name="IDS_EXCEPTIONS_MANAGE" desc="The label on the button that launches the exceptions management page for a given content type">
-        Manage exceptions...
-      </message>
       <message translateable="false" name="IDS_EXCEPTIONS_PATTERN_EXAMPLE" desc="Example pattern when the user is adding a new exception" >
         [*.]example.com
       </message>
       <message name="IDS_EXCEPTIONS_ADD_NEW_INSTRUCTIONS" desc="Placeholder text before the user adds a new exception" >
         Add a new exception pattern
       </message>
       <message name="IDS_EXCEPTIONS_NOT_SET_BUTTON" desc="A label to display in the exception page's action column when a site's content setting has not yet been set for a given domain.">
         Not set
       </message>
       <message name="IDS_EXCEPTIONS_SAMPLE_HOST" desc="Exceptions page view's host entry field's watermark - example host name. Users will see this text before they start typing host name in the field.">
         example.com
       </message>
       <message name="IDS_EXCEPTIONS_SAMPLE_PATTERN" desc="Exceptions page view's pattern entry field's watermark - example pattern. Users will see this text before they start typing pattern in the field.">
         [*.]example.com
       </message>
       <message name="IDS_EXCEPTIONS_GEOLOCATION_EMBEDDED_ON_HOST" desc="Template text for a child row in the Geolocation Exceptions page view. Controls the permission setting for the parent page when embedded on the specified site.">
         embedded on <ph name="URL">$1<ex>www.google.com</ex></ph>
       </message>
       <message name="IDS_EXCEPTIONS_GEOLOCATION_EMBEDDED_ANY_OTHER" desc="A child row in the Geolocation Exceptions page view. Sets the default permission for the parent page when embedded on any other site.">
         embedded on any other site
       </message>
 
+      <if expr="not pp_ifdef('use_titlecase')">

[stuartmorgan, 2011/01/07 17:06:58]

Swap block order for consistency?

[Evan Stade, 2011/01/07 19:32:28]

Done.

+        <message name="IDS_EXCEPTIONS_MANAGE" desc="The label on the button that launches the exceptions management page for a given content type">
+          Manage exceptions...
+        </message>
+        <message name="IDS_COOKIES_SHOW_COOKIES_BUTTON" desc="A button in the Content Settings dialog for showing cookies and other stored site data.">
+          All cookies and site data...
+        </message>
+      </if>
+      <if expr="pp_ifdef('use_titlecase')">
+        <message name="IDS_EXCEPTIONS_MANAGE" desc="The label on the button that launches the exceptions management page for a given content type">
+          Manage Exceptions...
+        </message>
+        <message name="IDS_COOKIES_SHOW_COOKIES_BUTTON" desc="A button in the Content Settings dialog for showing cookies and other stored site data.">
+          All Cookies and Site Data...
+        </message>
+      </if>
+
       <!-- Cookie/Images/JavaScript/Plugins/Pop-ups/Location exception editor dialogs -->
       <message name="IDS_EXCEPTION_EDITOR_TITLE" desc="Title for exception editor">
         Edit Exception
       </message>
       <message name="IDS_EXCEPTION_EDITOR_NEW_TITLE" desc="Title for exception editor">
         New Exception
       </message>
       <message name="IDS_EXCEPTION_EDITOR_HOST_TITLE" desc="Title of the host field in the exception editor">
         Host:
       </message>
@@ skipping 1366 matching lines @@
       </message>
       <message name="IDS_OPTIONS_STARTUP_PAGE_TOOLTIP" desc="A tooltip to display for a page in the list of pages to open on startup">
         <ph name="PAGE_TITLE">$1<ex>Google</ex></ph> - <ph name="PAGE_URL">$2<ex>http://www.google.com/</ex></ph>
       </message>
       <message name="IDS_OPTIONS_STARTUP_ADD_BUTTON" desc="The label of the 'Add...' button for the custom startup urls list">
         A&amp;dd...
       </message>
       <message name="IDS_OPTIONS_STARTUP_REMOVE_BUTTON" desc="The label of the 'Remove' button for the custom startup urls list">
         &amp;Remove
       </message>
-      <message name="IDS_OPTIONS_STARTUP_MANAGE_BUTTON" desc="The label of the 'Use Current' button for the custom startup urls list">
-        Manage Startup Pages
-      </message>
-      <message name="IDS_OPTIONS_STARTUP_USE_CURRENT" desc="The label of the 'Use Current' button for the custom startup urls list">
-        Use Current Pages
-      </message>
       <message name="IDS_STARTUP_PAGE_SUBPAGE_TITLE" desc="Title for startup page management subpage">
         Startup Pages
       </message>
 
+      <if expr="pp_ifdef('use_titlecase')">
+        <message name="IDS_OPTIONS_STARTUP_MANAGE_BUTTON" desc="In Title Case: The label of the 'Use Current' button for the custom startup urls list">
+          Manage Startup Pages...
+        </message>
+        <message name="IDS_OPTIONS_STARTUP_USE_CURRENT" desc="In Title Case: The label of the 'Use Current' button for the custom startup urls list">
+          Use Current Pages
+        </message>
+        <message name="IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES" desc="In Title Case: The label of the 'Manage search engines' button">
+          Manage Search Engines...
+        </message>
+      </if>
+      <if expr="not pp_ifdef('use_titlecase')">
+        <message name="IDS_OPTIONS_STARTUP_MANAGE_BUTTON" desc="In sentence case: The label of the 'Use Current' button for the custom startup urls list">
+          Manage startup pages...
+        </message>
+        <message name="IDS_OPTIONS_STARTUP_USE_CURRENT" desc="In sentence case: The label of the 'Use Current' button for the custom startup urls list">
+          Use current pages
+        </message>
+        <message name="IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES" desc="In sentence case: The label of the 'Manage search engines' button">
+          Manage search engines...
+        </message>
+      </if>
+
       <message name="IDS_OPTIONS_TOOLBAR_GROUP_NAME" desc="The title of the toolbar group">
         Toolbar
       </message>
 
       <if expr="not pp_ifdef('use_titlecase') or os != 'linux2'">
         <message name="IDS_OPTIONS_HOMEPAGE_GROUP_NAME" desc="The title of the home pages group">
           Home page:
         </message>
       </if>
       <if expr="pp_ifdef('use_titlecase') and os == 'linux2'">
@@ skipping 36 matching lines @@
       <if expr="not pp_ifdef('use_titlecase') or os != 'linux2'">
         <message name="IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME" desc="The title of the default search engine group">
           Search:
         </message>
       </if>
       <if expr="pp_ifdef('use_titlecase') and os == 'linux2'">
         <message name="IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME" desc="In Title Case and without trailing colon: The title of the default search engine group">
           Search
         </message>
       </if>
-      <message name="IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES" desc="The label of the 'Manage search engines' button">
-        Manage search engines
-      </message>
+
       <message name="IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES_LINK"
                desc="The label of a link that brings up the keyword editor (aka search engine editor)">
         Manage
       </message>
 
       <if expr="not pp_ifdef('use_titlecase') or os != 'linux2'">
         <message name="IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME" desc="The title of the default browser group">
           Default browser:
         </message>
       </if>
@@ skipping 57 matching lines @@
         Change Gears settings
       </message>
 
       <message name="IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE" desc="The label of the check-box that enables page translate">
         Offer to translate pages that aren't in a language I read
       </message>
 
       <message name="IDS_OPTIONS_CERTIFICATES_LABEL" desc="The info label for the 'Manage certificates' button">
         Select trusted SSL certificates.
       </message>
-      <message name="IDS_OPTIONS_CERTIFICATES_MANAGE_BUTTON" desc="The label of the 'Manage Certificates' button">
-        Manage certificates
-      </message>
 
       <if expr="not pp_ifdef('use_titlecase') or os != 'linux2'">
         <message name="IDS_OPTIONS_PASSWORDS_GROUP_NAME" desc="The title of the 'Passwords' group">
           Passwords:
         </message>
       </if>
       <if expr="pp_ifdef('use_titlecase') and os == 'linux2'">
         <message name="IDS_OPTIONS_PASSWORDS_GROUP_NAME" desc="In Title Case and without trailing colon: The title of the 'Passwords' group">
           Passwords
         </message>
       </if>
+
+      <if expr="not pp_ifdef('use_titlecase')">

[stuartmorgan, 2011/01/07 17:06:58]

Swap blocks

[Evan Stade, 2011/01/07 19:32:28]

Done.

+        <message name="IDS_OPTIONS_PASSWORDS_SHOWPASSWORDS" desc="In sentence case: The label of the 'Show passwords' button">
+          Show saved passwords...
+        </message>
+      </if>
+      <if expr="pp_ifdef('use_titlecase')">
+        <message name="IDS_OPTIONS_PASSWORDS_SHOWPASSWORDS" desc="In Title Case: The label of the 'Show passwords' button">
+          Show Saved Passwords...
+        </message>
+      </if>
+
       <message name="IDS_OPTIONS_PASSWORDS_ASKTOSAVE" desc="The label of the 'Ask me to save passwords' radio button">
         Offer to save passwords
       </message>
       <message name="IDS_OPTIONS_PASSWORDS_NEVERSAVE" desc="The label of the 'Never save passwords' radio button">
         Never save passwords
       </message>
-      <message name="IDS_OPTIONS_PASSWORDS_SHOWPASSWORDS" desc="The label of the 'Show passwords' button">
-        Show saved passwords
-      </message>
       <message name="IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS" desc="The label of the 'Manage saved passwords' button">
         Manage saved passwords
       </message>
 
       <if expr="not pp_ifdef('use_titlecase') or os != 'linux2'">
         <message name="IDS_AUTOFILL_SETTING_WINDOWS_GROUP_NAME" desc="The title of the form Autofill group">
           Form autofill:
         </message>
       </if>
       <if expr="pp_ifdef('use_titlecase') and os == 'linux2'">
@@ skipping 26 matching lines @@
         Clear form
       </message>
       <message name="IDS_AUTOFILL_WARNING_FORM_DISABLED" desc="Warning text to show when autofill is disabled by the website for a given form.">
         This webpage has disabled automatic filling for this form.
       </message>
       <message name="IDS_AUTOFILL_WARNING_INSECURE_CONNECTION" desc="Warning text to show when credit card autofill is disabled because the website is not using a secure connection.">
         Automatic credit card filling is disabled because this form does not use a secure connection.
       </message>
       <if expr="not pp_ifdef('use_titlecase')">
         <message name="IDS_OPTIONS_MANAGE_AUTOFILL_SETTINGS" desc="The label of the 'Manage Autofill settings' button">
-          Manage Autofill settings
+          Manage Autofill settings...
+        </message>
+        <message name="IDS_AUTOFILL_ADD_ADDRESS_BUTTON" desc="The label of the button that adds a new Autofill address.">
+          Add new street address...
+        </message>
+        <message name="IDS_AUTOFILL_ADD_CREDITCARD_BUTTON" desc="The label of the button that adds a new Autofill credit card.">
+          Add new credit card...
         </message>
       </if>
       <if expr="pp_ifdef('use_titlecase')">
         <message name="IDS_OPTIONS_MANAGE_AUTOFILL_SETTINGS" desc="In Title Case: The label of the 'Manage Autofill Settings' button">
-          Manage Autofill Settings
+          Manage Autofill Settings...
+        </message>
+        <message name="IDS_AUTOFILL_ADD_ADDRESS_BUTTON" desc="In Title Case: The label of the button that adds a new Autofill address.">
+          Add New Street Address...
+        </message>
+        <message name="IDS_AUTOFILL_ADD_CREDITCARD_BUTTON" desc="In Title Case: The label of the button that adds a new Autofill credit card.">
+          Add New Credit Card...
         </message>
       </if>
       <if expr="os != 'darwin'">
         <message name="IDS_AUTOFILL_OPTIONS_TITLE" desc="The title of the Autofill dialog.">
           Autofill Options
         </message>
-        <message name="IDS_AUTOFILL_OPTIONS" desc="The value of the Autofill options button.">
-          Autofill options
+      </if>
+
+      <if expr="pp_ifdef('use_titlecase') and os != 'darwin'">
+        <message name="IDS_AUTOFILL_OPTIONS" desc="In Title Case: The value of the Autofill options button.">
+          Autofill Options...

[stuartmorgan, 2011/01/07 17:06:58]

Shouldn't this be "settings" on one of the platforms?

[Evan Stade, 2011/01/07 19:32:28]

Done.

         </message>
-        <message name="IDS_AUTOFILL_OPTIONS_POPUP" desc="The value of the Autofill options menu entry.">
+        <message name="IDS_AUTOFILL_OPTIONS_POPUP" desc="In Title Case: The value of the Autofill options menu entry.">
+          <ph name="PRODUCT_NAME_SHORT">$1<ex>Chrome</ex></ph> Autofill Options
+        </message>
+      </if>
+      <if expr="not pp_ifdef('use_titlecase') and os != 'darwin'">
+        <message name="IDS_AUTOFILL_OPTIONS" desc="In sentence case: The value of the Autofill options button.">
+          Autofill options...
+        </message>
+        <message name="IDS_AUTOFILL_OPTIONS_POPUP" desc="In sentence case: The value of the Autofill options menu entry.">
           <ph name="PRODUCT_NAME_SHORT">$1<ex>Chrome</ex></ph> Autofill options
         </message>
       </if>
+
       <if expr="os == 'darwin'">
         <message name="IDS_AUTOFILL_OPTIONS_TITLE" desc="The title of the Autofill dialog.">
           Autofill Preferences
         </message>
         <message name="IDS_AUTOFILL_OPTIONS" desc="The value of the Autofill options button.">
-          Autofill preferences
+          Autofill Preferences...
         </message>
         <message name="IDS_AUTOFILL_OPTIONS_POPUP" desc="The value of the Autofill options menu entry.">
-          <ph name="PRODUCT_NAME_SHORT">$1<ex>Chrome</ex></ph> Autofill preferences
+          <ph name="PRODUCT_NAME_SHORT">$1<ex>Chrome</ex></ph> Autofill Preferences
         </message>
       </if>
       <message name="IDS_AUTOFILL_LOADING" desc="The indicator that Autofill data is being loaded.">
         Loading...
       </message>
       <message name="IDS_AUTOFILL_USE_MAC_ADDRESS_BOOK" desc="Checkbox label to enable Address Book on Mac.">
         Include addresses from my Address Book card
       </message>
       <message name="IDS_AUTOFILL_ADDRESSES_GROUP_NAME" desc="The name of the Addresses group of the Autofill dialog.">
         Addresses
       </message>
       <message name="IDS_AUTOFILL_CREDITCARDS_GROUP_NAME" desc="The name of the Credit Cards group of the Autofill dialog.">
         Credit Cards
       </message>
-      <message name="IDS_AUTOFILL_ADD_ADDRESS_BUTTON" desc="The label of the button that adds a new Autofill address.">
-        Add new street address...
-      </message>
-      <message name="IDS_AUTOFILL_ADD_CREDITCARD_BUTTON" desc="The label of the button that adds a new Autofill credit card.">
-        Add new credit card...
-      </message>
       <message name="IDS_AUTOFILL_EDIT_BUTTON"
                desc="Text of the edit button in the Autofill editor">
         Edit...
       </message>
       <message name="IDS_AUTOFILL_EDIT_ADDRESS_CAPTION" desc="The caption on the edit Autofill address dialog.">
         Edit address
       </message>
       <message name="IDS_AUTOFILL_ADD_ADDRESS_CAPTION" desc="The caption on the edit Autofill address dialog for the new entry.">
         Add an address
       </message>
@@ skipping 162 matching lines @@
       </message>
 
       <message name="IDS_THEMES_GROUP_NAME" desc="The title of the themes group">
         Themes:
       </message>
       <if expr="os == 'linux2' or os.find('bsd') != -1">
         <message name="IDS_APPEARANCE_GROUP_NAME" desc="In Title Case and without trailing colon: The title of the themes group">
           Appearance
         </message>
         <message name="IDS_THEMES_GTK_BUTTON" desc="The button to choose GTK colors and icons as the current theme.">
-          Use GTK+ theme
+          Use GTK+ Theme
         </message>
         <message name="IDS_THEMES_SET_CLASSIC" desc="The button to choose the classic windows theme in GTK">
-          Use Classic theme
+          Use Classic Theme
         </message>
         <message name="IDS_SHOW_WINDOW_DECORATIONS_RADIO" desc="A radio button in the options dialog for using the system title bar and borders.">
           Use system title bar and borders
         </message>
         <message name="IDS_HIDE_WINDOW_DECORATIONS_RADIO" desc="A radio button in the options dialog for using the chrome custom frame and hiding the system title bar.">
           Hide system title bar and use compact borders
         </message>
       </if>
       <message name="IDS_THEMES_RESET_BUTTON" desc="The button to reset your theme">
         Reset to default theme
@@ skipping 11 matching lines @@
 
       <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>
       <message name="IDS_OPTIONS_SYSTEM_PROXIES_LABEL" desc="The info label for the 'Proxy settings' button when managed by the system.">
         <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> is using your computer's system proxy settings to connect to the network.
       </message>
       <message name="IDS_OPTIONS_EXTENSION_PROXIES_LABEL" desc="The info label for the 'Proxy settings' button when managed by an extension.">
         Your network proxy settings are being managed by an extension.
       </message>
-      <message name="IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON" desc="The label of the 'Configure proxy settings' button">
-        Change proxy settings
-      </message>
 
       <message name="IDS_OPTIONS_CLOUD_PRINT_PROXY_DISABLED_LABEL" desc="The label of the cloud print setup button when it hasn't been set up yet.">
         <ph name="CLOUD_PRINT_NAME">Google Cloud Print</ph> lets you access this computer's printers from anywhere. Sign in to enable.
       </message>
       <message name="IDS_OPTIONS_CLOUD_PRINT_PROXY_DISABLED_BUTTON" desc="The label of the cloud proxy configure button when it hasn't been set up yet.">
         Sign in to <ph name="CLOUD_PRINT_NAME">Google Cloud Print</ph>
       </message>
       <message name="IDS_OPTIONS_CLOUD_PRINT_PROXY_ENABLED_LABEL" desc="The label of the cloud print setup button when it has been set up.">
         You have registered your printers with <ph name="CLOUD_PRINT_NAME">Google Cloud Print</ph> using the account <ph name="EMAIL">$1<ex>foo@bar.com</ex></ph>
       </message>
@@ skipping 58 matching lines @@
       <if expr="not pp_ifdef('use_titlecase') or os != 'linux2'">
         <message name="IDS_OPTIONS_BROWSING_DATA_GROUP_NAME" desc="The title of the 'Browsing data' group.">
           Browsing data:
         </message>
       </if>
       <if expr="pp_ifdef('use_titlecase') and os == 'linux2'">
         <message name="IDS_OPTIONS_BROWSING_DATA_GROUP_NAME" desc="In Title Case and without trailing colon: The title of the 'Browsing data' group.">
           Browsing Data
         </message>
       </if>
-      <message name="IDS_OPTIONS_IMPORT_DATA_BUTTON" desc="Label for the import data button.">
-        Import data from another browser...
-      </message>
       <message name="IDS_OPTIONS_MANAGED_PREFS" desc="Banner displayed in case there are managed options the user won't be able to change">
         Some options have been disabled by your IT administrator.
       </message>
 
+      <if expr="not pp_ifdef('use_titlecase')">
+        <message name="IDS_OPTIONS_IMPORT_DATA_BUTTON" desc="In sentence case: Label for the import data button.">
+          Import data from another browser...
+        </message>
+      </if>
+      <if expr="pp_ifdef('use_titlecase')">
+        <message name="IDS_OPTIONS_IMPORT_DATA_BUTTON" desc="In Title Case: Label for the import data button.">
+          Import Data from Another Browser...
+        </message>
+      </if>
+
       <!-- Options search page strings. -->
       <message name="IDS_OPTIONS_SEARCH_PAGE_TITLE" desc="">
         Search
       </message>
       <message name="IDS_OPTIONS_SEARCH_PAGE_INFO" desc="">
         Type to search <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> settings.
       </message>
       <message name="IDS_OPTIONS_SEARCH_PAGE_NO_MATCHES" desc="">
         No matches were found.
       </message>
@@ skipping 642 matching lines @@
       <message name="IDS_SAVE_PAGE_STATUS_CANCELED" desc="Save page status: canceled">
         Canceled
       </message>
       <message name="IDS_SAVE_PAGE_STATUS_FAILED" desc="Save page status: failed">
         Failed
       </message>
       <message name="IDS_SAVE_PAGE_PROGRESS" desc="Text string for saving page progress, the number of saved files and total files">
         <ph name="SAVED_FILES">$1<ex>5</ex></ph> / <ph name="TOTAL_FILES">$2<ex>13</ex></ph> files
       </message>
 
-      <message name="IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON" desc="Text for content settings button in Privacy options">
-        Content settings...
-      </message>
-      <message name="IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON" desc="Text for clear browsing data dialog in Privacy options">
-        Clear browsing data...
-      </message>
+      <if expr="not pp_ifdef('use_titlecase')">
+        <message name="IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON" desc="Text for content settings button in Privacy options">
+          Content settings...
+        </message>
+        <message name="IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON" desc="Text for clear browsing data dialog in Privacy options">
+          Clear browsing data...
+        </message>
+        <message name="IDS_OPTIONS_FONTSETTINGS_CUSTOMIZE_FONTS_BUTTON" desc="The label of the 'Customize fonts' button">
+          Customize fonts...
+        </message>
+        <message name="IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON" desc="The label of the 'Configure proxy settings' button">
+          Change proxy settings...
+        </message>
+        <message name="IDS_OPTIONS_CERTIFICATES_MANAGE_BUTTON" desc="The label of the 'Manage Certificates' button">
+          Manage certificates...
+        </message>
+      </if>
+      <if expr="pp_ifdef('use_titlecase')">
+        <message name="IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON" desc="In Title Case: Text for content settings button in Privacy options">
+          Content Settings...
+        </message>
+        <message name="IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON" desc="In Title Case: Text for clear browsing data dialog in Privacy options">
+          Clear Browsing Data...
+        </message>
+        <message name="IDS_OPTIONS_FONTSETTINGS_CUSTOMIZE_FONTS_BUTTON" desc="In Title Case: The label of the 'Customize fonts' button">
+          Customize Fonts...
+        </message>
+        <message name="IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON" desc="In Title Case: The label of the 'Configure proxy settings' button">
+          Change Proxy Settings...
+        </message>
+        <message name="IDS_OPTIONS_CERTIFICATES_MANAGE_BUTTON" desc="The label of the 'Manage Certificates' button">
+          Manage Certificates...
+        </message>
+      </if>
+
       <message name="IDS_OPTIONS_DISABLE_WEB_SERVICES" desc="The text in the options panel describes that we can disable web services.">
         You may optionally disable these services.
       </message>
       <message name="IDS_OPTIONS_LINKDOCTOR_PREF" desc="The documentation string of the 'Use Link Doctor' preference">
         Show suggestions for navigation errors.
       </message>
 
       <message name="IDS_OPTIONS_SUGGEST_PREF" desc="The documentation string of the 'Use Suggest' preference">
         Show suggestions to help complete searches and URLs.
       </message>
 
       <message name="IDS_OPTIONS_ENABLE_LOGGING" desc="The label of the checkbox to enable/disable crash and user metrics logging">
         Automatically send usage statistics and crash reports to Google.
       </message>
 
       <message name="IDS_OPTIONS_TABS_TO_LINKS_PREF" desc="The documentation string of the 'Tabs to Links' preference">
         Pressing Tab on a webpage highlights links, as well as form fields
       </message>
 
       <message name="IDS_OPTIONS_FONTSETTINGS_INFO" desc="Information text about font and language options for web pages">
         Change the default font and language for webpages.
       </message>
       <message name="IDS_OPTIONS_FONTSETTINGS_CONFIGUREFONTS_BUTTON" desc="The label of the 'configure fonts and languages' button">
         Change font and language settings
       </message>
       <message name="IDS_OPTIONS_FONTSETTINGS_CONFIGUREFONTSONLY_BUTTON" desc="The label of the 'configure fonts' button">
         Change font settings
       </message>
-      <message name="IDS_OPTIONS_FONTSETTINGS_CUSTOMIZE_FONTS_BUTTON" desc="The label of the 'Customize fonts' button">
-        Customize fonts
-      </message>
       <message name="IDS_OPTIONS_DEFAULT_ZOOM_LEVEL_LABEL" desc="The label of the 'Default Zoom Level' select menu">
         Page zoom:
       </message>
       <message name="IDS_OPTIONS_DEFAULT_FONT_SIZE_LABEL" desc="The label of the 'Default font size' select menu">
         Font size:
       </message>
       <message name="IDS_OPTIONS_FONT_SIZE_LABEL_VERY_SMALL" desc="The label of the 'Very Small' option">
         Very Small
       </message>
       <message name="IDS_OPTIONS_FONT_SIZE_LABEL_SMALL" desc="The label of the 'Small' option">
@@ skipping 3421 matching lines @@
     </includes>
     <structures fallback_to_english="true">
       <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type="dialog" >
       </structure>
       <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" type="dialog" >
       </structure>
     </structures>
 
   </release>
 </grit>