summaryrefslogtreecommitdiffstats
path: root/browser
diff options
context:
space:
mode:
Diffstat (limited to 'browser')
-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/components/preferences/in-content/security.xul4
-rw-r--r--browser/components/shell/ShellService.jsm4
-rw-r--r--browser/components/shell/nsGNOMEShellService.cpp2
-rw-r--r--browser/components/shell/nsWindowsShellService.cpp2
-rw-r--r--browser/installer/windows/Makefile.in3
-rw-r--r--browser/installer/windows/nsis/defines.nsi.in10
-rw-r--r--browser/installer/windows/nsis/oneoff_en-US.nsh12
-rwxr-xr-xbrowser/installer/windows/nsis/shared.nsh100
-rwxr-xr-xbrowser/installer/windows/nsis/uninstaller.nsi6
-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/preferences/security.dtd3
-rw-r--r--browser/locales/en-US/chrome/browser/syncCustomize.dtd3
-rw-r--r--browser/locales/en-US/chrome/browser/syncSetup.dtd2
24 files changed, 81 insertions, 129 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/components/preferences/in-content/security.xul b/browser/components/preferences/in-content/security.xul
index a10576c25..b7bdb9361 100644
--- a/browser/components/preferences/in-content/security.xul
+++ b/browser/components/preferences/in-content/security.xul
@@ -45,6 +45,7 @@
<!-- Passwords -->
<preference id="signon.rememberSignons" name="signon.rememberSignons" type="bool"/>
+ <preference id="signon.autofillForms" name="signon.autofillForms" type="bool"/>
</preferences>
@@ -103,6 +104,9 @@
accesskey="&passwordExceptions.accesskey;"
preference="pref.privacy.disable_button.view_passwords_exceptions"/>
</hbox>
+ <checkbox id="autofillPasswords" flex="1"
+ label="&autofillPasswords.label;" accesskey="&autofillPasswords.accesskey;"
+ preference="signon.autofillForms"/>
<grid id="passwordGrid">
<columns>
<column flex="1"/>
diff --git a/browser/components/shell/ShellService.jsm b/browser/components/shell/ShellService.jsm
index 2a3400b60..cc225eae0 100644
--- a/browser/components/shell/ShellService.jsm
+++ b/browser/components/shell/ShellService.jsm
@@ -62,10 +62,10 @@ let ShellServiceInternal = {
if (AppConstants.platform == "win") {
let optOutValue = WindowsRegistry.readRegKey(Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
- "Software\\Mozilla\\Firefox",
+ "Software\\Mozilla\\Basilisk",
"DefaultBrowserOptOut");
WindowsRegistry.removeRegKey(Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
- "Software\\Mozilla\\Firefox",
+ "Software\\Mozilla\\Basilisk",
"DefaultBrowserOptOut");
if (optOutValue == "True") {
Services.prefs.setBoolPref("browser.shell.checkDefaultBrowser", false);
diff --git a/browser/components/shell/nsGNOMEShellService.cpp b/browser/components/shell/nsGNOMEShellService.cpp
index 1001a52ae..613b5bffc 100644
--- a/browser/components/shell/nsGNOMEShellService.cpp
+++ b/browser/components/shell/nsGNOMEShellService.cpp
@@ -451,7 +451,7 @@ nsGNOMEShellService::SetDesktopBackground(nsIDOMElement* aElement,
// Set the image to an empty string first to force a refresh
// (since we could be writing a new image on top of an existing
- // Firefox_wallpaper.png and nautilus doesn't monitor the file for changes)
+ // Basilisk_wallpaper.png and nautilus doesn't monitor the file for changes)
gconf->SetString(NS_LITERAL_CSTRING(kDesktopImageKey),
EmptyCString());
diff --git a/browser/components/shell/nsWindowsShellService.cpp b/browser/components/shell/nsWindowsShellService.cpp
index 6c43d95db..cb13c0910 100644
--- a/browser/components/shell/nsWindowsShellService.cpp
+++ b/browser/components/shell/nsWindowsShellService.cpp
@@ -135,7 +135,7 @@ OpenKeyForReading(HKEY aKeyRoot, const nsAString& aKeyName, HKEY* aKey)
// The following keys are set to make Basilisk appear in the Start Menu as the
// browser:
//
-// HKCU\SOFTWARE\Clients\StartMenuInternet\FIREFOX.EXE\
+// HKCU\SOFTWARE\Clients\StartMenuInternet\BASILISK.EXE\
// (default) REG_SZ <appname>
// DefaultIcon (default) REG_SZ <apppath>,0
// InstallInfo HideIconsCommand REG_SZ <uninstpath> /HideShortcuts
diff --git a/browser/installer/windows/Makefile.in b/browser/installer/windows/Makefile.in
index ee672e921..a8305d077 100644
--- a/browser/installer/windows/Makefile.in
+++ b/browser/installer/windows/Makefile.in
@@ -83,9 +83,6 @@ $(CONFIG_DIR)/setup.exe::
--preprocess-single-file $(topsrcdir) \
$(PPL_LOCALE_ARGS) $(CONFIG_DIR) \
nsisstrings.properties nsisstrings.nlf
- $(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
- --convert-utf8-utf16le \
- $(srcdir)/nsis/oneoff_en-US.nsh $(CONFIG_DIR)/oneoff_en-US.nsh
GARBARGE_DIRS += instgen
diff --git a/browser/installer/windows/nsis/defines.nsi.in b/browser/installer/windows/nsis/defines.nsi.in
index 30a9f3784..5ad9b7966 100644
--- a/browser/installer/windows/nsis/defines.nsi.in
+++ b/browser/installer/windows/nsis/defines.nsi.in
@@ -21,15 +21,15 @@
!endif
# These defines should match application.ini settings
-!define AppName "Firefox"
+!define AppName "Basilisk"
!define AppVersion "@APP_VERSION@"
!define GREVersion @MOZILLA_VERSION@
!define AB_CD "@AB_CD@"
!define FileMainEXE "@MOZ_APP_NAME@.exe"
-!define WindowClass "FirefoxMessageWindow"
-!define DDEApplication "Firefox"
-!define AppRegName "Firefox"
+!define WindowClass "BasiliskMessageWindow"
+!define DDEApplication "Basilisk"
+!define AppRegName "Basilisk"
!ifndef DEV_EDITION
!define BrandShortName "@MOZ_APP_DISPLAYNAME@"
@@ -77,7 +77,7 @@ VIProductVersion "1.0.0.0"
VIAddVersionKey "ProductName" "${BrandShortName}"
VIAddVersionKey "CompanyName" "${CompanyName}"
#ifdef MOZ_OFFICIAL_BRANDING
-VIAddVersionKey "LegalTrademarks" "${BrandShortName} is a Trademark of The Mozilla Foundation."
+VIAddVersionKey "LegalTrademarks" "${BrandShortName} is a Trademark of Moonchild Productions."
#endif
VIAddVersionKey "LegalCopyright" "${CompanyName}"
VIAddVersionKey "FileVersion" "${AppVersion}"
diff --git a/browser/installer/windows/nsis/oneoff_en-US.nsh b/browser/installer/windows/nsis/oneoff_en-US.nsh
deleted file mode 100644
index 62d95ade9..000000000
--- a/browser/installer/windows/nsis/oneoff_en-US.nsh
+++ /dev/null
@@ -1,12 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-; Custom strings for en-US. This is not in the locale directory so these strings
-; aren't translated.
-!define INDENT " "
-!define INTRO_BLURB "Thanks for choosing $BrandFullName. We’re not just designed to be different, we’re different by design."
-!define INSTALL_BLURB1 "You're about to enjoy the very latest in speed, flexibility and security so you're always in control."
-!define INSTALL_BLURB2 "And you're joining a global community of users, contributors and developers working to make the best browser in the world."
-!define INSTALL_BLURB3 "You even get a haiku:$\n${INDENT}Proudly non-profit$\n${INDENT}Free to innovate for you$\n${INDENT}And a better Web"
-!undef INDENT
diff --git a/browser/installer/windows/nsis/shared.nsh b/browser/installer/windows/nsis/shared.nsh
index 8d7eea618..fb2239d24 100755
--- a/browser/installer/windows/nsis/shared.nsh
+++ b/browser/installer/windows/nsis/shared.nsh
@@ -10,12 +10,12 @@
System::Call "kernel32::ProcessIdToSessionId(i $0, *i ${NSIS_MAX_STRLEN} r9)"
; Determine if we're the protected UserChoice default or not. If so fix the
- ; start menu tile. In case there are 2 Firefox installations, we only do
+ ; start menu tile. In case there are 2 Basilisk installations, we only do
; this if the application being updated is the default.
ReadRegStr $0 HKCU "Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice" "ProgId"
- ${If} $0 == "FirefoxURL"
+ ${If} $0 == "BasiliskURL"
${AndIf} $9 != 0 ; We're not running in session 0
- ReadRegStr $0 HKCU "Software\Classes\FirefoxURL\shell\open\command" ""
+ ReadRegStr $0 HKCU "Software\Classes\BasiliskURL\shell\open\command" ""
${GetPathFromString} "$0" $0
${GetParent} "$0" $0
${If} ${FileExists} "$0"
@@ -327,13 +327,13 @@
ClearErrors
EnumRegKey $7 HKCR "${FILE_TYPE}" 0
${If} ${Errors}
- WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}" "" "FirefoxHTML"
+ WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}" "" "BasiliskHTML"
${EndIf}
- WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}\OpenWithProgids" "FirefoxHTML" ""
+ WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}\OpenWithProgids" "BasiliskHTML" ""
!macroend
!define AddAssociationIfNoneExist "!insertmacro AddAssociationIfNoneExist"
-; Adds the protocol and file handler registry entries for making Firefox the
+; Adds the protocol and file handler registry entries for making Basilisk the
; default handler (uses SHCTX).
!macro SetHandlers
${GetLongPath} "$INSTDIR\${FileMainEXE}" $8
@@ -341,30 +341,30 @@
StrCpy $0 "SOFTWARE\Classes"
StrCpy $2 "$\"$8$\" -osint -url $\"%1$\""
- ; Associate the file handlers with FirefoxHTML
+ ; Associate the file handlers with BasiliskHTML
ReadRegStr $6 SHCTX "$0\.htm" ""
- ${If} "$6" != "FirefoxHTML"
- WriteRegStr SHCTX "$0\.htm" "" "FirefoxHTML"
+ ${If} "$6" != "BasiliskHTML"
+ WriteRegStr SHCTX "$0\.htm" "" "BasiliskHTML"
${EndIf}
ReadRegStr $6 SHCTX "$0\.html" ""
- ${If} "$6" != "FirefoxHTML"
- WriteRegStr SHCTX "$0\.html" "" "FirefoxHTML"
+ ${If} "$6" != "BasiliskHTML"
+ WriteRegStr SHCTX "$0\.html" "" "BasiliskHTML"
${EndIf}
ReadRegStr $6 SHCTX "$0\.shtml" ""
- ${If} "$6" != "FirefoxHTML"
- WriteRegStr SHCTX "$0\.shtml" "" "FirefoxHTML"
+ ${If} "$6" != "BasiliskHTML"
+ WriteRegStr SHCTX "$0\.shtml" "" "BasiliskHTML"
${EndIf}
ReadRegStr $6 SHCTX "$0\.xht" ""
- ${If} "$6" != "FirefoxHTML"
- WriteRegStr SHCTX "$0\.xht" "" "FirefoxHTML"
+ ${If} "$6" != "BasiliskHTML"
+ WriteRegStr SHCTX "$0\.xht" "" "BasiliskHTML"
${EndIf}
ReadRegStr $6 SHCTX "$0\.xhtml" ""
- ${If} "$6" != "FirefoxHTML"
- WriteRegStr SHCTX "$0\.xhtml" "" "FirefoxHTML"
+ ${If} "$6" != "BasiliskHTML"
+ WriteRegStr SHCTX "$0\.xhtml" "" "BasiliskHTML"
${EndIf}
${AddAssociationIfNoneExist} ".pdf"
@@ -374,12 +374,12 @@
${AddAssociationIfNoneExist} ".pdf"
${AddAssociationIfNoneExist} ".webm"
- ; An empty string is used for the 5th param because FirefoxHTML is not a
+ ; An empty string is used for the 5th param because BasiliskHTML is not a
; protocol handler
- ${AddDisabledDDEHandlerValues} "FirefoxHTML" "$2" "$8,1" \
+ ${AddDisabledDDEHandlerValues} "BasiliskHTML" "$2" "$8,1" \
"${AppRegName} HTML Document" ""
- ${AddDisabledDDEHandlerValues} "FirefoxURL" "$2" "$8,1" "${AppRegName} URL" \
+ ${AddDisabledDDEHandlerValues} "BasiliskURL" "$2" "$8,1" "${AppRegName} URL" \
"true"
; An empty string is used for the 4th & 5th params because the following
; protocol handlers already have a display name and the additional keys
@@ -449,35 +449,35 @@
WriteRegStr ${RegKey} "$0\Capabilities" "ApplicationIcon" "$8,0"
WriteRegStr ${RegKey} "$0\Capabilities" "ApplicationName" "${BrandShortName}"
- WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".htm" "FirefoxHTML"
- WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".html" "FirefoxHTML"
- WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".shtml" "FirefoxHTML"
- WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xht" "FirefoxHTML"
- WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xhtml" "FirefoxHTML"
+ WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".htm" "BasiliskHTML"
+ WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".html" "BasiliskHTML"
+ WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".shtml" "BasiliskHTML"
+ WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xht" "BasiliskHTML"
+ WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xhtml" "BasiliskHTML"
WriteRegStr ${RegKey} "$0\Capabilities\StartMenu" "StartMenuInternet" "$R9"
- WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "ftp" "FirefoxURL"
- WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "http" "FirefoxURL"
- WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "https" "FirefoxURL"
+ WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "ftp" "BasiliskURL"
+ WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "http" "BasiliskURL"
+ WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "https" "BasiliskURL"
; Vista Registered Application
WriteRegStr ${RegKey} "Software\RegisteredApplications" "${AppRegName}" "$0\Capabilities"
!macroend
!define SetStartMenuInternet "!insertmacro SetStartMenuInternet"
-; The IconHandler reference for FirefoxHTML can end up in an inconsistent state
+; The IconHandler reference for BasiliskHTML can end up in an inconsistent state
; due to changes not being detected by the IconHandler for side by side
; installs (see bug 268512). The symptoms can be either an incorrect icon or no
-; icon being displayed for files associated with Firefox (does not use SHCTX).
+; icon being displayed for files associated with Basilisk (does not use SHCTX).
!macro FixShellIconHandler RegKey
ClearErrors
- ReadRegStr $1 ${RegKey} "Software\Classes\FirefoxHTML\ShellEx\IconHandler" ""
+ ReadRegStr $1 ${RegKey} "Software\Classes\BasiliskHTML\ShellEx\IconHandler" ""
${Unless} ${Errors}
- ReadRegStr $1 ${RegKey} "Software\Classes\FirefoxHTML\DefaultIcon" ""
+ ReadRegStr $1 ${RegKey} "Software\Classes\BasiliskHTML\DefaultIcon" ""
${GetLongPath} "$INSTDIR\${FileMainEXE}" $2
${If} "$1" != "$2,1"
- WriteRegStr ${RegKey} "Software\Classes\FirefoxHTML\DefaultIcon" "" "$2,1"
+ WriteRegStr ${RegKey} "Software\Classes\BasiliskHTML\DefaultIcon" "" "$2,1"
${EndIf}
${EndUnless}
!macroend
@@ -612,7 +612,7 @@
; HKCU Software\Classes keys when associating handlers. The fix uses the merged
; view in HKCR to check for existance of an existing association. This macro
; cleans affected installations by removing the HKLM and HKCU value if it is set
-; to FirefoxHTML when there is a value for PersistentHandler or by removing the
+; to BasiliskHTML when there is a value for PersistentHandler or by removing the
; HKCU value when the HKLM value has a value other than an empty string.
!macro FixBadFileAssociation FILE_TYPE
; Only delete the default value in case the key has values for OpenWithList,
@@ -621,16 +621,16 @@
ReadRegStr $1 HKLM "Software\Classes\${FILE_TYPE}" ""
ReadRegStr $2 HKCR "${FILE_TYPE}\PersistentHandler" ""
${If} "$2" != ""
- ; Since there is a persistent handler remove FirefoxHTML as the default
- ; value from both HKCU and HKLM if it set to FirefoxHTML.
- ${If} "$0" == "FirefoxHTML"
+ ; Since there is a persistent handler remove BasiliskHTML as the default
+ ; value from both HKCU and HKLM if it set to BasiliskHTML.
+ ${If} "$0" == "BasiliskHTML"
DeleteRegValue HKCU "Software\Classes\${FILE_TYPE}" ""
${EndIf}
- ${If} "$1" == "FirefoxHTML"
+ ${If} "$1" == "BasiliskHTML"
DeleteRegValue HKLM "Software\Classes\${FILE_TYPE}" ""
${EndIf}
- ${ElseIf} "$0" == "FirefoxHTML"
- ; Since KHCU is set to FirefoxHTML remove FirefoxHTML as the default value
+ ${ElseIf} "$0" == "BasiliskHTML"
+ ; Since KHCU is set to BasiliskHTML remove BasiliskHTML as the default value
; from HKCU if HKLM is set to a value other than an empty string.
${If} "$1" != ""
DeleteRegValue HKCU "Software\Classes\${FILE_TYPE}" ""
@@ -686,17 +686,17 @@
; Only set the file and protocol handlers if the existing one under HKCR is
; for this install location.
- ${IsHandlerForInstallDir} "FirefoxHTML" $R9
+ ${IsHandlerForInstallDir} "BasiliskHTML" $R9
${If} "$R9" == "true"
- ; An empty string is used for the 5th param because FirefoxHTML is not a
+ ; An empty string is used for the 5th param because BasiliskHTML is not a
; protocol handler.
- ${AddDisabledDDEHandlerValues} "FirefoxHTML" "$2" "$8,1" \
+ ${AddDisabledDDEHandlerValues} "BasiliskHTML" "$2" "$8,1" \
"${AppRegName} HTML Document" ""
${EndIf}
- ${IsHandlerForInstallDir} "FirefoxURL" $R9
+ ${IsHandlerForInstallDir} "BasiliskURL" $R9
${If} "$R9" == "true"
- ${AddDisabledDDEHandlerValues} "FirefoxURL" "$2" "$8,1" \
+ ${AddDisabledDDEHandlerValues} "BasiliskURL" "$2" "$8,1" \
"${AppRegName} URL" "true"
${EndIf}
@@ -780,8 +780,8 @@
${RegCleanAppHandler} "chrome"
; Remove protocol handler registry keys added by the MS shim
- DeleteRegKey HKLM "Software\Classes\Firefox.URL"
- DeleteRegKey HKCU "Software\Classes\Firefox.URL"
+ DeleteRegKey HKLM "Software\Classes\Basilisk.URL"
+ DeleteRegKey HKCU "Software\Classes\Basilisk.URL"
; Delete gopher from Capabilities\URLAssociations if it is present.
${StrFilter} "${FileMainEXE}" "+" "" "" $R9
@@ -792,10 +792,10 @@
DeleteRegValue HKLM "$0\Capabilities\URLAssociations" "gopher"
${EndUnless}
- ; Delete gopher from the user's UrlAssociations if it points to FirefoxURL.
+ ; Delete gopher from the user's UrlAssociations if it points to BasiliskURL.
StrCpy $0 "Software\Microsoft\Windows\Shell\Associations\UrlAssociations\gopher"
ReadRegStr $2 HKCU "$0\UserChoice" "Progid"
- ${If} "$2" == "FirefoxURL"
+ ${If} "$2" == "BasiliskURL"
DeleteRegKey HKCU "$0"
${EndIf}
!macroend
@@ -943,7 +943,7 @@
${If} $AddTaskbarSC == ""
; No need to check the default on Win8 and later
${If} ${AtMostWin2008R2}
- ; Check if the Firefox is the http handler for this user
+ ; Check if the Basilisk is the http handler for this user
SetShellVarContext current ; Set SHCTX to the current user
${IsHandlerForInstallDir} "http" $R9
${If} $TmpVal == "HKLM"
diff --git a/browser/installer/windows/nsis/uninstaller.nsi b/browser/installer/windows/nsis/uninstaller.nsi
index 687bcd6eb..87f4d838a 100755
--- a/browser/installer/windows/nsis/uninstaller.nsi
+++ b/browser/installer/windows/nsis/uninstaller.nsi
@@ -351,7 +351,7 @@ Section "Uninstall"
StrCpy $0 "Software\Microsoft\MediaPlayer\ShimInclusionList\plugin-container.exe"
DeleteRegKey HKLM "$0"
DeleteRegKey HKCU "$0"
- StrCpy $0 "Software\Classes\MIME\Database\Content Type\application/x-xpinstall;app=firefox"
+ StrCpy $0 "Software\Classes\MIME\Database\Content Type\application/x-xpinstall;app=Basilisk"
DeleteRegKey HKLM "$0"
DeleteRegKey HKCU "$0"
${Else}
@@ -419,8 +419,8 @@ Section "Uninstall"
; Remove the installation directory if it is empty
RmDir "$INSTDIR"
- ; If firefox.exe was successfully deleted yet we still need to restart to
- ; remove other files create a dummy firefox.exe.moz-delete to prevent the
+ ; If Basilisk.exe was successfully deleted yet we still need to restart to
+ ; remove other files create a dummy Basilisk.exe.moz-delete to prevent the
; installer from allowing an install without restart when it is required
; to complete an uninstall.
${If} ${RebootFlag}
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/preferences/security.dtd b/browser/locales/en-US/chrome/browser/preferences/security.dtd
index ca9420401..7ccc9af50 100644
--- a/browser/locales/en-US/chrome/browser/preferences/security.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/security.dtd
@@ -31,6 +31,9 @@
<!ENTITY passwordExceptions.label "Exceptions…">
<!ENTITY passwordExceptions.accesskey "x">
+<!ENTITY autofillPasswords.label "Automatically fill in log-in details">
+<!ENTITY autofillPasswords.accesskey "A">
+
<!ENTITY useMasterPassword.label "Use a master password">
<!ENTITY useMasterPassword.accesskey "U">
<!ENTITY changeMasterPassword.label "Change Master Password…">
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.">