112 files changed, 97 insertions, 112 deletions

diff --git a/app/app.gyp b/app/app.gyp
index fc10ca0..d1b3198 100644
--- a/app/app.gyp
+++ b/app/app.gyp
@@ -11,6 +11,10 @@
                       '<@(grit_defines)'],
     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/app',
     'grit_cmd': ['python', '../tools/grit/grit.py'],
+    'localizable_resources': [
+      'resources/app_locale_settings.grd',
+      'resources/app_strings.grd',
+    ],
   },
   'includes': [
     'app_base.gypi',
@@ -66,9 +70,9 @@
             '../ui/base/dragdrop/gtk_dnd_util_unittest.cc',
           ],
           'dependencies': [
+            'app_unittest_strings',
             '../build/linux/system.gyp:gtk',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
-            '../ui/base/strings/ui_strings.gyp:ui_unittest_strings',
           ],
         }],
         ['OS!="win"', {
@@ -89,6 +93,43 @@
       ],
     },
     {
+      'target_name': 'app_strings',
+      'msvs_guid': 'AE9BF4A2-19C5-49D8-BB1A-F28496DD7051',
+      'type': 'none',
+      'rules': [
+        {
+          'rule_name': 'grit',
+          'extension': 'grd',
+          'inputs': [
+            '<!@(<(grit_info_cmd) --inputs <(localizable_resources))',
+          ],
+          'outputs': [
+            '<(grit_out_dir)/<(RULE_INPUT_ROOT)/grit/<(RULE_INPUT_ROOT).h',
+            # TODO: remove this helper when we have loops in GYP
+            '>!@(<(apply_locales_cmd) \'<(grit_out_dir)/<(RULE_INPUT_ROOT)/<(RULE_INPUT_ROOT)_ZZLOCALE.pak\' <(locales))',
+          ],
+          'action': ['<@(grit_cmd)', '-i', '<(RULE_INPUT_PATH)',
+            'build', '-o', '<(grit_out_dir)/<(RULE_INPUT_ROOT)',
+            '<@(grit_defines)'],
+          'message': 'Generating resources from <(RULE_INPUT_PATH)',
+        },
+      ],
+      'sources': [
+        '<@(localizable_resources)',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '<(grit_out_dir)/app_locale_settings',
+          '<(grit_out_dir)/app_strings',
+        ],
+      },
+      'conditions': [
+        ['OS=="win"', {
+          'dependencies': ['../build/win/system.gyp:cygwin'],
+        }],
+      ],
+    },
+    {
       'target_name': 'app_resources',
       'type': 'none',
       'msvs_guid': '3FBC4235-3FBD-46DF-AEDC-BADBBA13A095',
@@ -123,6 +164,45 @@
       ],
     },
   ],
+  'conditions': [
+    ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+      'targets': [{
+        'target_name': 'app_unittest_strings',
+        'type': 'none',
+        'variables': {
+          'repack_path': '<(DEPTH)/tools/data_pack/repack.py',
+        },
+        'actions': [
+          {
+            'action_name': 'repack_app_unittest_strings',
+            'variables': {
+              'pak_inputs': [
+                '<(grit_out_dir)/app_strings/app_strings_en-US.pak',
+                '<(grit_out_dir)/app_locale_settings/app_locale_settings_en-US.pak',
+              ],
+            },
+            'inputs': [
+              '<(repack_path)',
+              '<@(pak_inputs)',
+            ],
+            'outputs': [
+              '<(PRODUCT_DIR)/app_unittests_strings/en-US.pak',
+            ],
+            'action': ['python', '<(repack_path)', '<@(_outputs)',
+                       '<@(pak_inputs)'],
+          },
+        ],
+        'copies': [
+          {
+            'destination': '<(PRODUCT_DIR)/app_unittests_strings',
+            'files': [
+              '<(grit_out_dir)/app_resources/app_resources.pak',
+            ],
+          },
+        ],
+      }],
+    }],
+  ],
 }
 
 # Local Variables:
