summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsdefresne <sdefresne@chromium.org>2015-09-17 12:09:37 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-17 19:11:34 +0000
commitf81c7156b931192595f6f3333acde66fdfbaa1b0 (patch)
tree45a8096e57065c281015dbb9a26a182b3ee9fc8d
parent79869a857063f10d1a86b7ce9bf32c73aeaf79be (diff)
downloadchromium_src-f81c7156b931192595f6f3333acde66fdfbaa1b0.zip
chromium_src-f81c7156b931192595f6f3333acde66fdfbaa1b0.tar.gz
chromium_src-f81c7156b931192595f6f3333acde66fdfbaa1b0.tar.bz2
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}
-rwxr-xr-xchrome/tools/build/repack_locales.py14
-rw-r--r--ios/chrome/app/strings/ios_locale_settings.grd140
-rw-r--r--ios/chrome/app/strings/ios_strings.grd10
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_am.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_ar.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_bg.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_bn.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_ca.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_cs.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_da.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_de.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_el.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_en-GB.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_es-419.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_es.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_et.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_fa.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_fi.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_fil.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_fr.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_gu.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_he.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_hi.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_hr.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_hu.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_id.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_it.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_ja.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_kn.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_ko.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_lt.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_lv.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_ml.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_mr.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_ms.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_nb.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_nl.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_pl.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_pt-BR.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_pt-PT.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_ro.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_ru.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_sk.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_sl.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_sr.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_sv.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_sw.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_ta.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_te.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_th.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_tr.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_uk.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_vi.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_zh-CN.xtb6
-rw-r--r--ios/chrome/app/strings/resources/ios_locale_settings_zh-TW.xtb6
-rw-r--r--ios/chrome/browser/prefs/browser_prefs.cc2
-rw-r--r--ios/chrome/ios_chrome_resources.gyp8
-rwxr-xr-xios/chrome/tools/build/ios_repack_locales.py4
-rw-r--r--tools/gritsettings/resource_ids11
-rw-r--r--tools/gritsettings/translation_expectations.pyl1
60 files changed, 485 insertions, 17 deletions
diff --git a/chrome/tools/build/repack_locales.py b/chrome/tools/build/repack_locales.py
index 3ed2c84..d6209a4 100755
--- a/chrome/tools/build/repack_locales.py
+++ b/chrome/tools/build/repack_locales.py
@@ -122,9 +122,19 @@ def calc_inputs(locale):
'app_locale_settings_%s.pak' % locale))
else:
- #e.g. '<(SHARED_INTERMEDIATE_DIR)/ios/chrome/ios_strings_resources_da.pak'
+ #e.g. '<(SHARED_INTERMEDIATE_DIR)/ios/chrome/ios_locale_settings_da.pak'
inputs.append(os.path.join(SHARE_INT_DIR, 'ios', 'chrome',
- 'ios_strings_resources_%s.pak' % locale))
+ 'ios_locale_settings_%s.pak' % locale))
+
+ #e.g. '<(SHARED_INTERMEDIATE_DIR)/ios/chrome/ios_strings_da.pak'
+ inputs.append(os.path.join(SHARE_INT_DIR, 'ios', 'chrome',
+ 'ios_strings_%s.pak' % locale))
+
+ #e.g. '<(SHARED_INTERMEDIATE_DIR)/ios/chrome/ios_chromium_strings_da.pak'
+ # or '<(SHARED_INTERMEDIATE_DIR)/ios/chrome/
+ # ios_google_chrome_strings_da.pak'
+ inputs.append(os.path.join(SHARE_INT_DIR, 'ios', 'chrome',
+ 'ios_%s_strings_%s.pak' % (BRANDING, locale)))
if ENABLE_AUTOFILL_DIALOG:
#e.g. '<(SHARED_INTERMEDIATE_DIR)/third_party/libaddressinput/
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+This file contains definition of resources that will be translated for each
+locale. The variables is_win, is_macosx, is_linux, is_ios and is_posix are
+available for making strings OS specific. Other platform defines such as
+use_titlecase are declared in build/common.gypi.
+
+The strings in this file are specific to iOS, thus is_ios will be true and
+all other OS specific variables will be false.
+-->
+
+<grit base_dir="." latest_public_release="0" current_release="1"
+ source_lang_id="en" enc_check="möl">
+ <outputs>
+ <output filename="grit/ios_locale_settings.h" type="rc_header">
+ <emit emit_type="prepend"></emit>
+ </output>
+ <output filename="ios_locale_settings_am.pak" type="data_package" lang="am" />
+ <output filename="ios_locale_settings_ar.pak" type="data_package" lang="ar" />
+ <output filename="ios_locale_settings_bg.pak" type="data_package" lang="bg" />
+ <output filename="ios_locale_settings_bn.pak" type="data_package" lang="bn" />
+ <output filename="ios_locale_settings_ca.pak" type="data_package" lang="ca" />
+ <output filename="ios_locale_settings_cs.pak" type="data_package" lang="cs" />
+ <output filename="ios_locale_settings_da.pak" type="data_package" lang="da" />
+ <output filename="ios_locale_settings_de.pak" type="data_package" lang="de" />
+ <output filename="ios_locale_settings_el.pak" type="data_package" lang="el" />
+ <output filename="ios_locale_settings_en-GB.pak" type="data_package" lang="en-GB" />
+ <output filename="ios_locale_settings_en-US.pak" type="data_package" lang="en" />
+ <output filename="ios_locale_settings_es.pak" type="data_package" lang="es" />
+ <output filename="ios_locale_settings_es-MX.pak" type="data_package" lang="es-419" />
+ <output filename="ios_locale_settings_et.pak" type="data_package" lang="et" />
+ <output filename="ios_locale_settings_fa.pak" type="data_package" lang="fa" />
+ <output filename="ios_locale_settings_fake-bidi.pak" type="data_package" lang="fake-bidi" />
+ <output filename="ios_locale_settings_fi.pak" type="data_package" lang="fi" />
+ <output filename="ios_locale_settings_fil.pak" type="data_package" lang="fil" />
+ <output filename="ios_locale_settings_fr.pak" type="data_package" lang="fr" />
+ <output filename="ios_locale_settings_gu.pak" type="data_package" lang="gu" />
+ <output filename="ios_locale_settings_he.pak" type="data_package" lang="he" />
+ <output filename="ios_locale_settings_hi.pak" type="data_package" lang="hi" />
+ <output filename="ios_locale_settings_hr.pak" type="data_package" lang="hr" />
+ <output filename="ios_locale_settings_hu.pak" type="data_package" lang="hu" />
+ <output filename="ios_locale_settings_id.pak" type="data_package" lang="id" />
+ <output filename="ios_locale_settings_it.pak" type="data_package" lang="it" />
+ <output filename="ios_locale_settings_ja.pak" type="data_package" lang="ja" />
+ <output filename="ios_locale_settings_kn.pak" type="data_package" lang="kn" />
+ <output filename="ios_locale_settings_ko.pak" type="data_package" lang="ko" />
+ <output filename="ios_locale_settings_lt.pak" type="data_package" lang="lt" />
+ <output filename="ios_locale_settings_lv.pak" type="data_package" lang="lv" />
+ <output filename="ios_locale_settings_ml.pak" type="data_package" lang="ml" />
+ <output filename="ios_locale_settings_mr.pak" type="data_package" lang="mr" />
+ <output filename="ios_locale_settings_ms.pak" type="data_package" lang="ms" />
+ <output filename="ios_locale_settings_nl.pak" type="data_package" lang="nl" />
+ <output filename="ios_locale_settings_nb.pak" type="data_package" lang="no" />
+ <output filename="ios_locale_settings_pl.pak" type="data_package" lang="pl" />
+ <output filename="ios_locale_settings_pt.pak" type="data_package" lang="pt-BR" />
+ <output filename="ios_locale_settings_pt-PT.pak" type="data_package" lang="pt-PT" />
+ <output filename="ios_locale_settings_ro.pak" type="data_package" lang="ro" />
+ <output filename="ios_locale_settings_ru.pak" type="data_package" lang="ru" />
+ <output filename="ios_locale_settings_sk.pak" type="data_package" lang="sk" />
+ <output filename="ios_locale_settings_sl.pak" type="data_package" lang="sl" />
+ <output filename="ios_locale_settings_sr.pak" type="data_package" lang="sr" />
+ <output filename="ios_locale_settings_sv.pak" type="data_package" lang="sv" />
+ <output filename="ios_locale_settings_sw.pak" type="data_package" lang="sw" />
+ <output filename="ios_locale_settings_ta.pak" type="data_package" lang="ta" />
+ <output filename="ios_locale_settings_te.pak" type="data_package" lang="te" />
+ <output filename="ios_locale_settings_th.pak" type="data_package" lang="th" />
+ <output filename="ios_locale_settings_tr.pak" type="data_package" lang="tr" />
+ <output filename="ios_locale_settings_uk.pak" type="data_package" lang="uk" />
+ <output filename="ios_locale_settings_vi.pak" type="data_package" lang="vi" />
+ <output filename="ios_locale_settings_zh-CN.pak" type="data_package" lang="zh-CN" />
+ <output filename="ios_locale_settings_zh-TW.pak" type="data_package" lang="zh-TW" />
+ </outputs>
+ <translations>
+ <file path="resources/ios_locale_settings_am.xtb" lang="am" />
+ <file path="resources/ios_locale_settings_ar.xtb" lang="ar" />
+ <file path="resources/ios_locale_settings_bg.xtb" lang="bg" />
+ <file path="resources/ios_locale_settings_bn.xtb" lang="bn" />
+ <file path="resources/ios_locale_settings_ca.xtb" lang="ca" />
+ <file path="resources/ios_locale_settings_cs.xtb" lang="cs" />
+ <file path="resources/ios_locale_settings_da.xtb" lang="da" />
+ <file path="resources/ios_locale_settings_de.xtb" lang="de" />
+ <file path="resources/ios_locale_settings_el.xtb" lang="el" />
+ <file path="resources/ios_locale_settings_en-GB.xtb" lang="en-GB" />
+ <file path="resources/ios_locale_settings_es.xtb" lang="es" />
+ <file path="resources/ios_locale_settings_es-419.xtb" lang="es-419" />
+ <file path="resources/ios_locale_settings_et.xtb" lang="et" />
+ <file path="resources/ios_locale_settings_fa.xtb" lang="fa" />
+ <file path="resources/ios_locale_settings_fi.xtb" lang="fi" />
+ <file path="resources/ios_locale_settings_fil.xtb" lang="fil" />
+ <file path="resources/ios_locale_settings_fr.xtb" lang="fr" />
+ <file path="resources/ios_locale_settings_gu.xtb" lang="gu" />
+ <file path="resources/ios_locale_settings_hi.xtb" lang="hi" />
+ <file path="resources/ios_locale_settings_hr.xtb" lang="hr" />
+ <file path="resources/ios_locale_settings_hu.xtb" lang="hu" />
+ <file path="resources/ios_locale_settings_id.xtb" lang="id" />
+ <file path="resources/ios_locale_settings_it.xtb" lang="it" />
+ <file path="resources/ios_locale_settings_he.xtb" lang="he" />
+ <file path="resources/ios_locale_settings_ja.xtb" lang="ja" />
+ <file path="resources/ios_locale_settings_kn.xtb" lang="kn" />
+ <file path="resources/ios_locale_settings_ko.xtb" lang="ko" />
+ <file path="resources/ios_locale_settings_lt.xtb" lang="lt" />
+ <file path="resources/ios_locale_settings_lv.xtb" lang="lv" />
+ <file path="resources/ios_locale_settings_ml.xtb" lang="ml" />
+ <file path="resources/ios_locale_settings_mr.xtb" lang="mr" />
+ <file path="resources/ios_locale_settings_ms.xtb" lang="ms" />
+ <file path="resources/ios_locale_settings_nl.xtb" lang="nl" />
+ <file path="resources/ios_locale_settings_nb.xtb" lang="no" />
+ <file path="resources/ios_locale_settings_pl.xtb" lang="pl" />
+ <file path="resources/ios_locale_settings_pt-BR.xtb" lang="pt-BR" />
+ <file path="resources/ios_locale_settings_pt-PT.xtb" lang="pt-PT" />
+ <file path="resources/ios_locale_settings_ro.xtb" lang="ro" />
+ <file path="resources/ios_locale_settings_ru.xtb" lang="ru" />
+ <file path="resources/ios_locale_settings_sk.xtb" lang="sk" />
+ <file path="resources/ios_locale_settings_sl.xtb" lang="sl" />
+ <file path="resources/ios_locale_settings_sr.xtb" lang="sr" />
+ <file path="resources/ios_locale_settings_sv.xtb" lang="sv" />
+ <file path="resources/ios_locale_settings_sw.xtb" lang="sw" />
+ <file path="resources/ios_locale_settings_ta.xtb" lang="ta" />
+ <file path="resources/ios_locale_settings_te.xtb" lang="te" />
+ <file path="resources/ios_locale_settings_th.xtb" lang="th" />
+ <file path="resources/ios_locale_settings_tr.xtb" lang="tr" />
+ <file path="resources/ios_locale_settings_uk.xtb" lang="uk" />
+ <file path="resources/ios_locale_settings_vi.xtb" lang="vi" />
+ <file path="resources/ios_locale_settings_zh-CN.xtb" lang="zh-CN" />
+ <file path="resources/ios_locale_settings_zh-TW.xtb" lang="zh-TW" />
+ </translations>
+ <release seq="1" allow_pseudo="false">
+ <messages fallback_to_english="true">
+ <!-- The default value for HTTP Accept-Language header. -->
+ <message name="IDS_IOS_ACCEPT_LANGUAGES" use_name_for_id="true">
+ en-US,en
+ </message>
+ <!-- The default value for |WebPreference::default_encoding|. -->
+ <message name="IDS_IOS_DEFAULT_ENCODING" use_name_for_id="true">
+ windows-1252
+ </message>
+ </messages>
+ </release>
+</grit>
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.
</translations>
<release seq="1" allow_pseudo="false">
<messages fallback_to_english="true">
- <!-- The default value for HTTP Accept-Language header. -->
- <message name="IDS_IOS_ACCEPT_LANGUAGES" translateable="false">
- en-US,en
- </message>
-
- <!-- The default value for |WebPreference::default_encoding|. -->
- <message name="IDS_IOS_DEFAULT_ENCODING" translateable="false">
- windows-1252
- </message>
-
<message name="IDS_IOS_AUTOFILL_ACCNAME_HIDE_KEYBOARD" desc="The accessible name for the hide keyboard button in the keyboard accessory shown when filling out forms. [Length: unlimited] [iOS only]">
Hide keyboard
</message>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="am">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">am,en-GB,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1252</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="ar">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">ar,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1256</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="bg">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">bg-BG,bg</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1251</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="bn">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">bn-IN,bn,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1252</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="ca">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">ca-ES,ca</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1252</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="cs">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">cs-CZ,cs</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1250</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="da">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">da-DK,da,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1252</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="de">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">de-DE,de,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1252</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="el">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">el-GR,el</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">ISO-8859-7</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="en-GB">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">en-GB,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1252</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="es-419">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">es-419,es</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1252</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="es">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">es-ES,es</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1252</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="et">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">et-EE,et,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1257</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="fa">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">fa,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1256</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="fi">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">fi-FI,fi,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1252</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="fil">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">fil,fil-PH,tl,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1252</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="fr">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">fr-FR,fr,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1252</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="gu">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">gu-IN,gu,hi-IN,hi,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1252</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="he">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">he-IL,he,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1255</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="hi">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">hi-IN,hi,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1252</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="hr">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">hr-HR,hr,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1250</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="hu">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">hu-HU,hu,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">ISO-8859-2</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="id">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">id-ID,id,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1252</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="it">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">it-IT,it,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1252</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="ja">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">ja,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">Shift_JIS</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="kn">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">kn-IN,kn,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1252</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="ko">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">ko-KR,ko,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-949</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="lt">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">lt,en-US,en,ru,pl</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1257</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="lv">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">lv-LV,lv,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1257</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="ml">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">ml-IN,ml,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1252</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="mr">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">mr-IN,mr,hi-IN,hi,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1252</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="ms">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1252</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="no">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">nb-NO,nb,no,nn,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1252</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="nl">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">nl-NL,nl,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1252</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="pl">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">pl-PL,pl,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">ISO-8859-2</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="pt-BR">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">pt-BR,pt,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1252</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="pt-PT">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">pt-PT,pt,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1252</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="ro">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">ro-RO,ro,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">ISO-8859-2</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="ru">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">ru-RU,ru,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1251</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="sk">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">sk-SK,sk,cs,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1250</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="sl">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">sl-SI,sl,en-GB,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">ISO-8859-2</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="sr">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">sr-RS,sr,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1251</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="sv">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">sv-SE,sv,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1252</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="sw">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">sw,en-GB,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1252</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="ta">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">ta-IN,ta,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1252</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="te">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">te-IN,te,hi-IN,hi,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1252</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="th">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">th-TH,th</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-874</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="tr">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">tr-TR,tr,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">ISO-8859-9</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="uk">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">uk-UA,uk,ru,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1251</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="vi">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">vi-VN,vi,fr-FR,fr,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">windows-1258</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="zh-CN">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">zh-CN,zh</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">GBK</translation>
+</translationbundle>
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 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="zh-TW">
+<translation id="IDS_IOS_ACCEPT_LANGUAGES">zh-TW,zh,en-US,en</translation>
+<translation id="IDS_IOS_DEFAULT_ENCODING">Big5</translation>
+</translationbundle>
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))
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
index 5794db7..e3e1dd6 100644
--- a/tools/gritsettings/resource_ids
+++ b/tools/gritsettings/resource_ids
@@ -173,20 +173,23 @@
},
# iOS resources overlap with android_webview, ash, chromeos and extensions_api,
# as these are not used on iOS.
- "ios/chrome/app/strings/ios_strings.grd": {
+ "ios/chrome/app/strings/ios_locale_settings.grd": {
"messages": [25650],
},
+ "ios/chrome/app/strings/ios_strings.grd": {
+ "messages": [25655],
+ },
# Chromium strings and Google Chrome strings must start at the same id.
# We only use one file depending on whether we're building Chromium or
# Google Chrome.
"ios/chrome/app/strings/ios_chromium_strings.grd": {
- "messages": [26550],
+ "messages": [26555],
},
"ios/chrome/app/strings/ios_google_chrome_strings.grd": {
- "messages": [26550],
+ "messages": [26555],
},
"ios/chrome/app/theme/ios_theme_resources.grd": {
- "structures": [26650],
+ "structures": [26655],
},
"ash/ash_strings.grd": {
"messages": [25650],
diff --git a/tools/gritsettings/translation_expectations.pyl b/tools/gritsettings/translation_expectations.pyl
index fd4494a..bc33f87 100644
--- a/tools/gritsettings/translation_expectations.pyl
+++ b/tools/gritsettings/translation_expectations.pyl
@@ -64,6 +64,7 @@
"chromecast/app/resources/chromecast_settings.grd": "Not UI strings; localized separately",
"cloud_print/service/win/service_resources.grd": "Separate release process",
"cloud_print/virtual_driver/win/install/virtual_driver_setup_resources.grd": "Separate release process",
+ "ios/chrome/app/strings/ios_locale_settings.grd": "Not UI strings; localized separately",
"ui/strings/app_locale_settings.grd": "Not UI strings; localized separately",
},
}