Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 15:52:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 709921 - (2/2) Rename "Preferences" to "Settings" for Android fennec [r=cpeterson]

Browse Source
This commit is contained in:
Matt Brubeck 2011-12-20 08:33:25 -08:00
parent d0672955b4
commit c797031bda
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/base/AndroidManifest.xml.in
View File

@ -137,7 +137,7 @@
<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"

6
mobile/android/base/GeckoApp.java
View File

@ -450,7 +450,7 @@ abstract public class GeckoApp
}
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);
@ -540,7 +540,7 @@ abstract public class GeckoApp
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;
@ -938,7 +938,7 @@ abstract public class GeckoApp
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);

4
mobile/android/base/locales/en-US/android_strings.dtd
View File

@ -43,8 +43,8 @@
<!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">

4
mobile/android/base/resources/layout/gecko_menu.xml
View File

@ -24,8 +24,8 @@
<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" />

4
mobile/android/base/strings.xml.in
View File

@ -49,8 +49,8 @@
<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>