Reverting half the checkins that are suspected of breaking the world.

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.  The variables is_win, is_macosx, is_linux, and is_posix are available
 for making strings OS specific.  Other platform defines such as use_titlecase
 are declared in build/common.gypi.
 -->
 
 <grit base_dir="." latest_public_release="0" current_release="1"
@@ skipping 7789 matching lines @@
       </message>
       <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_DISPLAY_IN_THIS_LANGUAGE"
                desc="The label is used for a button that changes the UI
                      language of Chrome OS">
         Display <ph name="PRODUCT_NAME">$1<ex>Chrome OS</ex></ph> in this language
       </message>
       <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_THIS_LANGUAGE_IS_CURRENTLY_IN_USE"
                desc="Warning invoked when the user tries to remove the language used for displaying Chrome OS">
         This language is currently in use for displaying <ph name="PRODUCT_NAME">$1<ex>Chrome OS</ex></ph>.
       </message>
-      <if expr="not is_macosx">
-        <message name="IDS_OPTIONS_SETTINGS_USE_THIS_FOR_SPELL_CHECKING"
-                 desc="The label for a language a button that changes the spell check language of Chrome">
-          Use this language for spell checking
-        </message>
-        <message name="IDS_OPTIONS_SETTINGS_CANNOT_BE_USED_FOR_SPELL_CHECKING"
-                 desc="The label for a language that cannot be used for spell checking">
-          This language cannot be used for spell checking
-        </message>
-        <message name="IDS_OPTIONS_SETTINGS_IS_USED_FOR_SPELL_CHECKING"
-                 desc="The label for a language that is currently used for spell checking">
-          This language is used for spell checking
-        </message>
-      </if>
+      <message name="IDS_OPTIONS_SETTINGS_USE_THIS_FOR_SPELL_CHECKING"
+               desc="The label for a language a button that changes the spell check language of Chrome OS">
+        Use this language for spell checking
+      </message>
+      <message name="IDS_OPTIONS_SETTINGS_CANNOT_BE_USED_FOR_SPELL_CHECKING"
+               desc="The label for a language that cannot be used for spell checking">
+        This language cannot be used for spell checking
+      </message>
+      <message name="IDS_OPTIONS_SETTINGS_IS_USED_FOR_SPELL_CHECKING"
+               desc="The label for a language that is currently used for spell checking">
+        This language is used for spell checking
+      </message>
       <if expr="not pp_ifdef('chromeos')">
         <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_RELAUNCH_BUTTON"
                  desc="The label for the relaunch button for changing UI language">
           Relaunch
         </message>
       </if>
       <if expr="pp_ifdef('chromeos')">
         <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_RELAUNCH_BUTTON"
                  desc="The label for the restart button for changing UI language">
           Restart
@@ skipping 1806 matching lines @@
       </message>
       <message name="IDS_OPTIONS_FONT_SIZE_LABEL_LARGE" desc="The label of the 'Large' option">
         Large
       </message>
       <message name="IDS_OPTIONS_FONT_SIZE_LABEL_VERY_LARGE" desc="The label of the 'Very Large' option">
         Very Large
       </message>
       <message name="IDS_OPTIONS_FONT_SIZE_LABEL_CUSTOM" desc="The label of the 'Custom' option">
         Custom
       </message>
-      <if expr="not pp_ifdef('use_titlecase') and not is_macosx">
+      <if expr="not pp_ifdef('use_titlecase')">
         <message name="IDS_OPTIONS_LANGUAGE_AND_SPELLCHECK_BUTTON" desc="Button title for invoking the 'Languages and Spell-checker' panel.">
           Languages and spell-checker settings...
         </message>
       </if>
-      <if expr="pp_ifdef('use_titlecase') and not is_macosx">
+      <if expr="pp_ifdef('use_titlecase')">
         <message name="IDS_OPTIONS_LANGUAGE_AND_SPELLCHECK_BUTTON" desc="Button title for invoking the 'Languages and Spell-checker' panel.">
           Languages and Spell-checker Settings...
         </message>
       </if>
-      <if expr="is_macosx">
-        <message name="IDS_OPTIONS_LANGUAGE_AND_SPELLCHECK_BUTTON" desc="Button title for invoking the 'Languages' panel.">
-          Language Settings...
-        </message>
-      </if>
 
-      <if expr="not is_macosx">
-        <message name="IDS_OPTIONS_ENABLE_SPELLCHECK" desc="The documentation string of the 'Enable spellcheck' option">
-          Enable spell checking
-        </message>
-        <message name="IDS_OPTIONS_ENABLE_AUTO_SPELL_CORRECTION" desc="The documentation string of the 'Enable auto spell correction' option">
-          Enable automatic spell correction
-        </message>
-      </if>
+      <message name="IDS_OPTIONS_ENABLE_SPELLCHECK" desc="The documentation string of the 'Enable spellcheck' option">
+        Enable spell checking
+      </message>
+      <message name="IDS_OPTIONS_ENABLE_AUTO_SPELL_CORRECTION" desc="The documentation string of the 'Enable auto spell correction' option">
+        Enable automatic spell correction
+      </message>
 
       <!-- General app failure messages -->
       <message name="IDS_COULDNT_OPEN_PROFILE_ERROR" desc="Error displayed on startup when the profile can not be opened correctly due to problems reading or writing files in it">
 Your profile could not be opened correctly.
 
 Some features may be unavailable.  Please check that the profile exists and you have permission to read and write its contents.
       </message>
       <message name="IDS_REFUSE_TO_RUN_AS_ROOT" desc="Short error message in displayed in an error dialog on startup if the user tries to run chrome as root">
         <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> can not be run as root.
       </message>
@@ skipping 5073 matching lines @@
     </messages>
     <structures fallback_to_english="true">
       <!-- Make sure these stay in sync with the structures in generated_resources.grd. -->
       <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>