Browse Source

[Navigator] Reorganize the preferences window

custom-2020
Matt A. Tobin 2 years ago committed by Roy Tam
parent
commit
4dc58be9ec
  1. 54
      navigator/components/preferences/content/pref-advanced.js
  2. 51
      navigator/components/preferences/content/pref-advanced.xul
  3. 2
      navigator/components/preferences/content/pref-certs.xul
  4. 8
      navigator/components/preferences/content/pref-content.xul
  5. 1
      navigator/components/preferences/content/pref-http.js
  6. 14
      navigator/components/preferences/content/pref-navigator.js
  7. 9
      navigator/components/preferences/content/pref-navigator.xul
  8. 0
      navigator/components/preferences/content/pref-privacy.js
  9. 25
      navigator/components/preferences/content/pref-privacy.xul
  10. 29
      navigator/components/preferences/content/pref-scripts.xul
  11. 20
      navigator/components/preferences/content/pref-ssl.xul
  12. 4
      navigator/components/preferences/content/preferences.js
  13. 169
      navigator/components/preferences/content/preferences.xul
  14. 7
      navigator/components/preferences/jar.mn
  15. 26
      navigator/components/preferences/locale/pref-advanced.dtd
  16. 7
      navigator/components/preferences/locale/pref-certs.dtd
  17. 3
      navigator/components/preferences/locale/pref-http.dtd
  18. 14
      navigator/components/preferences/locale/pref-navigator.dtd
  19. 8
      navigator/components/preferences/locale/pref-privacy.dtd
  20. 14
      navigator/components/preferences/locale/pref-scripts.dtd
  21. 15
      navigator/components/preferences/locale/pref-ssl.dtd
  22. 9
      navigator/components/preferences/locale/preferences.dtd

54
navigator/components/preferences/content/pref-advanced.js

@ -1,54 +0,0 @@
/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* 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/. */
function Startup()
{
SysPrefCheck();
ShellServiceCheck();
CrashReportsCheck();
}
/**
* System preferences
*/
function SysPrefCheck()
{
const kPrefService = "@mozilla.org/system-preference-service;1";
let visible = kPrefService in Components.classes &&
Components.classes[kPrefService].getService() instanceof Components.interfaces.nsIPrefBranch;
document.getElementById("systemPrefs").hidden = !visible;
}
function ShellServiceCheck()
{
const NS_SHELLSERVICE_CID = "@mozilla.org/suite/shell-service;1";
if (NS_SHELLSERVICE_CID in Components.classes) try {
Components.classes[NS_SHELLSERVICE_CID]
.getService(Components.interfaces.nsIShellService)
.shouldCheckDefaultClient;
document.getElementById("checkDefault").hidden = false;
} catch (e) {
}
}
function CrashReportsCheck()
{
if ("nsICrashReporter" in Components.interfaces)
{
var cr = Components.classes["@mozilla.org/toolkit/crash-reporter;1"]
.getService(Components.interfaces.nsICrashReporter);
document.getElementById("crashReports").hidden = !cr.enabled;
document.getElementById("submitCrashes").checked = cr.submitReports;
}
}
function updateSubmitCrashes(aChecked)
{
Components.classes["@mozilla.org/toolkit/crash-reporter;1"]
.getService(Components.interfaces.nsICrashReporter)
.submitReports = aChecked;
}

51
navigator/components/preferences/content/pref-advanced.xul

@ -11,54 +11,7 @@
<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<prefpane id="advanced_pane"
label="&pref.advanced.title;"
script="chrome://communicator/content/pref/pref-advanced.js">
<preferences id="advanced_preferences">
<preference id="config.use_system_prefs"
name="config.use_system_prefs"
type="bool"/>
<preference id="shell.checkDefaultClient"
name="shell.checkDefaultClient"
type="bool"/>
<preference id="devtools.debugger.remote-enabled"
name="devtools.debugger.remote-enabled"
type="bool"/>
<preference id="devtools.debugger.force-local"
name="devtools.debugger.force-local"
inverted="true"
type="bool"/>
<preference id="devtools.debugger.prompt-connection"
name="devtools.debugger.prompt-connection"
type="bool"/>
<preference id="devtools.debugger.remote-port"
name="devtools.debugger.remote-port"
type="int"/>
</preferences>
<groupbox id="systemPrefs">
<caption id="systemPrefCaption" label="&systemPref.caption;"/>
<description>&systemPref.desc;</description>
<checkbox id="systemPrefCheck"
label="&systemPrefCheck.label;"
accesskey="&systemPrefCheck.accesskey;"
preference="config.use_system_prefs"/>
</groupbox>
<groupbox id="checkDefault" hidden="true">
<caption label="&prefCheckDefault.caption;"/>
<checkbox id="checkDefaultClient"
label="&prefCheckDefaultClient.label;"
accesskey="&prefCheckDefaultClient.accesskey;"
preference="shell.checkDefaultClient"/>
</groupbox>
<groupbox id="crashReports" hidden="true">
<caption id="crashReportsCaption" label="&crashReports.caption;"/>
<checkbox id="submitCrashes"
label="&submitCrashes.label;"
accesskey="&submitCrashes.accesskey;"
oncommand="updateSubmitCrashes(this.checked);"/>
</groupbox>
label="&pref.advanced.title;">
<description>&pref.advanced.description;</description>
</prefpane>
</overlay>

