Bug 717284 - Update "Enable plugins" pref strings to be more l10n friendly. r=mfinkle
authorMargaret Leibovic <margaret.leibovic@gmail.com>
Fri, 13 Jan 2012 11:38:30 -0800
changeset 85666 70cde72e024bcb00eb21401c89932d4c1300de33
parent 85665 1e60b2e0c8a3dbd171e7308dd0785e313bd5f1bd
child 85667 7ea17887bc78be093e3878d14a48fbd4aea6af4e
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs717284
milestone12.0a1
Bug 717284 - Update "Enable plugins" pref strings to be more l10n friendly. r=mfinkle
mobile/android/base/locales/en-US/android_strings.dtd
mobile/android/base/resources/values/arrays.xml
mobile/android/base/resources/xml/preferences.xml
mobile/android/base/strings.xml.in
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -51,20 +51,20 @@
 <!ENTITY pref_telemetry "Send performance data">
 <!ENTITY pref_remember_signons "Remember passwords">
 <!ENTITY pref_cookies "Enable cookies">
 <!ENTITY pref_char_encoding "Show character encoding">
 <!ENTITY pref_clear_history "Clear history">
 <!ENTITY pref_clear_history_confirm "Browsing history will be deleted">
 <!ENTITY pref_clear_private_data "Clear private data">
 <!ENTITY pref_clear_private_data_confirm "Browsing settings, including passwords and cookies, will be deleted">
-<!ENTITY pref_enable_plugins "Enable plugins">
-<!ENTITY pref_enable_plugins_yes "Yes">
-<!ENTITY pref_enable_plugins_tap_to_play "Tap to play">
-<!ENTITY pref_enable_plugins_no "No">
+<!ENTITY pref_plugins "Plugins">
+<!ENTITY pref_plugins_enabled "Enabled">
+<!ENTITY pref_plugins_tap_to_play "Tap to play">
+<!ENTITY pref_plugins_disabled "Disabled">
 <!ENTITY pref_font_size "Font size">
 <!ENTITY pref_font_size_small "Small">
 <!ENTITY pref_font_size_medium "Medium">
 <!ENTITY pref_font_size_large "Large">
 <!ENTITY pref_font_size_xlarge "Extra Large">
 <!ENTITY pref_use_master_password "Use master password">
 
 <!ENTITY quit "Quit">
--- a/mobile/android/base/resources/values/arrays.xml
+++ b/mobile/android/base/resources/values/arrays.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
-    <string-array name="pref_enable_plugins_entries">
-        <item>@string/pref_enable_plugins_yes</item>
-        <item>@string/pref_enable_plugins_tap_to_play</item>
-        <item>@string/pref_enable_plugins_no</item>
+    <string-array name="pref_plugins_entries">
+        <item>@string/pref_plugins_enabled</item>
+        <item>@string/pref_plugins_tap_to_play</item>
+        <item>@string/pref_plugins_disabled</item>
     </string-array>
-    <string-array name="pref_enable_plugins_values">
+    <string-array name="pref_plugins_values">
         <item>1</item>
         <item>2</item>
         <item>0</item>
     </string-array>
     <string-array name="pref_font_size_entries">
         <item>@string/pref_font_size_small</item>
         <item>@string/pref_font_size_medium</item>
         <item>@string/pref_font_size_large</item>
--- a/mobile/android/base/resources/xml/preferences.xml
+++ b/mobile/android/base/resources/xml/preferences.xml
@@ -15,19 +15,19 @@
 
     <PreferenceCategory android:title="@string/pref_category_content">
 
         <CheckBoxPreference android:key="browser.menu.showCharacterEncoding"
                             android:title="@string/pref_char_encoding"
                             android:persistent="false" />
 
         <ListPreference     android:key="plugin.enable"
-                            android:title="@string/pref_enable_plugins"
-                            android:entries="@array/pref_enable_plugins_entries"
-                            android:entryValues="@array/pref_enable_plugins_values"
+                            android:title="@string/pref_plugins"
+                            android:entries="@array/pref_plugins_entries"
+                            android:entryValues="@array/pref_plugins_values"
                             android:persistent="false" />
 
         <ListPreference     android:key="font.size.inflation.minTwips"
                             android:title="@string/pref_font_size"
                             android:entries="@array/pref_font_size_entries"
                             android:entryValues="@array/pref_font_size_values"
                             android:persistent="false" />
 
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -57,20 +57,20 @@
   <string name="pref_telemetry">&pref_telemetry;</string>
   <string name="pref_remember_signons">&pref_remember_signons;</string>
   <string name="pref_cookies">&pref_cookies;</string>
   <string name="pref_char_encoding">&pref_char_encoding;</string>
   <string name="pref_clear_history">&pref_clear_history;</string>
   <string name="pref_clear_history_confirm">&pref_clear_history_confirm;</string>
   <string name="pref_clear_private_data">&pref_clear_private_data;</string>
   <string name="pref_clear_private_data_confirm">&pref_clear_private_data_confirm;</string>
-  <string name="pref_enable_plugins">&pref_enable_plugins;</string>
-  <string name="pref_enable_plugins_yes">&pref_enable_plugins_yes;</string>
-  <string name="pref_enable_plugins_tap_to_play">&pref_enable_plugins_tap_to_play;</string>
-  <string name="pref_enable_plugins_no">&pref_enable_plugins_no;</string>
+  <string name="pref_plugins">&pref_plugins;</string>
+  <string name="pref_plugins_enabled">&pref_plugins_enabled;</string>
+  <string name="pref_plugins_tap_to_play">&pref_plugins_tap_to_play;</string>
+  <string name="pref_plugins_disabled">&pref_plugins_disabled;</string>
   <string name="pref_font_size">&pref_font_size;</string>
   <string name="pref_font_size_small">&pref_font_size_small;</string>
   <string name="pref_font_size_medium">&pref_font_size_medium;</string>
   <string name="pref_font_size_large">&pref_font_size_large;</string>
   <string name="pref_font_size_xlarge">&pref_font_size_xlarge;</string>
 
   <string name="reload">&reload;</string>
   <string name="forward">&forward;</string>