Use grit to generate locale rc files and remove the old locale rc files from the tree.

I made a small change to grit so we can use our resource ID as the translation ID making it a bit easier to read.

The old locale_settings*.rc files would #include the google_strings.rc or chromium_strings.rc.  Instead, I added it to the vcproj file using $(CHROMIUM_BUILD) to grab the right file.  This required changing the output names in the grd files.

TBR=deanm

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

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

1 files changed, 52 insertions, 50 deletions

diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd
index ac0127b..ec1eb41 100644
--- a/chrome/app/google_chrome_strings.grd
+++ b/chrome/app/google_chrome_strings.grd
@@ -9,57 +9,59 @@ Chrome supports. -->
     <output filename="grit/google_chrome_strings.h" type="rc_header">
       <emit emit_type='prepend'></emit>
     </output>
-    <output filename="google_chrome_strings_ar.rc" type="rc_all" lang="ar" />
-    <output filename="google_chrome_strings_bg.rc" type="rc_all" lang="bg" />
-    <output filename="google_chrome_strings_bn.rc" type="rc_all" lang="bn" />
-    <output filename="google_chrome_strings_ca.rc" type="rc_all" lang="ca" />
-    <output filename="google_chrome_strings_cs.rc" type="rc_all" lang="cs" />
-    <output filename="google_chrome_strings_da.rc" type="rc_all" lang="da" />
-    <output filename="google_chrome_strings_de.rc" type="rc_all" lang="de" />
-    <output filename="google_chrome_strings_el.rc" type="rc_all" lang="el" />
-    <output filename="google_chrome_strings_en-GB.rc" type="rc_all" lang="en-GB" />
-    <output filename="google_chrome_strings_en-US.rc" type="rc_all" lang="en" />
-    <output filename="google_chrome_strings_es.rc" type="rc_all" lang="es" />
-    <output filename="google_chrome_strings_es-419.rc" type="rc_all" lang="es-419" />
-    <output filename="google_chrome_strings_et.rc" type="rc_all" lang="et" />
-    <output filename="google_chrome_strings_fi.rc" type="rc_all" lang="fi" />
-    <output filename="google_chrome_strings_fil.rc" type="rc_all" lang="fil" />
-    <output filename="google_chrome_strings_fr.rc" type="rc_all" lang="fr" />
-    <output filename="google_chrome_strings_gu.rc" type="rc_all" lang="gu" />
-    <output filename="google_chrome_strings_he.rc" type="rc_all" lang="he" />
-    <output filename="google_chrome_strings_hi.rc" type="rc_all" lang="hi" />
-    <output filename="google_chrome_strings_hr.rc" type="rc_all" lang="hr" />
-    <output filename="google_chrome_strings_hu.rc" type="rc_all" lang="hu" />
-    <output filename="google_chrome_strings_id.rc" type="rc_all" lang="id" />
-    <output filename="google_chrome_strings_it.rc" type="rc_all" lang="it" />
-    <output filename="google_chrome_strings_ja.rc" type="rc_all" lang="ja" />
-    <output filename="google_chrome_strings_kn.rc" type="rc_all" lang="kn" />
-    <output filename="google_chrome_strings_ko.rc" type="rc_all" lang="ko" />
-    <output filename="google_chrome_strings_lt.rc" type="rc_all" lang="lt" />
-    <output filename="google_chrome_strings_lv.rc" type="rc_all" lang="lv" />
-    <output filename="google_chrome_strings_ml.rc" type="rc_all" lang="ml" />
-    <output filename="google_chrome_strings_mr.rc" type="rc_all" lang="mr" />
-    <output filename="google_chrome_strings_nl.rc" type="rc_all" lang="nl" />
-    <output filename="google_chrome_strings_nb.rc" type="rc_all" lang="no" />
+    <!-- We use different filenames here so we can include the file easily in
+         vcproj files using the $(CHROMIUM_BUILD). -->
+    <output filename="strings_google_chrome_ar.rc" type="rc_all" lang="ar" />
+    <output filename="strings_google_chrome_bg.rc" type="rc_all" lang="bg" />
+    <output filename="strings_google_chrome_bn.rc" type="rc_all" lang="bn" />
+    <output filename="strings_google_chrome_ca.rc" type="rc_all" lang="ca" />
+    <output filename="strings_google_chrome_cs.rc" type="rc_all" lang="cs" />
+    <output filename="strings_google_chrome_da.rc" type="rc_all" lang="da" />
+    <output filename="strings_google_chrome_de.rc" type="rc_all" lang="de" />
+    <output filename="strings_google_chrome_el.rc" type="rc_all" lang="el" />
+    <output filename="strings_google_chrome_en-GB.rc" type="rc_all" lang="en-GB" />
+    <output filename="strings_google_chrome_en-US.rc" type="rc_all" lang="en" />
+    <output filename="strings_google_chrome_es.rc" type="rc_all" lang="es" />
+    <output filename="strings_google_chrome_es-419.rc" type="rc_all" lang="es-419" />
+    <output filename="strings_google_chrome_et.rc" type="rc_all" lang="et" />
+    <output filename="strings_google_chrome_fi.rc" type="rc_all" lang="fi" />
+    <output filename="strings_google_chrome_fil.rc" type="rc_all" lang="fil" />
+    <output filename="strings_google_chrome_fr.rc" type="rc_all" lang="fr" />
+    <output filename="strings_google_chrome_gu.rc" type="rc_all" lang="gu" />
+    <output filename="strings_google_chrome_he.rc" type="rc_all" lang="he" />
+    <output filename="strings_google_chrome_hi.rc" type="rc_all" lang="hi" />
+    <output filename="strings_google_chrome_hr.rc" type="rc_all" lang="hr" />
+    <output filename="strings_google_chrome_hu.rc" type="rc_all" lang="hu" />
+    <output filename="strings_google_chrome_id.rc" type="rc_all" lang="id" />
+    <output filename="strings_google_chrome_it.rc" type="rc_all" lang="it" />
+    <output filename="strings_google_chrome_ja.rc" type="rc_all" lang="ja" />
+    <output filename="strings_google_chrome_kn.rc" type="rc_all" lang="kn" />
+    <output filename="strings_google_chrome_ko.rc" type="rc_all" lang="ko" />
+    <output filename="strings_google_chrome_lt.rc" type="rc_all" lang="lt" />
+    <output filename="strings_google_chrome_lv.rc" type="rc_all" lang="lv" />
+    <output filename="strings_google_chrome_ml.rc" type="rc_all" lang="ml" />
+    <output filename="strings_google_chrome_mr.rc" type="rc_all" lang="mr" />
+    <output filename="strings_google_chrome_nl.rc" type="rc_all" lang="nl" />
+    <output filename="strings_google_chrome_nb.rc" type="rc_all" lang="no" />
     <!-- 'no' for Norwegian Bokmål. It should be 'nb'. -->