2
navigator/components/preferences/content/pref-certs.xul

@ -10,8 +10,6 @@
%brandDTD;
<!ENTITY % prefCertsDTD SYSTEM "chrome://pippki/locale/pref-certs.dtd">
%prefCertsDTD;
<!ENTITY % prefSslDTD SYSTEM "chrome://pippki/locale/pref-ssl.dtd">
%prefSslDTD;
]>
<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

8
navigator/components/preferences/content/pref-content.xul

@ -45,9 +45,9 @@
<preference id="gfx.direct2d.disabled"
name="gfx.direct2d.disabled"
type="bool" inverted="true"/>
<preference id="layers.acceleration.disabled"
name="layers.acceleration.disabled"
type="bool" inverted="true"
<preference id="layers.acceleration.enabled"
name="layers.acceleration.enabled"
type="bool"
onchange="updateHardwareAcceleration(this.value);"/>
<preference id="accessibility.blockautorefresh"
name="accessibility.blockautorefresh"
@ -127,7 +127,7 @@
<checkbox id="allowHWAccel"
label="&allowHWAccel.label;"
accesskey="&allowHWAccel.accesskey;"
preference="layers.acceleration.disabled"/>
preference="layers.acceleration.enabled"/>
<checkbox id="blockAutoRefresh"
label="&blockAutoRefresh.label;"
accesskey="&blockAutoRefresh.accesskey;"

1
navigator/components/preferences/content/pref-http.js

@ -9,7 +9,6 @@ function Startup()
{
CheckPipelining();
CheckPipeliningProxy();
CheckLightningUA();
}
function CheckPipelining()

14
navigator/components/preferences/content/pref-navigator.js

@ -246,6 +246,7 @@ function Startup()
// platform integration
InitPlatformIntegration();
ShellServiceCheck();
}
function SwitchPage(aIndex)
@ -319,3 +320,16 @@ function SetAsDefaultBrowser()
document.getElementById("defaultBrowserButton").disabled = true;
}
}
function ShellServiceCheck()
{
const NS_SHELLSERVICE_CID = "@mozilla.org/suite/shell-service;1";
if (NS_SHELLSERVICE_CID in Components.classes) try {
Components.classes[NS_SHELLSERVICE_CID]
.getService(Components.interfaces.nsIShellService)
.shouldCheckDefaultClient;
document.getElementById("checkDefault").hidden = false;
} catch (e) {
}
}

9
navigator/components/preferences/content/pref-navigator.xul

@ -48,6 +48,9 @@
<preference id="pref.browser.homepage.disable_button.default_page"
name="pref.browser.homepage.disable_button.default_page"
type="bool"/>
<preference id="shell.checkDefaultClient"
name="shell.checkDefaultClient"
type="bool"/>
</preferences>
<hbox id="pref-nav-platform-extensions">
@ -104,7 +107,7 @@
</groupbox>
<!-- default browser settings are shown only if supported by the platform -->
<groupbox id="defaultBrowserGroup" flex="1000" align="center" hidden="true">
<groupbox id="defaultBrowserGroup" flex="2000" hidden="true">
<caption label="&defaultBrowserGroup.label;"/>
<!-- We have four use cases, identified by their index:
0: not already the default => button enabled
@ -123,6 +126,10 @@
oncommand="SetAsDefaultBrowser()"
disabled="true"
preference="pref.browser.disable_button.default_browser"/>
<checkbox id="checkDefaultClient"
label="&prefCheckDefaultClient.label;"
accesskey="&prefCheckDefaultClient.accesskey;"
preference="shell.checkDefaultClient"/>
</groupbox>
</hbox>

0
navigator/components/preferences/content/pref-security.js → navigator/components/preferences/content/pref-privacy.js

25
navigator/components/preferences/content/pref-security.xul → navigator/components/preferences/content/pref-privacy.xul

