Rename app_strings to ui_strings.

BUG=72317
TEST=None

R=rsesek@chromium.org, tony@chromium.org

Review URL: http://codereview.chromium.org/7210060

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

78 files changed, 255 insertions, 254 deletions

diff --git a/chrome/app/locales/locales.gyp b/chrome/app/locales/locales.gyp
index 42e6944..205c24c 100644
--- a/chrome/app/locales/locales.gyp
+++ b/chrome/app/locales/locales.gyp
@@ -4,9 +4,9 @@
     'chrome_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
     'webkit_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit',
 
-    'app_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui',
-    'app_strings_out_dir': '<(app_grit_out_dir)/app_strings',
-    'app_locale_out_dir': '<(app_grit_out_dir)/app_locale_settings',
+    'ui_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui',
+    'ui_strings_out_dir': '<(ui_grit_out_dir)/ui_strings',
+    'app_locale_out_dir': '<(ui_grit_out_dir)/app_locale_settings',
 
     # TODO(sgk): eliminate this; see comment in build/common.gypi
     'msvs_debug_link_incremental': '1',
@@ -56,7 +56,7 @@
             '<(chrome_grit_out_dir)/locale_settings_am.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_am.rc',
             '<(webkit_grit_out_dir)/webkit_strings_am.rc',
-            '<(app_strings_out_dir)/app_strings_am.rc',
+            '<(ui_strings_out_dir)/ui_strings_am.rc',
             '<(app_locale_out_dir)/app_locale_settings_am.rc',
           ],
         },
@@ -68,7 +68,7 @@
             '<(chrome_grit_out_dir)/locale_settings_ar.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_ar.rc',
             '<(webkit_grit_out_dir)/webkit_strings_ar.rc',
-            '<(app_strings_out_dir)/app_strings_ar.rc',
+            '<(ui_strings_out_dir)/ui_strings_ar.rc',
             '<(app_locale_out_dir)/app_locale_settings_ar.rc',
           ],
         },
@@ -80,7 +80,7 @@
             '<(chrome_grit_out_dir)/locale_settings_bg.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_bg.rc',
             '<(webkit_grit_out_dir)/webkit_strings_bg.rc',
-            '<(app_strings_out_dir)/app_strings_bg.rc',
+            '<(ui_strings_out_dir)/ui_strings_bg.rc',
             '<(app_locale_out_dir)/app_locale_settings_bg.rc',
           ],
         },
@@ -92,7 +92,7 @@
             '<(chrome_grit_out_dir)/locale_settings_bn.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_bn.rc',
             '<(webkit_grit_out_dir)/webkit_strings_bn.rc',
-            '<(app_strings_out_dir)/app_strings_bn.rc',
+            '<(ui_strings_out_dir)/ui_strings_bn.rc',
             '<(app_locale_out_dir)/app_locale_settings_bn.rc',
           ],
         },
@@ -104,7 +104,7 @@
             '<(chrome_grit_out_dir)/locale_settings_ca.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_ca.rc',
             '<(webkit_grit_out_dir)/webkit_strings_ca.rc',
-            '<(app_strings_out_dir)/app_strings_ca.rc',
+            '<(ui_strings_out_dir)/ui_strings_ca.rc',
             '<(app_locale_out_dir)/app_locale_settings_ca.rc',
           ],
         },
@@ -116,7 +116,7 @@
             '<(chrome_grit_out_dir)/locale_settings_cs.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_cs.rc',
             '<(webkit_grit_out_dir)/webkit_strings_cs.rc',
-            '<(app_strings_out_dir)/app_strings_cs.rc',
+            '<(ui_strings_out_dir)/ui_strings_cs.rc',
             '<(app_locale_out_dir)/app_locale_settings_cs.rc',
           ],
         },
@@ -128,7 +128,7 @@
             '<(chrome_grit_out_dir)/locale_settings_da.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_da.rc',
             '<(webkit_grit_out_dir)/webkit_strings_da.rc',
-            '<(app_strings_out_dir)/app_strings_da.rc',
+            '<(ui_strings_out_dir)/ui_strings_da.rc',
             '<(app_locale_out_dir)/app_locale_settings_da.rc',
           ],
         },
@@ -140,7 +140,7 @@
             '<(chrome_grit_out_dir)/locale_settings_de.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_de.rc',
             '<(webkit_grit_out_dir)/webkit_strings_de.rc',
-            '<(app_strings_out_dir)/app_strings_de.rc',
+            '<(ui_strings_out_dir)/ui_strings_de.rc',
             '<(app_locale_out_dir)/app_locale_settings_de.rc',
           ],
         },
@@ -152,7 +152,7 @@
             '<(chrome_grit_out_dir)/locale_settings_el.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_el.rc',
             '<(webkit_grit_out_dir)/webkit_strings_el.rc',
-            '<(app_strings_out_dir)/app_strings_el.rc',
+            '<(ui_strings_out_dir)/ui_strings_el.rc',
             '<(app_locale_out_dir)/app_locale_settings_el.rc',
           ],
         },
@@ -164,7 +164,7 @@
             '<(chrome_grit_out_dir)/locale_settings_en-GB.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_en-GB.rc',
             '<(webkit_grit_out_dir)/webkit_strings_en-GB.rc',
-            '<(app_strings_out_dir)/app_strings_en-GB.rc',
+            '<(ui_strings_out_dir)/ui_strings_en-GB.rc',
             '<(app_locale_out_dir)/app_locale_settings_en-GB.rc',
           ],
         },
@@ -176,7 +176,7 @@
             '<(chrome_grit_out_dir)/locale_settings_en-US.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_en-US.rc',
             '<(webkit_grit_out_dir)/webkit_strings_en-US.rc',
-            '<(app_strings_out_dir)/app_strings_en-US.rc',
+            '<(ui_strings_out_dir)/ui_strings_en-US.rc',
             '<(app_locale_out_dir)/app_locale_settings_en-US.rc',
           ],
         },
@@ -188,7 +188,7 @@
             '<(chrome_grit_out_dir)/locale_settings_es-419.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_es-419.rc',
             '<(webkit_grit_out_dir)/webkit_strings_es-419.rc',
-            '<(app_strings_out_dir)/app_strings_es-419.rc',
+            '<(ui_strings_out_dir)/ui_strings_es-419.rc',
             '<(app_locale_out_dir)/app_locale_settings_es-419.rc',
           ],
         },
@@ -200,7 +200,7 @@
             '<(chrome_grit_out_dir)/locale_settings_es.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_es.rc',
             '<(webkit_grit_out_dir)/webkit_strings_es.rc',
-            '<(app_strings_out_dir)/app_strings_es.rc',
+            '<(ui_strings_out_dir)/ui_strings_es.rc',
             '<(app_locale_out_dir)/app_locale_settings_es.rc',
           ],
         },
@@ -212,7 +212,7 @@
             '<(chrome_grit_out_dir)/locale_settings_et.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_et.rc',
             '<(webkit_grit_out_dir)/webkit_strings_et.rc',
-            '<(app_strings_out_dir)/app_strings_et.rc',
+            '<(ui_strings_out_dir)/ui_strings_et.rc',
             '<(app_locale_out_dir)/app_locale_settings_et.rc',
           ],
         },
@@ -224,7 +224,7 @@
             '<(chrome_grit_out_dir)/locale_settings_fa.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_fa.rc',
             '<(webkit_grit_out_dir)/webkit_strings_fa.rc',
-            '<(app_strings_out_dir)/app_strings_fa.rc',
+            '<(ui_strings_out_dir)/ui_strings_fa.rc',
             '<(app_locale_out_dir)/app_locale_settings_fa.rc',
           ],
         },
@@ -236,7 +236,7 @@
             '<(chrome_grit_out_dir)/locale_settings_fi.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_fi.rc',
             '<(webkit_grit_out_dir)/webkit_strings_fi.rc',
-            '<(app_strings_out_dir)/app_strings_fi.rc',
+            '<(ui_strings_out_dir)/ui_strings_fi.rc',
             '<(app_locale_out_dir)/app_locale_settings_fi.rc',
           ],
         },
@@ -248,7 +248,7 @@
             '<(chrome_grit_out_dir)/locale_settings_fil.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_fil.rc',
             '<(webkit_grit_out_dir)/webkit_strings_fil.rc',
-            '<(app_strings_out_dir)/app_strings_fil.rc',
+            '<(ui_strings_out_dir)/ui_strings_fil.rc',
             '<(app_locale_out_dir)/app_locale_settings_fil.rc',
           ],
         },
@@ -260,7 +260,7 @@
             '<(chrome_grit_out_dir)/locale_settings_fr.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_fr.rc',
             '<(webkit_grit_out_dir)/webkit_strings_fr.rc',
-            '<(app_strings_out_dir)/app_strings_fr.rc',
+            '<(ui_strings_out_dir)/ui_strings_fr.rc',
             '<(app_locale_out_dir)/app_locale_settings_fr.rc',
           ],
         },
@@ -272,7 +272,7 @@
             '<(chrome_grit_out_dir)/locale_settings_gu.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_gu.rc',
             '<(webkit_grit_out_dir)/webkit_strings_gu.rc',
-            '<(app_strings_out_dir)/app_strings_gu.rc',
+            '<(ui_strings_out_dir)/ui_strings_gu.rc',
             '<(app_locale_out_dir)/app_locale_settings_gu.rc',
           ],
         },
@@ -284,7 +284,7 @@
             '<(chrome_grit_out_dir)/locale_settings_he.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_he.rc',
             '<(webkit_grit_out_dir)/webkit_strings_he.rc',
-            '<(app_strings_out_dir)/app_strings_he.rc',
+            '<(ui_strings_out_dir)/ui_strings_he.rc',
             '<(app_locale_out_dir)/app_locale_settings_he.rc',
           ],
         },