diff --git a/app/app_base.gypi b/app/app_base.gypi
index 1cf9f34..163045f 100644
--- a/app/app_base.gypi
+++ b/app/app_base.gypi
@@ -59,9 +59,10 @@
         'gl_binding_output_dir': '<(SHARED_INTERMEDIATE_DIR)/app',
       },
       'dependencies': [
-        # app resources and ui_strings should be shared with the 64-bit
+        # app resources and app_strings should be shared with the 64-bit
         # target, but it doesn't work due to a bug in gyp
         'app_resources',
+        'app_strings',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../ui/gfx/gfx.gyp:gfx',
@@ -72,7 +73,6 @@
         '../third_party/libpng/libpng.gyp:libpng',
         '../third_party/sqlite/sqlite.gyp:sqlite',
         '../third_party/zlib/zlib.gyp:zlib',
-        '../ui/base/strings/ui_strings.gyp:ui_strings',
         '<(libjpeg_gyp_path):libjpeg',
       ],
       'include_dirs': [
@@ -420,11 +420,11 @@
           'type': '<(library)',
           'msvs_guid': '4987C6F9-B230-48E5-BF91-418EAE69AD90',
           'dependencies': [
-            # app resources and ui_strings should be shared with the 32-bit
+            # app resources and app_strings should be shared with the 32-bit
             # target, but it doesn't work due to a bug in gyp
             'app_resources',
+            'app_strings',
             '../base/base.gyp:base_nacl_win64',
-            '../ui/base/strings/ui_strings.gyp:ui_strings',
           ],
           'variables': {
             'app_base_target': 1,
diff --git a/ui/base/strings/app_locale_settings.grd b/app/resources/app_locale_settings.grd
index 1bf5203..1bf5203 100644
--- a/ui/base/strings/app_locale_settings.grd
+++ b/app/resources/app_locale_settings.grd
diff --git a/ui/base/strings/app_locale_settings_am.xtb b/app/resources/app_locale_settings_am.xtb
index c05871b..c05871b 100644
--- a/ui/base/strings/app_locale_settings_am.xtb
+++ b/app/resources/app_locale_settings_am.xtb
diff --git a/ui/base/strings/app_locale_settings_ar.xtb b/app/resources/app_locale_settings_ar.xtb
index e1d3faf..e1d3faf 100644
--- a/ui/base/strings/app_locale_settings_ar.xtb
+++ b/app/resources/app_locale_settings_ar.xtb
diff --git a/ui/base/strings/app_locale_settings_bg.xtb b/app/resources/app_locale_settings_bg.xtb
index ebab473..ebab473 100644
--- a/ui/base/strings/app_locale_settings_bg.xtb
+++ b/app/resources/app_locale_settings_bg.xtb
diff --git a/ui/base/strings/app_locale_settings_bn.xtb b/app/resources/app_locale_settings_bn.xtb
index 6c32c06..6c32c06 100644
--- a/ui/base/strings/app_locale_settings_bn.xtb
+++ b/app/resources/app_locale_settings_bn.xtb
diff --git a/ui/base/strings/app_locale_settings_ca.xtb b/app/resources/app_locale_settings_ca.xtb
index 1438d89..1438d89 100644
--- a/ui/base/strings/app_locale_settings_ca.xtb
+++ b/app/resources/app_locale_settings_ca.xtb
diff --git a/ui/base/strings/app_locale_settings_cs.xtb b/app/resources/app_locale_settings_cs.xtb
index 2d95130..2d95130 100644
--- a/ui/base/strings/app_locale_settings_cs.xtb
+++ b/app/resources/app_locale_settings_cs.xtb
diff --git a/ui/base/strings/app_locale_settings_da.xtb b/app/resources/app_locale_settings_da.xtb
index 751fa4a..751fa4a 100644
--- a/ui/base/strings/app_locale_settings_da.xtb
+++ b/app/resources/app_locale_settings_da.xtb
diff --git a/ui/base/strings/app_locale_settings_de.xtb b/app/resources/app_locale_settings_de.xtb
index 91de7f51..91de7f51 100644
--- a/ui/base/strings/app_locale_settings_de.xtb
+++ b/app/resources/app_locale_settings_de.xtb
diff --git a/ui/base/strings/app_locale_settings_el.xtb b/app/resources/app_locale_settings_el.xtb
index 6e5e7d8..6e5e7d8 100644
--- a/ui/base/strings/app_locale_settings_el.xtb
+++ b/app/resources/app_locale_settings_el.xtb
diff --git a/ui/base/strings/app_locale_settings_en-GB.xtb b/app/resources/app_locale_settings_en-GB.xtb
index 0fb2133..0fb2133 100644
--- a/ui/base/strings/app_locale_settings_en-GB.xtb
+++ b/app/resources/app_locale_settings_en-GB.xtb
diff --git a/ui/base/strings/app_locale_settings_es-419.xtb b/app/resources/app_locale_settings_es-419.xtb
index 2fe4770..2fe4770 100644
--- a/ui/base/strings/app_locale_settings_es-419.xtb
+++ b/app/resources/app_locale_settings_es-419.xtb
diff --git a/ui/base/strings/app_locale_settings_es.xtb b/app/resources/app_locale_settings_es.xtb
index 64022ec..64022ec 100644
--- a/ui/base/strings/app_locale_settings_es.xtb
+++ b/app/resources/app_locale_settings_es.xtb
diff --git a/ui/base/strings/app_locale_settings_et.xtb b/app/resources/app_locale_settings_et.xtb
index 5244dfd..5244dfd 100644
--- a/ui/base/strings/app_locale_settings_et.xtb
+++ b/app/resources/app_locale_settings_et.xtb
diff --git a/ui/base/strings/app_locale_settings_fa.xtb b/app/resources/app_locale_settings_fa.xtb
index 386e0ae..386e0ae 100644
--- a/ui/base/strings/app_locale_settings_fa.xtb
+++ b/app/resources/app_locale_settings_fa.xtb
diff --git a/ui/base/strings/app_locale_settings_fi.xtb b/app/resources/app_locale_settings_fi.xtb
index 4691cd5..4691cd5 100644
--- a/ui/base/strings/app_locale_settings_fi.xtb
+++ b/app/resources/app_locale_settings_fi.xtb
diff --git a/ui/base/strings/app_locale_settings_fil.xtb b/app/resources/app_locale_settings_fil.xtb
index 443630e..443630e 100644
--- a/ui/base/strings/app_locale_settings_fil.xtb
+++ b/app/resources/app_locale_settings_fil.xtb
diff --git a/ui/base/strings/app_locale_settings_fr.xtb b/app/resources/app_locale_settings_fr.xtb
index 63026a3..63026a3 100644
--- a/ui/base/strings/app_locale_settings_fr.xtb
+++ b/app/resources/app_locale_settings_fr.xtb
diff --git a/ui/base/strings/app_locale_settings_gu.xtb b/app/resources/app_locale_settings_gu.xtb
index 36e4998..36e4998 100644
--- a/ui/base/strings/app_locale_settings_gu.xtb
+++ b/app/resources/app_locale_settings_gu.xtb
diff --git a/ui/base/strings/app_locale_settings_he.xtb b/app/resources/app_locale_settings_he.xtb
index 5545011..5545011 100644
--- a/ui/base/strings/app_locale_settings_he.xtb
+++ b/app/resources/app_locale_settings_he.xtb
diff --git a/ui/base/strings/app_locale_settings_hi.xtb b/app/resources/app_locale_settings_hi.xtb
index 56983d7..56983d7 100644
--- a/ui/base/strings/app_locale_settings_hi.xtb
+++ b/app/resources/app_locale_settings_hi.xtb
diff --git a/ui/base/strings/app_locale_settings_hr.xtb b/app/resources/app_locale_settings_hr.xtb
index 26f99d0..26f99d0 100644
--- a/ui/base/strings/app_locale_settings_hr.xtb
+++ b/app/resources/app_locale_settings_hr.xtb
diff --git a/ui/base/strings/app_locale_settings_hu.xtb b/app/resources/app_locale_settings_hu.xtb
index 7ef9a5e..7ef9a5e 100644
--- a/ui/base/strings/app_locale_settings_hu.xtb
+++ b/app/resources/app_locale_settings_hu.xtb
diff --git a/ui/base/strings/app_locale_settings_id.xtb b/app/resources/app_locale_settings_id.xtb
index aa34783..aa34783 100644
--- a/ui/base/strings/app_locale_settings_id.xtb
+++ b/app/resources/app_locale_settings_id.xtb
diff --git a/ui/base/strings/app_locale_settings_it.xtb b/app/resources/app_locale_settings_it.xtb
index a6ac8d46..a6ac8d46 100644
--- a/ui/base/strings/app_locale_settings_it.xtb
+++ b/app/resources/app_locale_settings_it.xtb
diff --git a/ui/base/strings/app_locale_settings_ja.xtb b/app/resources/app_locale_settings_ja.xtb
index 933d47d..933d47d 100644
--- a/ui/base/strings/app_locale_settings_ja.xtb
+++ b/app/resources/app_locale_settings_ja.xtb
diff --git a/ui/base/strings/app_locale_settings_kn.xtb b/app/resources/app_locale_settings_kn.xtb
index 2991bff..2991bff 100644
--- a/ui/base/strings/app_locale_settings_kn.xtb
+++ b/app/resources/app_locale_settings_kn.xtb
diff --git a/ui/base/strings/app_locale_settings_ko.xtb b/app/resources/app_locale_settings_ko.xtb
index 7c4134c..7c4134c 100644
--- a/ui/base/strings/app_locale_settings_ko.xtb
+++ b/app/resources/app_locale_settings_ko.xtb
diff --git a/ui/base/strings/app_locale_settings_lt.xtb b/app/resources/app_locale_settings_lt.xtb
index 5804ae2..5804ae2 100644
--- a/ui/base/strings/app_locale_settings_lt.xtb
+++ b/app/resources/app_locale_settings_lt.xtb
diff --git a/ui/base/strings/app_locale_settings_lv.xtb b/app/resources/app_locale_settings_lv.xtb
index a0a1c47..a0a1c47 100644
--- a/ui/base/strings/app_locale_settings_lv.xtb
+++ b/app/resources/app_locale_settings_lv.xtb
diff --git a/ui/base/strings/app_locale_settings_ml.xtb b/app/resources/app_locale_settings_ml.xtb
index 96da8a6..96da8a6 100644
--- a/ui/base/strings/app_locale_settings_ml.xtb
+++ b/app/resources/app_locale_settings_ml.xtb
diff --git a/ui/base/strings/app_locale_settings_mr.xtb b/app/resources/app_locale_settings_mr.xtb
index 95ff0b3..95ff0b3 100644
--- a/ui/base/strings/app_locale_settings_mr.xtb
+++ b/app/resources/app_locale_settings_mr.xtb
diff --git a/ui/base/strings/app_locale_settings_nb.xtb b/app/resources/app_locale_settings_nb.xtb
index 913638b..913638b 100644
--- a/ui/base/strings/app_locale_settings_nb.xtb
+++ b/app/resources/app_locale_settings_nb.xtb
diff --git a/ui/base/strings/app_locale_settings_nl.xtb b/app/resources/app_locale_settings_nl.xtb
index e782410..e782410 100644
--- a/ui/base/strings/app_locale_settings_nl.xtb
+++ b/app/resources/app_locale_settings_nl.xtb
diff --git a/ui/base/strings/app_locale_settings_pl.xtb b/app/resources/app_locale_settings_pl.xtb
index 4519e3d..4519e3d 100644
--- a/ui/base/strings/app_locale_settings_pl.xtb
+++ b/app/resources/app_locale_settings_pl.xtb
diff --git a/ui/base/strings/app_locale_settings_pt-BR.xtb b/app/resources/app_locale_settings_pt-BR.xtb
index e95eb56..e95eb56 100644
--- a/ui/base/strings/app_locale_settings_pt-BR.xtb
+++ b/app/resources/app_locale_settings_pt-BR.xtb
diff --git a/ui/base/strings/app_locale_settings_pt-PT.xtb b/app/resources/app_locale_settings_pt-PT.xtb
index 1dcf557a..1dcf557a 100644
--- a/ui/base/strings/app_locale_settings_pt-PT.xtb
+++ b/app/resources/app_locale_settings_pt-PT.xtb
diff --git a/ui/base/strings/app_locale_settings_ro.xtb b/app/resources/app_locale_settings_ro.xtb
index 9e43493..9e43493 100644
--- a/ui/base/strings/app_locale_settings_ro.xtb
+++ b/app/resources/app_locale_settings_ro.xtb
diff --git a/ui/base/strings/app_locale_settings_ru.xtb b/app/resources/app_locale_settings_ru.xtb
index c4a621b..c4a621b 100644
--- a/ui/base/strings/app_locale_settings_ru.xtb
+++ b/app/resources/app_locale_settings_ru.xtb
diff --git a/ui/base/strings/app_locale_settings_sk.xtb b/app/resources/app_locale_settings_sk.xtb
index 00750d3..00750d3 100644
--- a/ui/base/strings/app_locale_settings_sk.xtb
+++ b/app/resources/app_locale_settings_sk.xtb
diff --git a/ui/base/strings/app_locale_settings_sl.xtb b/app/resources/app_locale_settings_sl.xtb
index 489b7e4..489b7e4 100644
--- a/ui/base/strings/app_locale_settings_sl.xtb
+++ b/app/resources/app_locale_settings_sl.xtb
diff --git a/ui/base/strings/app_locale_settings_sr.xtb b/app/resources/app_locale_settings_sr.xtb
index 38f6f35..38f6f35 100644
--- a/ui/base/strings/app_locale_settings_sr.xtb
+++ b/app/resources/app_locale_settings_sr.xtb
diff --git a/ui/base/strings/app_locale_settings_sv.xtb b/app/resources/app_locale_settings_sv.xtb
index ddea3dc..ddea3dc 100644
--- a/ui/base/strings/app_locale_settings_sv.xtb
+++ b/app/resources/app_locale_settings_sv.xtb
diff --git a/ui/base/strings/app_locale_settings_sw.xtb b/app/resources/app_locale_settings_sw.xtb
index b775088..b775088 100644
--- a/ui/base/strings/app_locale_settings_sw.xtb
+++ b/app/resources/app_locale_settings_sw.xtb
diff --git a/ui/base/strings/app_locale_settings_ta.xtb b/app/resources/app_locale_settings_ta.xtb
index ef90687..ef90687 100644
--- a/ui/base/strings/app_locale_settings_ta.xtb
+++ b/app/resources/app_locale_settings_ta.xtb
diff --git a/ui/base/strings/app_locale_settings_te.xtb b/app/resources/app_locale_settings_te.xtb
index d6d71bd..d6d71bd 100644
--- a/ui/base/strings/app_locale_settings_te.xtb
+++ b/app/resources/app_locale_settings_te.xtb
diff --git a/ui/base/strings/app_locale_settings_th.xtb b/app/resources/app_locale_settings_th.xtb
index 070c16e..070c16e 100644
--- a/ui/base/strings/app_locale_settings_th.xtb
+++ b/app/resources/app_locale_settings_th.xtb
diff --git a/ui/base/strings/app_locale_settings_tr.xtb b/app/resources/app_locale_settings_tr.xtb
index 9a29951..9a29951 100644
--- a/ui/base/strings/app_locale_settings_tr.xtb
+++ b/app/resources/app_locale_settings_tr.xtb
diff --git a/ui/base/strings/app_locale_settings_uk.xtb b/app/resources/app_locale_settings_uk.xtb
index f0db52c..f0db52c 100644
--- a/ui/base/strings/app_locale_settings_uk.xtb
+++ b/app/resources/app_locale_settings_uk.xtb
diff --git a/ui/base/strings/app_locale_settings_vi.xtb b/app/resources/app_locale_settings_vi.xtb
index b2957da..b2957da 100644
--- a/ui/base/strings/app_locale_settings_vi.xtb
+++ b/app/resources/app_locale_settings_vi.xtb
diff --git a/ui/base/strings/app_locale_settings_zh-CN.xtb b/app/resources/app_locale_settings_zh-CN.xtb
index 1034e66..1034e66 100644
--- a/ui/base/strings/app_locale_settings_zh-CN.xtb
+++ b/app/resources/app_locale_settings_zh-CN.xtb
diff --git a/ui/base/strings/app_locale_settings_zh-TW.xtb b/app/resources/app_locale_settings_zh-TW.xtb
index 8829d71..8829d71 100644
--- a/ui/base/strings/app_locale_settings_zh-TW.xtb
+++ b/app/resources/app_locale_settings_zh-TW.xtb
diff --git a/ui/base/strings/app_strings.grd b/app/resources/app_strings.grd
index 4434ca7..ea66566 100644
--- a/ui/base/strings/app_strings.grd
+++ b/app/resources/app_strings.grd
@@ -157,12 +157,12 @@ need to be translated for each locale.-->
     <file path="app_strings_es.xtb" lang="es" />
     <file path="app_strings_es-419.xtb" lang="es-419" />
     <file path="app_strings_et.xtb" lang="et" />
-    <file path="../../../third_party/launchpad_translations/app_strings_eu.xtb" lang="eu" />
+    <file path="../../third_party/launchpad_translations/app_strings_eu.xtb" lang="eu" />
     <file path="app_strings_fa.xtb" lang="fa" />
     <file path="app_strings_fi.xtb" lang="fi" />
     <file path="app_strings_fil.xtb" lang="fil" />
     <file path="app_strings_fr.xtb" lang="fr" />
-    <file path="../../../third_party/launchpad_translations/app_strings_gl.xtb" lang="gl" />
+    <file path="../../third_party/launchpad_translations/app_strings_gl.xtb" lang="gl" />
     <file path="app_strings_gu.xtb" lang="gu" />
     <file path="app_strings_hi.xtb" lang="hi" />
     <file path="app_strings_hr.xtb" lang="hr" />
@@ -172,10 +172,10 @@ need to be translated for each locale.-->
     <!-- The translation console uses 'iw' for Hebrew, but we use 'he'. -->
     <file path="app_strings_iw.xtb" lang="he" />
     <file path="app_strings_ja.xtb" lang="ja" />
-    <file path="../../../third_party/launchpad_translations/app_strings_ka.xtb" lang="ka" />
+    <file path="../../third_party/launchpad_translations/app_strings_ka.xtb" lang="ka" />
     <file path="app_strings_kn.xtb" lang="kn" />
     <file path="app_strings_ko.xtb" lang="ko" />
-    <file path="../../../third_party/launchpad_translations/app_strings_ku.xtb" lang="ku" />
+    <file path="../../third_party/launchpad_translations/app_strings_ku.xtb" lang="ku" />
     <file path="app_strings_lt.xtb" lang="lt" />
     <file path="app_strings_lv.xtb" lang="lv" />
     <file path="app_strings_ml.xtb" lang="ml" />
@@ -196,7 +196,7 @@ need to be translated for each locale.-->
     <file path="app_strings_te.xtb" lang="te" />
     <file path="app_strings_th.xtb" lang="th" />
     <file path="app_strings_tr.xtb" lang="tr" />
-    <file path="../../../third_party/launchpad_translations/app_strings_ug.xtb" lang="ug" />
+    <file path="../../third_party/launchpad_translations/app_strings_ug.xtb" lang="ug" />
     <file path="app_strings_uk.xtb" lang="uk" />
     <file path="app_strings_vi.xtb" lang="vi" />
     <file path="app_strings_zh-CN.xtb" lang="zh-CN" />
diff --git a/ui/base/strings/app_strings_am.xtb b/app/resources/app_strings_am.xtb
index c30de78..c30de78 100644
--- a/ui/base/strings/app_strings_am.xtb
+++ b/app/resources/app_strings_am.xtb
diff --git a/ui/base/strings/app_strings_ar.xtb b/app/resources/app_strings_ar.xtb
index 1984ec3..1984ec3 100644
--- a/ui/base/strings/app_strings_ar.xtb
+++ b/app/resources/app_strings_ar.xtb
diff --git a/ui/base/strings/app_strings_bg.xtb b/app/resources/app_strings_bg.xtb
index 53b953d..53b953d 100644
--- a/ui/base/strings/app_strings_bg.xtb
+++ b/app/resources/app_strings_bg.xtb
diff --git a/ui/base/strings/app_strings_bn.xtb b/app/resources/app_strings_bn.xtb
index 9d1c4ab..9d1c4ab 100644
--- a/ui/base/strings/app_strings_bn.xtb
+++ b/app/resources/app_strings_bn.xtb
diff --git a/ui/base/strings/app_strings_ca.xtb b/app/resources/app_strings_ca.xtb
index d9b2bed..d9b2bed 100644
--- a/ui/base/strings/app_strings_ca.xtb
+++ b/app/resources/app_strings_ca.xtb
diff --git a/ui/base/strings/app_strings_cs.xtb b/app/resources/app_strings_cs.xtb
index 5fec120..5fec120 100644
--- a/ui/base/strings/app_strings_cs.xtb
+++ b/app/resources/app_strings_cs.xtb
diff --git a/ui/base/strings/app_strings_da.xtb b/app/resources/app_strings_da.xtb
index 79a6a5e..79a6a5e 100644
--- a/ui/base/strings/app_strings_da.xtb
+++ b/app/resources/app_strings_da.xtb
diff --git a/ui/base/strings/app_strings_de.xtb b/app/resources/app_strings_de.xtb
index 6db62c7..6db62c7 100644
--- a/ui/base/strings/app_strings_de.xtb
+++ b/app/resources/app_strings_de.xtb
diff --git a/ui/base/strings/app_strings_el.xtb b/app/resources/app_strings_el.xtb
index 14adb74..14adb74 100644
--- a/ui/base/strings/app_strings_el.xtb
+++ b/app/resources/app_strings_el.xtb
diff --git a/ui/base/strings/app_strings_en-GB.xtb b/app/resources/app_strings_en-GB.xtb
index b57c258..b57c258 100644
--- a/ui/base/strings/app_strings_en-GB.xtb
+++ b/app/resources/app_strings_en-GB.xtb
diff --git a/ui/base/strings/app_strings_es-419.xtb b/app/resources/app_strings_es-419.xtb
index e41ef27..e41ef27 100644
--- a/ui/base/strings/app_strings_es-419.xtb
+++ b/app/resources/app_strings_es-419.xtb
diff --git a/ui/base/strings/app_strings_es.xtb b/app/resources/app_strings_es.xtb
index 64e01df..64e01df 100644
--- a/ui/base/strings/app_strings_es.xtb
+++ b/app/resources/app_strings_es.xtb
diff --git a/ui/base/strings/app_strings_et.xtb b/app/resources/app_strings_et.xtb
index 53ffd0f..53ffd0f 100644
--- a/ui/base/strings/app_strings_et.xtb
+++ b/app/resources/app_strings_et.xtb
diff --git a/ui/base/strings/app_strings_fa.xtb b/app/resources/app_strings_fa.xtb
index 1beaae2..1beaae2 100644
--- a/ui/base/strings/app_strings_fa.xtb
+++ b/app/resources/app_strings_fa.xtb
diff --git a/ui/base/strings/app_strings_fi.xtb b/app/resources/app_strings_fi.xtb
index 92bb01d..92bb01d 100644
--- a/ui/base/strings/app_strings_fi.xtb
+++ b/app/resources/app_strings_fi.xtb
diff --git a/ui/base/strings/app_strings_fil.xtb b/app/resources/app_strings_fil.xtb
index f6d65b1..f6d65b1 100644
--- a/ui/base/strings/app_strings_fil.xtb
+++ b/app/resources/app_strings_fil.xtb
diff --git a/ui/base/strings/app_strings_fr.xtb b/app/resources/app_strings_fr.xtb
index e0578f0..e0578f0 100644
--- a/ui/base/strings/app_strings_fr.xtb
+++ b/app/resources/app_strings_fr.xtb
diff --git a/ui/base/strings/app_strings_gu.xtb b/app/resources/app_strings_gu.xtb
index 63e7d85..63e7d85 100644
--- a/ui/base/strings/app_strings_gu.xtb
+++ b/app/resources/app_strings_gu.xtb
diff --git a/ui/base/strings/app_strings_hi.xtb b/app/resources/app_strings_hi.xtb
index 291caba..291caba 100644
--- a/ui/base/strings/app_strings_hi.xtb
+++ b/app/resources/app_strings_hi.xtb
diff --git a/ui/base/strings/app_strings_hr.xtb b/app/resources/app_strings_hr.xtb
index 0cc8561..0cc8561 100644
--- a/ui/base/strings/app_strings_hr.xtb
+++ b/app/resources/app_strings_hr.xtb
diff --git a/ui/base/strings/app_strings_hu.xtb b/app/resources/app_strings_hu.xtb
index 65ba160..65ba160 100644
--- a/ui/base/strings/app_strings_hu.xtb
+++ b/app/resources/app_strings_hu.xtb
diff --git a/ui/base/strings/app_strings_id.xtb b/app/resources/app_strings_id.xtb
index bb3ea1f..bb3ea1f 100644
--- a/ui/base/strings/app_strings_id.xtb
+++ b/app/resources/app_strings_id.xtb
diff --git a/ui/base/strings/app_strings_it.xtb b/app/resources/app_strings_it.xtb
index 6c5a880..6c5a880 100644
--- a/ui/base/strings/app_strings_it.xtb
+++ b/app/resources/app_strings_it.xtb
diff --git a/ui/base/strings/app_strings_iw.xtb b/app/resources/app_strings_iw.xtb
index f61493e..f61493e 100644
--- a/ui/base/strings/app_strings_iw.xtb
+++ b/app/resources/app_strings_iw.xtb
diff --git a/ui/base/strings/app_strings_ja.xtb b/app/resources/app_strings_ja.xtb
index 8eb88f9..8eb88f9 100644
--- a/ui/base/strings/app_strings_ja.xtb
+++ b/app/resources/app_strings_ja.xtb
diff --git a/ui/base/strings/app_strings_kn.xtb b/app/resources/app_strings_kn.xtb
index 4bb4213..4bb4213 100644
--- a/ui/base/strings/app_strings_kn.xtb
+++ b/app/resources/app_strings_kn.xtb
diff --git a/ui/base/strings/app_strings_ko.xtb b/app/resources/app_strings_ko.xtb
index d078b74..d078b74 100644
--- a/ui/base/strings/app_strings_ko.xtb
+++ b/app/resources/app_strings_ko.xtb
diff --git a/ui/base/strings/app_strings_lt.xtb b/app/resources/app_strings_lt.xtb
index 3556377..3556377 100644
--- a/ui/base/strings/app_strings_lt.xtb
+++ b/app/resources/app_strings_lt.xtb
diff --git a/ui/base/strings/app_strings_lv.xtb b/app/resources/app_strings_lv.xtb
index 8137686..8137686 100644
--- a/ui/base/strings/app_strings_lv.xtb
+++ b/app/resources/app_strings_lv.xtb
diff --git a/ui/base/strings/app_strings_ml.xtb b/app/resources/app_strings_ml.xtb
index 358fcce..358fcce 100644
--- a/ui/base/strings/app_strings_ml.xtb
+++ b/app/resources/app_strings_ml.xtb
diff --git a/ui/base/strings/app_strings_mr.xtb b/app/resources/app_strings_mr.xtb
index 4cfdcf6..4cfdcf6 100644
--- a/ui/base/strings/app_strings_mr.xtb
+++ b/app/resources/app_strings_mr.xtb
diff --git a/ui/base/strings/app_strings_nl.xtb b/app/resources/app_strings_nl.xtb
index 91e613a..91e613a 100644
--- a/ui/base/strings/app_strings_nl.xtb
+++ b/app/resources/app_strings_nl.xtb
diff --git a/ui/base/strings/app_strings_no.xtb b/app/resources/app_strings_no.xtb
index 397bd47..397bd47 100644
--- a/ui/base/strings/app_strings_no.xtb
+++ b/app/resources/app_strings_no.xtb
diff --git a/ui/base/strings/app_strings_pl.xtb b/app/resources/app_strings_pl.xtb
index 0fadbb3..0fadbb3 100644
--- a/ui/base/strings/app_strings_pl.xtb
+++ b/app/resources/app_strings_pl.xtb
diff --git a/ui/base/strings/app_strings_pt-BR.xtb b/app/resources/app_strings_pt-BR.xtb
index 56d1bfd..56d1bfd 100644
--- a/ui/base/strings/app_strings_pt-BR.xtb
+++ b/app/resources/app_strings_pt-BR.xtb
diff --git a/ui/base/strings/app_strings_pt-PT.xtb b/app/resources/app_strings_pt-PT.xtb
index fe988d7..fe988d7 100644
--- a/ui/base/strings/app_strings_pt-PT.xtb
+++ b/app/resources/app_strings_pt-PT.xtb
diff --git a/ui/base/strings/app_strings_ro.xtb b/app/resources/app_strings_ro.xtb
index 600a62b..600a62b 100644
--- a/ui/base/strings/app_strings_ro.xtb
+++ b/app/resources/app_strings_ro.xtb
diff --git a/ui/base/strings/app_strings_ru.xtb b/app/resources/app_strings_ru.xtb
index 4a82bc8..4a82bc8 100644
--- a/ui/base/strings/app_strings_ru.xtb
+++ b/app/resources/app_strings_ru.xtb
diff --git a/ui/base/strings/app_strings_sk.xtb b/app/resources/app_strings_sk.xtb
index 652e74a..652e74a 100644
--- a/ui/base/strings/app_strings_sk.xtb
+++ b/app/resources/app_strings_sk.xtb
diff --git a/ui/base/strings/app_strings_sl.xtb b/app/resources/app_strings_sl.xtb
index 8e085a4..8e085a4 100644
--- a/ui/base/strings/app_strings_sl.xtb
+++ b/app/resources/app_strings_sl.xtb
diff --git a/ui/base/strings/app_strings_sr.xtb b/app/resources/app_strings_sr.xtb
index 1d54ea5..1d54ea5 100644
--- a/ui/base/strings/app_strings_sr.xtb
+++ b/app/resources/app_strings_sr.xtb
diff --git a/ui/base/strings/app_strings_sv.xtb b/app/resources/app_strings_sv.xtb
index 577b1b0..577b1b0 100644
--- a/ui/base/strings/app_strings_sv.xtb
+++ b/app/resources/app_strings_sv.xtb
diff --git a/ui/base/strings/app_strings_sw.xtb b/app/resources/app_strings_sw.xtb
index 0048134..0048134 100644
--- a/ui/base/strings/app_strings_sw.xtb
+++ b/app/resources/app_strings_sw.xtb
diff --git a/ui/base/strings/app_strings_ta.xtb b/app/resources/app_strings_ta.xtb
index 8b074bd..8b074bd 100644
--- a/ui/base/strings/app_strings_ta.xtb
+++ b/app/resources/app_strings_ta.xtb
diff --git a/ui/base/strings/app_strings_te.xtb b/app/resources/app_strings_te.xtb
index 9675e55..9675e55 100644
--- a/ui/base/strings/app_strings_te.xtb
+++ b/app/resources/app_strings_te.xtb
diff --git a/ui/base/strings/app_strings_th.xtb b/app/resources/app_strings_th.xtb
index 2f626aa..2f626aa 100644
--- a/ui/base/strings/app_strings_th.xtb
+++ b/app/resources/app_strings_th.xtb
diff --git a/ui/base/strings/app_strings_tr.xtb b/app/resources/app_strings_tr.xtb
index e2cd168..e2cd168 100644
--- a/ui/base/strings/app_strings_tr.xtb
+++ b/app/resources/app_strings_tr.xtb
diff --git a/ui/base/strings/app_strings_uk.xtb b/app/resources/app_strings_uk.xtb
index d27b06e..d27b06e 100644
--- a/ui/base/strings/app_strings_uk.xtb
+++ b/app/resources/app_strings_uk.xtb
diff --git a/ui/base/strings/app_strings_vi.xtb b/app/resources/app_strings_vi.xtb
index bdcad06..bdcad06 100644
--- a/ui/base/strings/app_strings_vi.xtb
+++ b/app/resources/app_strings_vi.xtb
diff --git a/ui/base/strings/app_strings_zh-CN.xtb b/app/resources/app_strings_zh-CN.xtb
index b440151..b440151 100644
--- a/ui/base/strings/app_strings_zh-CN.xtb
+++ b/app/resources/app_strings_zh-CN.xtb
diff --git a/ui/base/strings/app_strings_zh-TW.xtb b/app/resources/app_strings_zh-TW.xtb
index 2905d5d..2905d5d 100644
--- a/ui/base/strings/app_strings_zh-TW.xtb
+++ b/app/resources/app_strings_zh-TW.xtb
diff --git a/chrome/app/locales/locales.gyp b/chrome/app/locales/locales.gyp
index 79ac5f8..1e5024a 100644
--- a/chrome/app/locales/locales.gyp
+++ b/chrome/app/locales/locales.gyp
@@ -25,8 +25,8 @@
     'dependencies': [
       '../../chrome.gyp:chrome_strings',
       '../../chrome.gyp:platform_locale_settings',
-      '../../../ui/base/strings/ui_strings.gyp:ui_strings',
       '../../../webkit/support/webkit_support.gyp:webkit_strings',
+      '../../../app/app.gyp:app_strings',
     ],
     'msvs_settings': {
       'VCLinkerTool': {
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 39314b9..e535fd3 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -27,6 +27,7 @@
         'theme_resources',
         'userfeedback_proto',
         '../app/app.gyp:app_resources',
+        '../app/app.gyp:app_strings',
         '../content/content.gyp:content_browser',
         '../media/media.gyp:media',
         '../ppapi/ppapi.gyp:ppapi_proxy',  # For PpapiMsg_LoadPlugin
@@ -40,7 +41,6 @@
         '../third_party/libjingle/libjingle.gyp:libjingle',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/npapi/npapi.gyp:npapi',
-        '../ui/base/strings/ui_strings.gyp:ui_strings',
         '../webkit/support/webkit_support.gyp:appcache',
         '../webkit/support/webkit_support.gyp:blob',
         '../webkit/support/webkit_support.gyp:database',
diff --git a/tools/grit/resource_ids b/tools/grit/resource_ids
index 6817316..97e9ee7 100644
--- a/tools/grit/resource_ids
+++ b/tools/grit/resource_ids
@@ -59,7 +59,7 @@
     "includes": [7000],
   },
 
-  "ui/base/strings/app_locale_settings.grd": {
+  "app/resources/app_locale_settings.grd": {
     "messages": [7500],
   },
   "chrome/app/resources/locale_settings.grd": {
@@ -81,7 +81,7 @@
     "messages": [9000],
   },
 
-  "ui/base/strings/app_strings.grd": {
+  "app/resources/app_strings.grd": {
     "messages": [9500],
   },
   # Chromium strings and Google Chrome strings must start at the same id.
diff --git a/ui/base/strings/ui_strings.gyp b/ui/base/strings/ui_strings.gyp
deleted file mode 100644
index db42e04..0000000
--- a/ui/base/strings/ui_strings.gyp
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  'variables': {
-    # TODO: remove this helper when we have loops in GYP
-    'apply_locales_cmd': ['python', '<(DEPTH)/build/apply_locales.py',],
-    'chromium_code': 1,
-    'grit_cmd': ['python', '../../../tools/grit/grit.py'],
-    'grit_info_cmd': ['python', '../../../tools/grit/grit_info.py',
-                      '<@(grit_defines)'],
-    'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/app',
-    'localizable_resources': [
-      'app_locale_settings.grd',
-      'app_strings.grd',
-    ],
-  },
-  'targets': [
-    {
-      'target_name': 'ui_strings',
-      'type': 'none',
-      'msvs_guid': 'BC3C49A3-D061-4E78-84EE-742DA064DC46',
-      'rules': [
-        {
-          'rule_name': 'grit',
-          'extension': 'grd',
-          'inputs': [
-            '<!@(<(grit_info_cmd) --inputs <(localizable_resources))',
-          ],
-          'outputs': [
-            '<(grit_out_dir)/<(RULE_INPUT_ROOT)/grit/<(RULE_INPUT_ROOT).h',
-            # TODO: remove this helper when we have loops in GYP
-            '>!@(<(apply_locales_cmd) \'<(grit_out_dir)/<(RULE_INPUT_ROOT)/<(RULE_INPUT_ROOT)_ZZLOCALE.pak\' <(locales))',
-          ],
-          'action': [
-			'<@(grit_cmd)',
-			'-i', '<(RULE_INPUT_PATH)', 'build',
-			'-o', '<(grit_out_dir)/<(RULE_INPUT_ROOT)',
-            '<@(grit_defines)'],
-          'message': 'Generating resources from <(RULE_INPUT_PATH)',
-        },
-      ],
-      'sources': [
-        '<@(localizable_resources)',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(grit_out_dir)/app_locale_settings',
-          '<(grit_out_dir)/app_strings',
-        ],
-      },
-      'conditions': [
-        ['OS=="win"', {
-          'dependencies': ['../../../build/win/system.gyp:cygwin'],
-        }],
-      ],
-    },
-  ],
-  'conditions': [
-    ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-      'targets': [{
-        'target_name': 'ui_unittest_strings',
-        'type': 'none',
-        'variables': {
-          'repack_path': '<(DEPTH)/tools/data_pack/repack.py',
-        },
-        'actions': [
-          {
-            'action_name': 'repack_ui_unittest_strings',
-            'variables': {
-              'pak_inputs': [
-                '<(grit_out_dir)/app_strings/app_strings_en-US.pak',
-                '<(grit_out_dir)/app_locale_settings/app_locale_settings_en-US.pak',
-              ],
-            },
-            'inputs': [
-              '<(repack_path)',
-              '<@(pak_inputs)',
-            ],
-            'outputs': [
-              '<(PRODUCT_DIR)/app_unittests_strings/en-US.pak',
-            ],
-            'action': ['python', '<(repack_path)', '<@(_outputs)',
-                       '<@(pak_inputs)'],
-          },
-        ],
-        'copies': [
-          {
-            'destination': '<(PRODUCT_DIR)/app_unittests_strings',
-            'files': [
-              '<(grit_out_dir)/app_resources/app_resources.pak',
-            ],
-          },
-        ],
-      }],
-    }],
-  ],
-}
diff --git a/ui/views/views.gyp b/ui/views/views.gyp
index 527e9c2..4308183 100644
--- a/ui/views/views.gyp
+++ b/ui/views/views.gyp
@@ -47,8 +47,8 @@
       'msvs_guid': '70760ECA-4D8B-47A4-ACDC-D3E7F25F0543',
       'dependencies': [
         '<(DEPTH)/app/app.gyp:app_base',
+        '<(DEPTH)/app/app.gyp:app_strings',
         '<(DEPTH)/skia/skia.gyp:skia',
-        '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
         '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
       ],
       'sources': [
diff --git a/views/views.gyp b/views/views.gyp
index ec8352b..c2d1811 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -64,11 +64,11 @@
       'msvs_guid': '6F9258E5-294F-47B2-919D-17FFE7A8B751',
       'dependencies': [
         '../app/app.gyp:app_base',
+        '../app/app.gyp:app_strings',
         '../app/app.gyp:app_resources',
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
-        '../ui/base/strings/ui_strings.gyp:ui_strings',
       ],
       'sources': [
         # All .cc, .h under views, except unittests
@@ -460,6 +460,7 @@
       'type': 'executable',
       'dependencies': [
         '../app/app.gyp:app_resources',
+        '../app/app.gyp:app_strings',
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../skia/skia.gyp:skia',
@@ -467,7 +468,6 @@
         '../testing/gtest.gyp:gtest',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
-        '../ui/base/strings/ui_strings.gyp:ui_strings',
         'views',
       ],
       'include_dirs': [