@ -7,13 +7,13 @@
<!DOCTYPE overlay [
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
%brandDTD;
<!ENTITY % prefSecurityDTD SYSTEM "chrome://communicator/locale/pref/pref-security.dtd">
<!ENTITY % prefSecurityDTD SYSTEM "chrome://communicator/locale/pref/pref-privacy.dtd">
%prefSecurityDTD;
]>
<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<prefpane id="security_pane" label="&pref.security.title;"
script="chrome://communicator/content/pref/pref-security.js">
<prefpane id="privacy_pane" label="&pref.privacy.title;"
script="chrome://communicator/content/pref/pref-privacy.js">
<preferences id="security_preferences">
<!-- User Tracking -->
<preference id="privacy.donottrackheader.enabled"
@ -31,14 +31,6 @@
<preference id="geo.enabled"
name="geo.enabled"
type="bool"/>
<!-- Opportunistic Encryption -->
<preference id="network.http.upgrade-insecure-requests"
name="network.http.upgrade-insecure-requests"
type="bool"/>
<preference id="network.http.altsvc.oe"
name="network.http.altsvc.oe"
type="bool"/>
</preferences>
<!-- User Tracking -->
@ -78,16 +70,5 @@
accesskey="&geoDisabled.accesskey;"/>
</radiogroup>
</groupbox>
<!-- Opportunistic Encryption -->
<groupbox id="OpportunisticEncryption">
<caption label="&OpEnc.label;"/>
<checkbox id="enableUIROpEnc"
label="&enableUIROpEnc.label;"
preference="network.http.upgrade-insecure-requests" />
<checkbox id="enableAltSvcOpEnc"
label="&enableAltSvcOpEnc.label;"
preference="network.http.altsvc.oe" />
</groupbox>
</prefpane>
</overlay>

29
navigator/components/preferences/content/pref-scripts.xul

@ -44,7 +44,7 @@
type="int"/>
</preferences>
<groupbox id="javascriptPreferences" flex="1">
<groupbox id="javascriptPreferences">
<caption label="&enableJavaScript.label;"/>
<checkbox id="javascriptAllowNavigator"
@ -52,12 +52,13 @@
accesskey="&navigator.accesskey;"
preference="javascript.enabled"/>
<separator class="thin"/>
<label control="AllowList"
class="indent"
value="&allowScripts.label;"
accesskey="&allowScripts.accesskey;"/>
<listbox id="AllowList" class="indent" flex="1">
<listbox id="AllowList" rows="6">
<listitem type="checkbox" id="allowWindowMoveResize"
label="&allowWindowMoveResize.label;"
preference="dom.disable_window_move_resize"/>
@ -76,17 +77,6 @@
</listbox>
</groupbox>
<!-- REMOVE #ifndef once EME are ready for prime time, meta bug 1015800 -->
#ifndef RELEASE_OR_BETA
<groupbox id="drmPreferences">
<caption label="&enableDrmMedia.label;"/>
<checkbox id="emeForSuite"
label="&enableEmeForSuite.label;"
accesskey="&enableEmeForSuite.accesskey;"
preference="media.eme.enabled"/>
</groupbox>
#endif
<groupbox id="pluginPreferences">
<caption label="&enablePlugins.label;"/>
<checkbox id="pluginForSuite"
@ -94,12 +84,12 @@
accesskey="&enablePluginForSuite.accesskey;"
preference="plugin.disable"/>
<!-- mailnews will add its checkbox here using overlay (mailPrefsOverlay.xul).
-->
</groupbox>
<separator class="thin"/>
<label value="&whenPageRequiresPlugins.label;"/>
<separator class="thin"/>
<groupbox id="pageRequiresPlugins">
<caption label="&whenPageRequiresPlugins.label;"/>
<checkbox id="activateAllPlugins"
label="&activateAllPlugins.label;"
accesskey="&activateAllPlugins.accesskey;"
@ -111,6 +101,5 @@
accesskey="&warnPluginsRequired.accesskey;"
preference="plugins.hide_infobar_for_missing_plugin"/>
</groupbox>
</prefpane>
</overlay>

20
navigator/components/preferences/content/pref-ssl.xul

@ -45,6 +45,14 @@
<preference id="security.mixed_content.block_display_content"
name="security.mixed_content.block_display_content"
type="bool"/>
<!-- Opportunistic Encryption -->
<preference id="network.http.upgrade-insecure-requests"
name="network.http.upgrade-insecure-requests"
type="bool"/>
<preference id="network.http.altsvc.oe"
name="network.http.altsvc.oe"
type="bool"/>
</preferences>
<groupbox align="start">
@ -75,7 +83,6 @@
accesskey="&limit.tls13.accesskey;"
oncommand="UpdateSslPrefs();"/>
</hbox>
</groupbox>
<groupbox align="start">
@ -99,5 +106,16 @@
preference="security.mixed_content.block_display_content"/>
</groupbox>
<!-- Opportunistic Encryption -->
<groupbox id="OpportunisticEncryption"
align="start">
<caption label="&OpEnc.label;"/>
<checkbox id="enableUIROpEnc"
label="&enableUIROpEnc.label;"
preference="network.http.upgrade-insecure-requests" />
<checkbox id="enableAltSvcOpEnc"
label="&enableAltSvcOpEnc.label;"
preference="network.http.altsvc.oe" />
</groupbox>
</prefpane>
</overlay>

