Bug 709921 - (2/2) Rename "Preferences" to "Settings" for Android fennec [r=cpeterson]
authorMatt Brubeck <mbrubeck@mozilla.com>
Tue, 20 Dec 2011 08:33:25 -0800
changeset 83113 c7101dec8deb827a2c91eafe3ba2fafd506fc8c9
parent 83112 05720c79f740e7bfbfbf8e14aedd73afd0e64010
child 83130 a8506ab2c65480cf2f85f54e203ea746522c62bb
push id21731
push usermbrubeck@mozilla.com
push dateTue, 20 Dec 2011 16:34:58 +0000
treeherdermozilla-central@c7101dec8deb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscpeterson
bugs709921
milestone11.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 709921 - (2/2) Rename "Preferences" to "Settings" for Android fennec [r=cpeterson]
mobile/android/base/AndroidManifest.xml.in
mobile/android/base/GeckoApp.java
mobile/android/base/locales/en-US/android_strings.dtd
mobile/android/base/resources/layout/gecko_menu.xml
mobile/android/base/strings.xml.in
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -132,17 +132,17 @@
                   android:windowSoftInputMode="stateAlwaysVisible|adjustResize"/>
 
         <activity android:name="org.mozilla.gecko.TabsTray"
                   android:theme="@style/Gecko.Translucent"
                   android:launchMode="singleTask"/>
 
         <activity android:name="org.mozilla.gecko.GeckoPreferences"
                   android:theme="@style/Gecko.TitleBar"
-                  android:label="@string/preferences_title"
+                  android:label="@string/settings_title"
                   android:excludeFromRecents="true"/>
 
         <provider android:name="@ANDROID_PACKAGE_NAME@.db.BrowserProvider"
                   android:authorities="@ANDROID_PACKAGE_NAME@.db.browser"
                   android:permission="@ANDROID_PACKAGE_NAME@.permissions.BROWSER_PROVIDER"/>
 
     </application>
 
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -445,17 +445,17 @@ abstract public class GeckoApp
                         });
                     }
                 }
                 mi.setOnMenuItemClickListener(item);
             }
         }
 
         if (!sIsGeckoReady)
-            aMenu.findItem(R.id.preferences).setEnabled(false);
+            aMenu.findItem(R.id.settings).setEnabled(false);
 
         Tab tab = Tabs.getInstance().getSelectedTab();
         MenuItem bookmark = aMenu.findItem(R.id.bookmark);
         MenuItem forward = aMenu.findItem(R.id.forward);
         MenuItem share = aMenu.findItem(R.id.share);
         MenuItem agentMode = aMenu.findItem(R.id.agent_mode);
         MenuItem saveAsPDF = aMenu.findItem(R.id.save_as_pdf);
 
@@ -535,17 +535,17 @@ abstract public class GeckoApp
                 doReload();
                 return true;
             case R.id.forward:
                 doForward();
                 return true;
             case R.id.save_as_pdf:
                 GeckoAppShell.sendEventToGecko(new GeckoEvent("SaveAs:PDF", null));
                 return true;
-            case R.id.preferences:
+            case R.id.settings:
                 intent = new Intent(this, GeckoPreferences.class);
                 startActivity(intent);
                 return true;
             case R.id.site_settings:
                 GeckoAppShell.sendEventToGecko(new GeckoEvent("Permissions:Get", null));
                 return true;
             case R.id.addons:
                 loadUrlInNewTab("about:addons");
@@ -933,17 +933,17 @@ abstract public class GeckoApp
                 handleDoorHanger(message);
             } else if (event.equals("Doorhanger:Remove")) {
                 handleDoorHangerRemove(message);
             } else if (event.equals("Gecko:Ready")) {
                 sIsGeckoReady = true;
                 mMainHandler.post(new Runnable() {
                     public void run() {
                         if (sMenu != null)
-                            sMenu.findItem(R.id.preferences).setEnabled(true);
+                            sMenu.findItem(R.id.settings).setEnabled(true);
                     }
                 });
                 setLaunchState(GeckoApp.LaunchState.GeckoRunning);
                 GeckoAppShell.sendPendingEventsToGecko();
                 connectGeckoLayerClient();
             } else if (event.equals("ToggleChrome:Hide")) {
                 mMainHandler.post(new Runnable() {
                     public void run() {
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -38,18 +38,18 @@
 <!ENTITY history_week_section "7 days ago">
 <!ENTITY history_older_section "Older than 7 days">
 
 <!ENTITY reload "Reload">
 <!ENTITY forward "Forward">
 
 <!ENTITY new_tab "New Tab">
 
-<!ENTITY preferences "Preferences">
-<!ENTITY preferences_title "Preferences">
+<!ENTITY settings "Settings">
+<!ENTITY settings_title "Settings">
 <!ENTITY pref_category_general "General">
 <!ENTITY pref_category_privacy "Privacy &amp; Security">
 <!ENTITY pref_category_content "Content">
 <!ENTITY pref_about_firefox "About &brandShortName;">
 <!ENTITY pref_do_not_track "Tell sites not to track me">
 <!ENTITY pref_telemetry "Send performance data">
 <!ENTITY pref_homepage "Home page">
 <!ENTITY pref_homepage_start "Firefox Start">
--- a/mobile/android/base/resources/layout/gecko_menu.xml
+++ b/mobile/android/base/resources/layout/gecko_menu.xml
@@ -19,18 +19,18 @@
     
     <item android:id="@+id/save_as_pdf"
           android:icon="@drawable/ic_menu_save_as_pdf"
           android:title="@string/save_as_pdf" />
 
     <item android:id="@+id/agent_mode"
           android:title="@string/agent_request_desktop" />
 
-    <item android:id="@+id/preferences"
-          android:title="@string/preferences" />
+    <item android:id="@+id/settings"
+          android:title="@string/settings" />
 
     <item android:id="@+id/site_settings"
           android:title="@string/site_settings_title" />
 
     <item android:id="@+id/addons"
           android:title="@string/addons"/>
 
     <item android:id="@+id/quit"
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -44,18 +44,18 @@
   <string name="history_week_section">&history_week_section;</string>
   <string name="history_older_section">&history_older_section;</string>
 
   <string name="share">&share;</string>
   <string name="save_as_pdf">&save_as_pdf;</string>
   <string name="agent_request_desktop">&agent_request_desktop;</string>
   <string name="agent_request_mobile">&agent_request_mobile;</string>
 
-  <string name="preferences">&preferences;</string>
-  <string name="preferences_title">&preferences_title;</string>
+  <string name="settings">&settings;</string>
+  <string name="settings_title">&settings_title;</string>
   <string name="pref_category_general">&pref_category_general;</string>
   <string name="pref_category_privacy">&pref_category_privacy;</string>
   <string name="pref_category_content">&pref_category_content;</string>
   <string name="pref_about_firefox">&pref_about_firefox;</string>
   <string name="pref_do_not_track">&pref_do_not_track;</string>
   <string name="pref_telemetry">&pref_telemetry;</string>
   <string name="pref_homepage">&pref_homepage;</string>
   <string name="pref_homepage_start">&pref_homepage_start;</string>