@@ -296,7 +296,7 @@
             '<(chrome_grit_out_dir)/locale_settings_hi.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_hi.rc',
             '<(webkit_grit_out_dir)/webkit_strings_hi.rc',
-            '<(app_strings_out_dir)/app_strings_hi.rc',
+            '<(ui_strings_out_dir)/ui_strings_hi.rc',
             '<(app_locale_out_dir)/app_locale_settings_hi.rc',
           ],
         },
@@ -308,7 +308,7 @@
             '<(chrome_grit_out_dir)/locale_settings_hr.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_hr.rc',
             '<(webkit_grit_out_dir)/webkit_strings_hr.rc',
-            '<(app_strings_out_dir)/app_strings_hr.rc',
+            '<(ui_strings_out_dir)/ui_strings_hr.rc',
             '<(app_locale_out_dir)/app_locale_settings_hr.rc',
           ],
         },
@@ -320,7 +320,7 @@
             '<(chrome_grit_out_dir)/locale_settings_hu.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_hu.rc',
             '<(webkit_grit_out_dir)/webkit_strings_hu.rc',
-            '<(app_strings_out_dir)/app_strings_hu.rc',
+            '<(ui_strings_out_dir)/ui_strings_hu.rc',
             '<(app_locale_out_dir)/app_locale_settings_hu.rc',
           ],
         },
@@ -332,7 +332,7 @@
             '<(chrome_grit_out_dir)/locale_settings_id.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_id.rc',
             '<(webkit_grit_out_dir)/webkit_strings_id.rc',
-            '<(app_strings_out_dir)/app_strings_id.rc',
+            '<(ui_strings_out_dir)/ui_strings_id.rc',
             '<(app_locale_out_dir)/app_locale_settings_id.rc',
           ],
         },
@@ -344,7 +344,7 @@
             '<(chrome_grit_out_dir)/locale_settings_it.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_it.rc',
             '<(webkit_grit_out_dir)/webkit_strings_it.rc',
-            '<(app_strings_out_dir)/app_strings_it.rc',
+            '<(ui_strings_out_dir)/ui_strings_it.rc',
             '<(app_locale_out_dir)/app_locale_settings_it.rc',
           ],
         },
@@ -356,7 +356,7 @@
             '<(chrome_grit_out_dir)/locale_settings_ja.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_ja.rc',
             '<(webkit_grit_out_dir)/webkit_strings_ja.rc',
-            '<(app_strings_out_dir)/app_strings_ja.rc',
+            '<(ui_strings_out_dir)/ui_strings_ja.rc',
             '<(app_locale_out_dir)/app_locale_settings_ja.rc',
           ],
         },
@@ -368,7 +368,7 @@
             '<(chrome_grit_out_dir)/locale_settings_kn.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_kn.rc',
             '<(webkit_grit_out_dir)/webkit_strings_kn.rc',
-            '<(app_strings_out_dir)/app_strings_kn.rc',
+            '<(ui_strings_out_dir)/ui_strings_kn.rc',
             '<(app_locale_out_dir)/app_locale_settings_kn.rc',
           ],
         },
@@ -380,7 +380,7 @@
             '<(chrome_grit_out_dir)/locale_settings_ko.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_ko.rc',
             '<(webkit_grit_out_dir)/webkit_strings_ko.rc',
-            '<(app_strings_out_dir)/app_strings_ko.rc',
+            '<(ui_strings_out_dir)/ui_strings_ko.rc',
             '<(app_locale_out_dir)/app_locale_settings_ko.rc',
           ],
         },
@@ -392,7 +392,7 @@
             '<(chrome_grit_out_dir)/locale_settings_lt.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_lt.rc',
             '<(webkit_grit_out_dir)/webkit_strings_lt.rc',
-            '<(app_strings_out_dir)/app_strings_lt.rc',
+            '<(ui_strings_out_dir)/ui_strings_lt.rc',
             '<(app_locale_out_dir)/app_locale_settings_lt.rc',
           ],
         },
@@ -404,7 +404,7 @@
             '<(chrome_grit_out_dir)/locale_settings_lv.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_lv.rc',
             '<(webkit_grit_out_dir)/webkit_strings_lv.rc',
-            '<(app_strings_out_dir)/app_strings_lv.rc',
+            '<(ui_strings_out_dir)/ui_strings_lv.rc',
             '<(app_locale_out_dir)/app_locale_settings_lv.rc',
           ],
         },
@@ -416,7 +416,7 @@
             '<(chrome_grit_out_dir)/locale_settings_ml.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_ml.rc',
             '<(webkit_grit_out_dir)/webkit_strings_ml.rc',
-            '<(app_strings_out_dir)/app_strings_ml.rc',
+            '<(ui_strings_out_dir)/ui_strings_ml.rc',
             '<(app_locale_out_dir)/app_locale_settings_ml.rc',
           ],
         },
@@ -428,7 +428,7 @@
             '<(chrome_grit_out_dir)/locale_settings_mr.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_mr.rc',
             '<(webkit_grit_out_dir)/webkit_strings_mr.rc',
-            '<(app_strings_out_dir)/app_strings_mr.rc',
+            '<(ui_strings_out_dir)/ui_strings_mr.rc',
             '<(app_locale_out_dir)/app_locale_settings_mr.rc',
           ],
         },
@@ -440,7 +440,7 @@
             '<(chrome_grit_out_dir)/locale_settings_nb.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_nb.rc',
             '<(webkit_grit_out_dir)/webkit_strings_nb.rc',
-            '<(app_strings_out_dir)/app_strings_nb.rc',
+            '<(ui_strings_out_dir)/ui_strings_nb.rc',
             '<(app_locale_out_dir)/app_locale_settings_nb.rc',
           ],
         },
@@ -452,7 +452,7 @@
             '<(chrome_grit_out_dir)/locale_settings_nl.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_nl.rc',
             '<(webkit_grit_out_dir)/webkit_strings_nl.rc',
-            '<(app_strings_out_dir)/app_strings_nl.rc',
+            '<(ui_strings_out_dir)/ui_strings_nl.rc',
             '<(app_locale_out_dir)/app_locale_settings_nl.rc',
           ],
         },
@@ -464,7 +464,7 @@
             '<(chrome_grit_out_dir)/locale_settings_pl.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_pl.rc',
             '<(webkit_grit_out_dir)/webkit_strings_pl.rc',
-            '<(app_strings_out_dir)/app_strings_pl.rc',
+            '<(ui_strings_out_dir)/ui_strings_pl.rc',
             '<(app_locale_out_dir)/app_locale_settings_pl.rc',
           ],
         },
@@ -476,7 +476,7 @@
             '<(chrome_grit_out_dir)/locale_settings_pt-BR.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_pt-BR.rc',
             '<(webkit_grit_out_dir)/webkit_strings_pt-BR.rc',
-            '<(app_strings_out_dir)/app_strings_pt-BR.rc',
+            '<(ui_strings_out_dir)/ui_strings_pt-BR.rc',
             '<(app_locale_out_dir)/app_locale_settings_pt-BR.rc',
           ],
         },
@@ -488,7 +488,7 @@
             '<(chrome_grit_out_dir)/locale_settings_pt-PT.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_pt-PT.rc',
             '<(webkit_grit_out_dir)/webkit_strings_pt-PT.rc',
-            '<(app_strings_out_dir)/app_strings_pt-PT.rc',
+            '<(ui_strings_out_dir)/ui_strings_pt-PT.rc',
             '<(app_locale_out_dir)/app_locale_settings_pt-PT.rc',
           ],
         },
@@ -500,7 +500,7 @@
             '<(chrome_grit_out_dir)/locale_settings_ro.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_ro.rc',
             '<(webkit_grit_out_dir)/webkit_strings_ro.rc',
-            '<(app_strings_out_dir)/app_strings_ro.rc',
+            '<(ui_strings_out_dir)/ui_strings_ro.rc',
             '<(app_locale_out_dir)/app_locale_settings_ro.rc',
           ],
         },
@@ -512,7 +512,7 @@
             '<(chrome_grit_out_dir)/locale_settings_ru.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_ru.rc',
             '<(webkit_grit_out_dir)/webkit_strings_ru.rc',
-            '<(app_strings_out_dir)/app_strings_ru.rc',
+            '<(ui_strings_out_dir)/ui_strings_ru.rc',
             '<(app_locale_out_dir)/app_locale_settings_ru.rc',
           ],
         },
@@ -524,7 +524,7 @@
             '<(chrome_grit_out_dir)/locale_settings_sk.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_sk.rc',
             '<(webkit_grit_out_dir)/webkit_strings_sk.rc',
-            '<(app_strings_out_dir)/app_strings_sk.rc',
+            '<(ui_strings_out_dir)/ui_strings_sk.rc',
             '<(app_locale_out_dir)/app_locale_settings_sk.rc',
           ],
         },
@@ -536,7 +536,7 @@
             '<(chrome_grit_out_dir)/locale_settings_sl.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_sl.rc',
             '<(webkit_grit_out_dir)/webkit_strings_sl.rc',
-            '<(app_strings_out_dir)/app_strings_sl.rc',
+            '<(ui_strings_out_dir)/ui_strings_sl.rc',
             '<(app_locale_out_dir)/app_locale_settings_sl.rc',
           ],
         },
@@ -548,7 +548,7 @@
             '<(chrome_grit_out_dir)/locale_settings_sr.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_sr.rc',
             '<(webkit_grit_out_dir)/webkit_strings_sr.rc',
-            '<(app_strings_out_dir)/app_strings_sr.rc',
+            '<(ui_strings_out_dir)/ui_strings_sr.rc',
             '<(app_locale_out_dir)/app_locale_settings_sr.rc',
           ],
         },
