components: Rename component_resources.* to component_strings.*

components_resources is misleading. Resources are generally images/assets
and/or html/js/css files and we use IDR_* for them.

BUG=250213
R=joi@chromium.org, thestig@chromium.org

Review URL: https://codereview.chromium.org/17192004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207130 0039d316-1c4b-4281-b951-d872f2087c98

22 files changed, 104 insertions, 103 deletions

diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
index 8e273fa..1b1c4b0a 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
@@ -63,7 +63,7 @@
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/common/url_constants.h"
 #include "grit/chromium_strings.h"
-#include "grit/component_resources.h"
+#include "grit/component_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/webkit_resources.h"
diff --git a/chrome/browser/ui/webui/options/autofill_options_handler.cc b/chrome/browser/ui/webui/options/autofill_options_handler.cc
index b35645b..4fcbb41 100644
--- a/chrome/browser/ui/webui/options/autofill_options_handler.cc
+++ b/chrome/browser/ui/webui/options/autofill_options_handler.cc
@@ -26,7 +26,7 @@
 #include "components/autofill/browser/phone_number_i18n.h"
 #include "components/autofill/core/common/autofill_constants.h"
 #include "content/public/browser/web_ui.h"
-#include "grit/component_resources.h"
+#include "grit/component_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/webui/web_ui_util.h"
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 79d738e..6111be5 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -2365,7 +2365,7 @@
             'debugger',
             'installer_util',
             '../components/components.gyp:autofill_content_risk_proto',
-            '../components/component_resources.gyp:component_resources',
+            '../components/component_strings.gyp:component_strings',
             '../device/bluetooth/bluetooth.gyp:device_bluetooth',
             '../net/net.gyp:net_with_v8',
             '../printing/printing.gyp:printing',
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index f4eeff1..3793742 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -311,7 +311,7 @@
         'chrome_strings',
         'platform_locale_settings',
         'theme_resources',