4
navigator/components/preferences/content/preferences.js

@ -26,6 +26,10 @@ function OnLoad()
window.innerHeight = setHeight;
window.innerWidth = setWidth;
if (document.getElementById("advancedChildren").childElementCount == 0) {
document.getElementById("advancedItem").setAttribute("hidden", true);
}
}
function EnableElementById(aElementId, aEnable, aFocus)

169
navigator/components/preferences/content/preferences.xul

@ -18,12 +18,12 @@
<prefwindow id="prefDialog"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
title="&prefWindow.title;"
height="600px"
height="660px"
width="690px"
overflow="auto"
onload="OnLoad();"
windowtype="mozilla:preferences"
buttons="accept,cancel,help"
buttons="accept,cancel"
autopanes="true">
<script type="application/javascript" src="chrome://communicator/content/pref/preferences.js"/>
@ -41,7 +41,7 @@
</stringbundleset>
<tree id="prefsTree"
style="width: 13em;"
style="width: 30ch;"
seltype="single"
hidecolumnpicker="true"
hidden="true"
@ -54,39 +54,36 @@
id="navigatorItem"
label="&navigator.label;"
prefpane="navigator_pane"
helpTopic="navigator_pref_navigator"
url="chrome://communicator/content/pref/pref-navigator.xul">
<treechildren id="navigatorChildren">
<treeitem id="locationBarItem"
label="&locationBar.label;"
prefpane="locationBar_pane"
helpTopic="navigator_pref_location_bar"
url="chrome://communicator/content/pref/pref-locationbar.xul"/>
<treeitem id="searchItem"
label="&search.label;"
prefpane="search_pane"
helpTopic="navigator_pref_internet_searching"
url="chrome://communicator/content/pref/pref-search.xul"/>
<treeitem id="tabsItem"
label="&tabWindows.label;"
prefpane="tabs_pane"
helpTopic="navigator_pref_tabbed_browsing"
url="chrome://communicator/content/pref/pref-tabs.xul"/>
<treeitem id="linksItem"
label="&links.label;"
prefpane="links_pane"
helpTopic="navigator_pref_link_behavior"
url="chrome://communicator/content/pref/pref-links.xul"/>
<treeitem id="downloadItem"
label="&download.label;"
prefpane="download_pane"
helpTopic="navigator_pref_downloads"
url="chrome://communicator/content/pref/pref-download.xul"/>
<treeitem id="applicationsItem"
label="&applications.label;"
prefpane="applications_pane"
helpTopic="navigator_pref_helper_applications"
url="chrome://communicator/content/pref/pref-applications.xul"/>
<treeitem id="smartupdateItem"
label="&smart.label;"
prefpane="smartupdate_pane"
url="chrome://communicator/content/pref/pref-smartupdate.xul"/>
</treechildren>
</treeitem>
@ -96,138 +93,118 @@
id="contentItem"
label="&content.label;"
prefpane="content_pane"
helpTopic="appearance_pref_content"
url="chrome://communicator/content/pref/pref-content.xul">
<treechildren id="contentChildren">
<treeitem id="popupsItem"
label="&popups.label;"
prefpane="popups_pane"
helpTopic="pop_up_blocking_prefs"
url="chrome://communicator/content/pref/pref-popups.xul"/>
<treeitem id="imagesItem"
label="&images.label;"
prefpane="images_pane"
helpTopic="images_prefs"
url="chrome://communicator/content/pref/pref-images.xul"/>
<treeitem id="findasyoutypeItem"
label="&findAsYouType.label;"
prefpane="findasyoutype_pane"
helpTopic="advanced_pref_find_as_you_type"
url="chrome://communicator/content/pref/pref-findasyoutype.xul"/>
<treeitem id="colorsItem"
label="&colors.label;"
prefpane="colors_pane"
url="chrome://communicator/content/pref/pref-colors.xul"/>
<treeitem id="fontsItem"
label="&fonts.label;"
prefpane="fonts_pane"
url="chrome://communicator/content/pref/pref-fonts.xul"/>
<treeitem id="spellingItem"
label="&spellingPane.label;"
prefpane="spelling_pane"
helpTopic="appearance_pref_spelling"
url="chrome://communicator/content/pref/pref-spelling.xul"/>
<treeitem id="languagesItem"
label="&languages.label;"
prefpane="languages_pane"
helpTopic="navigator_pref_languages"
url="chrome://communicator/content/pref/pref-languages.xul"/>
<treeitem id="fontsItem"
label="&fonts.label;"
prefpane="fonts_pane"
helpTopic="appearance_pref_fonts"
url="chrome://communicator/content/pref/pref-fonts.xul"/>
<treeitem id="colorsItem"
label="&colors.label;"
prefpane="colors_pane"
helpTopic="appearance_pref_colors"
url="chrome://communicator/content/pref/pref-colors.xul"/>
<treeitem id="mousewheelItem"
label="&mousewheel.label;"
prefpane="mousewheel_pane"
url="chrome://communicator/content/pref/pref-mousewheel.xul"/>
<treeitem id="findasyoutypeItem"
label="&findAsYouType.label;"
prefpane="findasyoutype_pane"
url="chrome://communicator/content/pref/pref-findasyoutype.xul"/>
<treeitem id="keynavItem"
label="&keynav.label;"
prefpane="keynav_pane"
url="chrome://communicator/content/pref/pref-keynav.xul"/>
</treechildren>
</treeitem>
<!-- Privacy & Security items -->
<!-- Privacy items -->
<treeitem open="true"
container="true"
id="securityItem"
prefpane="security_pane"
label="&security.label;"
helpTopic="sec_gen"
url="chrome://communicator/content/pref/pref-security.xul">
id="privacyItem"
prefpane="privacy_pane"
label="&privacy.label;"
url="chrome://communicator/content/pref/pref-privacy.xul">
<treechildren id="securityChildren">
<treeitem id="privatedataItem"
label="&privatedata.label;"
prefpane="privatedata_pane"
helpTopic="privatedata_prefs"
url="chrome://communicator/content/pref/pref-privatedata.xul"/>
<treeitem id="historyItem"
label="&history.label;"
prefpane="history_pane"
helpTopic="navigator_pref_history"
url="chrome://communicator/content/pref/pref-history.xul"/>
<treeitem id="cookiesItem"
label="&cookies.label;"
prefpane="cookies_pane"
helpTopic="cookies_prefs"
url="chrome://communicator/content/pref/pref-cookies.xul"/>
<treeitem id="cacheItem"
label="&cache.label;"
prefpane="cache_pane"
url="chrome://communicator/content/pref/pref-cache.xul"/>
<treeitem id="offlineAppsItem"
label="&offlineApps.label;"
prefpane="offlineapps_pane"
helpTopic="advanced_pref_offlineapps"
url="chrome://communicator/content/pref/pref-offlineapps.xul"/>
<treeitem id="masterpassItem"
label="&masterpass.label;"
prefpane="masterpass_pane"
url="chrome://communicator/content/pref/pref-masterpass.xul"
helpTopic="passwords_master"/>
</treechildren>
</treeitem>
<!-- Networking & Security items -->
<treeitem open="true"
container="true"
id="httpItem"
label="&httpnetworking.label;"
prefpane="http_pane"
url="chrome://communicator/content/pref/pref-http.xul">
<treechildren id="securityChildren">
<treeitem id="proxiesItem"
label="&proxies.label;"
prefpane="proxies_pane"
url="chrome://communicator/content/pref/pref-proxies.xul"/>
<treeitem id="sslItem"
label="&ssltls.label;"
prefpane="ssl_pane"
url="chrome://pippki/content/pref-ssl.xul"
helpTopic="ssl_prefs"/>
url="chrome://pippki/content/pref-ssl.xul"/>
<treeitem id="certItem"
label="&certs.label;"
prefpane="certs_pane"
url="chrome://pippki/content/pref-certs.xul"
helpTopic="certs_prefs"/>
<treeitem id="smartupdateItem"
label="&smart.label;"
prefpane="smartupdate_pane"
helpTopic="advanced_pref_installation"
url="chrome://communicator/content/pref/pref-smartupdate.xul"/>
url="chrome://pippki/content/pref-certs.xul"/>
<treeitem id="imagesItem"
label="&images.label;"
prefpane="images_pane"
url="chrome://communicator/content/pref/pref-images.xul"/>
<treeitem id="popupsItem"
label="&popups.label;"
prefpane="popups_pane"
url="chrome://communicator/content/pref/pref-popups.xul"/>
<treeitem id="masterpassItem"
label="&masterpass.label;"
prefpane="masterpass_pane"
url="chrome://communicator/content/pref/pref-masterpass.xul"/>
<treeitem id="scriptsItem"
label="&scriptsAndWindows.label;"
prefpane="scripts_pane"
url="chrome://communicator/content/pref/pref-scripts.xul"/>
</treechildren>
</treeitem>
<!-- Advanced items -->
<treeitem container="true"
<treeitem open="true"
container="true"
id="advancedItem"
label="&advance.label;"
prefpane="advanced_pane"
helpTopic="advanced_pref_advanced"
url="chrome://communicator/content/pref/pref-advanced.xul">
<treechildren id="advancedChildren">
<treeitem id="scriptsItem"
label="&scriptsAndWindows.label;"
prefpane="scripts_pane"
helpTopic="advanced_pref_scripts"
url="chrome://communicator/content/pref/pref-scripts.xul"/>
<treeitem id="keynavItem"
label="&keynav.label;"
prefpane="keynav_pane"
helpTopic="advanced_pref_keyboard_nav"
url="chrome://communicator/content/pref/pref-keynav.xul"/>
<treeitem id="cacheItem"
label="&cache.label;"
prefpane="cache_pane"
helpTopic="advanced_pref_cache"
url="chrome://communicator/content/pref/pref-cache.xul"/>
<treeitem id="proxiesItem"
label="&proxies.label;"
prefpane="proxies_pane"
helpTopic="advanced_pref_proxies"
url="chrome://communicator/content/pref/pref-proxies.xul"/>
<treeitem id="httpItem"
label="&httpnetworking.label;"
prefpane="http_pane"
helpTopic="advanced_http_networking"
url="chrome://communicator/content/pref/pref-http.xul"/>
<treeitem id="mousewheelItem"
label="&mousewheel.label;"
prefpane="mousewheel_pane"
helpTopic="advanced_pref_mouse_wheel"
url="chrome://communicator/content/pref/pref-mousewheel.xul"/>
</treechildren>
<treechildren id="advancedChildren"/>
</treeitem>
</treechildren>
</tree>

