commit cae4cd67651680a623e09153fe53dc98f404636b
author Kenny Root <kroot@google.com> Tue Apr 27 14:22:32 2010 -0700
committer Kenny Root <kroot@google.com> Tue Apr 27 14:26:34 2010 -0700
tree 142651f4ea4c2256580d4e2c6bccac187bb49c0a
parent faea5646b25a94c669c5c63474d6c1c943599bea

Do not translate Latin-1 setting

The string used for comparison against actual encoding values was being
translated into different languages which made it not match any
available possible values.

This change corrects that and also adds in the case to use "SHIFT_JIS"
that the Japanese translators had put in when it was translatable.

Change-Id: I276bf4c8b2a150e9c2926633ed972bf3f3423831

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6844cbc..18a2144 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -483,7 +483,7 @@
         <item>SHIFT_JIS</item>
         <item>EUC-JP</item>
     </string-array>
-    <string name="pref_default_text_encoding_default">Latin-1</string>
+    <string name="pref_default_text_encoding_default" translatable="false">Latin-1</string>
     <!-- Title for a dialog displayed when the browser has a data connectivity
             problem -->
     <string name="browserFrameNetworkErrorLabel">Data connectivity problem</string>