@@ -560,7 +560,7 @@
             '<(chrome_grit_out_dir)/locale_settings_sv.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_sv.rc',
             '<(webkit_grit_out_dir)/webkit_strings_sv.rc',
-            '<(app_strings_out_dir)/app_strings_sv.rc',
+            '<(ui_strings_out_dir)/ui_strings_sv.rc',
             '<(app_locale_out_dir)/app_locale_settings_sv.rc',
           ],
         },
@@ -572,7 +572,7 @@
             '<(chrome_grit_out_dir)/locale_settings_sw.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_sw.rc',
             '<(webkit_grit_out_dir)/webkit_strings_sw.rc',
-            '<(app_strings_out_dir)/app_strings_sw.rc',
+            '<(ui_strings_out_dir)/ui_strings_sw.rc',
             '<(app_locale_out_dir)/app_locale_settings_sw.rc',
           ],
         },
@@ -584,7 +584,7 @@
             '<(chrome_grit_out_dir)/locale_settings_ta.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_ta.rc',
             '<(webkit_grit_out_dir)/webkit_strings_ta.rc',
-            '<(app_strings_out_dir)/app_strings_ta.rc',
+            '<(ui_strings_out_dir)/ui_strings_ta.rc',
             '<(app_locale_out_dir)/app_locale_settings_ta.rc',
           ],
         },
@@ -596,7 +596,7 @@
             '<(chrome_grit_out_dir)/locale_settings_te.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_te.rc',
             '<(webkit_grit_out_dir)/webkit_strings_te.rc',
-            '<(app_strings_out_dir)/app_strings_te.rc',
+            '<(ui_strings_out_dir)/ui_strings_te.rc',
             '<(app_locale_out_dir)/app_locale_settings_te.rc',
           ],
         },
@@ -608,7 +608,7 @@
             '<(chrome_grit_out_dir)/locale_settings_th.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_th.rc',
             '<(webkit_grit_out_dir)/webkit_strings_th.rc',
-            '<(app_strings_out_dir)/app_strings_th.rc',
+            '<(ui_strings_out_dir)/ui_strings_th.rc',
             '<(app_locale_out_dir)/app_locale_settings_th.rc',
           ],
         },
@@ -620,7 +620,7 @@
             '<(chrome_grit_out_dir)/locale_settings_tr.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_tr.rc',
             '<(webkit_grit_out_dir)/webkit_strings_tr.rc',
-            '<(app_strings_out_dir)/app_strings_tr.rc',
+            '<(ui_strings_out_dir)/ui_strings_tr.rc',
             '<(app_locale_out_dir)/app_locale_settings_tr.rc',
           ],
         },
@@ -632,7 +632,7 @@
             '<(chrome_grit_out_dir)/locale_settings_uk.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_uk.rc',
             '<(webkit_grit_out_dir)/webkit_strings_uk.rc',
-            '<(app_strings_out_dir)/app_strings_uk.rc',
+            '<(ui_strings_out_dir)/ui_strings_uk.rc',
             '<(app_locale_out_dir)/app_locale_settings_uk.rc',
           ],
         },
@@ -644,7 +644,7 @@
             '<(chrome_grit_out_dir)/locale_settings_vi.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_vi.rc',
             '<(webkit_grit_out_dir)/webkit_strings_vi.rc',
-            '<(app_strings_out_dir)/app_strings_vi.rc',
+            '<(ui_strings_out_dir)/ui_strings_vi.rc',
             '<(app_locale_out_dir)/app_locale_settings_vi.rc',
           ],
         },
@@ -656,7 +656,7 @@
             '<(chrome_grit_out_dir)/locale_settings_zh-CN.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_zh-CN.rc',
             '<(webkit_grit_out_dir)/webkit_strings_zh-CN.rc',
-            '<(app_strings_out_dir)/app_strings_zh-CN.rc',
+            '<(ui_strings_out_dir)/ui_strings_zh-CN.rc',
             '<(app_locale_out_dir)/app_locale_settings_zh-CN.rc',
           ],
         },
@@ -668,7 +668,7 @@
             '<(chrome_grit_out_dir)/locale_settings_zh-TW.rc',
             '<(chrome_grit_out_dir)/<(strings_rc_name)_zh-TW.rc',
             '<(webkit_grit_out_dir)/webkit_strings_zh-TW.rc',
-            '<(app_strings_out_dir)/app_strings_zh-TW.rc',
+            '<(ui_strings_out_dir)/ui_strings_zh-TW.rc',
             '<(app_locale_out_dir)/app_locale_settings_zh-TW.rc',
           ],
         },
diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc
index f4cc03a..e253a19 100644
--- a/chrome/browser/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/bookmarks/bookmark_utils.cc
@@ -26,9 +26,9 @@
 #include "content/browser/tab_contents/page_navigator.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_service.h"
-#include "grit/app_strings.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
+#include "grit/ui_strings.h"
 #include "net/base/net_util.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.mm b/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.mm
index 77d8149..3e1d783 100644
--- a/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.mm
+++ b/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.mm
@@ -11,8 +11,8 @@
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/chrome_browser_application_mac.h"
 #include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h"
-#include "grit/app_strings.h"
 #include "grit/generated_resources.h"
+#include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/message_box_flags.h"
 
diff --git a/chrome/browser/ui/cocoa/restart_browser.mm b/chrome/browser/ui/cocoa/restart_browser.mm
index ae97a77..b428dce 100644
--- a/chrome/browser/ui/cocoa/restart_browser.mm
+++ b/chrome/browser/ui/cocoa/restart_browser.mm
@@ -6,9 +6,9 @@
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/browser_list.h"
-#include "grit/app_strings.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
+#include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
diff --git a/chrome/browser/ui/cocoa/ui_localizer.mm b/chrome/browser/ui/cocoa/ui_localizer.mm
index 5268319..32f65d8 100644
--- a/chrome/browser/ui/cocoa/ui_localizer.mm
+++ b/chrome/browser/ui/cocoa/ui_localizer.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,11 +7,12 @@
 #import <Foundation/Foundation.h>
 
 #include <stdlib.h>
-#include "base/sys_string_conversions.h"
+
 #include "base/logging.h"
-#include "grit/app_strings.h"
+#include "base/sys_string_conversions.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
+#include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
diff --git a/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.cc b/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.cc
index fec4b12..d9fba76 100644
--- a/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.cc
@@ -8,8 +8,8 @@
 #include "chrome/browser/ui/gtk/gtk_floating_container.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/rounded_window.h"
-#include "grit/app_strings.h"
 #include "grit/generated_resources.h"
+#include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
diff --git a/chrome/browser/ui/views/shell_dialogs_win.cc b/chrome/browser/ui/views/shell_dialogs_win.cc
index 4f1692b..0ce04a0 100644
--- a/chrome/browser/ui/views/shell_dialogs_win.cc
+++ b/chrome/browser/ui/views/shell_dialogs_win.cc
@@ -22,8 +22,8 @@
 #include "base/win/scoped_comptr.h"
 #include "base/win/windows_version.h"
 #include "content/browser/browser_thread.h"
-#include "grit/app_strings.h"
 #include "grit/generated_resources.h"
+#include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 // This function takes the output of a SaveAs dialog: a filename, a filter and
diff --git a/chrome/tools/build/repack_locales.py b/chrome/tools/build/repack_locales.py
index f470f2e..b89fd4d 100755
--- a/chrome/tools/build/repack_locales.py
+++ b/chrome/tools/build/repack_locales.py
@@ -62,8 +62,8 @@ def calc_inputs(locale):
   #e.g. '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_da.pak'
   inputs.append('%s/webkit/webkit_strings_%s.pak' % (SHARE_INT_DIR, locale))
 
-  #e.g. '<(SHARED_INTERMEDIATE_DIR)/ui/app_strings_da.pak',
-  inputs.append('%s/ui/app_strings/app_strings_%s.pak' % (
+  #e.g. '<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings_da.pak',
+  inputs.append('%s/ui/ui_strings/ui_strings_%s.pak' % (
       SHARE_INT_DIR, locale))
 
   #e.g. '<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings_da.pak',
diff --git a/chrome/tools/check_grd_for_unused_strings.py b/chrome/tools/check_grd_for_unused_strings.py
index 0b2e593..3bc57d7 100755
--- a/chrome/tools/check_grd_for_unused_strings.py
+++ b/chrome/tools/check_grd_for_unused_strings.py
@@ -147,7 +147,7 @@ if __name__ == '__main__':
       os.path.join(src_dir, 'ui', 'gfx', 'gfx_resources.grd'),
       os.path.join(src_dir, 'ui', 'resources', 'ui_resources.grd'),
       os.path.join(ui_base_dir, 'app_locale_settings.grd'),
-      os.path.join(ui_base_dir, 'app_strings.grd'),
+      os.path.join(ui_base_dir, 'ui_strings.grd'),
     ]
 
   # If no source directories were given, default them:
diff --git a/tools/grit/resource_ids b/tools/grit/resource_ids
index 913cac9..d53a3cc 100644
--- a/tools/grit/resource_ids
+++ b/tools/grit/resource_ids
@@ -81,7 +81,7 @@
     "messages": [9000],
   },
 
