Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / app / resources / locale_settings.grd

diff --git a/src/chrome/app/resources/locale_settings.grd b/src/chrome/app/resources/locale_settings.grd
index c0f6be0..9ce9405 100644 (file)
--- a/src/chrome/app/resources/locale_settings.grd
+++ b/src/chrome/app/resources/locale_settings.grd
@@ -173,7 +173,7 @@
         <include name="IDS_TERMS_HTML" file="terms\terms_chromium.html" type="BINDATA" />
       </if>
 
-      <if expr="not chromeos and _google_chrome">
+      <if expr="not chromeos and not is_android and _google_chrome">
         <if expr="'am' == lang">    <include name="IDS_TERMS_HTML" file="terms\terms_am.html" type="BINDATA" /></if>
         <if expr="'ar' == lang">    <include name="IDS_TERMS_HTML" file="terms\terms_ar.html" type="BINDATA" /></if>
         <if expr="'bg' == lang">    <include name="IDS_TERMS_HTML" file="terms\terms_bg.html" type="BINDATA" /></if>
@@ -228,7 +228,7 @@
         <if expr="'zh-TW' == lang"> <include name="IDS_TERMS_HTML" file="terms\terms_zh-TW.html" type="BINDATA" /></if>
       </if>
 
-      <if expr="not chromeos and not _google_chrome">
+      <if expr="not chromeos and not is_android and not _google_chrome">
         <include name="IDS_TERMS_HTML" file="terms\terms_chromium.html" type="BINDATA" />
       </if>
     </includes>
@@ -241,7 +241,7 @@
 
       <!-- The default value for |WebPreference::default_encoding|. -->
       <message name="IDS_DEFAULT_ENCODING" use_name_for_id="true">
-        ISO-8859-1
+        windows-1252
       </message>
 
       <!-- The default value for |WebPreference::uses_universal_detector|. -->
@@ -317,7 +317,7 @@
 
       <!-- Locale-dependent static encodings string -->
       <message name="IDS_STATIC_ENCODING_LIST" use_name_for_id="true">
-        ISO-8859-1,windows-1252
+        windows-1252
       </message>
 
       <!-- The URL for the the Welcome to Chrome page shown on first run. -->