Index: components/components_locale_settings.grd |
diff --git a/components/components_locale_settings.grd b/components/components_locale_settings.grd |
index 56f08b2069c65e9d5de3e92673ba5009c4cf361b..1059fcaae0cf5442b25520d88b1d02bf35603ad5 100644 |
--- a/components/components_locale_settings.grd |
+++ b/components/components_locale_settings.grd |
@@ -72,6 +72,56 @@ |
<output filename="components_locale_settings_vi.pak" type="data_package" lang="vi" /> |
<output filename="components_locale_settings_zh-CN.pak" type="data_package" lang="zh-CN" /> |
<output filename="components_locale_settings_zh-TW.pak" type="data_package" lang="zh-TW" /> |
+ |
+ <!-- On Android, output some strings into Android's xml string format. |
+ These strings are tagged with formatter_data="android_java" --> |
+ <if expr="is_android"> |
+ <output filename="java/res/values-am/components_locale_settings.xml" lang="am" type="android" context="android_java" /> |
+ <output filename="java/res/values-ar/components_locale_settings.xml" lang="ar" type="android" context="android_java" /> |
+ <output filename="java/res/values-bg/components_locale_settings.xml" lang="bg" type="android" context="android_java" /> |
+ <output filename="java/res/values-ca/components_locale_settings.xml" lang="ca" type="android" context="android_java" /> |
+ <output filename="java/res/values-cs/components_locale_settings.xml" lang="cs" type="android" context="android_java" /> |
+ <output filename="java/res/values-da/components_locale_settings.xml" lang="da" type="android" context="android_java" /> |
+ <output filename="java/res/values-de/components_locale_settings.xml" lang="de" type="android" context="android_java" /> |
+ <output filename="java/res/values-el/components_locale_settings.xml" lang="el" type="android" context="android_java" /> |
+ <output filename="java/res/values/components_locale_settings.xml" lang="en" type="android" context="android_java" /> |
+ <output filename="java/res/values-en-rGB/components_locale_settings.xml" lang="en-GB" type="android" context="android_java" /> |
+ <output filename="java/res/values-es/components_locale_settings.xml" lang="es" type="android" context="android_java" /> |
+ <output filename="java/res/values-es-rUS/components_locale_settings.xml" lang="es-419" type="android" context="android_java" /> |
+ <output filename="java/res/values-fa/components_locale_settings.xml" lang="fa" type="android" context="android_java" /> |
+ <output filename="java/res/values-fi/components_locale_settings.xml" lang="fi" type="android" context="android_java" /> |
+ <output filename="java/res/values-tl/components_locale_settings.xml" lang="fil" type="android" context="android_java" /> |
+ <output filename="java/res/values-fr/components_locale_settings.xml" lang="fr" type="android" context="android_java" /> |
+ <output filename="java/res/values-hi/components_locale_settings.xml" lang="hi" type="android" context="android_java" /> |
+ <output filename="java/res/values-hr/components_locale_settings.xml" lang="hr" type="android" context="android_java" /> |
+ <output filename="java/res/values-hu/components_locale_settings.xml" lang="hu" type="android" context="android_java" /> |
+ <output filename="java/res/values-in/components_locale_settings.xml" lang="id" type="android" context="android_java" /> |
+ <output filename="java/res/values-it/components_locale_settings.xml" lang="it" type="android" context="android_java" /> |
+ <output filename="java/res/values-iw/components_locale_settings.xml" lang="he" type="android" context="android_java" /> |
+ <output filename="java/res/values-ja/components_locale_settings.xml" lang="ja" type="android" context="android_java" /> |
+ <output filename="java/res/values-ko/components_locale_settings.xml" lang="ko" type="android" context="android_java" /> |
+ <output filename="java/res/values-lt/components_locale_settings.xml" lang="lt" type="android" context="android_java" /> |
+ <output filename="java/res/values-lv/components_locale_settings.xml" lang="lv" type="android" context="android_java" /> |
+ <output filename="java/res/values-nl/components_locale_settings.xml" lang="nl" type="android" context="android_java" /> |
+ <output filename="java/res/values-nb/components_locale_settings.xml" lang="no" type="android" context="android_java" /> |
+ <output filename="java/res/values-pl/components_locale_settings.xml" lang="pl" type="android" context="android_java" /> |
+ <output filename="java/res/values-pt-rBR/components_locale_settings.xml" lang="pt-BR" type="android" context="android_java" /> |
+ <output filename="java/res/values-pt-rPT/components_locale_settings.xml" lang="pt-PT" type="android" context="android_java" /> |
+ <output filename="java/res/values-ro/components_locale_settings.xml" lang="ro" type="android" context="android_java" /> |
+ <output filename="java/res/values-ru/components_locale_settings.xml" lang="ru" type="android" context="android_java" /> |
+ <output filename="java/res/values-sk/components_locale_settings.xml" lang="sk" type="android" context="android_java" /> |
+ <output filename="java/res/values-sl/components_locale_settings.xml" lang="sl" type="android" context="android_java" /> |
+ <output filename="java/res/values-sr/components_locale_settings.xml" lang="sr" type="android" context="android_java" /> |
+ <output filename="java/res/values-sv/components_locale_settings.xml" lang="sv" type="android" context="android_java" /> |
+ <output filename="java/res/values-sw/components_locale_settings.xml" lang="sw" type="android" context="android_java" /> |
+ <output filename="java/res/values-th/components_locale_settings.xml" lang="th" type="android" context="android_java" /> |
+ <output filename="java/res/values-tr/components_locale_settings.xml" lang="tr" type="android" context="android_java" /> |
+ <output filename="java/res/values-uk/components_locale_settings.xml" lang="uk" type="android" context="android_java" /> |
+ <output filename="java/res/values-vi/components_locale_settings.xml" lang="vi" type="android" context="android_java" /> |
+ <output filename="java/res/values-zh-rCN/components_locale_settings.xml" lang="zh-CN" type="android" context="android_java" /> |
+ <output filename="java/res/values-zh/components_locale_settings.xml" lang="zh-TW" type="android" context="android_java" /> |
+ </if> |
+ |
</outputs> |
<translations> |
<file path="strings/components_locale_settings_am.xtb" lang="am" /> |
@@ -200,7 +250,7 @@ |
<messages fallback_to_english="true"> |
<!-- The default value for HTTP Accept-Language header. --> |
- <message name="IDS_ACCEPT_LANGUAGES" use_name_for_id="true"> |
+ <message name="IDS_ACCEPT_LANGUAGES" use_name_for_id="true" formatter_data="android_java"> |
en-US,en |
</message> |