-  "ui/base/strings/app_strings.grd": {
+  "ui/base/strings/ui_strings.grd": {
     "messages": [9500],
   },
   # Chromium strings and Google Chrome strings must start at the same id.
diff --git a/ui/DEPS b/ui/DEPS
index 5e1339a..22ef73e 100644
--- a/ui/DEPS
+++ b/ui/DEPS
@@ -1,6 +1,6 @@
 include_rules = [
   "+grit/app_locale_settings.h",
-  "+grit/app_strings.h",
+  "+grit/ui_strings.h",
   "+net",
   "+skia",
   "+third_party/mozilla",
diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.cc b/ui/base/dragdrop/os_exchange_data_provider_win.cc
index 3809628..207584a 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_win.cc
+++ b/ui/base/dragdrop/os_exchange_data_provider_win.cc
@@ -13,7 +13,7 @@
 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_hglobal.h"
 #include "googleurl/src/gurl.h"
-#include "grit/app_strings.h"
+#include "grit/ui_strings.h"
 #include "net/base/net_util.h"
 #include "ui/base/clipboard/clipboard_util_win.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/ui/base/strings/app_strings.grd b/ui/base/strings/ui_strings.grd
index 6c62dcf..96c7f8d3 100644
--- a/ui/base/strings/app_strings.grd
+++ b/ui/base/strings/ui_strings.grd
@@ -12,214 +12,214 @@ need to be translated for each locale.-->
     (http://wiki/Main/GritUsersGuide) for more details.
     Note that all output references are relative to the output directory
     which is specified at build time. -->
-    <output filename="grit/app_strings.h" type="rc_header">
+    <output filename="grit/ui_strings.h" type="rc_header">
       <emit emit_type='prepend'></emit>
     </output>
-    <output filename="app_strings_am.rc" type="rc_all" lang="am" />
-    <output filename="app_strings_ar.rc" type="rc_all" lang="ar" />
-    <output filename="app_strings_bg.rc" type="rc_all" lang="bg" />
-    <output filename="app_strings_bn.rc" type="rc_all" lang="bn" />
-    <output filename="app_strings_ca.rc" type="rc_all" lang="ca" />
-    <output filename="app_strings_cs.rc" type="rc_all" lang="cs" />
-    <output filename="app_strings_da.rc" type="rc_all" lang="da" />
-    <output filename="app_strings_de.rc" type="rc_all" lang="de" />
-    <output filename="app_strings_el.rc" type="rc_all" lang="el" />
-    <output filename="app_strings_en-GB.rc" type="rc_all" lang="en-GB" />
-    <output filename="app_strings_en-US.rc" type="rc_all" lang="en" />
-    <output filename="app_strings_es.rc" type="rc_all" lang="es" />
-    <output filename="app_strings_es-419.rc" type="rc_all" lang="es-419" />
-    <output filename="app_strings_et.rc" type="rc_all" lang="et" />
-    <output filename="app_strings_fa.rc" type="rc_all" lang="fa" />
-    <output filename="app_strings_fi.rc" type="rc_all" lang="fi" />
-    <output filename="app_strings_fil.rc" type="rc_all" lang="fil" />
-    <output filename="app_strings_fr.rc" type="rc_all" lang="fr" />
-    <output filename="app_strings_gu.rc" type="rc_all" lang="gu" />
-    <output filename="app_strings_he.rc" type="rc_all" lang="he" />
-    <output filename="app_strings_hi.rc" type="rc_all" lang="hi" />
-    <output filename="app_strings_hr.rc" type="rc_all" lang="hr" />
-    <output filename="app_strings_hu.rc" type="rc_all" lang="hu" />
-    <output filename="app_strings_id.rc" type="rc_all" lang="id" />
-    <output filename="app_strings_it.rc" type="rc_all" lang="it" />
-    <output filename="app_strings_ja.rc" type="rc_all" lang="ja" />
-    <output filename="app_strings_kn.rc" type="rc_all" lang="kn" />
-    <output filename="app_strings_ko.rc" type="rc_all" lang="ko" />
-    <output filename="app_strings_lt.rc" type="rc_all" lang="lt" />
-    <output filename="app_strings_lv.rc" type="rc_all" lang="lv" />
-    <output filename="app_strings_ml.rc" type="rc_all" lang="ml" />
-    <output filename="app_strings_mr.rc" type="rc_all" lang="mr" />
-    <output filename="app_strings_nl.rc" type="rc_all" lang="nl" />
+    <output filename="ui_strings_am.rc" type="rc_all" lang="am" />
+    <output filename="ui_strings_ar.rc" type="rc_all" lang="ar" />
+    <output filename="ui_strings_bg.rc" type="rc_all" lang="bg" />
+    <output filename="ui_strings_bn.rc" type="rc_all" lang="bn" />
+    <output filename="ui_strings_ca.rc" type="rc_all" lang="ca" />
+    <output filename="ui_strings_cs.rc" type="rc_all" lang="cs" />
+    <output filename="ui_strings_da.rc" type="rc_all" lang="da" />
+    <output filename="ui_strings_de.rc" type="rc_all" lang="de" />
+    <output filename="ui_strings_el.rc" type="rc_all" lang="el" />
+    <output filename="ui_strings_en-GB.rc" type="rc_all" lang="en-GB" />
+    <output filename="ui_strings_en-US.rc" type="rc_all" lang="en" />
+    <output filename="ui_strings_es.rc" type="rc_all" lang="es" />
+    <output filename="ui_strings_es-419.rc" type="rc_all" lang="es-419" />
+    <output filename="ui_strings_et.rc" type="rc_all" lang="et" />
+    <output filename="ui_strings_fa.rc" type="rc_all" lang="fa" />
+    <output filename="ui_strings_fi.rc" type="rc_all" lang="fi" />
+    <output filename="ui_strings_fil.rc" type="rc_all" lang="fil" />
+    <output filename="ui_strings_fr.rc" type="rc_all" lang="fr" />
+    <output filename="ui_strings_gu.rc" type="rc_all" lang="gu" />
+    <output filename="ui_strings_he.rc" type="rc_all" lang="he" />
+    <output filename="ui_strings_hi.rc" type="rc_all" lang="hi" />
+    <output filename="ui_strings_hr.rc" type="rc_all" lang="hr" />
+    <output filename="ui_strings_hu.rc" type="rc_all" lang="hu" />
+    <output filename="ui_strings_id.rc" type="rc_all" lang="id" />
+    <output filename="ui_strings_it.rc" type="rc_all" lang="it" />
+    <output filename="ui_strings_ja.rc" type="rc_all" lang="ja" />
+    <output filename="ui_strings_kn.rc" type="rc_all" lang="kn" />
+    <output filename="ui_strings_ko.rc" type="rc_all" lang="ko" />
+    <output filename="ui_strings_lt.rc" type="rc_all" lang="lt" />
+    <output filename="ui_strings_lv.rc" type="rc_all" lang="lv" />
+    <output filename="ui_strings_ml.rc" type="rc_all" lang="ml" />
+    <output filename="ui_strings_mr.rc" type="rc_all" lang="mr" />
+    <output filename="ui_strings_nl.rc" type="rc_all" lang="nl" />
     <!-- The translation console uses 'no' for Norwegian Bokmål. It should
          be 'nb'. -->
-    <output filename="app_strings_nb.rc" type="rc_all" lang="no" />
-    <output filename="app_strings_pl.rc" type="rc_all" lang="pl" />
-    <output filename="app_strings_pt-BR.rc" type="rc_all" lang="pt-BR" />
-    <output filename="app_strings_pt-PT.rc" type="rc_all" lang="pt-PT" />
-    <output filename="app_strings_ro.rc" type="rc_all" lang="ro" />
-    <output filename="app_strings_ru.rc" type="rc_all" lang="ru" />
-    <output filename="app_strings_sk.rc" type="rc_all" lang="sk" />
-    <output filename="app_strings_sl.rc" type="rc_all" lang="sl" />
-    <output filename="app_strings_sr.rc" type="rc_all" lang="sr" />
-    <output filename="app_strings_sv.rc" type="rc_all" lang="sv" />
-    <output filename="app_strings_sw.rc" type="rc_all" lang="sw" />
-    <output filename="app_strings_ta.rc" type="rc_all" lang="ta" />
-    <output filename="app_strings_te.rc" type="rc_all" lang="te" />
-    <output filename="app_strings_th.rc" type="rc_all" lang="th" />
-    <output filename="app_strings_tr.rc" type="rc_all" lang="tr" />
-    <output filename="app_strings_uk.rc" type="rc_all" lang="uk" />
-    <output filename="app_strings_vi.rc" type="rc_all" lang="vi" />
-    <output filename="app_strings_zh-CN.rc" type="rc_all" lang="zh-CN" />
-    <output filename="app_strings_zh-TW.rc" type="rc_all" lang="zh-TW" />
+    <output filename="ui_strings_nb.rc" type="rc_all" lang="no" />
+    <output filename="ui_strings_pl.rc" type="rc_all" lang="pl" />
+    <output filename="ui_strings_pt-BR.rc" type="rc_all" lang="pt-BR" />
+    <output filename="ui_strings_pt-PT.rc" type="rc_all" lang="pt-PT" />
+    <output filename="ui_strings_ro.rc" type="rc_all" lang="ro" />
+    <output filename="ui_strings_ru.rc" type="rc_all" lang="ru" />
+    <output filename="ui_strings_sk.rc" type="rc_all" lang="sk" />
+    <output filename="ui_strings_sl.rc" type="rc_all" lang="sl" />
+    <output filename="ui_strings_sr.rc" type="rc_all" lang="sr" />
+    <output filename="ui_strings_sv.rc" type="rc_all" lang="sv" />
+    <output filename="ui_strings_sw.rc" type="rc_all" lang="sw" />
+    <output filename="ui_strings_ta.rc" type="rc_all" lang="ta" />
+    <output filename="ui_strings_te.rc" type="rc_all" lang="te" />
+    <output filename="ui_strings_th.rc" type="rc_all" lang="th" />
+    <output filename="ui_strings_tr.rc" type="rc_all" lang="tr" />
+    <output filename="ui_strings_uk.rc" type="rc_all" lang="uk" />
+    <output filename="ui_strings_vi.rc" type="rc_all" lang="vi" />
+    <output filename="ui_strings_zh-CN.rc" type="rc_all" lang="zh-CN" />
+    <output filename="ui_strings_zh-TW.rc" type="rc_all" lang="zh-TW" />
 
-    <output filename="app_strings_am.pak" type="data_package" lang="am" />
-    <output filename="app_strings_ar.pak" type="data_package" lang="ar" />
+    <output filename="ui_strings_am.pak" type="data_package" lang="am" />
+    <output filename="ui_strings_ar.pak" type="data_package" lang="ar" />
     <if expr="pp_ifdef('use_third_party_translations')">
-      <output filename="app_strings_ast.pak" type="data_package" lang="ast" />
+      <output filename="ui_strings_ast.pak" type="data_package" lang="ast" />
     </if>
-    <output filename="app_strings_bg.pak" type="data_package" lang="bg" />
-    <output filename="app_strings_bn.pak" type="data_package" lang="bn" />
+    <output filename="ui_strings_bg.pak" type="data_package" lang="bg" />
+    <output filename="ui_strings_bn.pak" type="data_package" lang="bn" />
     <if expr="pp_ifdef('use_third_party_translations')">
-      <output filename="app_strings_bs.pak" type="data_package" lang="bs" />
+      <output filename="ui_strings_bs.pak" type="data_package" lang="bs" />
     </if>
-    <output filename="app_strings_ca.pak" type="data_package" lang="ca" />
+    <output filename="ui_strings_ca.pak" type="data_package" lang="ca" />
     <if expr="pp_ifdef('use_third_party_translations')">
-      <output filename="app_strings_ca@valencia.pak" type="data_package" lang="ca@valencia" />
+      <output filename="ui_strings_ca@valencia.pak" type="data_package" lang="ca@valencia" />
     </if>
-    <output filename="app_strings_cs.pak" type="data_package" lang="cs" />
-    <output filename="app_strings_da.pak" type="data_package" lang="da" />
-    <output filename="app_strings_de.pak" type="data_package" lang="de" />
-    <output filename="app_strings_el.pak" type="data_package" lang="el" />
-    <output filename="app_strings_en-GB.pak" type="data_package" lang="en-GB" />
-    <output filename="app_strings_en-US.pak" type="data_package" lang="en" />
+    <output filename="ui_strings_cs.pak" type="data_package" lang="cs" />
+    <output filename="ui_strings_da.pak" type="data_package" lang="da" />
+    <output filename="ui_strings_de.pak" type="data_package" lang="de" />
+    <output filename="ui_strings_el.pak" type="data_package" lang="el" />
+    <output filename="ui_strings_en-GB.pak" type="data_package" lang="en-GB" />
+    <output filename="ui_strings_en-US.pak" type="data_package" lang="en" />
     <if expr="pp_ifdef('use_third_party_translations')">
-      <output filename="app_strings_eo.pak" type="data_package" lang="eo" />
+      <output filename="ui_strings_eo.pak" type="data_package" lang="eo" />
     </if>
-    <output filename="app_strings_es.pak" type="data_package" lang="es" />
-    <output filename="app_strings_es-419.pak" type="data_package" lang="es-419" />
-    <output filename="app_strings_et.pak" type="data_package" lang="et" />
+    <output filename="ui_strings_es.pak" type="data_package" lang="es" />
+    <output filename="ui_strings_es-419.pak" type="data_package" lang="es-419" />
+    <output filename="ui_strings_et.pak" type="data_package" lang="et" />
     <if expr="pp_ifdef('use_third_party_translations')">
-      <output filename="app_strings_eu.pak" type="data_package" lang="eu" />
+      <output filename="ui_strings_eu.pak" type="data_package" lang="eu" />
     </if>
-    <output filename="app_strings_fa.pak" type="data_package" lang="fa" />
-    <output filename="app_strings_fi.pak" type="data_package" lang="fi" />
-    <output filename="app_strings_fil.pak" type="data_package" lang="fil" />
-    <output filename="app_strings_fr.pak" type="data_package" lang="fr" />
+    <output filename="ui_strings_fa.pak" type="data_package" lang="fa" />
+    <output filename="ui_strings_fi.pak" type="data_package" lang="fi" />
+    <output filename="ui_strings_fil.pak" type="data_package" lang="fil" />
+    <output filename="ui_strings_fr.pak" type="data_package" lang="fr" />
     <if expr="pp_ifdef('use_third_party_translations')">
-      <output filename="app_strings_gl.pak" type="data_package" lang="gl" />
+      <output filename="ui_strings_gl.pak" type="data_package" lang="gl" />
     </if>
-    <output filename="app_strings_gu.pak" type="data_package" lang="gu" />
-    <output filename="app_strings_he.pak" type="data_package" lang="he" />
-    <output filename="app_strings_hi.pak" type="data_package" lang="hi" />
-    <output filename="app_strings_hr.pak" type="data_package" lang="hr" />
-    <output filename="app_strings_hu.pak" type="data_package" lang="hu" />
+    <output filename="ui_strings_gu.pak" type="data_package" lang="gu" />
+    <output filename="ui_strings_he.pak" type="data_package" lang="he" />
+    <output filename="ui_strings_hi.pak" type="data_package" lang="hi" />
+    <output filename="ui_strings_hr.pak" type="data_package" lang="hr" />
+    <output filename="ui_strings_hu.pak" type="data_package" lang="hu" />
     <if expr="pp_ifdef('use_third_party_translations')">
-      <output filename="app_strings_hy.pak" type="data_package" lang="hy" />
+      <output filename="ui_strings_hy.pak" type="data_package" lang="hy" />
     </if>
-    <output filename="app_strings_id.pak" type="data_package" lang="id" />
-    <output filename="app_strings_it.pak" type="data_package" lang="it" />
-    <output filename="app_strings_ja.pak" type="data_package" lang="ja" />
+    <output filename="ui_strings_id.pak" type="data_package" lang="id" />
+    <output filename="ui_strings_it.pak" type="data_package" lang="it" />
+    <output filename="ui_strings_ja.pak" type="data_package" lang="ja" />
     <if expr="pp_ifdef('use_third_party_translations')">
-      <output filename="app_strings_ka.pak" type="data_package" lang="ka" />
+      <output filename="ui_strings_ka.pak" type="data_package" lang="ka" />
     </if>
-    <output filename="app_strings_kn.pak" type="data_package" lang="kn" />
-    <output filename="app_strings_ko.pak" type="data_package" lang="ko" />
+    <output filename="ui_strings_kn.pak" type="data_package" lang="kn" />
+    <output filename="ui_strings_ko.pak" type="data_package" lang="ko" />
     <if expr="pp_ifdef('use_third_party_translations')">
-      <output filename="app_strings_ku.pak" type="data_package" lang="ku" />
-      <output filename="app_strings_kw.pak" type="data_package" lang="kw" />
+      <output filename="ui_strings_ku.pak" type="data_package" lang="ku" />
+      <output filename="ui_strings_kw.pak" type="data_package" lang="kw" />
     </if>
-    <output filename="app_strings_lt.pak" type="data_package" lang="lt" />
-    <output filename="app_strings_lv.pak" type="data_package" lang="lv" />
-    <output filename="app_strings_ml.pak" type="data_package" lang="ml" />
-    <output filename="app_strings_mr.pak" type="data_package" lang="mr" />
-    <output filename="app_strings_nl.pak" type="data_package" lang="nl" />
+    <output filename="ui_strings_lt.pak" type="data_package" lang="lt" />
+    <output filename="ui_strings_lv.pak" type="data_package" lang="lv" />
+    <output filename="ui_strings_ml.pak" type="data_package" lang="ml" />
+    <output filename="ui_strings_mr.pak" type="data_package" lang="mr" />
+    <output filename="ui_strings_nl.pak" type="data_package" lang="nl" />
     <!-- The translation console uses 'no' for Norwegian Bokmål. It should
          be 'nb'. -->
-    <output filename="app_strings_nb.pak" type="data_package" lang="no" />
-    <output filename="app_strings_pl.pak" type="data_package" lang="pl" />
-    <output filename="app_strings_pt-BR.pak" type="data_package" lang="pt-BR" />
-    <output filename="app_strings_pt-PT.pak" type="data_package" lang="pt-PT" />
-    <output filename="app_strings_ro.pak" type="data_package" lang="ro" />
-    <output filename="app_strings_ru.pak" type="data_package" lang="ru" />
-    <output filename="app_strings_sk.pak" type="data_package" lang="sk" />
-    <output filename="app_strings_sl.pak" type="data_package" lang="sl" />
-    <output filename="app_strings_sr.pak" type="data_package" lang="sr" />
-    <output filename="app_strings_sv.pak" type="data_package" lang="sv" />
-    <output filename="app_strings_sw.pak" type="data_package" lang="sw" />
-    <output filename="app_strings_ta.pak" type="data_package" lang="ta" />
-    <output filename="app_strings_te.pak" type="data_package" lang="te" />
-    <output filename="app_strings_th.pak" type="data_package" lang="th" />
-    <output filename="app_strings_tr.pak" type="data_package" lang="tr" />
+    <output filename="ui_strings_nb.pak" type="data_package" lang="no" />
+    <output filename="ui_strings_pl.pak" type="data_package" lang="pl" />
+    <output filename="ui_strings_pt-BR.pak" type="data_package" lang="pt-BR" />
+    <output filename="ui_strings_pt-PT.pak" type="data_package" lang="pt-PT" />
+    <output filename="ui_strings_ro.pak" type="data_package" lang="ro" />
+    <output filename="ui_strings_ru.pak" type="data_package" lang="ru" />
+    <output filename="ui_strings_sk.pak" type="data_package" lang="sk" />
+    <output filename="ui_strings_sl.pak" type="data_package" lang="sl" />
+    <output filename="ui_strings_sr.pak" type="data_package" lang="sr" />
+    <output filename="ui_strings_sv.pak" type="data_package" lang="sv" />
+    <output filename="ui_strings_sw.pak" type="data_package" lang="sw" />
+    <output filename="ui_strings_ta.pak" type="data_package" lang="ta" />
+    <output filename="ui_strings_te.pak" type="data_package" lang="te" />
+    <output filename="ui_strings_th.pak" type="data_package" lang="th" />
+    <output filename="ui_strings_tr.pak" type="data_package" lang="tr" />
     <if expr="pp_ifdef('use_third_party_translations')">
-      <output filename="app_strings_ug.pak" type="data_package" lang="ug" />
+      <output filename="ui_strings_ug.pak" type="data_package" lang="ug" />
     </if>
-    <output filename="app_strings_uk.pak" type="data_package" lang="uk" />
-    <output filename="app_strings_vi.pak" type="data_package" lang="vi" />
-    <output filename="app_strings_zh-CN.pak" type="data_package" lang="zh-CN" />
-    <output filename="app_strings_zh-TW.pak" type="data_package" lang="zh-TW" />
+    <output filename="ui_strings_uk.pak" type="data_package" lang="uk" />
+    <output filename="ui_strings_vi.pak" type="data_package" lang="vi" />
+    <output filename="ui_strings_zh-CN.pak" type="data_package" lang="zh-CN" />
+    <output filename="ui_strings_zh-TW.pak" type="data_package" lang="zh-TW" />
   </outputs>
   <translations>
-    <file path="app_strings_am.xtb" lang="am" />
-    <file path="app_strings_ar.xtb" lang="ar" />
+    <file path="ui_strings_am.xtb" lang="am" />
+    <file path="ui_strings_ar.xtb" lang="ar" />
     <file path="../../../third_party/launchpad_translations/app_strings_ast.xtb" lang="ast" />
-    <file path="app_strings_bg.xtb" lang="bg" />
-    <file path="app_strings_bn.xtb" lang="bn" />
+    <file path="ui_strings_bg.xtb" lang="bg" />
+    <file path="ui_strings_bn.xtb" lang="bn" />
     <file path="../../../third_party/launchpad_translations/app_strings_bs.xtb" lang="bs" />
-    <file path="app_strings_ca.xtb" lang="ca" />
+    <file path="ui_strings_ca.xtb" lang="ca" />
     <file path="../../../third_party/launchpad_translations/app_strings_ca-valencia.xtb" lang="ca@valencia" />
-    <file path="app_strings_cs.xtb" lang="cs" />
-    <file path="app_strings_da.xtb" lang="da" />
-    <file path="app_strings_de.xtb" lang="de" />
-    <file path="app_strings_el.xtb" lang="el" />
-    <file path="app_strings_en-GB.xtb" lang="en-GB" />
+    <file path="ui_strings_cs.xtb" lang="cs" />
+    <file path="ui_strings_da.xtb" lang="da" />
+    <file path="ui_strings_de.xtb" lang="de" />
+    <file path="ui_strings_el.xtb" lang="el" />
+    <file path="ui_strings_en-GB.xtb" lang="en-GB" />
     <file path="../../../third_party/launchpad_translations/app_strings_eo.xtb" lang="eo" />
-    <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="ui_strings_es.xtb" lang="es" />
+    <file path="ui_strings_es-419.xtb" lang="es-419" />
+    <file path="ui_strings_et.xtb" lang="et" />
     <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="ui_strings_fa.xtb" lang="fa" />
+    <file path="ui_strings_fi.xtb" lang="fi" />
+    <file path="ui_strings_fil.xtb" lang="fil" />
+    <file path="ui_strings_fr.xtb" lang="fr" />
     <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" />
-    <file path="app_strings_hu.xtb" lang="hu" />
+    <file path="ui_strings_gu.xtb" lang="gu" />
+    <file path="ui_strings_hi.xtb" lang="hi" />
+    <file path="ui_strings_hr.xtb" lang="hr" />
+    <file path="ui_strings_hu.xtb" lang="hu" />
     <file path="../../../third_party/launchpad_translations/app_strings_hy.xtb" lang="hy" />
-    <file path="app_strings_id.xtb" lang="id" />
-    <file path="app_strings_it.xtb" lang="it" />
+    <file path="ui_strings_id.xtb" lang="id" />
+    <file path="ui_strings_it.xtb" lang="it" />
     <!-- 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="ui_strings_iw.xtb" lang="he" />
+    <file path="ui_strings_ja.xtb" lang="ja" />
     <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="ui_strings_kn.xtb" lang="kn" />
+    <file path="ui_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_kw.xtb" lang="kw" />
-    <file path="app_strings_lt.xtb" lang="lt" />
-    <file path="app_strings_lv.xtb" lang="lv" />
-    <file path="app_strings_ml.xtb" lang="ml" />
-    <file path="app_strings_mr.xtb" lang="mr" />
-    <file path="app_strings_nl.xtb" lang="nl" />
-    <file path="app_strings_no.xtb" lang="no" />
-    <file path="app_strings_pl.xtb" lang="pl" />
-    <file path="app_strings_pt-BR.xtb" lang="pt-BR" />
-    <file path="app_strings_pt-PT.xtb" lang="pt-PT" />
-    <file path="app_strings_ro.xtb" lang="ro" />
-    <file path="app_strings_ru.xtb" lang="ru" />
-    <file path="app_strings_sk.xtb" lang="sk" />
-    <file path="app_strings_sl.xtb" lang="sl" />
-    <file path="app_strings_sr.xtb" lang="sr" />
-    <file path="app_strings_sv.xtb" lang="sv" />
-    <file path="app_strings_sw.xtb" lang="sw" />
-    <file path="app_strings_ta.xtb" lang="ta" />
-    <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="ui_strings_lt.xtb" lang="lt" />
+    <file path="ui_strings_lv.xtb" lang="lv" />
+    <file path="ui_strings_ml.xtb" lang="ml" />
+    <file path="ui_strings_mr.xtb" lang="mr" />
+    <file path="ui_strings_nl.xtb" lang="nl" />
+    <file path="ui_strings_no.xtb" lang="no" />
+    <file path="ui_strings_pl.xtb" lang="pl" />
+    <file path="ui_strings_pt-BR.xtb" lang="pt-BR" />
+    <file path="ui_strings_pt-PT.xtb" lang="pt-PT" />
+    <file path="ui_strings_ro.xtb" lang="ro" />
+    <file path="ui_strings_ru.xtb" lang="ru" />
+    <file path="ui_strings_sk.xtb" lang="sk" />
+    <file path="ui_strings_sl.xtb" lang="sl" />
+    <file path="ui_strings_sr.xtb" lang="sr" />
+    <file path="ui_strings_sv.xtb" lang="sv" />
+    <file path="ui_strings_sw.xtb" lang="sw" />
+    <file path="ui_strings_ta.xtb" lang="ta" />
+    <file path="ui_strings_te.xtb" lang="te" />
+    <file path="ui_strings_th.xtb" lang="th" />
+    <file path="ui_strings_tr.xtb" lang="tr" />
     <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" />
-    <file path="app_strings_zh-TW.xtb" lang="zh-TW" />
+    <file path="ui_strings_uk.xtb" lang="uk" />
+    <file path="ui_strings_vi.xtb" lang="vi" />
+    <file path="ui_strings_zh-CN.xtb" lang="zh-CN" />
+    <file path="ui_strings_zh-TW.xtb" lang="zh-TW" />
   </translations>
   <release seq="1" allow_pseudo="false">
     <messages fallback_to_english="true">
diff --git a/ui/base/strings/ui_strings.gyp b/ui/base/strings/ui_strings.gyp
index 7dded58..9af39cb 100644
--- a/ui/base/strings/ui_strings.gyp
+++ b/ui/base/strings/ui_strings.gyp
@@ -9,10 +9,10 @@
       'type': 'none',
       'actions': [
         {
-          'action_name': 'app_strings',
+          'action_name': 'ui_strings',
           'variables': {
-            'grit_grd_file': 'app_strings.grd',
-            'grit_out_dir': '<(grit_base_out_dir)/app_strings',
+            'grit_grd_file': 'ui_strings.grd',
+            'grit_out_dir': '<(grit_base_out_dir)/ui_strings',
           },
           'includes': [ '../../../build/grit_action.gypi' ],
         },
@@ -28,7 +28,7 @@
       'direct_dependent_settings': {
         'include_dirs': [
           '<(grit_base_out_dir)/app_locale_settings',
-          '<(grit_base_out_dir)/app_strings',
+          '<(grit_base_out_dir)/ui_strings',
         ],
       },
       'conditions': [
@@ -51,7 +51,7 @@
             'action_name': 'repack_ui_unittest_strings',
             'variables': {
               'pak_inputs': [
-                '<(grit_base_out_dir)/app_strings/app_strings_en-US.pak',
+                '<(grit_base_out_dir)/ui_strings/ui_strings_en-US.pak',
                 '<(grit_base_out_dir)/app_locale_settings/app_locale_settings_en-US.pak',
               ],
             },
diff --git a/ui/base/strings/app_strings_am.xtb b/ui/base/strings/ui_strings_am.xtb
index 9144d6b..9144d6b 100644
--- a/ui/base/strings/app_strings_am.xtb
+++ b/ui/base/strings/ui_strings_am.xtb
diff --git a/ui/base/strings/app_strings_ar.xtb b/ui/base/strings/ui_strings_ar.xtb
index feea3a1..feea3a1 100644
--- a/ui/base/strings/app_strings_ar.xtb
+++ b/ui/base/strings/ui_strings_ar.xtb
diff --git a/ui/base/strings/app_strings_bg.xtb b/ui/base/strings/ui_strings_bg.xtb
index de175d3..de175d3 100644
--- a/ui/base/strings/app_strings_bg.xtb
+++ b/ui/base/strings/ui_strings_bg.xtb
diff --git a/ui/base/strings/app_strings_bn.xtb b/ui/base/strings/ui_strings_bn.xtb
index 349f7f7..349f7f7 100644
--- a/ui/base/strings/app_strings_bn.xtb
+++ b/ui/base/strings/ui_strings_bn.xtb
diff --git a/ui/base/strings/app_strings_ca.xtb b/ui/base/strings/ui_strings_ca.xtb
index 1c0364b..1c0364b 100644
--- a/ui/base/strings/app_strings_ca.xtb
+++ b/ui/base/strings/ui_strings_ca.xtb
diff --git a/ui/base/strings/app_strings_cs.xtb b/ui/base/strings/ui_strings_cs.xtb
index 0cabcad..0cabcad 100644
--- a/ui/base/strings/app_strings_cs.xtb
+++ b/ui/base/strings/ui_strings_cs.xtb
diff --git a/ui/base/strings/app_strings_da.xtb b/ui/base/strings/ui_strings_da.xtb
index 07cb42a..07cb42a 100644
--- a/ui/base/strings/app_strings_da.xtb
+++ b/ui/base/strings/ui_strings_da.xtb
diff --git a/ui/base/strings/app_strings_de.xtb b/ui/base/strings/ui_strings_de.xtb
index ae8a1f5..ae8a1f5 100644
--- a/ui/base/strings/app_strings_de.xtb
+++ b/ui/base/strings/ui_strings_de.xtb
diff --git a/ui/base/strings/app_strings_el.xtb b/ui/base/strings/ui_strings_el.xtb
index 22ab346..22ab346 100644
--- a/ui/base/strings/app_strings_el.xtb
+++ b/ui/base/strings/ui_strings_el.xtb
diff --git a/ui/base/strings/app_strings_en-GB.xtb b/ui/base/strings/ui_strings_en-GB.xtb
index f535a2d..f535a2d 100644
--- a/ui/base/strings/app_strings_en-GB.xtb
+++ b/ui/base/strings/ui_strings_en-GB.xtb
diff --git a/ui/base/strings/app_strings_es-419.xtb b/ui/base/strings/ui_strings_es-419.xtb
index 2764f5c..2764f5c 100644
--- a/ui/base/strings/app_strings_es-419.xtb
+++ b/ui/base/strings/ui_strings_es-419.xtb
diff --git a/ui/base/strings/app_strings_es.xtb b/ui/base/strings/ui_strings_es.xtb
index ab93d3e..ab93d3e 100644
--- a/ui/base/strings/app_strings_es.xtb
+++ b/ui/base/strings/ui_strings_es.xtb
diff --git a/ui/base/strings/app_strings_et.xtb b/ui/base/strings/ui_strings_et.xtb
index e78f09b..e78f09b 100644
--- a/ui/base/strings/app_strings_et.xtb
+++ b/ui/base/strings/ui_strings_et.xtb
diff --git a/ui/base/strings/app_strings_fa.xtb b/ui/base/strings/ui_strings_fa.xtb
index be18cac..be18cac 100644
--- a/ui/base/strings/app_strings_fa.xtb
+++ b/ui/base/strings/ui_strings_fa.xtb
diff --git a/ui/base/strings/app_strings_fi.xtb b/ui/base/strings/ui_strings_fi.xtb
index 7c096ad..7c096ad 100644
--- a/ui/base/strings/app_strings_fi.xtb
+++ b/ui/base/strings/ui_strings_fi.xtb
diff --git a/ui/base/strings/app_strings_fil.xtb b/ui/base/strings/ui_strings_fil.xtb
index bc2532e..bc2532e 100644
--- a/ui/base/strings/app_strings_fil.xtb
+++ b/ui/base/strings/ui_strings_fil.xtb
diff --git a/ui/base/strings/app_strings_fr.xtb b/ui/base/strings/ui_strings_fr.xtb
index 373d92b..373d92b 100644
--- a/ui/base/strings/app_strings_fr.xtb
+++ b/ui/base/strings/ui_strings_fr.xtb
diff --git a/ui/base/strings/app_strings_gu.xtb b/ui/base/strings/ui_strings_gu.xtb
index 26c7d2f..26c7d2f 100644
--- a/ui/base/strings/app_strings_gu.xtb
+++ b/ui/base/strings/ui_strings_gu.xtb
diff --git a/ui/base/strings/app_strings_hi.xtb b/ui/base/strings/ui_strings_hi.xtb
index a8b9295..a8b9295 100644
--- a/ui/base/strings/app_strings_hi.xtb
+++ b/ui/base/strings/ui_strings_hi.xtb
diff --git a/ui/base/strings/app_strings_hr.xtb b/ui/base/strings/ui_strings_hr.xtb
index 77d19d3f..77d19d3f 100644
--- a/ui/base/strings/app_strings_hr.xtb
+++ b/ui/base/strings/ui_strings_hr.xtb
diff --git a/ui/base/strings/app_strings_hu.xtb b/ui/base/strings/ui_strings_hu.xtb
index 3b6c990..3b6c990 100644
--- a/ui/base/strings/app_strings_hu.xtb
+++ b/ui/base/strings/ui_strings_hu.xtb
diff --git a/ui/base/strings/app_strings_id.xtb b/ui/base/strings/ui_strings_id.xtb
index c100501..c100501 100644
--- a/ui/base/strings/app_strings_id.xtb
+++ b/ui/base/strings/ui_strings_id.xtb
diff --git a/ui/base/strings/app_strings_it.xtb b/ui/base/strings/ui_strings_it.xtb
index f3e95b6..f3e95b6 100644
--- a/ui/base/strings/app_strings_it.xtb
+++ b/ui/base/strings/ui_strings_it.xtb
diff --git a/ui/base/strings/app_strings_iw.xtb b/ui/base/strings/ui_strings_iw.xtb
index 4fa0e56..4fa0e56 100644
--- a/ui/base/strings/app_strings_iw.xtb
+++ b/ui/base/strings/ui_strings_iw.xtb
diff --git a/ui/base/strings/app_strings_ja.xtb b/ui/base/strings/ui_strings_ja.xtb
index 19797b2..19797b2 100644
--- a/ui/base/strings/app_strings_ja.xtb
+++ b/ui/base/strings/ui_strings_ja.xtb
diff --git a/ui/base/strings/app_strings_kn.xtb b/ui/base/strings/ui_strings_kn.xtb
index 5a38417..5a38417 100644
--- a/ui/base/strings/app_strings_kn.xtb
+++ b/ui/base/strings/ui_strings_kn.xtb
diff --git a/ui/base/strings/app_strings_ko.xtb b/ui/base/strings/ui_strings_ko.xtb
index 843d34b..843d34b 100644
--- a/ui/base/strings/app_strings_ko.xtb
+++ b/ui/base/strings/ui_strings_ko.xtb
diff --git a/ui/base/strings/app_strings_lt.xtb b/ui/base/strings/ui_strings_lt.xtb
index c905580..c905580 100644
--- a/ui/base/strings/app_strings_lt.xtb
+++ b/ui/base/strings/ui_strings_lt.xtb
diff --git a/ui/base/strings/app_strings_lv.xtb b/ui/base/strings/ui_strings_lv.xtb
index 6136b30..6136b30 100644
--- a/ui/base/strings/app_strings_lv.xtb
+++ b/ui/base/strings/ui_strings_lv.xtb
diff --git a/ui/base/strings/app_strings_ml.xtb b/ui/base/strings/ui_strings_ml.xtb
index 35eae27..35eae27 100644
--- a/ui/base/strings/app_strings_ml.xtb
+++ b/ui/base/strings/ui_strings_ml.xtb
diff --git a/ui/base/strings/app_strings_mr.xtb b/ui/base/strings/ui_strings_mr.xtb
index 0b0b858..0b0b858 100644
--- a/ui/base/strings/app_strings_mr.xtb
+++ b/ui/base/strings/ui_strings_mr.xtb
diff --git a/ui/base/strings/app_strings_nl.xtb b/ui/base/strings/ui_strings_nl.xtb
index 9a6e0e3..9a6e0e3 100644
--- a/ui/base/strings/app_strings_nl.xtb
+++ b/ui/base/strings/ui_strings_nl.xtb
diff --git a/ui/base/strings/app_strings_no.xtb b/ui/base/strings/ui_strings_no.xtb
index 0c312ba..0c312ba 100644
--- a/ui/base/strings/app_strings_no.xtb
+++ b/ui/base/strings/ui_strings_no.xtb
diff --git a/ui/base/strings/app_strings_pl.xtb b/ui/base/strings/ui_strings_pl.xtb
index 3bd34b4..3bd34b4 100644
--- a/ui/base/strings/app_strings_pl.xtb
+++ b/ui/base/strings/ui_strings_pl.xtb
diff --git a/ui/base/strings/app_strings_pt-BR.xtb b/ui/base/strings/ui_strings_pt-BR.xtb
index 5aa4d6c..5aa4d6c 100644
--- a/ui/base/strings/app_strings_pt-BR.xtb
+++ b/ui/base/strings/ui_strings_pt-BR.xtb
diff --git a/ui/base/strings/app_strings_pt-PT.xtb b/ui/base/strings/ui_strings_pt-PT.xtb
index 682cefc..682cefc 100644
--- a/ui/base/strings/app_strings_pt-PT.xtb
+++ b/ui/base/strings/ui_strings_pt-PT.xtb
diff --git a/ui/base/strings/app_strings_ro.xtb b/ui/base/strings/ui_strings_ro.xtb
index 661e402..661e402 100644
--- a/ui/base/strings/app_strings_ro.xtb
+++ b/ui/base/strings/ui_strings_ro.xtb
diff --git a/ui/base/strings/app_strings_ru.xtb b/ui/base/strings/ui_strings_ru.xtb
index 939f1cf..939f1cf 100644
--- a/ui/base/strings/app_strings_ru.xtb
+++ b/ui/base/strings/ui_strings_ru.xtb
diff --git a/ui/base/strings/app_strings_sk.xtb b/ui/base/strings/ui_strings_sk.xtb
index 2d2f08f..2d2f08f 100644
--- a/ui/base/strings/app_strings_sk.xtb
+++ b/ui/base/strings/ui_strings_sk.xtb
diff --git a/ui/base/strings/app_strings_sl.xtb b/ui/base/strings/ui_strings_sl.xtb
index 65c2341..65c2341 100644
--- a/ui/base/strings/app_strings_sl.xtb
+++ b/ui/base/strings/ui_strings_sl.xtb
diff --git a/ui/base/strings/app_strings_sr.xtb b/ui/base/strings/ui_strings_sr.xtb
index e1ce2095..e1ce2095 100644
--- a/ui/base/strings/app_strings_sr.xtb
+++ b/ui/base/strings/ui_strings_sr.xtb
diff --git a/ui/base/strings/app_strings_sv.xtb b/ui/base/strings/ui_strings_sv.xtb
index af0e54d..af0e54d 100644
--- a/ui/base/strings/app_strings_sv.xtb
+++ b/ui/base/strings/ui_strings_sv.xtb
diff --git a/ui/base/strings/app_strings_sw.xtb b/ui/base/strings/ui_strings_sw.xtb
index d940a37..d940a37 100644
--- a/ui/base/strings/app_strings_sw.xtb
+++ b/ui/base/strings/ui_strings_sw.xtb
diff --git a/ui/base/strings/app_strings_ta.xtb b/ui/base/strings/ui_strings_ta.xtb
index 2efd256..2efd256 100644
--- a/ui/base/strings/app_strings_ta.xtb
+++ b/ui/base/strings/ui_strings_ta.xtb
diff --git a/ui/base/strings/app_strings_te.xtb b/ui/base/strings/ui_strings_te.xtb
index d9a1d6c..d9a1d6c 100644
--- a/ui/base/strings/app_strings_te.xtb
+++ b/ui/base/strings/ui_strings_te.xtb
diff --git a/ui/base/strings/app_strings_th.xtb b/ui/base/strings/ui_strings_th.xtb
index 50bd6ae..50bd6ae 100644
--- a/ui/base/strings/app_strings_th.xtb
+++ b/ui/base/strings/ui_strings_th.xtb
diff --git a/ui/base/strings/app_strings_tr.xtb b/ui/base/strings/ui_strings_tr.xtb
index 18f45ae..18f45ae 100644
--- a/ui/base/strings/app_strings_tr.xtb
+++ b/ui/base/strings/ui_strings_tr.xtb
diff --git a/ui/base/strings/app_strings_uk.xtb b/ui/base/strings/ui_strings_uk.xtb
index 15059c6..15059c6 100644
--- a/ui/base/strings/app_strings_uk.xtb
+++ b/ui/base/strings/ui_strings_uk.xtb
diff --git a/ui/base/strings/app_strings_vi.xtb b/ui/base/strings/ui_strings_vi.xtb
index fe64548..fe64548 100644
--- a/ui/base/strings/app_strings_vi.xtb
+++ b/ui/base/strings/ui_strings_vi.xtb
diff --git a/ui/base/strings/app_strings_zh-CN.xtb b/ui/base/strings/ui_strings_zh-CN.xtb
index b8d65d9..b8d65d9 100644
--- a/ui/base/strings/app_strings_zh-CN.xtb
+++ b/ui/base/strings/ui_strings_zh-CN.xtb
diff --git a/ui/base/strings/app_strings_zh-TW.xtb b/ui/base/strings/ui_strings_zh-TW.xtb
index ab76e8b..ab76e8b 100644
--- a/ui/base/strings/app_strings_zh-TW.xtb
+++ b/ui/base/strings/ui_strings_zh-TW.xtb
diff --git a/ui/base/text/bytes_formatting.cc b/ui/base/text/bytes_formatting.cc
index 6399b3c..169566e 100644
--- a/ui/base/text/bytes_formatting.cc
+++ b/ui/base/text/bytes_formatting.cc
@@ -8,7 +8,7 @@
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "grit/app_strings.h"
+#include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace ui {
diff --git a/ui/views/events/accelerator.cc b/ui/views/events/accelerator.cc
index c80f63e..8cd7f03a 100644
--- a/ui/views/events/accelerator.cc
+++ b/ui/views/events/accelerator.cc
@@ -14,7 +14,7 @@
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "grit/app_strings.h"
+#include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace ui {
diff --git a/views/DEPS b/views/DEPS
index 0cd2876..42feff04 100644
--- a/views/DEPS
+++ b/views/DEPS
@@ -1,6 +1,6 @@
 include_rules = [
-  "+grit/app_strings.h",
   "+grit/ui_resources.h",
+  "+grit/ui_strings.h",
   "+skia/ext",
   "+net",
   "+ui",
diff --git a/views/accelerator.cc b/views/accelerator.cc
index bf9b90b..79c72cb 100644
--- a/views/accelerator.cc
+++ b/views/accelerator.cc
@@ -14,7 +14,7 @@
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "grit/app_strings.h"
+#include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace views {
diff --git a/views/controls/button/button_dropdown.cc b/views/controls/button/button_dropdown.cc
index dc893df..c942aab 100644
--- a/views/controls/button/button_dropdown.cc
+++ b/views/controls/button/button_dropdown.cc
@@ -7,7 +7,7 @@
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
-#include "grit/app_strings.h"
+#include "grit/ui_strings.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/menu_model.h"
diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc
index d2aa09e..7701d59 100644
--- a/views/controls/button/menu_button.cc
+++ b/views/controls/button/menu_button.cc
@@ -5,8 +5,8 @@
 #include "views/controls/button/menu_button.h"
 
 #include "base/utf_string_conversions.h"
-#include "grit/app_strings.h"
 #include "grit/ui_resources.h"
+#include "grit/ui_strings.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/views/controls/menu/menu_item_view.cc b/views/controls/menu/menu_item_view.cc
index 2e82569a..a47e5d3 100644
--- a/views/controls/menu/menu_item_view.cc
+++ b/views/controls/menu/menu_item_view.cc
@@ -7,7 +7,7 @@
 #include "base/i18n/case_conversion.h"
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
-#include "grit/app_strings.h"
+#include "grit/ui_strings.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/menu_model.h"
diff --git a/views/controls/menu/menu_item_view_win.cc b/views/controls/menu/menu_item_view_win.cc
index dd3807c..92d7384 100644
--- a/views/controls/menu/menu_item_view_win.cc
+++ b/views/controls/menu/menu_item_view_win.cc
@@ -7,7 +7,7 @@
 #include <uxtheme.h>
 #include <Vssym32.h>
 
-#include "grit/app_strings.h"
+#include "grit/ui_strings.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/native_theme_win.h"
 #include "views/controls/menu/menu_config.h"
diff --git a/views/controls/scrollbar/bitmap_scroll_bar.cc b/views/controls/scrollbar/bitmap_scroll_bar.cc
index ca35cbe..b52e8d9 100644
--- a/views/controls/scrollbar/bitmap_scroll_bar.cc
+++ b/views/controls/scrollbar/bitmap_scroll_bar.cc
@@ -13,7 +13,7 @@
 #include "base/message_loop.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
-#include "grit/app_strings.h"
+#include "grit/ui_strings.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/views/controls/textfield/native_textfield_views.cc b/views/controls/textfield/native_textfield_views.cc
index 2a6a4c6..adc6288 100644
--- a/views/controls/textfield/native_textfield_views.cc
+++ b/views/controls/textfield/native_textfield_views.cc
@@ -10,7 +10,7 @@
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
-#include "grit/app_strings.h"
+#include "grit/ui_strings.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/range/range.h"
diff --git a/views/controls/textfield/native_textfield_win.cc b/views/controls/textfield/native_textfield_win.cc
index 5b4bad5..c14fb4d 100644
--- a/views/controls/textfield/native_textfield_win.cc
+++ b/views/controls/textfield/native_textfield_win.cc
@@ -11,7 +11,7 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/windows_version.h"
-#include "grit/app_strings.h"
+#include "grit/ui_strings.h"
 #include "skia/ext/skia_utils_win.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/clipboard/clipboard.h"
diff --git a/views/window/custom_frame_view.cc b/views/window/custom_frame_view.cc
index 8de6072..0c18819 100644
--- a/views/window/custom_frame_view.cc
+++ b/views/window/custom_frame_view.cc
@@ -5,8 +5,8 @@
 #include "views/window/custom_frame_view.h"
 
 #include "base/utf_string_conversions.h"
-#include "grit/app_strings.h"
 #include "grit/ui_resources.h"
+#include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
diff --git a/views/window/dialog_client_view.cc b/views/window/dialog_client_view.cc
index 583443f..7a1dc09 100644
--- a/views/window/dialog_client_view.cc
+++ b/views/window/dialog_client_view.cc
@@ -15,7 +15,7 @@
 #include <algorithm>
 
 #include "base/utf_string_conversions.h"
-#include "grit/app_strings.h"
+#include "grit/ui_strings.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"