-    <output filename="google_chrome_strings_or.rc" type="rc_all" lang="or" />
-    <output filename="google_chrome_strings_pl.rc" type="rc_all" lang="pl" />
-    <output filename="google_chrome_strings_pt-BR.rc" type="rc_all" lang="pt-BR" />
-    <output filename="google_chrome_strings_pt-PT.rc" type="rc_all" lang="pt-PT" />
-    <output filename="google_chrome_strings_ro.rc" type="rc_all" lang="ro" />
-    <output filename="google_chrome_strings_ru.rc" type="rc_all" lang="ru" />
-    <output filename="google_chrome_strings_sk.rc" type="rc_all" lang="sk" />
-    <output filename="google_chrome_strings_sl.rc" type="rc_all" lang="sl" />
-    <output filename="google_chrome_strings_sr.rc" type="rc_all" lang="sr" />
-    <output filename="google_chrome_strings_sv.rc" type="rc_all" lang="sv" />
-    <output filename="google_chrome_strings_ta.rc" type="rc_all" lang="ta" />
-    <output filename="google_chrome_strings_te.rc" type="rc_all" lang="te" />
-    <output filename="google_chrome_strings_th.rc" type="rc_all" lang="th" />
-    <output filename="google_chrome_strings_tr.rc" type="rc_all" lang="tr" />
-    <output filename="google_chrome_strings_uk.rc" type="rc_all" lang="uk" />
-    <output filename="google_chrome_strings_vi.rc" type="rc_all" lang="vi" />
-    <output filename="google_chrome_strings_zh-CN.rc" type="rc_all" lang="zh-CN" />
-    <output filename="google_chrome_strings_zh-TW.rc" type="rc_all" lang="zh-TW" />
+    <output filename="strings_google_chrome_or.rc" type="rc_all" lang="or" />
+    <output filename="strings_google_chrome_pl.rc" type="rc_all" lang="pl" />
+    <output filename="strings_google_chrome_pt-BR.rc" type="rc_all" lang="pt-BR" />
+    <output filename="strings_google_chrome_pt-PT.rc" type="rc_all" lang="pt-PT" />
+    <output filename="strings_google_chrome_ro.rc" type="rc_all" lang="ro" />
+    <output filename="strings_google_chrome_ru.rc" type="rc_all" lang="ru" />
+    <output filename="strings_google_chrome_sk.rc" type="rc_all" lang="sk" />
+    <output filename="strings_google_chrome_sl.rc" type="rc_all" lang="sl" />
+    <output filename="strings_google_chrome_sr.rc" type="rc_all" lang="sr" />
+    <output filename="strings_google_chrome_sv.rc" type="rc_all" lang="sv" />
+    <output filename="strings_google_chrome_ta.rc" type="rc_all" lang="ta" />
+    <output filename="strings_google_chrome_te.rc" type="rc_all" lang="te" />
+    <output filename="strings_google_chrome_th.rc" type="rc_all" lang="th" />
+    <output filename="strings_google_chrome_tr.rc" type="rc_all" lang="tr" />
+    <output filename="strings_google_chrome_uk.rc" type="rc_all" lang="uk" />
+    <output filename="strings_google_chrome_vi.rc" type="rc_all" lang="vi" />
+    <output filename="strings_google_chrome_zh-CN.rc" type="rc_all" lang="zh-CN" />
+    <output filename="strings_google_chrome_zh-TW.rc" type="rc_all" lang="zh-TW" />
 
     <output filename="google_chrome_strings_en-US.pak" type="data_package" lang="en" />
   </outputs>