-        '<(DEPTH)/components/component_resources.gyp:component_resources',
+        '<(DEPTH)/components/component_strings.gyp:component_strings',
         '<(DEPTH)/net/net.gyp:net_resources',
         '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
         '<(DEPTH)/ui/ui.gyp:ui_resources',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index fbedbd7..8ba9543 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -1869,7 +1869,7 @@
           'dependencies': [
             'common/extensions/api/api.gyp:api',
             '../components/components.gyp:autofill_content_test_util',
-            '../components/component_resources.gyp:component_resources',
+            '../components/component_strings.gyp:component_strings',
             '../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',
             '../gpu/gpu.gyp:gpu_unittest_utils',
             '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared',
diff --git a/chrome/tools/build/repack_locales.py b/chrome/tools/build/repack_locales.py
index 4319dac..a43e171 100755
--- a/chrome/tools/build/repack_locales.py
+++ b/chrome/tools/build/repack_locales.py
@@ -69,10 +69,10 @@ def calc_inputs(locale):
   inputs.append(os.path.join(GRIT_DIR,
                 'platform_locale_settings_%s.pak' % locale))
 
-  #e.g. '<(SHARED_INTERMEDIATE_DIR)/component_resources/
-  # component_resources_da.pak',
-  inputs.append(os.path.join(SHARE_INT_DIR, 'component_resources',
-                'component_resources_%s.pak' % locale))
+  #e.g. '<(SHARED_INTERMEDIATE_DIR)/components/strings/
+  # component_strings_da.pak',
+  inputs.append(os.path.join(SHARE_INT_DIR, 'components', 'strings',
+                'component_strings_%s.pak' % locale))
 
   if OS != 'ios':
     #e.g. '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_da.pak'
diff --git a/components/autofill.gypi b/components/autofill.gypi
index 98052fb..db00537 100644
--- a/components/autofill.gypi
+++ b/components/autofill.gypi
@@ -114,7 +114,7 @@
             '../url/url.gyp:url_lib',
             '../webkit/support/webkit_support.gyp:webkit_resources',
 
-            'component_resources.gyp:component_resources',
+            'component_strings.gyp:component_strings',
           ],
           'sources': [
             'autofill/browser/address.cc',
@@ -269,7 +269,7 @@
             '../url/url.gyp:url_lib',
             '../webkit/support/webkit_support.gyp:webkit_resources',
 
-            'component_resources.gyp:component_resources',
+            'component_strings.gyp:component_strings',
           ],
           'sources': [
             'autofill/content/browser/autocheckout/whitelist_manager.cc',
@@ -326,7 +326,7 @@
             '../ipc/ipc.gyp:ipc',
             '../skia/skia.gyp:skia',
 
-            'component_resources.gyp:component_resources',
+            'component_strings.gyp:component_strings',
           ],
           'sources': [
             'autofill/content/renderer/autofill_agent.cc',
diff --git a/components/autofill/browser/autofill_country.cc b/components/autofill/browser/autofill_country.cc
index af16359..ad080bc 100644
--- a/components/autofill/browser/autofill_country.cc
+++ b/components/autofill/browser/autofill_country.cc
@@ -15,7 +15,7 @@
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "grit/component_resources.h"
+#include "grit/component_strings.h"
 #include "third_party/icu/public/common/unicode/locid.h"
 #include "third_party/icu/public/common/unicode/uloc.h"
 #include "third_party/icu/public/common/unicode/unistr.h"
diff --git a/components/autofill/browser/autofill_data_model.cc b/components/autofill/browser/autofill_data_model.cc
index fc6b0c4..de2910c 100644
--- a/components/autofill/browser/autofill_data_model.cc
+++ b/components/autofill/browser/autofill_data_model.cc
@@ -15,7 +15,7 @@
 #include "components/autofill/browser/validation.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "googleurl/src/gurl.h"
-#include "grit/component_resources.h"
+#include "grit/component_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace autofill {
diff --git a/components/autofill/browser/autofill_external_delegate.cc b/components/autofill/browser/autofill_external_delegate.cc
index 983bb2c..94e2d29 100644
--- a/components/autofill/browser/autofill_external_delegate.cc
+++ b/components/autofill/browser/autofill_external_delegate.cc
@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "components/autofill/browser/autofill_external_delegate.h"
+
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/browser/autocomplete_history_manager.h"
-#include "components/autofill/browser/autofill_external_delegate.h"
 #include "components/autofill/browser/autofill_manager.h"
 #include "components/autofill/core/common/autofill_messages.h"
 #include "content/public/browser/navigation_controller.h"
@@ -13,7 +14,7 @@
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
-#include "grit/component_resources.h"
+#include "grit/component_strings.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h"
 #include "ui/base/l10n/l10n_util.h"
 
diff --git a/components/autofill/browser/autofill_manager.cc b/components/autofill/browser/autofill_manager.cc
index d6a5e83..ea6864d 100644
--- a/components/autofill/browser/autofill_manager.cc
+++ b/components/autofill/browser/autofill_manager.cc
@@ -54,7 +54,7 @@
 #include "content/public/common/frame_navigate_params.h"
 #include "content/public/common/url_constants.h"
 #include "googleurl/src/gurl.h"
-#include "grit/component_resources.h"
+#include "grit/component_strings.h"
 #include "ipc/ipc_message_macros.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/components/autofill/browser/autofill_manager_unittest.cc b/components/autofill/browser/autofill_manager_unittest.cc
index 2ea75f1..c87b5d3 100644
--- a/components/autofill/browser/autofill_manager_unittest.cc
+++ b/components/autofill/browser/autofill_manager_unittest.cc
@@ -46,7 +46,7 @@
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_utils.h"
 #include "googleurl/src/gurl.h"
-#include "grit/component_resources.h"
+#include "grit/component_strings.h"
 #include "ipc/ipc_test_sink.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/autofill/browser/autofill_profile.cc b/components/autofill/browser/autofill_profile.cc
index 320d8d2..3b9e303 100644
--- a/components/autofill/browser/autofill_profile.cc
+++ b/components/autofill/browser/autofill_profile.cc
@@ -23,7 +23,7 @@
 #include "components/autofill/browser/phone_number.h"
 #include "components/autofill/browser/phone_number_i18n.h"
 #include "components/autofill/core/common/form_field_data.h"
-#include "grit/component_resources.h"
+#include "grit/component_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace autofill {
diff --git a/components/autofill/browser/autofill_profile_unittest.cc b/components/autofill/browser/autofill_profile_unittest.cc
index bd55fc1..9e49a75 100644
--- a/components/autofill/browser/autofill_profile_unittest.cc
+++ b/components/autofill/browser/autofill_profile_unittest.cc
@@ -13,7 +13,7 @@
 #include "components/autofill/browser/autofill_common_test.h"
 #include "components/autofill/browser/autofill_profile.h"
 #include "components/autofill/core/common/form_field_data.h"
-#include "grit/component_resources.h"
+#include "grit/component_strings.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace autofill {
diff --git a/components/autofill/browser/credit_card.cc b/components/autofill/browser/credit_card.cc
index f68b98c..2f5417f 100644
--- a/components/autofill/browser/credit_card.cc
+++ b/components/autofill/browser/credit_card.cc
@@ -23,7 +23,7 @@
 #include "components/autofill/browser/field_types.h"
 #include "components/autofill/browser/validation.h"
 #include "components/autofill/core/common/form_field_data.h"
-#include "grit/component_resources.h"
+#include "grit/component_strings.h"
 #include "grit/webkit_resources.h"
 #include "third_party/icu/public/common/unicode/uloc.h"
 #include "third_party/icu/public/i18n/unicode/dtfmtsym.h"
diff --git a/components/autofill/browser/personal_data_manager_mac.mm b/components/autofill/browser/personal_data_manager_mac.mm
index 5e28add..08487bd 100644
--- a/components/autofill/browser/personal_data_manager_mac.mm
+++ b/components/autofill/browser/personal_data_manager_mac.mm
@@ -19,7 +19,7 @@
 #include "components/autofill/browser/autofill_country.h"
 #include "components/autofill/browser/autofill_profile.h"
 #include "components/autofill/browser/phone_number.h"
-#include "grit/component_resources.h"
+#include "grit/component_strings.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 namespace autofill {
diff --git a/components/autofill/content/browser/wallet/wallet_items.cc b/components/autofill/content/browser/wallet/wallet_items.cc
index 3f4ff77..4e55744 100644
--- a/components/autofill/content/browser/wallet/wallet_items.cc
+++ b/components/autofill/content/browser/wallet/wallet_items.cc
@@ -11,7 +11,7 @@
 #include "components/autofill/browser/autofill_type.h"
 #include "components/autofill/browser/credit_card.h"
 #include "googleurl/src/gurl.h"
-#include "grit/component_resources.h"
+#include "grit/component_strings.h"
 #include "grit/webkit_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/components/autofill/content/renderer/autofill_agent.cc b/components/autofill/content/renderer/autofill_agent.cc
index 5c30cda..6e9b547 100644
--- a/components/autofill/content/renderer/autofill_agent.cc
+++ b/components/autofill/content/renderer/autofill_agent.cc
@@ -25,7 +25,7 @@
 #include "content/public/common/password_form.h"
 #include "content/public/common/ssl_status.h"
 #include "content/public/renderer/render_view.h"
-#include "grit/component_resources.h"
+#include "grit/component_strings.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormControlElement.h"
diff --git a/components/autofill/content/renderer/form_cache.cc b/components/autofill/content/renderer/form_cache.cc
index e09075e..36eca67 100644
--- a/components/autofill/content/renderer/form_cache.cc
+++ b/components/autofill/content/renderer/form_cache.cc
@@ -12,7 +12,7 @@
 #include "components/autofill/core/common/form_data_predictions.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "components/autofill/core/common/form_field_data_predictions.h"
-#include "grit/component_resources.h"
+#include "grit/component_strings.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormControlElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormElement.h"
diff --git a/components/component_resources.grd b/components/component_strings.grd
index 61d32395..6215b29 100644
--- a/components/component_resources.grd
+++ b/components/component_strings.grd
@@ -3,106 +3,106 @@
 <grit latest_public_release="0" current_release="1"
       source_lang_id="en" enc_check="möl">
   <outputs>
-    <output filename="grit/component_resources.h" type="rc_header">
+    <output filename="grit/component_strings.h" type="rc_header">
       <emit emit_type='prepend'></emit>
     </output>
-    <output filename="component_resources_am.pak" type="data_package" lang="am" />
-    <output filename="component_resources_ar.pak" type="data_package" lang="ar" />
+    <output filename="component_strings_am.pak" type="data_package" lang="am" />
+    <output filename="component_strings_ar.pak" type="data_package" lang="ar" />
     <if expr="pp_ifdef('use_third_party_translations')">
-      <output filename="component_resources_ast.pak" type="data_package" lang="ast" />
+      <output filename="component_strings_ast.pak" type="data_package" lang="ast" />
     </if>
-    <output filename="component_resources_bg.pak" type="data_package" lang="bg" />
-    <output filename="component_resources_bn.pak" type="data_package" lang="bn" />
+    <output filename="component_strings_bg.pak" type="data_package" lang="bg" />
+    <output filename="component_strings_bn.pak" type="data_package" lang="bn" />
     <if expr="pp_ifdef('use_third_party_translations')">
-      <output filename="component_resources_bs.pak" type="data_package" lang="bs" />
+      <output filename="component_strings_bs.pak" type="data_package" lang="bs" />
     </if>
-    <output filename="component_resources_ca.pak" type="data_package" lang="ca" />
+    <output filename="component_strings_ca.pak" type="data_package" lang="ca" />
     <if expr="pp_ifdef('use_third_party_translations')">
-      <output filename="component_resources_ca@valencia.pak" type="data_package" lang="ca@valencia" />
+      <output filename="component_strings_ca@valencia.pak" type="data_package" lang="ca@valencia" />
     </if>
-    <output filename="component_resources_cs.pak" type="data_package" lang="cs" />
-    <output filename="component_resources_da.pak" type="data_package" lang="da" />
-    <output filename="component_resources_de.pak" type="data_package" lang="de" />
-    <output filename="component_resources_el.pak" type="data_package" lang="el" />
+    <output filename="component_strings_cs.pak" type="data_package" lang="cs" />
+    <output filename="component_strings_da.pak" type="data_package" lang="da" />
+    <output filename="component_strings_de.pak" type="data_package" lang="de" />
+    <output filename="component_strings_el.pak" type="data_package" lang="el" />
     <if expr="pp_ifdef('use_third_party_translations')">
-      <output filename="component_resources_en-AU.pak" type="data_package" lang="en-AU" />
+      <output filename="component_strings_en-AU.pak" type="data_package" lang="en-AU" />
     </if>
-    <output filename="component_resources_en-GB.pak" type="data_package" lang="en-GB" />
-    <output filename="component_resources_en-US.pak" type="data_package" lang="en" />
+    <output filename="component_strings_en-GB.pak" type="data_package" lang="en-GB" />
+    <output filename="component_strings_en-US.pak" type="data_package" lang="en" />
     <if expr="pp_ifdef('use_third_party_translations')">
-      <output filename="component_resources_eo.pak" type="data_package" lang="eo" />
+      <output filename="component_strings_eo.pak" type="data_package" lang="eo" />
     </if>
-    <output filename="component_resources_es.pak" type="data_package" lang="es" />
-    <output filename="component_resources_es-419.pak" type="data_package" lang="es-419" />
-    <output filename="component_resources_et.pak" type="data_package" lang="et" />
+    <output filename="component_strings_es.pak" type="data_package" lang="es" />
+    <output filename="component_strings_es-419.pak" type="data_package" lang="es-419" />
+    <output filename="component_strings_et.pak" type="data_package" lang="et" />
     <if expr="pp_ifdef('use_third_party_translations')">
-      <output filename="component_resources_eu.pak" type="data_package" lang="eu" />
+      <output filename="component_strings_eu.pak" type="data_package" lang="eu" />
     </if>
-    <output filename="component_resources_fa.pak" type="data_package" lang="fa" />
-    <output filename="component_resources_fake-bidi.pak" type="data_package" lang="fake-bidi" />
-    <output filename="component_resources_fi.pak" type="data_package" lang="fi" />
-    <output filename="component_resources_fil.pak" type="data_package" lang="fil" />
-    <output filename="component_resources_fr.pak" type="data_package" lang="fr" />
+    <output filename="component_strings_fa.pak" type="data_package" lang="fa" />
+    <output filename="component_strings_fake-bidi.pak" type="data_package" lang="fake-bidi" />
+    <output filename="component_strings_fi.pak" type="data_package" lang="fi" />
+    <output filename="component_strings_fil.pak" type="data_package" lang="fil" />
+    <output filename="component_strings_fr.pak" type="data_package" lang="fr" />
     <if expr="pp_ifdef('use_third_party_translations')">
-      <output filename="component_resources_gl.pak" type="data_package" lang="gl" />
+      <output filename="component_strings_gl.pak" type="data_package" lang="gl" />
     </if>
-    <output filename="component_resources_gu.pak" type="data_package" lang="gu" />
-    <output filename="component_resources_he.pak" type="data_package" lang="he" />
-    <output filename="component_resources_hi.pak" type="data_package" lang="hi" />
-    <output filename="component_resources_hr.pak" type="data_package" lang="hr" />
-    <output filename="component_resources_hu.pak" type="data_package" lang="hu" />
+    <output filename="component_strings_gu.pak" type="data_package" lang="gu" />
+    <output filename="component_strings_he.pak" type="data_package" lang="he" />
+    <output filename="component_strings_hi.pak" type="data_package" lang="hi" />
+    <output filename="component_strings_hr.pak" type="data_package" lang="hr" />
+    <output filename="component_strings_hu.pak" type="data_package" lang="hu" />
     <if expr="pp_ifdef('use_third_party_translations')">
-      <output filename="component_resources_hy.pak" type="data_package" lang="hy" />
-      <output filename="component_resources_ia.pak" type="data_package" lang="ia" />
+      <output filename="component_strings_hy.pak" type="data_package" lang="hy" />
+      <output filename="component_strings_ia.pak" type="data_package" lang="ia" />
     </if>
-    <output filename="component_resources_id.pak" type="data_package" lang="id" />
-    <output filename="component_resources_it.pak" type="data_package" lang="it" />
-    <output filename="component_resources_ja.pak" type="data_package" lang="ja" />
+    <output filename="component_strings_id.pak" type="data_package" lang="id" />
+    <output filename="component_strings_it.pak" type="data_package" lang="it" />
+    <output filename="component_strings_ja.pak" type="data_package" lang="ja" />
     <if expr="pp_ifdef('use_third_party_translations')">
-      <output filename="component_resources_ka.pak" type="data_package" lang="ka" />
+      <output filename="component_strings_ka.pak" type="data_package" lang="ka" />
     </if>
-    <output filename="component_resources_kn.pak" type="data_package" lang="kn" />
-    <output filename="component_resources_ko.pak" type="data_package" lang="ko" />
+    <output filename="component_strings_kn.pak" type="data_package" lang="kn" />
+    <output filename="component_strings_ko.pak" type="data_package" lang="ko" />
     <if expr="pp_ifdef('use_third_party_translations')">
-      <output filename="component_resources_ku.pak" type="data_package" lang="ku" />
-      <output filename="component_resources_kw.pak" type="data_package" lang="kw" />
+      <output filename="component_strings_ku.pak" type="data_package" lang="ku" />
+      <output filename="component_strings_kw.pak" type="data_package" lang="kw" />
     </if>
-    <output filename="component_resources_lt.pak" type="data_package" lang="lt" />
-    <output filename="component_resources_lv.pak" type="data_package" lang="lv" />
-    <output filename="component_resources_ml.pak" type="data_package" lang="ml" />
-    <output filename="component_resources_mr.pak" type="data_package" lang="mr" />
-    <output filename="component_resources_ms.pak" type="data_package" lang="ms" />
-    <output filename="component_resources_nl.pak" type="data_package" lang="nl" />
+    <output filename="component_strings_lt.pak" type="data_package" lang="lt" />
+    <output filename="component_strings_lv.pak" type="data_package" lang="lv" />
+    <output filename="component_strings_ml.pak" type="data_package" lang="ml" />
+    <output filename="component_strings_mr.pak" type="data_package" lang="mr" />
+    <output filename="component_strings_ms.pak" type="data_package" lang="ms" />
+    <output filename="component_strings_nl.pak" type="data_package" lang="nl" />
     <!-- The translation console uses 'no' for Norwegian Bokmål. It should
          be 'nb'. -->
-    <output filename="component_resources_nb.pak" type="data_package" lang="no" />
-    <output filename="component_resources_pl.pak" type="data_package" lang="pl" />
+    <output filename="component_strings_nb.pak" type="data_package" lang="no" />
+    <output filename="component_strings_pl.pak" type="data_package" lang="pl" />
     <if expr="pp_ifdef('ios')">
       <!-- iOS uses pt for pt-BR -->
-      <output filename="component_resources_pt.pak" type="data_package" lang="pt-BR" />
+      <output filename="component_strings_pt.pak" type="data_package" lang="pt-BR" />
     </if>
     <if expr="not pp_ifdef('ios')">
-      <output filename="component_resources_pt-BR.pak" type="data_package" lang="pt-BR" />
+      <output filename="component_strings_pt-BR.pak" type="data_package" lang="pt-BR" />
     </if>
-    <output filename="component_resources_pt-PT.pak" type="data_package" lang="pt-PT" />
-    <output filename="component_resources_ro.pak" type="data_package" lang="ro" />
-    <output filename="component_resources_ru.pak" type="data_package" lang="ru" />
-    <output filename="component_resources_sk.pak" type="data_package" lang="sk" />
-    <output filename="component_resources_sl.pak" type="data_package" lang="sl" />
-    <output filename="component_resources_sr.pak" type="data_package" lang="sr" />
-    <output filename="component_resources_sv.pak" type="data_package" lang="sv" />
-    <output filename="component_resources_sw.pak" type="data_package" lang="sw" />
-    <output filename="component_resources_ta.pak" type="data_package" lang="ta" />
-    <output filename="component_resources_te.pak" type="data_package" lang="te" />
-    <output filename="component_resources_th.pak" type="data_package" lang="th" />
-    <output filename="component_resources_tr.pak" type="data_package" lang="tr" />
+    <output filename="component_strings_pt-PT.pak" type="data_package" lang="pt-PT" />
+    <output filename="component_strings_ro.pak" type="data_package" lang="ro" />
+    <output filename="component_strings_ru.pak" type="data_package" lang="ru" />
+    <output filename="component_strings_sk.pak" type="data_package" lang="sk" />
+    <output filename="component_strings_sl.pak" type="data_package" lang="sl" />
+    <output filename="component_strings_sr.pak" type="data_package" lang="sr" />
+    <output filename="component_strings_sv.pak" type="data_package" lang="sv" />
+    <output filename="component_strings_sw.pak" type="data_package" lang="sw" />
+    <output filename="component_strings_ta.pak" type="data_package" lang="ta" />
+    <output filename="component_strings_te.pak" type="data_package" lang="te" />
+    <output filename="component_strings_th.pak" type="data_package" lang="th" />
+    <output filename="component_strings_tr.pak" type="data_package" lang="tr" />
     <if expr="pp_ifdef('use_third_party_translations')">
-      <output filename="component_resources_ug.pak" type="data_package" lang="ug" />
+      <output filename="component_strings_ug.pak" type="data_package" lang="ug" />
     </if>
-    <output filename="component_resources_uk.pak" type="data_package" lang="uk" />
-    <output filename="component_resources_vi.pak" type="data_package" lang="vi" />
-    <output filename="component_resources_zh-CN.pak" type="data_package" lang="zh-CN" />
-    <output filename="component_resources_zh-TW.pak" type="data_package" lang="zh-TW" />
+    <output filename="component_strings_uk.pak" type="data_package" lang="uk" />
+    <output filename="component_strings_vi.pak" type="data_package" lang="vi" />
+    <output filename="component_strings_zh-CN.pak" type="data_package" lang="zh-CN" />
+    <output filename="component_strings_zh-TW.pak" type="data_package" lang="zh-TW" />
   </outputs>
   <release seq="1" allow_pseudo="false">
     <messages fallback_to_english="true">
diff --git a/components/component_resources.gyp b/components/component_strings.gyp
index 94839c1..a186f1e 100644
--- a/components/component_resources.gyp
+++ b/components/component_strings.gyp
@@ -4,27 +4,27 @@
 
 {
   'variables': {
-    'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
+    'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/components',
   },
   'targets': [
     {
-      'target_name': 'component_resources',
+      'target_name': 'component_strings',
       'type': 'none',
       'actions': [
         {
-          'action_name': 'component_resources',
+          'action_name': 'component_strings',
           'variables': {
-            'grit_grd_file': 'component_resources.grd',
-            'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/component_resources',
+            'grit_grd_file': 'component_strings.grd',
+            'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/components/strings',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
       ],
      'direct_dependent_settings': {
         'include_dirs': [
-            '<(SHARED_INTERMEDIATE_DIR)/component_resources',
-          ],
-        },
+            '<(SHARED_INTERMEDIATE_DIR)/components/strings',
+        ],
+      },
     },
   ],
 }
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
index b9bb6bf..57c57e4 100644
--- a/tools/gritsettings/resource_ids
+++ b/tools/gritsettings/resource_ids
@@ -218,7 +218,7 @@
   "chrome/browser/resources/sync_file_system_internals_resources.grd": {
     "includes": [29000],
   },
-  "components/component_resources.grd": {
+  "components/component_strings.grd": {
     "messages": [30000],
   },
   # Resource ids starting at 31000 are reserved for projects built on Chromium.