From f81c7156b931192595f6f3333acde66fdfbaa1b0 Mon Sep 17 00:00:00 2001 From: sdefresne Date: Thu, 17 Sep 2015 12:09:37 -0700 Subject: Fix translation of IDS_IOS_ACCEPT_LANGUAGES & IDS_IOS_DEFAULT_ENCODING. Create a new .grd file for locale settings on iOS and move the two strings there. The file is marked as untranslatable and the strings to use their name as id (to allow creating the translated version manually). Add "manual" translation for those two strings for all the locales supported by Chrome on iOS by re-using the translation from the files chrome/app/resources/locale_settings_${locale}.xtb. Update the repacking scripts chrome/tools/build/repack_locales.py and ios/chrome/tools/build/ios_repack_locales.py (and fix a bug in the chrome/tools/build/repack_locales.py on iOS fixed downstream). BUG=531718 Review URL: https://codereview.chromium.org/1348173005 Cr-Commit-Position: refs/heads/master@{#349463} --- ios/chrome/app/strings/ios_locale_settings.grd | 140 +++++++++++++++++++++ ios/chrome/app/strings/ios_strings.grd | 10 -- .../strings/resources/ios_locale_settings_am.xtb | 6 + .../strings/resources/ios_locale_settings_ar.xtb | 6 + .../strings/resources/ios_locale_settings_bg.xtb | 6 + .../strings/resources/ios_locale_settings_bn.xtb | 6 + .../strings/resources/ios_locale_settings_ca.xtb | 6 + .../strings/resources/ios_locale_settings_cs.xtb | 6 + .../strings/resources/ios_locale_settings_da.xtb | 6 + .../strings/resources/ios_locale_settings_de.xtb | 6 + .../strings/resources/ios_locale_settings_el.xtb | 6 + .../resources/ios_locale_settings_en-GB.xtb | 6 + .../resources/ios_locale_settings_es-419.xtb | 6 + .../strings/resources/ios_locale_settings_es.xtb | 6 + .../strings/resources/ios_locale_settings_et.xtb | 6 + .../strings/resources/ios_locale_settings_fa.xtb | 6 + .../strings/resources/ios_locale_settings_fi.xtb | 6 + .../strings/resources/ios_locale_settings_fil.xtb | 6 + .../strings/resources/ios_locale_settings_fr.xtb | 6 + .../strings/resources/ios_locale_settings_gu.xtb | 6 + .../strings/resources/ios_locale_settings_he.xtb | 6 + .../strings/resources/ios_locale_settings_hi.xtb | 6 + .../strings/resources/ios_locale_settings_hr.xtb | 6 + .../strings/resources/ios_locale_settings_hu.xtb | 6 + .../strings/resources/ios_locale_settings_id.xtb | 6 + .../strings/resources/ios_locale_settings_it.xtb | 6 + .../strings/resources/ios_locale_settings_ja.xtb | 6 + .../strings/resources/ios_locale_settings_kn.xtb | 6 + .../strings/resources/ios_locale_settings_ko.xtb | 6 + .../strings/resources/ios_locale_settings_lt.xtb | 6 + .../strings/resources/ios_locale_settings_lv.xtb | 6 + .../strings/resources/ios_locale_settings_ml.xtb | 6 + .../strings/resources/ios_locale_settings_mr.xtb | 6 + .../strings/resources/ios_locale_settings_ms.xtb | 6 + .../strings/resources/ios_locale_settings_nb.xtb | 6 + .../strings/resources/ios_locale_settings_nl.xtb | 6 + .../strings/resources/ios_locale_settings_pl.xtb | 6 + .../resources/ios_locale_settings_pt-BR.xtb | 6 + .../resources/ios_locale_settings_pt-PT.xtb | 6 + .../strings/resources/ios_locale_settings_ro.xtb | 6 + .../strings/resources/ios_locale_settings_ru.xtb | 6 + .../strings/resources/ios_locale_settings_sk.xtb | 6 + .../strings/resources/ios_locale_settings_sl.xtb | 6 + .../strings/resources/ios_locale_settings_sr.xtb | 6 + .../strings/resources/ios_locale_settings_sv.xtb | 6 + .../strings/resources/ios_locale_settings_sw.xtb | 6 + .../strings/resources/ios_locale_settings_ta.xtb | 6 + .../strings/resources/ios_locale_settings_te.xtb | 6 + .../strings/resources/ios_locale_settings_th.xtb | 6 + .../strings/resources/ios_locale_settings_tr.xtb | 6 + .../strings/resources/ios_locale_settings_uk.xtb | 6 + .../strings/resources/ios_locale_settings_vi.xtb | 6 + .../resources/ios_locale_settings_zh-CN.xtb | 6 + .../resources/ios_locale_settings_zh-TW.xtb | 6 + ios/chrome/browser/prefs/browser_prefs.cc | 2 +- ios/chrome/ios_chrome_resources.gyp | 8 ++ ios/chrome/tools/build/ios_repack_locales.py | 4 + 57 files changed, 465 insertions(+), 11 deletions(-) create mode 100644 ios/chrome/app/strings/ios_locale_settings.grd create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_am.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_ar.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_bg.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_bn.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_ca.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_cs.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_da.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_de.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_el.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_en-GB.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_es-419.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_es.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_et.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_fa.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_fi.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_fil.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_fr.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_gu.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_he.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_hi.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_hr.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_hu.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_id.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_it.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_ja.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_kn.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_ko.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_lt.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_lv.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_ml.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_mr.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_ms.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_nb.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_nl.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_pl.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_pt-BR.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_pt-PT.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_ro.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_ru.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_sk.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_sl.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_sr.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_sv.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_sw.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_ta.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_te.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_th.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_tr.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_uk.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_vi.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_zh-CN.xtb create mode 100644 ios/chrome/app/strings/resources/ios_locale_settings_zh-TW.xtb (limited to 'ios') diff --git a/ios/chrome/app/strings/ios_locale_settings.grd b/ios/chrome/app/strings/ios_locale_settings.grd new file mode 100644 index 0000000..ba75f47 --- /dev/null +++ b/ios/chrome/app/strings/ios_locale_settings.grd @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + en-US,en + + + + windows-1252 + + + + diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios_strings.grd index 1dd521c..96098c6 100644 --- a/ios/chrome/app/strings/ios_strings.grd +++ b/ios/chrome/app/strings/ios_strings.grd @@ -130,16 +130,6 @@ all other OS specific variables will be false. - - - en-US,en - - - - - windows-1252 - - Hide keyboard diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_am.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_am.xtb new file mode 100644 index 0000000..78790df --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_am.xtb @@ -0,0 +1,6 @@ + + + +am,en-GB,en +windows-1252 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_ar.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_ar.xtb new file mode 100644 index 0000000..778b064 --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_ar.xtb @@ -0,0 +1,6 @@ + + + +ar,en-US,en +windows-1256 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_bg.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_bg.xtb new file mode 100644 index 0000000..fbe0c79 --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_bg.xtb @@ -0,0 +1,6 @@ + + + +bg-BG,bg +windows-1251 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_bn.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_bn.xtb new file mode 100644 index 0000000..b752dcc --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_bn.xtb @@ -0,0 +1,6 @@ + + + +bn-IN,bn,en-US,en +windows-1252 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_ca.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_ca.xtb new file mode 100644 index 0000000..a10a1c3 --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_ca.xtb @@ -0,0 +1,6 @@ + + + +ca-ES,ca +windows-1252 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_cs.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_cs.xtb new file mode 100644 index 0000000..b0fac89 --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_cs.xtb @@ -0,0 +1,6 @@ + + + +cs-CZ,cs +windows-1250 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_da.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_da.xtb new file mode 100644 index 0000000..f22ad6d --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_da.xtb @@ -0,0 +1,6 @@ + + + +da-DK,da,en-US,en +windows-1252 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_de.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_de.xtb new file mode 100644 index 0000000..45c4e78 --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_de.xtb @@ -0,0 +1,6 @@ + + + +de-DE,de,en-US,en +windows-1252 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_el.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_el.xtb new file mode 100644 index 0000000..272a60a --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_el.xtb @@ -0,0 +1,6 @@ + + + +el-GR,el +ISO-8859-7 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_en-GB.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_en-GB.xtb new file mode 100644 index 0000000..cb6d0c4 --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_en-GB.xtb @@ -0,0 +1,6 @@ + + + +en-GB,en-US,en +windows-1252 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_es-419.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_es-419.xtb new file mode 100644 index 0000000..ba72c7e --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_es-419.xtb @@ -0,0 +1,6 @@ + + + +es-419,es +windows-1252 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_es.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_es.xtb new file mode 100644 index 0000000..1666d80 --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_es.xtb @@ -0,0 +1,6 @@ + + + +es-ES,es +windows-1252 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_et.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_et.xtb new file mode 100644 index 0000000..82fb856 --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_et.xtb @@ -0,0 +1,6 @@ + + + +et-EE,et,en-US,en +windows-1257 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_fa.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_fa.xtb new file mode 100644 index 0000000..63414f3 --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_fa.xtb @@ -0,0 +1,6 @@ + + + +fa,en-US,en +windows-1256 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_fi.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_fi.xtb new file mode 100644 index 0000000..a5f00a5 --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_fi.xtb @@ -0,0 +1,6 @@ + + + +fi-FI,fi,en-US,en +windows-1252 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_fil.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_fil.xtb new file mode 100644 index 0000000..510a0ba --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_fil.xtb @@ -0,0 +1,6 @@ + + + +fil,fil-PH,tl,en-US,en +windows-1252 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_fr.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_fr.xtb new file mode 100644 index 0000000..7353096 --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_fr.xtb @@ -0,0 +1,6 @@ + + + +fr-FR,fr,en-US,en +windows-1252 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_gu.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_gu.xtb new file mode 100644 index 0000000..396827b --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_gu.xtb @@ -0,0 +1,6 @@ + + + +gu-IN,gu,hi-IN,hi,en-US,en +windows-1252 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_he.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_he.xtb new file mode 100644 index 0000000..5a23773 --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_he.xtb @@ -0,0 +1,6 @@ + + + +he-IL,he,en-US,en +windows-1255 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_hi.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_hi.xtb new file mode 100644 index 0000000..0cd96b7 --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_hi.xtb @@ -0,0 +1,6 @@ + + + +hi-IN,hi,en-US,en +windows-1252 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_hr.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_hr.xtb new file mode 100644 index 0000000..d23196b --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_hr.xtb @@ -0,0 +1,6 @@ + + + +hr-HR,hr,en-US,en +windows-1250 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_hu.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_hu.xtb new file mode 100644 index 0000000..749694d --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_hu.xtb @@ -0,0 +1,6 @@ + + + +hu-HU,hu,en-US,en +ISO-8859-2 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_id.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_id.xtb new file mode 100644 index 0000000..e951c01 --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_id.xtb @@ -0,0 +1,6 @@ + + + +id-ID,id,en-US,en +windows-1252 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_it.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_it.xtb new file mode 100644 index 0000000..76e3a0d --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_it.xtb @@ -0,0 +1,6 @@ + + + +it-IT,it,en-US,en +windows-1252 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_ja.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_ja.xtb new file mode 100644 index 0000000..7429037 --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_ja.xtb @@ -0,0 +1,6 @@ + + + +ja,en-US,en +Shift_JIS + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_kn.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_kn.xtb new file mode 100644 index 0000000..dd6b048 --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_kn.xtb @@ -0,0 +1,6 @@ + + + +kn-IN,kn,en-US,en +windows-1252 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_ko.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_ko.xtb new file mode 100644 index 0000000..ba54fea --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_ko.xtb @@ -0,0 +1,6 @@ + + + +ko-KR,ko,en-US,en +windows-949 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_lt.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_lt.xtb new file mode 100644 index 0000000..6e93251 --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_lt.xtb @@ -0,0 +1,6 @@ + + + +lt,en-US,en,ru,pl +windows-1257 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_lv.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_lv.xtb new file mode 100644 index 0000000..63be912 --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_lv.xtb @@ -0,0 +1,6 @@ + + + +lv-LV,lv,en-US,en +windows-1257 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_ml.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_ml.xtb new file mode 100644 index 0000000..293af18 --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_ml.xtb @@ -0,0 +1,6 @@ + + + +ml-IN,ml,en-US,en +windows-1252 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_mr.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_mr.xtb new file mode 100644 index 0000000..5092caa --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_mr.xtb @@ -0,0 +1,6 @@ + + + +mr-IN,mr,hi-IN,hi,en-US,en +windows-1252 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_ms.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_ms.xtb new file mode 100644 index 0000000..077bc34 --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_ms.xtb @@ -0,0 +1,6 @@ + + + +en-US,en +windows-1252 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_nb.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_nb.xtb new file mode 100644 index 0000000..febe7c1 --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_nb.xtb @@ -0,0 +1,6 @@ + + + +nb-NO,nb,no,nn,en-US,en +windows-1252 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_nl.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_nl.xtb new file mode 100644 index 0000000..31a6818 --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_nl.xtb @@ -0,0 +1,6 @@ + + + +nl-NL,nl,en-US,en +windows-1252 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_pl.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_pl.xtb new file mode 100644 index 0000000..1da6643 --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_pl.xtb @@ -0,0 +1,6 @@ + + + +pl-PL,pl,en-US,en +ISO-8859-2 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_pt-BR.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_pt-BR.xtb new file mode 100644 index 0000000..b77073f --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_pt-BR.xtb @@ -0,0 +1,6 @@ + + + +pt-BR,pt,en-US,en +windows-1252 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_pt-PT.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_pt-PT.xtb new file mode 100644 index 0000000..07c2119 --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_pt-PT.xtb @@ -0,0 +1,6 @@ + + + +pt-PT,pt,en-US,en +windows-1252 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_ro.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_ro.xtb new file mode 100644 index 0000000..5d70db3 --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_ro.xtb @@ -0,0 +1,6 @@ + + + +ro-RO,ro,en-US,en +ISO-8859-2 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_ru.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_ru.xtb new file mode 100644 index 0000000..5c9bcce --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_ru.xtb @@ -0,0 +1,6 @@ + + + +ru-RU,ru,en-US,en +windows-1251 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_sk.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_sk.xtb new file mode 100644 index 0000000..c257d65 --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_sk.xtb @@ -0,0 +1,6 @@ + + + +sk-SK,sk,cs,en-US,en +windows-1250 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_sl.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_sl.xtb new file mode 100644 index 0000000..960a66f --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_sl.xtb @@ -0,0 +1,6 @@ + + + +sl-SI,sl,en-GB,en +ISO-8859-2 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_sr.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_sr.xtb new file mode 100644 index 0000000..105ec8e --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_sr.xtb @@ -0,0 +1,6 @@ + + + +sr-RS,sr,en-US,en +windows-1251 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_sv.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_sv.xtb new file mode 100644 index 0000000..c018ae4 --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_sv.xtb @@ -0,0 +1,6 @@ + + + +sv-SE,sv,en-US,en +windows-1252 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_sw.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_sw.xtb new file mode 100644 index 0000000..9164402 --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_sw.xtb @@ -0,0 +1,6 @@ + + + +sw,en-GB,en +windows-1252 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_ta.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_ta.xtb new file mode 100644 index 0000000..4576dbd --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_ta.xtb @@ -0,0 +1,6 @@ + + + +ta-IN,ta,en-US,en +windows-1252 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_te.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_te.xtb new file mode 100644 index 0000000..4599a19 --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_te.xtb @@ -0,0 +1,6 @@ + + + +te-IN,te,hi-IN,hi,en-US,en +windows-1252 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_th.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_th.xtb new file mode 100644 index 0000000..351dc8b --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_th.xtb @@ -0,0 +1,6 @@ + + + +th-TH,th +windows-874 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_tr.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_tr.xtb new file mode 100644 index 0000000..649a8b3 --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_tr.xtb @@ -0,0 +1,6 @@ + + + +tr-TR,tr,en-US,en +ISO-8859-9 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_uk.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_uk.xtb new file mode 100644 index 0000000..eede881 --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_uk.xtb @@ -0,0 +1,6 @@ + + + +uk-UA,uk,ru,en-US,en +windows-1251 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_vi.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_vi.xtb new file mode 100644 index 0000000..16f8b83 --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_vi.xtb @@ -0,0 +1,6 @@ + + + +vi-VN,vi,fr-FR,fr,en-US,en +windows-1258 + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_zh-CN.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_zh-CN.xtb new file mode 100644 index 0000000..6179d2f --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_zh-CN.xtb @@ -0,0 +1,6 @@ + + + +zh-CN,zh +GBK + diff --git a/ios/chrome/app/strings/resources/ios_locale_settings_zh-TW.xtb b/ios/chrome/app/strings/resources/ios_locale_settings_zh-TW.xtb new file mode 100644 index 0000000..c1a2a29 --- /dev/null +++ b/ios/chrome/app/strings/resources/ios_locale_settings_zh-TW.xtb @@ -0,0 +1,6 @@ + + + +zh-TW,zh,en-US,en +Big5 + diff --git a/ios/chrome/browser/prefs/browser_prefs.cc b/ios/chrome/browser/prefs/browser_prefs.cc index 5f260e7..e3aec57 100644 --- a/ios/chrome/browser/prefs/browser_prefs.cc +++ b/ios/chrome/browser/prefs/browser_prefs.cc @@ -26,7 +26,7 @@ #include "ios/chrome/browser/net/http_server_properties_manager_factory.h" #include "ios/chrome/browser/pref_names.h" #include "ios/chrome/browser/signin/signin_manager_factory.h" -#include "ios/chrome/grit/ios_strings.h" +#include "ios/chrome/grit/ios_locale_settings.h" #include "ios/public/provider/chrome/browser/chrome_browser_provider.h" #include "ui/base/l10n/l10n_util.h" diff --git a/ios/chrome/ios_chrome_resources.gyp b/ios/chrome/ios_chrome_resources.gyp index 1d677cf..cadbbe3 100644 --- a/ios/chrome/ios_chrome_resources.gyp +++ b/ios/chrome/ios_chrome_resources.gyp @@ -23,6 +23,14 @@ 'hard_dependency': 1, 'actions': [ { + 'action_name': 'generate_ios_locale_settings', + 'variables': { + 'grit_whitelist': '', + 'grit_grd_file': 'app/strings/ios_locale_settings.grd', + }, + 'includes': [ '../../build/grit_action.gypi' ], + }, + { 'action_name': 'generate_ios_strings', 'variables': { 'grit_whitelist': '', diff --git a/ios/chrome/tools/build/ios_repack_locales.py b/ios/chrome/tools/build/ios_repack_locales.py index 5b3ec71..bd30bc0 100755 --- a/ios/chrome/tools/build/ios_repack_locales.py +++ b/ios/chrome/tools/build/ios_repack_locales.py @@ -56,6 +56,10 @@ def calc_inputs(options, locale): inputs.append(os.path.join(options.share_int_dir, 'ui', 'strings', 'ui_strings_%s.pak' % locale)) + #e.g. 'out/Debug/gen/ios/chrome/ios_locale_settings_da.pak' + inputs.append(os.path.join(options.share_int_dir, 'ios', 'chrome', + 'ios_locale_settings_%s.pak' % locale)) + #e.g. 'out/Debug/gen/ios/chrome/ios_strings_da.pak' inputs.append(os.path.join(options.share_int_dir, 'ios', 'chrome', 'ios_strings_%s.pak' % locale)) -- cgit v1.1