7
navigator/components/preferences/jar.mn

@ -9,7 +9,6 @@ comm.jar:
content/communicator/pref/preferences.js (content/preferences.js)
content/communicator/pref/prefpanels.css (content/prefpanels.css)
content/communicator/pref/prefpanels.xml (content/prefpanels.xml)
content/communicator/pref/pref-advanced.js (content/pref-advanced.js)
content/communicator/pref/pref-advanced.xul (content/pref-advanced.xul)
content/communicator/pref/pref-appearance.js (content/pref-appearance.js)
content/communicator/pref/pref-appearance.xul (content/pref-appearance.xul)
@ -64,8 +63,8 @@ comm.jar:
content/communicator/pref/pref-scripts.js (content/pref-scripts.js)
* content/communicator/pref/pref-scripts.xul (content/pref-scripts.xul)
content/communicator/pref/pref-search.xul (content/pref-search.xul)
content/communicator/pref/pref-security.js (content/pref-security.js)
content/communicator/pref/pref-security.xul (content/pref-security.xul)
content/communicator/pref/pref-privacy.js (content/pref-privacy.js)
content/communicator/pref/pref-privacy.xul (content/pref-privacy.xul)
content/communicator/pref/pref-smartupdate.js (content/pref-smartupdate.js)
content/communicator/pref/pref-smartupdate.xul (content/pref-smartupdate.xul)
content/communicator/pref/pref-spelling.js (content/pref-spelling.js)
@ -113,7 +112,7 @@ en-US.jar:
locale/en-US/communicator/pref/pref-proxies-advanced.dtd (locale/pref-proxies-advanced.dtd)
locale/en-US/communicator/pref/pref-scripts.dtd (locale/pref-scripts.dtd)
locale/en-US/communicator/pref/pref-search.dtd (locale/pref-search.dtd)
locale/en-US/communicator/pref/pref-security.dtd (locale/pref-security.dtd)
locale/en-US/communicator/pref/pref-privacy.dtd (locale/pref-privacy.dtd)
locale/en-US/communicator/pref/pref-smartupdate.dtd (locale/pref-smartupdate.dtd)
locale/en-US/communicator/pref/pref-spelling.dtd (locale/pref-spelling.dtd)
locale/en-US/communicator/pref/pref-tabs.dtd (locale/pref-tabs.dtd)

