summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2017-12-31 13:45:14 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-02-18 10:23:42 +0100
commit1a418cf476709cc49a4b7dcf4aef64c5100ddaf9 (patch)
treeb5893e8569f5c0d183e8192cb5cb2675a5d55572
parente803a1be814ccffbed19072f77425c7252b5e19e (diff)
downloadUXP-1a418cf476709cc49a4b7dcf4aef64c5100ddaf9.tar
UXP-1a418cf476709cc49a4b7dcf4aef64c5100ddaf9.tar.gz
UXP-1a418cf476709cc49a4b7dcf4aef64c5100ddaf9.tar.lz
UXP-1a418cf476709cc49a4b7dcf4aef64c5100ddaf9.tar.xz
UXP-1a418cf476709cc49a4b7dcf4aef64c5100ddaf9.zip
Rename Options to Preferences and unify location.
This also removes OS-specific naming/handling for separate locations. Fixes #270.
-rw-r--r--browser/base/content/browser-menubar.inc11
-rwxr-xr-xbrowser/base/content/browser.js4
-rw-r--r--browser/base/content/sync/customize.xul7
-rw-r--r--browser/base/jar.mn2
-rw-r--r--browser/components/customizableui/CustomizableWidgets.jsm5
-rw-r--r--browser/components/preferences/in-content/preferences.xul8
-rw-r--r--browser/locales/en-US/chrome/browser/aboutHome.dtd2
-rw-r--r--browser/locales/en-US/chrome/browser/browser.dtd6
-rw-r--r--browser/locales/en-US/chrome/browser/browser.properties6
-rw-r--r--browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties4
-rw-r--r--browser/locales/en-US/chrome/browser/migration/migration.dtd3
-rw-r--r--browser/locales/en-US/chrome/browser/preferences/preferences.dtd1
-rw-r--r--browser/locales/en-US/chrome/browser/syncCustomize.dtd3
-rw-r--r--browser/locales/en-US/chrome/browser/syncSetup.dtd2
14 files changed, 12 insertions, 52 deletions
diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index e952bc3ca..3fc098755 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -179,15 +179,6 @@
label="&bidiSwitchTextDirectionItem.label;"
accesskey="&bidiSwitchTextDirectionItem.accesskey;"
hidden="true"/>
-#ifdef XP_UNIX
-#ifndef XP_MACOSX
- <menuseparator/>
- <menuitem id="menu_preferences"
- label="&preferencesCmdUnix.label;"
- accesskey="&preferencesCmdUnix.accesskey;"
- oncommand="openPreferences();"/>
-#endif
-#endif
</menupopup>
</menu>
@@ -521,13 +512,11 @@
<menupopup id="menu_mirrorTab-popup"
onpopupshowing="populateMirrorTabMenu(this)"/>
</menu>
-#ifndef XP_UNIX
<menuseparator id="prefSep"/>
<menuitem id="menu_preferences"
label="&preferencesCmd2.label;"
accesskey="&preferencesCmd2.accesskey;"
oncommand="openPreferences();"/>
-#endif
</menupopup>
</menu>
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index a8aff1bd7..9ccd86b12 100755
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -473,9 +473,7 @@ var gPopupBlockerObserver = {
var brandShortName = brandBundle.getString("brandShortName");
var popupCount = gBrowser.selectedBrowser.blockedPopups.length;
- var stringKey = AppConstants.platform == "win"
- ? "popupWarningButton"
- : "popupWarningButtonUnix";
+ var stringKey = "popupWarningButton";
var popupButtonText = gNavigatorBundle.getString(stringKey);
var popupButtonAccesskey = gNavigatorBundle.getString(stringKey + ".accesskey");
diff --git a/browser/base/content/sync/customize.xul b/browser/base/content/sync/customize.xul
index d95536d9a..827edf565 100644
--- a/browser/base/content/sync/customize.xul
+++ b/browser/base/content/sync/customize.xul
@@ -31,12 +31,7 @@
<label id="sync-customize-title" value="&syncCustomize.title;"/>
<description id="sync-customize-subtitle"
-#ifdef XP_UNIX
- value="&syncCustomizeUnix.description;"
-#else
- value="&syncCustomize.description;"
-#endif
- />
+ value="&syncCustomize.description;"/>
<vbox align="start">
<checkbox label="&engine.tabs.label;"
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
index c9dbbbb9f..60f1facc0 100644
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -152,7 +152,7 @@ browser.jar:
content/browser/sync/genericChange.js (content/sync/genericChange.js)
content/browser/sync/key.xhtml (content/sync/key.xhtml)
content/browser/sync/utils.js (content/sync/utils.js)
-* content/browser/sync/customize.xul (content/sync/customize.xul)
+ content/browser/sync/customize.xul (content/sync/customize.xul)
content/browser/sync/customize.js (content/sync/customize.js)
content/browser/sync/customize.css (content/sync/customize.css)
content/browser/safeMode.css (content/safeMode.css)
diff --git a/browser/components/customizableui/CustomizableWidgets.jsm b/browser/components/customizableui/CustomizableWidgets.jsm
index 907e2e0f7..1e68b01c1 100644
--- a/browser/components/customizableui/CustomizableWidgets.jsm
+++ b/browser/components/customizableui/CustomizableWidgets.jsm
@@ -1187,10 +1187,7 @@ let preferencesButton = {
win.openPreferences();
}
};
-if (AppConstants.platform == "win") {
- preferencesButton.label = "preferences-button.labelWin";
- preferencesButton.tooltiptext = "preferences-button.tooltipWin2";
-} else if (AppConstants.platform == "macosx") {
+if (AppConstants.platform == "macosx") {
preferencesButton.tooltiptext = "preferences-button.tooltiptext.withshortcut";
preferencesButton.shortcutId = "key_preferencesCmdMac";
} else {
diff --git a/browser/components/preferences/in-content/preferences.xul b/browser/components/preferences/in-content/preferences.xul
index e9664eaf4..7ec7ef119 100644
--- a/browser/components/preferences/in-content/preferences.xul
+++ b/browser/components/preferences/in-content/preferences.xul
@@ -55,18 +55,10 @@
%advancedDTD;
]>
-#ifdef XP_WIN
-#define USE_WIN_TITLE_STYLE
-#endif
-
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml"
disablefastfind="true"
-#ifdef USE_WIN_TITLE_STYLE
- title="&prefWindow.titleWin;">
-#else
title="&prefWindow.title;">
-#endif
<html:link rel="shortcut icon"
href="chrome://browser/skin/preferences/in-content/favicon.ico"/>
diff --git a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales/en-US/chrome/browser/aboutHome.dtd
index 7e3b57a79..17b401c6c 100644
--- a/browser/locales/en-US/chrome/browser/aboutHome.dtd
+++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd
@@ -26,7 +26,7 @@
<!ENTITY abouthome.historyButton.label "History">
<!-- LOCALIZATION NOTE (abouthome.preferencesButtonWin.label): The label for the
preferences/options item on about:home on Windows -->
-<!ENTITY abouthome.preferencesButtonWin.label "Options">
+<!ENTITY abouthome.preferencesButtonWin.label "Preferences">
<!-- LOCALIZATION NOTE (abouthome.preferencesButtonUnix.label): The label for the
preferences/options item on about:home on Linux and OS X -->
<!ENTITY abouthome.preferencesButtonUnix.label "Preferences">
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index f6fc6e3fd..6de17b64f 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -315,10 +315,8 @@ These should match what Safari and other Apple applications use on OS X Lion. --
<!ENTITY selectAllCmd.label "Select All">
<!ENTITY selectAllCmd.key "A">
<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd2.label "Options">
-<!ENTITY preferencesCmd2.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "Preferences">
-<!ENTITY preferencesCmdUnix.accesskey "n">
+<!ENTITY preferencesCmd2.label "Preferences">
+<!ENTITY preferencesCmd2.accesskey "P">
<!ENTITY clearRecentHistory.label "Clear Recent History…">
diff --git a/browser/locales/en-US/chrome/browser/browser.properties b/browser/locales/en-US/chrome/browser/browser.properties
index 21e794f08..1947a3c90 100644
--- a/browser/locales/en-US/chrome/browser/browser.properties
+++ b/browser/locales/en-US/chrome/browser/browser.properties
@@ -128,10 +128,8 @@ lwthemeNeedsRestart.accesskey=R
# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
# #1 is brandShortName and #2 is the number of pop-ups blocked.
popupWarning.message=#1 prevented this site from opening a pop-up window.;#1 prevented this site from opening #2 pop-up windows.
-popupWarningButton=Options
-popupWarningButton.accesskey=O
-popupWarningButtonUnix=Preferences
-popupWarningButtonUnix.accesskey=P
+popupWarningButton=Preferences
+popupWarningButton.accesskey=P
popupAllow=Allow pop-ups for %S
popupBlock=Block pop-ups for %S
popupWarningDontShowFromMessage=Don’t show this message when pop-ups are blocked
diff --git a/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties b/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties
index a467aef69..a68f59fe3 100644
--- a/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties
+++ b/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties
@@ -39,10 +39,6 @@ add-ons-button.tooltiptext3 = Manage your add-ons (%S)
preferences-button.label = Preferences
preferences-button.tooltiptext2 = Open preferences
preferences-button.tooltiptext.withshortcut = Open preferences (%S)
-# LOCALIZATION NOTE (preferences-button.labelWin): Windows-only label for Options
-preferences-button.labelWin = Options
-# LOCALIZATION NOTE (preferences-button.tooltipWin): Windows-only tooltip for Options
-preferences-button.tooltipWin2 = Open options
zoom-controls.label = Zoom Controls
zoom-controls.tooltiptext2 = Zoom controls
diff --git a/browser/locales/en-US/chrome/browser/migration/migration.dtd b/browser/locales/en-US/chrome/browser/migration/migration.dtd
index df6938c51..ad9293a5d 100644
--- a/browser/locales/en-US/chrome/browser/migration/migration.dtd
+++ b/browser/locales/en-US/chrome/browser/migration/migration.dtd
@@ -5,8 +5,7 @@
<!ENTITY migrationWizard.title "Import Wizard">
-<!ENTITY importFrom.label "Import Options, Bookmarks, History, Passwords and other data from:">
-<!ENTITY importFromUnix.label "Import Preferences, Bookmarks, History, Passwords and other data from:">
+<!ENTITY importFrom.label "Import Preferences, Bookmarks, History, Passwords and other data from:">
<!ENTITY importFromBookmarks.label "Import Bookmarks from:">
<!ENTITY importFromIE.label "Microsoft Internet Explorer">
diff --git a/browser/locales/en-US/chrome/browser/preferences/preferences.dtd b/browser/locales/en-US/chrome/browser/preferences/preferences.dtd
index 380da7178..7702c8c51 100644
--- a/browser/locales/en-US/chrome/browser/preferences/preferences.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/preferences.dtd
@@ -3,7 +3,6 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<!ENTITY prefWindow.titleWin "Options">
<!ENTITY prefWindow.title "Preferences">
<!-- LOCALIZATION NOTE (prefWindow.titleGNOME): This is not used for in-content preferences -->
<!ENTITY prefWindow.titleGNOME "&brandShortName; Preferences">
diff --git a/browser/locales/en-US/chrome/browser/syncCustomize.dtd b/browser/locales/en-US/chrome/browser/syncCustomize.dtd
index 3375c48ce..e59d1db25 100644
--- a/browser/locales/en-US/chrome/browser/syncCustomize.dtd
+++ b/browser/locales/en-US/chrome/browser/syncCustomize.dtd
@@ -6,8 +6,7 @@
<!ENTITY syncCustomize.acceptButton.label "Start">
<!ENTITY syncCustomize.title "What would you like to sync?">
-<!ENTITY syncCustomize.description "You can change this selection in Options.">
-<!ENTITY syncCustomizeUnix.description "You can change this selection in Preferences.">
+<!ENTITY syncCustomize.description "You can change this selection in Preferences.">
<!--
These engine names are the same as in browser/preferences/sync.dtd except
diff --git a/browser/locales/en-US/chrome/browser/syncSetup.dtd b/browser/locales/en-US/chrome/browser/syncSetup.dtd
index 1fd46942d..950a83553 100644
--- a/browser/locales/en-US/chrome/browser/syncSetup.dtd
+++ b/browser/locales/en-US/chrome/browser/syncSetup.dtd
@@ -72,7 +72,7 @@
<!-- Existing Account Page 2: Manual Login -->
<!ENTITY setup.signInPage.title.label "Sign In">
-<!ENTITY existingRecoveryKey.description "You can get a copy of your Recovery Key by going to &syncBrand.shortName.label; Options on your other device, and selecting &#x0022;My Recovery Key&#x0022; under &#x0022;Manage Account&#x0022;.">
+<!ENTITY existingRecoveryKey.description "You can get a copy of your Recovery Key by going to &syncBrand.shortName.label; Preferences on your other device, and selecting &#x0022;My Recovery Key&#x0022; under &#x0022;Manage Account&#x0022;.">
<!ENTITY verifying.label "Verifying…">
<!ENTITY resetPassword.label "Reset Password">
<!ENTITY resetSyncKey.label "I have lost my other device.">