26
navigator/components/preferences/locale/pref-advanced.dtd

@ -3,27 +3,5 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<!--LOCALIZATION NOTE : FILE 'Advanced' prefs settings -->
<!ENTITY pref.advanced.title "Advanced">
<!ENTITY systemPref.caption "System Preferences">
<!ENTITY systemPrefCheck.label "Use Preferences from System">
<!ENTITY systemPrefCheck.accesskey "U">
<!ENTITY systemPref.desc "With this option, &brandShortName; inherits preferences from the system. These system settings will override the &brandShortName; preferences.">
<!ENTITY prefCheckDefault.caption "System Integration">
<!ENTITY prefCheckDefaultClient.label "Check default application settings on startup">
<!ENTITY prefCheckDefaultClient.accesskey "C">
<!ENTITY crashReports.caption "Crash Reporter">
<!ENTITY submitCrashes.label "Submit crash reports">
<!ENTITY submitCrashes.accesskey "S">
<!ENTITY devTools.caption "Developer Tools">
<!ENTITY allowDebugger.label "Allow a debugger to connect to &brandShortName;">
<!ENTITY allowDebugger.accesskey "A">
<!ENTITY allowRemoteConnections.label "Allow connections from other computers">
<!ENTITY allowRemoteConnections.accesskey "o">
<!ENTITY connectionPrompt.label "Prompt for incoming connections">
<!ENTITY connectionPrompt.accesskey "P">
<!ENTITY remoteDebuggerPort.label "Port number for connection:">
<!ENTITY remoteDebuggerPort.accesskey "n">
<!ENTITY pref.advanced.title "Additional Settings">
<!ENTITY pref.advanced.description "There are no settings here.">

7
navigator/components/preferences/locale/pref-certs.dtd

@ -21,3 +21,10 @@
<!ENTITY enableOCSP.accesskey "U">
<!ENTITY validation.requireOCSP.description "When an OCSP server connection fails, treat the certificate as invalid">
<!ENTITY validation.requireOCSP.accesskey "W">
<!ENTITY SSLClientAuthMethod.caption "Client Certificate Selection">
<!ENTITY certselect.description "Decide how &brandFullName; selects a security certificate to present to websites that require one:">
<!ENTITY certselect.auto "Select Automatically">
<!ENTITY certselect.auto.accesskey "A">
<!ENTITY certselect.ask "Ask Every Time">
<!ENTITY certselect.ask.accesskey "E">

3
navigator/components/preferences/locale/pref-http.dtd

@ -2,7 +2,7 @@
- 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/. -->
<!ENTITY pref.http.title "HTTP Networking">
<!ENTITY pref.http.title "Networking &amp; Security">
<!-- Network-->
<!ENTITY prefDirect.label "Direct Connection Options">
@ -24,3 +24,4 @@
<!ENTITY prefFirefoxCompat.label "Advertise Firefox compatibility">
<!ENTITY prefFirefoxCompat.accesskey "F">
<!ENTITY prefCompatWarning "WARNING: Changing these settings may result in websites or services not working properly.">

14
navigator/components/preferences/locale/pref-navigator.dtd

@ -41,10 +41,12 @@
<!ENTITY useDefault.label "Restore Default">
<!ENTITY useDefault.accesskey "R">
<!ENTITY defaultBrowserGroup.label "Default Browser">
<!ENTITY defaultBrowserButton.label "Set Default Browser">
<!ENTITY defaultBrowserGroup.label "Default Web Client">
<!ENTITY defaultBrowserButton.label "Set Default Web Client">
<!ENTITY defaultBrowserButton.accesskey "D">
<!ENTITY alreadyDefaultText "&brandShortName; is already your default browser.">
<!ENTITY defaultPendingText "&brandShortName; will be set as your default browser when you click OK.">
<!ENTITY wasMadeDefaultText "&brandShortName; has been set as your default browser.">
<!ENTITY makeDefaultText "Set &brandShortName; as your default browser.">
<!ENTITY alreadyDefaultText "&brandFullName; is already your default web client.">
<!ENTITY defaultPendingText "&brandFullName; will be set as your default web client when you click OK.">
<!ENTITY wasMadeDefaultText "&brandFullName; has been set as your default web client.">
<!ENTITY makeDefaultText "Set &brandFullName; as your default web client.">
<!ENTITY prefCheckDefaultClient.label "Check on startup">
<!ENTITY prefCheckDefaultClient.accesskey "C">

8
navigator/components/preferences/locale/pref-security.dtd → navigator/components/preferences/locale/pref-privacy.dtd

@ -2,8 +2,8 @@
- 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/. -->
<!--LOCALIZATION NOTE : FILE 'Privacy and Security' prefs settings -->
<!ENTITY pref.security.title "Privacy &amp; Security">
<!--LOCALIZATION NOTE : FILE 'Privacy' prefs settings -->
<!ENTITY pref.privacy.title "Privacy">
<!ENTITY tracking.label "User Tracking">
<!ENTITY trackingIntro.label "Websites may track how you use them, thus affecting your privacy.">
@ -22,7 +22,3 @@
<!ENTITY geoEnabled.accesskey "m">
<!ENTITY geoDisabled.label "Disable this feature and deny all requests">
<!ENTITY geoDisabled.accesskey "D">
<!ENTITY OpEnc.label "Opportunistic Encryption">
<!ENTITY enableUIROpEnc.label "Enable Upgrade Insecure Requests">
<!ENTITY enableAltSvcOpEnc.label "Enable HTTP Alternative Services">

14
navigator/components/preferences/locale/pref-scripts.dtd

@ -7,11 +7,11 @@
<!--LOCALIZATION NOTE : FILE The 'Scripts & Plugins' preferences dialog -->
<!ENTITY pref.scripts.title "Scripts &amp; Plugins">
<!ENTITY navigator.label "Browser">
<!ENTITY navigator.accesskey "B">
<!ENTITY navigator.label "Enable JavaScript">
<!ENTITY navigator.accesskey "J">
<!--LOCALIZATION NOTE (enableJavaScript.label): 'JavaScript' should never be translated -->
<!ENTITY enableJavaScript.label "Enable JavaScript for">
<!ENTITY enableJavaScript.label "JavaScript Settings">
<!ENTITY allowScripts.label "Allow scripts to:">
<!ENTITY allowScripts.accesskey "s">
<!ENTITY allowWindowMoveResize.label "Move or resize existing windows">
@ -24,11 +24,11 @@
<!ENTITY enableEmeForSuite.label "Third-party Content Decryption Modules">
<!ENTITY enableEmeForSuite.accesskey "C">
<!ENTITY enablePlugins.label "Enable Plugins for">
<!ENTITY enablePluginForSuite.label "Suite">
<!ENTITY enablePluginForSuite.accesskey "u">
<!ENTITY enablePlugins.label "Plugin Settings">
<!ENTITY enablePluginForSuite.label "Enable Plugins">
<!ENTITY enablePluginForSuite.accesskey "P">
<!ENTITY whenPageRequiresPlugins.label "When a page requires plugins">
<!ENTITY whenPageRequiresPlugins.label "When a page requires plugins:">
<!ENTITY activateAllPlugins.label "Activate all plugins by default">
<!ENTITY activateAllPlugins.accesskey "d">
<!ENTITY warnPluginsRequired.label "Warn me if additional plugins need to be installed">

15
navigator/components/preferences/locale/pref-ssl.dtd

@ -2,11 +2,10 @@
- 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/. -->
<!ENTITY SSLTLSProtocolVersions.caption "SSL/TLS Protocol Versions">
<!ENTITY SSLTLSProtocolVersions.caption "Transport Layer Security">
<!ENTITY SSLMixedContent.caption "Mixed Content">
<!ENTITY SSLClientAuthMethod.caption "Client Certificate Selection">
<!ENTITY pref.ssltls.title "Transport Layer Security (SSL/TLS)">
<!ENTITY pref.ssltls.title "Encryption">
<!ENTITY limit.description "You can restrict which encryption protocols to use for secure connections. Choose a single version or a contiguous range of versions.">
<!ENTITY limit.enable.label "Enable:">
<!ENTITY limit.tls10.label "TLS 1.0">
@ -18,7 +17,7 @@
<!ENTITY limit.tls13.label "TLS 1.3">
<!ENTITY limit.tls13.accesskey "3">
<!ENTITY mixed.description "Encrypted pages may contain unencrypted content that is vulnerable to eavesdropping or forgery. &brandShortName; can detect and block it:">
<!ENTITY mixed.description "Encrypted pages may contain unencrypted content that is vulnerable to eavesdropping or forgery. &brandFullName; can detect and block it:">
<!ENTITY warn.mixedactivecontent "Warn me when encrypted pages contain insecure content">
<!ENTITY warn.mixedactivecontent.accesskey "W">
<!ENTITY block.activecontent "Don't load insecure content on encrypted pages">
@ -28,8 +27,6 @@
<!ENTITY block.displaycontent "Don't load other types of mixed content on encrypted pages">
<!ENTITY block.displaycontent.accesskey "m">
<!ENTITY certselect.description "Decide how &brandShortName; selects a security certificate to present to websites that require one:">
<!ENTITY certselect.auto "Select Automatically">
<!ENTITY certselect.auto.accesskey "A">
<!ENTITY certselect.ask "Ask Every Time">
<!ENTITY certselect.ask.accesskey "E">
<!ENTITY OpEnc.label "Opportunistic Encryption">
<!ENTITY enableUIROpEnc.label "Enable Upgrade Insecure Requests">
<!ENTITY enableAltSvcOpEnc.label "Enable HTTP Alternative Services">

9
navigator/components/preferences/locale/preferences.dtd

@ -22,25 +22,26 @@
<!ENTITY links.label "Link Behavior">
<!ENTITY download.label "Downloads">
<!ENTITY security.label "Privacy &amp; Security">
<!ENTITY privacy.label "Privacy">
<!ENTITY privatedata.label "Private Data">
<!ENTITY cookies.label "Cookies">
<!ENTITY images.label "Images">
<!ENTITY popups.label "Popup Windows">
<!ENTITY masterpass.label "Passwords">
<!ENTITY ssltls.label "SSL/TLS">
<!ENTITY ssltls.label "Encryption">
<!ENTITY certs.label "Certificates">
<!ENTITY sync.label "Sync">
<!ENTITY advance.label "Advanced">
<!ENTITY advance.label "Additional Settings">
<!ENTITY scriptsAndWindows.label "Scripts &amp; Plugins">
<!ENTITY keynav.label "Keyboard Navigation">
<!ENTITY findAsYouType.label "Find As You Type">
<!ENTITY cache.label "Cache">
<!ENTITY offlineApps.label "Offline Apps">
<!ENTITY proxies.label "Proxies">
<!ENTITY httpnetworking.label "HTTP Networking">
<!ENTITY httpnetworking.label "Networking &amp; Security">
<!ENTITY smart.label "Software Installation">
<!ENTITY mousewheel.label "Mouse Wheel">

Loading…
Cancel
Save