--- a/browser/components/preferences/colors.xul
+++ b/browser/components/preferences/colors.xul
@@ -36,44 +36,44 @@
<preference id="browser.display.background_color" name="browser.display.background_color" type="string"/>
<preference id="browser.display.use_system_colors" name="browser.display.use_system_colors" type="bool"/>
</preferences>
<hbox>
<groupbox flex="1">
<caption><label>&color;</label></caption>
<hbox align="center">
- <label accesskey="&textColor.accesskey;" control="foregroundtextmenu">&textColor.label;</label>
+ <label accesskey="&textColor2.accesskey;" control="foregroundtextmenu">&textColor2.label;</label>
<spacer flex="1"/>
<colorpicker type="button" id="foregroundtextmenu" palettename="standard"
preference="browser.display.foreground_color"/>
</hbox>
<hbox align="center" style="margin-top: 5px">
- <label accesskey="&backgroundColor.accesskey;" control="backgroundmenu">&backgroundColor.label;</label>
+ <label accesskey="&backgroundColor2.accesskey;" control="backgroundmenu">&backgroundColor2.label;</label>
<spacer flex="1"/>
<colorpicker type="button" id="backgroundmenu" palettename="standard"
preference="browser.display.background_color"/>
</hbox>
<separator class="thin"/>
<hbox align="center">
<checkbox id="browserUseSystemColors" label="&useSystemColors.label;" accesskey="&useSystemColors.accesskey;"
preference="browser.display.use_system_colors"/>
</hbox>
</groupbox>
<groupbox flex="1">
<caption><label>&links;</label></caption>
<hbox align="center">
- <label accesskey="&linkColor.accesskey;" control="unvisitedlinkmenu">&linkColor.label;</label>
+ <label accesskey="&linkColor2.accesskey;" control="unvisitedlinkmenu">&linkColor2.label;</label>
<spacer flex="1"/>
<colorpicker type="button" id="unvisitedlinkmenu" palettename="standard"
preference="browser.anchor_color"/>
</hbox>
<hbox align="center" style="margin-top: 5px">
- <label accesskey="&visitedLinkColor.accesskey;" control="visitedlinkmenu">&visitedLinkColor.label;</label>
+ <label accesskey="&visitedLinkColor2.accesskey;" control="visitedlinkmenu">&visitedLinkColor2.label;</label>
<spacer flex="1"/>
<colorpicker type="button" id="visitedlinkmenu" palettename="standard"
preference="browser.visited_color"/>
</hbox>
<separator class="thin"/>
<hbox align="center">
<checkbox id="browserUnderlineAnchors" label="&underlineLinks.label;" accesskey="&underlineLinks.accesskey;"
preference="browser.underline_anchors"/>
--- a/browser/components/preferences/connection.xul
+++ b/browser/components/preferences/connection.xul
@@ -67,95 +67,95 @@
<groupbox>
<caption><label>&proxyTitle.label;</label></caption>
<radiogroup id="networkProxyType" preference="network.proxy.type"
onsyncfrompreference="return gConnectionsDialog.readProxyType();">
<radio value="0" label="&noProxyTypeRadio.label;" accesskey="&noProxyTypeRadio.accesskey;"/>
<radio value="4" label="&WPADTypeRadio.label;" accesskey="&WPADTypeRadio.accesskey;"/>
<radio value="5" label="&systemTypeRadio.label;" accesskey="&systemTypeRadio.accesskey;" id="systemPref" hidden="true"/>
- <radio value="1" label="&manualTypeRadio.label;" accesskey="&manualTypeRadio.accesskey;"/>
+ <radio value="1" label="&manualTypeRadio2.label;" accesskey="&manualTypeRadio2.accesskey;"/>
<grid class="indent" flex="1">
<columns>
<column/>
<column flex="1"/>
</columns>
<rows>
<row align="center">
<hbox pack="end">
- <label accesskey="&http.accesskey;" control="networkProxyHTTP">&http.label;</label>
+ <label accesskey="&http2.accesskey;" control="networkProxyHTTP">&http2.label;</label>
</hbox>
<hbox align="center">
<textbox id="networkProxyHTTP" flex="1"
preference="network.proxy.http" onsyncfrompreference="return gConnectionsDialog.readHTTPProxyServer();"/>
- <label accesskey="&HTTPport.accesskey;" control="networkProxyHTTP_Port">&port.label;</label>
+ <label accesskey="&HTTPport.accesskey;" control="networkProxyHTTP_Port">&port2.label;</label>
<textbox id="networkProxyHTTP_Port" type="number" max="65535" size="5"
preference="network.proxy.http_port" onsyncfrompreference="return gConnectionsDialog.readHTTPProxyPort();"/>
</hbox>
</row>
<row>
<hbox/>
<hbox>
<checkbox id="shareAllProxies" label="&shareproxy.label;" accesskey="&shareproxy.accesskey;"
preference="network.proxy.share_proxy_settings"
onsyncfrompreference="return gConnectionsDialog.updateProtocolPrefs();"/>
</hbox>
</row>
<row align="center">
<hbox pack="end">
- <label accesskey="&ssl.accesskey;" control="networkProxySSL">&ssl.label;</label>
+ <label accesskey="&ssl2.accesskey;" control="networkProxySSL">&ssl2.label;</label>
</hbox>
<hbox align="center">
<textbox id="networkProxySSL" flex="1" preference="network.proxy.ssl"
onsyncfrompreference="return gConnectionsDialog.readProxyProtocolPref('ssl', false);"/>
- <label accesskey="&SSLport.accesskey;" control="networkProxySSL_Port">&port.label;</label>
+ <label accesskey="&SSLport.accesskey;" control="networkProxySSL_Port">&port2.label;</label>
<textbox id="networkProxySSL_Port" type="number" max="65535" size="5" preference="network.proxy.ssl_port"
onsyncfrompreference="return gConnectionsDialog.readProxyProtocolPref('ssl', true);"/>
</hbox>
</row>
<row align="center">
<hbox pack="end">
- <label accesskey="&ftp.accesskey;" control="networkProxyFTP">&ftp.label;</label>
+ <label accesskey="&ftp2.accesskey;" control="networkProxyFTP">&ftp2.label;</label>
</hbox>
<hbox align="center">
<textbox id="networkProxyFTP" flex="1" preference="network.proxy.ftp"
onsyncfrompreference="return gConnectionsDialog.readProxyProtocolPref('ftp', false);"/>
- <label accesskey="&FTPport.accesskey;" control="networkProxyFTP_Port">&port.label;</label>
+ <label accesskey="&FTPport.accesskey;" control="networkProxyFTP_Port">&port2.label;</label>
<textbox id="networkProxyFTP_Port" type="number" max="65535" size="5" preference="network.proxy.ftp_port"
onsyncfrompreference="return gConnectionsDialog.readProxyProtocolPref('ftp', true);"/>
</hbox>
</row>
<row align="center">
<hbox pack="end">
- <label accesskey="&socks.accesskey;" control="networkProxySOCKS">&socks.label;</label>
+ <label accesskey="&socks2.accesskey;" control="networkProxySOCKS">&socks2.label;</label>
</hbox>
<hbox align="center">
<textbox id="networkProxySOCKS" flex="1" preference="network.proxy.socks"
onsyncfrompreference="return gConnectionsDialog.readProxyProtocolPref('socks', false);"/>
- <label accesskey="&SOCKSport.accesskey;" control="networkProxySOCKS_Port">&port.label;</label>
+ <label accesskey="&SOCKSport.accesskey;" control="networkProxySOCKS_Port">&port2.label;</label>
<textbox id="networkProxySOCKS_Port" type="number" max="65535" size="5" preference="network.proxy.socks_port"
onsyncfrompreference="return gConnectionsDialog.readProxyProtocolPref('socks', true);"/>
</hbox>
</row>
<row>
<spacer/>
<box pack="start">
<radiogroup id="networkProxySOCKSVersion" orient="horizontal"
preference="network.proxy.socks_version">
<radio id="networkProxySOCKSVersion4" value="4" label="&socks4.label;" accesskey="&socks4.accesskey;" />
<radio id="networkProxySOCKSVersion5" value="5" label="&socks5.label;" accesskey="&socks5.accesskey;" />
</radiogroup>
</box>
</row>
- <label accesskey="&noproxy.accesskey;" control="networkProxyNone">&noproxy.label;</label>
+ <label accesskey="&noproxy2.accesskey;" control="networkProxyNone">&noproxy2.label;</label>
<textbox id="networkProxyNone" preference="network.proxy.no_proxies_on" multiline="true" rows="2"/>
<label control="networkProxyNone">&noproxyExplain.label;</label>
</rows>
</grid>
- <radio value="2" label="&autoTypeRadio.label;" accesskey="&autoTypeRadio.accesskey;"/>
+ <radio value="2" label="&autoTypeRadio2.label;" accesskey="&autoTypeRadio2.accesskey;"/>
<hbox class="indent" flex="1" align="center">
<textbox id="networkProxyAutoconfigURL" flex="1" preference="network.proxy.autoconfig_url"
oninput="gConnectionsDialog.updateReloadButton();"/>
<button id="autoReload" icon="refresh"
label="&reload.label;" accesskey="&reload.accesskey;"
oncommand="gConnectionsDialog.reloadPAC();"
preference="pref.advanced.proxies.disable_button.reload"/>
</hbox>
--- a/browser/components/preferences/containers.xul
+++ b/browser/components/preferences/containers.xul
@@ -26,24 +26,24 @@
src="chrome://browser/locale/preferences/preferences.properties"/>
<keyset>
<key key="&windowClose.key;" modifiers="accel" oncommand="window.close();"/>
</keyset>
<vbox class="contentPane largeDialogContainer" flex="1" hidden="true" id="containers-content">
<hbox align="start">
- <label id="nameLabel" control="name" accesskey="&name.accesskey;">&name.label;</label>
+ <label id="nameLabel" control="name" accesskey="&name2.accesskey;">&name2.label;</label>
<textbox id="name" placeholder="&name.placeholder;" flex="1" onkeyup="gContainersManager.checkForm();" />
</hbox>
<hbox align="center" id="iconWrapper">
- <label id="iconLabel" control="icon" accesskey="&icon.accesskey;">&icon.label;</label>
+ <label id="iconLabel" control="icon" accesskey="&icon2.accesskey;">&icon2.label;</label>
</hbox>
<hbox align="center" id="colorWrapper">
- <label id="colorLabel" control="color" accesskey="&color.accesskey;">&color.label;</label>
+ <label id="colorLabel" control="color" accesskey="&color2.accesskey;">&color2.label;</label>
</hbox>
</vbox>
<vbox>
<hbox class="actionButtons" align="right" flex="1">
<button id="btnApplyChanges" disabled="true" oncommand="gContainersManager.onApplyChanges();" icon="save"
label="&button.ok.label;" accesskey="&button.ok.accesskey;"/>
</hbox>
</vbox>
--- a/browser/components/preferences/fonts.xul
+++ b/browser/components/preferences/fonts.xul
@@ -37,17 +37,17 @@
<stringbundle id="bundlePreferences" src="chrome://browser/locale/preferences/preferences.properties"/>
<script type="application/javascript" src="chrome://mozapps/content/preferences/fontbuilder.js"/>
<script type="application/javascript" src="chrome://browser/content/preferences/fonts.js"/>
<!-- Fonts for: [ Language ] -->
<groupbox>
<caption>
<hbox align="center">
- <label accesskey="&language.accesskey;" control="selectLangs">&language.label;</label>
+ <label accesskey="&fonts.accesskey;" control="selectLangs">&fonts.label;</label>
</hbox>
<!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
<hbox>
<menulist id="selectLangs" preference="font.language.group"
onsyncfrompreference="return gFontsDialog.readFontLanguageGroup();">
<menupopup>
<menuitem value="ar" label="&font.langGroup.arabic;"/>
<menuitem value="x-armn" label="&font.langGroup.armenian;"/>
@@ -93,30 +93,30 @@
<rows>
<row>
<separator class="thin"/>
</row>
<row align="center">
<hbox align="center" pack="end">
- <label accesskey="&proportional.accesskey;" control="defaultFontType">&proportional.label;</label>
+ <label accesskey="&proportional2.accesskey;" control="defaultFontType">&proportional2.label;</label>
</hbox>
<!-- This <hbox> is needed to position search tooltips correctly. -->
<hbox>
<menulist id="defaultFontType" flex="1" style="width: 0px;">
<menupopup>
<menuitem value="serif" label="&useDefaultFontSerif.label;"/>
<menuitem value="sans-serif" label="&useDefaultFontSansSerif.label;"/>
</menupopup>
</menulist>
</hbox>
<hbox align="center" pack="end">
<label accesskey="&sizeProportional.accesskey;"
- control="sizeVar">&size.label;</label>
+ control="sizeVar">&size2.label;</label>
</hbox>
<!-- This <hbox> is needed to position search tooltips correctly. -->
<hbox>
<menulist id="sizeVar" delayprefsave="true">
<menupopup>
<menuitem value="9" label="9"/>
<menuitem value="10" label="10"/>
<menuitem value="11" label="11"/>
@@ -143,45 +143,45 @@
<menuitem value="64" label="64"/>
<menuitem value="72" label="72"/>
</menupopup>
</menulist>
</hbox>
</row>
<row align="center">
<hbox align="center" pack="end">
- <label accesskey="&serif.accesskey;" control="serif">&serif.label;</label>
+ <label accesskey="&serif2.accesskey;" control="serif">&serif2.label;</label>
</hbox>
<hbox>
<menulist id="serif" flex="1" style="width: 0px;" delayprefsave="true"
onsyncfrompreference="return FontBuilder.readFontSelection(this);"/>
</hbox>
<spacer/>
</row>
<row align="center">
<hbox align="center" pack="end">
- <label accesskey="&sans-serif.accesskey;" control="sans-serif">&sans-serif.label;</label>
+ <label accesskey="&sans-serif2.accesskey;" control="sans-serif">&sans-serif2.label;</label>
</hbox>
<hbox>
<menulist id="sans-serif" flex="1" style="width: 0px;" delayprefsave="true"
onsyncfrompreference="return FontBuilder.readFontSelection(this);"/>
</hbox>
<spacer/>
</row>
<row align="center">
<hbox align="center" pack="end">
- <label accesskey="&monospace.accesskey;" control="monospace">&monospace.label;</label>
+ <label accesskey="&monospace2.accesskey;" control="monospace">&monospace2.label;</label>
</hbox>
<hbox>
<menulist id="monospace" flex="1" style="width: 0px;" crop="right" delayprefsave="true"
onsyncfrompreference="return FontBuilder.readFontSelection(this);"/>
</hbox>
<hbox align="center" pack="end">
<label accesskey="&sizeMonospace.accesskey;"
- control="sizeMono">&size.label;</label>
+ control="sizeMono">&size2.label;</label>
</hbox>
<hbox>
<menulist id="sizeMono" delayprefsave="true">
<menupopup>
<menuitem value="9" label="9"/>
<menuitem value="10" label="10"/>
<menuitem value="11" label="11"/>
<menuitem value="12" label="12"/>
@@ -211,17 +211,17 @@
</hbox>
</row>
</rows>
</grid>
<separator class="thin"/>
<hbox flex="1">
<spacer flex="1"/>
<hbox align="center" pack="end">
- <label accesskey="&minSize.accesskey;" control="minSize">&minSize.label;</label>
+ <label accesskey="&minSize2.accesskey;" control="minSize">&minSize2.label;</label>
<!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
<hbox>
<menulist id="minSize">
<menupopup>
<menuitem value="0" label="&minSize.none;"/>
<menuitem value="9" label="9"/>
<menuitem value="10" label="10"/>
<menuitem value="11" label="11"/>
@@ -263,18 +263,18 @@
</hbox>
</groupbox>
<!-- Text Encoding -->
<groupbox>
<caption><label>&languages.customize.Fallback2.grouplabel;</label></caption>
<description>&languages.customize.Fallback2.desc;</description>
<hbox align="center">
- <label accesskey="&languages.customize.Fallback2.accesskey;"
- control="DefaultCharsetList">&languages.customize.Fallback2.label;</label>
+ <label accesskey="&languages.customize.Fallback3.accesskey;"
+ control="DefaultCharsetList">&languages.customize.Fallback3.label;</label>
<!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
<hbox>
<menulist id="DefaultCharsetList" preference="intl.charset.fallback.override">
<menupopup>
<menuitem label="&languages.customize.Fallback.auto;" value=""/>
<menuitem label="&languages.customize.Fallback.arabic;" value="windows-1256"/>
<menuitem label="&languages.customize.Fallback.baltic;" value="windows-1257"/>
<menuitem label="&languages.customize.Fallback.ceiso;" value="ISO-8859-2"/>
--- a/browser/components/preferences/in-content-new/main.xul
+++ b/browser/components/preferences/in-content-new/main.xul
@@ -502,22 +502,22 @@
<!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
<hbox>
<button id="advancedFonts"
class="accessory-button"
icon="select-font"
label="&advancedFonts.label;"
accesskey="&advancedFonts.accesskey;"
searchkeywords="&fontsDialog.title;
- &language.label;
- &size.label;
- &proportional.label;
- &serif.label;
- &sans-serif.label;
- &monospace.label;
+ &fonts.label;
+ &size2.label;
+ &proportional2.label;
+ &serif2.label;
+ &sans-serif2.label;
+ &monospace2.label;
&font.langGroup.latin;
&font.langGroup.japanese;
&font.langGroup.trad-chinese;
&font.langGroup.simpl-chinese;
&font.langGroup.trad-chinese-hk;
&font.langGroup.korean;
&font.langGroup.cyrillic;
&font.langGroup.el;
@@ -537,23 +537,23 @@
&font.langGroup.khmer;
&font.langGroup.malayalam;
&font.langGroup.math;
&font.langGroup.odia;
&font.langGroup.telugu;
&font.langGroup.kannada;
&font.langGroup.sinhala;
&font.langGroup.tibetan;
- &minSize.label;
+ &minSize2.label;
&minSize.none;
&useDefaultFontSerif.label;
&useDefaultFontSansSerif.label;
&allowPagesToUseOwn.label;
&languages.customize.Fallback2.grouplabel;
- &languages.customize.Fallback2.label;
+ &languages.customize.Fallback3.label;
&languages.customize.Fallback2.desc;
&languages.customize.Fallback.auto;
&languages.customize.Fallback.arabic;
&languages.customize.Fallback.baltic;
&languages.customize.Fallback.ceiso;
&languages.customize.Fallback.cewindows;
&languages.customize.Fallback.simplified;
&languages.customize.Fallback.traditional;
@@ -576,20 +576,23 @@
class="accessory-button"
icon="select-color"
label="&colors.label;"
accesskey="&colors.accesskey;"
searchkeywords="&overrideDefaultPageColors.label;
&overrideDefaultPageColors.always.label;
&overrideDefaultPageColors.auto.label;
&overrideDefaultPageColors.never.label;
+ &color;
+ &textColor2.label;
+ &backgroundColor2.label;
&useSystemColors.label;
&underlineLinks.label;
- &linkColor.label;
- &visitedLinkColor.label;"/>
+ &linkColor2.label;
+ &visitedLinkColor2.label;"/>
</hbox>
</hbox>
</vbox>
</groupbox>
<!-- Languages -->
<groupbox id="languagesGroup" data-category="paneGeneral" hidden="true">
<caption><label>&language2.label;</label></caption>
@@ -598,17 +601,17 @@
<description flex="1" control="chooseLanguage">&chooseLanguage.label;</description>
<!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
<hbox>
<button id="chooseLanguage"
class="accessory-button"
label="&chooseButton.label;"
accesskey="&chooseButton.accesskey;"
searchkeywords="&languages.customize.Header;
- &languages.customize.description;
+ &languages.customize2.description;
&languages.customize.moveUp.label;
&languages.customize.moveDown.label;
&languages.customize.deleteButton.label;
&languages.customize.selectLanguage.label;
&languages.customize.addButton.label;"/>
</hbox>
</hbox>
@@ -765,17 +768,17 @@
<spacer flex="1"/>
<!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
<vbox>
<button id="showUpdateHistory"
class="accessory-button"
label="&updateHistory2.label;"
accesskey="&updateHistory2.accesskey;"
preference="app.update.disable_button.showUpdateHistory"
- searchkeywords="&history.title; &history.intro;"/>
+ searchkeywords="&history.title; &history2.intro;"/>
</vbox>
#endif
</hbox>
#ifdef MOZ_UPDATER
<vbox id="updateBox">
<deck id="updateDeck" orient="vertical">
<hbox id="checkForUpdates" align="center">
<spacer flex="1"/>
@@ -987,25 +990,26 @@
class="accessory-button"
icon="network"
label="&connectionSettings.label;"
accesskey="&connectionSettings.accesskey;"
searchkeywords="&connectionsDialog.title;
&noProxyTypeRadio.label;
&WPADTypeRadio.label;
&systemTypeRadio.label;
- &manualTypeRadio.label;
- &http.label;
- &ssl.label;
- &ftp.label;
- &socks.label;
+ &manualTypeRadio2.label;
+ &http2.label;
+ &ssl2.label;
+ &ftp2.label;
+ &port2.label;
+ &socks2.label;
&socks4.label;
&socks5.label;
- &noproxy.label;
+ &noproxy2.label;
&noproxyExplain.label;
&shareproxy.label;
- &autoTypeRadio.label;
+ &autoTypeRadio2.label;
&reload.label;
&autologinproxy.label;
&socksRemoteDNS.label2;"/>
</hbox>
</hbox>
</groupbox>
--- a/browser/components/preferences/in-content-new/privacy.js
+++ b/browser/components/preferences/in-content-new/privacy.js
@@ -248,17 +248,17 @@ var gPrivacyPane = {
let bundlePrefs = document.getElementById("bundlePreferences");
let signonBundle = document.getElementById("signonBundle");
let pkiBundle = document.getElementById("pkiBundle");
appendSearchKeywords("passwordExceptions", [
bundlePrefs.getString("savedLoginsExceptions_title"),
bundlePrefs.getString("savedLoginsExceptions_desc2"),
]);
appendSearchKeywords("showPasswords", [
- signonBundle.getString("loginsDescriptionAll"),
+ signonBundle.getString("loginsDescriptionAll2"),
]);
appendSearchKeywords("trackingProtectionExceptions", [
bundlePrefs.getString("trackingprotectionpermissionstitle"),
bundlePrefs.getString("trackingprotectionpermissionstext2"),
]);
appendSearchKeywords("changeBlockList", [
bundlePrefs.getString("blockliststitle"),
bundlePrefs.getString("blockliststext"),
--- a/browser/components/preferences/in-content-new/privacy.xul
+++ b/browser/components/preferences/in-content-new/privacy.xul
@@ -191,17 +191,17 @@
flex="1" />
<!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
<hbox>
<button id="passwordExceptions"
class="accessory-button"
label="&passwordExceptions.label;"
accesskey="&passwordExceptions.accesskey;"
preference="pref.privacy.disable_button.view_passwords_exceptions"
- searchkeywords="&address.label;"/>
+ searchkeywords="&address2.label;"/>
</hbox>
</hbox>
<hbox id="showPasswordBox" pack="end">
<!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
<hbox>
<button id="showPasswords"
class="accessory-button"
label="&savedLogins.label;" accesskey="&savedLogins.accesskey;"
@@ -247,21 +247,21 @@
&dontrememberActions.pre.label;
&dontrememberActions.clearHistory.label;
&dontrememberActions.post.label;"/>
<menuitem label="&historyHeader.custom.label;" value="custom" searchkeywords="&privateBrowsingPermanent2.label;
&rememberHistory2.label;
&rememberSearchForm.label;
&acceptCookies2.label;
&cookieExceptions.label;
- &acceptThirdParty.pre.label;
+ &acceptThirdParty2.pre.label;
&acceptThirdParty.always.label;
&acceptThirdParty.visited.label;
&acceptThirdParty.never.label;
- &keepUntil.label;
+ &keepUntil2.label;
&expire.label;
&close.label;
&showCookies.label;
&clearOnClose.label;
&clearOnCloseSettings.label;"/>
</menupopup>
</menulist>
</hbox>
@@ -319,33 +319,33 @@
class="accessory-button"
label="&cookieExceptions.label;" accesskey="&cookieExceptions.accesskey;"
preference="pref.privacy.disable_button.cookie_exceptions"/>
</hbox>
<hbox id="acceptThirdPartyRow"
class="indent"
align="center">
<label id="acceptThirdPartyLabel" control="acceptThirdPartyMenu"
- accesskey="&acceptThirdParty.pre.accesskey;">&acceptThirdParty.pre.label;</label>
+ accesskey="&acceptThirdParty2.pre.accesskey;">&acceptThirdParty2.pre.label;</label>
<menulist id="acceptThirdPartyMenu" preference="network.cookie.cookieBehavior"
onsyncfrompreference="return gPrivacyPane.readAcceptThirdPartyCookies();"
onsynctopreference="return gPrivacyPane.writeAcceptThirdPartyCookies();">
<menupopup>
<menuitem label="&acceptThirdParty.always.label;" value="always"/>
<menuitem label="&acceptThirdParty.visited.label;" value="visited"/>
<menuitem label="&acceptThirdParty.never.label;" value="never"/>
</menupopup>
</menulist>
</hbox>
<hbox id="keepRow"
class="indent"
align="center">
<label id="keepUntil"
control="keepCookiesUntil"
- accesskey="&keepUntil.accesskey;">&keepUntil.label;</label>
+ accesskey="&keepUntil2.accesskey;">&keepUntil2.label;</label>
<menulist id="keepCookiesUntil"
preference="network.cookie.lifetimePolicy">
<menupopup>
<menuitem label="&expire.label;" value="0"/>
<menuitem label="&close.label;" value="2"/>
</menupopup>
</menulist>
<spacer flex="1"/>
@@ -573,34 +573,34 @@
'dom.disable_open_during_load');"
flex="1" />
<!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
<hbox>
<button id="popupPolicyButton"
class="accessory-button"
label="&popupExceptions.label;"
accesskey="&popupExceptions.accesskey;"
- searchkeywords="&address.label; &button.cancel.label; &button.ok.label;"/>
+ searchkeywords="&address2.label; &button.cancel.label; &button.ok.label;"/>
</hbox>
</hbox>
<hbox id="addonInstallBox">
<checkbox id="warnAddonInstall"
label="&warnOnAddonInstall2.label;"
accesskey="&warnOnAddonInstall2.accesskey;"
preference="xpinstall.whitelist.required"
onsyncfrompreference="return gPrivacyPane.readWarnAddonInstall();"
flex="1" />
<!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
<hbox>
<button id="addonExceptions"
class="accessory-button"
label="&addonExceptions.label;"
accesskey="&addonExceptions.accesskey;"
- searchkeywords="&address.label;
+ searchkeywords="&address2.label;
&allow.label;
&removepermission2.label;
&removeallpermissions2.label;
&button.cancel.label;
&button.ok.label;"/>
</hbox>
</hbox>
</groupbox>
@@ -704,21 +704,21 @@
label="&viewCerts2.label;"
accesskey="&viewCerts2.accesskey;"
preference="security.disable_button.openCertManager"
searchkeywords="&certmgr.tab.mine;
&certmgr.tab.others2;
&certmgr.tab.websites3;
&certmgr.tab.ca;
&certmgr.tab.orphan2;
- &certmgr.mine;
- &certmgr.others;
- &certmgr.websites2;
- &certmgr.cas;
- &certmgr.orphans;
+ &certmgr.mine2;
+ &certmgr.others2;
+ &certmgr.websites3;
+ &certmgr.cas2;
+ &certmgr.orphans2;
&certmgr.certname;
&certmgr.tokenname;
&certmgr.view2.label;
&certmgr.export.label;
&certmgr.delete2.label;"/>
</hbox>
<!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
<hbox>
@@ -766,17 +766,17 @@
<button id="offlineNotifyExceptions"
class="accessory-button"
label="&offlineStorageNotifyExceptions.label;"
accesskey="&offlineStorageNotifyExceptions.accesskey;"/>
</hbox>
</hbox>
<hbox>
<vbox flex="1">
- <label id="offlineAppsListLabel">&offlineAppsList2.label;</label>
+ <label id="offlineAppsListLabel">&offlineAppsList3.label;</label>
<listbox id="offlineAppsList"
flex="1"
aria-labelledby="offlineAppsListLabel">
</listbox>
</vbox>
<vbox pack="end">
<button id="offlineAppsListRemove"
class="accessory-button"
--- a/browser/components/preferences/languages.xul
+++ b/browser/components/preferences/languages.xul
@@ -46,17 +46,17 @@
<stringbundleset id="languageSet">
<stringbundle id="bundleRegions" src="chrome://global/locale/regionNames.properties"/>
<stringbundle id="bundleLanguages" src="chrome://global/locale/languageNames.properties"/>
<stringbundle id="bundlePreferences" src="chrome://browser/locale/preferences/preferences.properties"/>
<stringbundle id="bundleAccepted" src="resource://gre/res/language.properties"/>
</stringbundleset>
- <description>&languages.customize.description;</description>
+ <description>&languages.customize2.description;</description>
<grid flex="1">
<columns>
<column flex="1"/>
<column/>
</columns>
<rows>
<row flex="1">
<listbox id="activeLanguages" flex="1" rows="6"
--- a/browser/components/preferences/permissions.xul
+++ b/browser/components/preferences/permissions.xul
@@ -27,17 +27,17 @@
<keyset>
<key key="&windowClose.key;" modifiers="accel" oncommand="window.close();"/>
</keyset>
<vbox class="contentPane largeDialogContainer" flex="1">
<description id="permissionsText" control="url"/>
<separator class="thin"/>
- <label id="urlLabel" control="url" accesskey="&address.accesskey;">&address.label;</label>
+ <label id="urlLabel" control="url" accesskey="&address2.accesskey;">&address2.label;</label>
<hbox align="start">
<textbox id="url" flex="1"
oninput="gPermissionManager.onHostInput(event.target);"
onkeypress="gPermissionManager.onHostKeyPress(event);"/>
</hbox>
<hbox pack="end">
<button id="btnBlock" disabled="true" label="&block.label;" accesskey="&block.accesskey;"
oncommand="gPermissionManager.addPermission(nsIPermissionManager.DENY_ACTION);"/>
--- a/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
@@ -111,17 +111,17 @@ available. -->
<!ENTITY enableSearchUpdate2.label "Automatically update search engines">
<!ENTITY enableSearchUpdate2.accesskey "e">
<!ENTITY offlineStorageNotify.label "Tell you when a website asks to store data for offline use">
<!ENTITY offlineStorageNotify.accesskey "T">
<!ENTITY offlineStorageNotifyExceptions.label "Exceptions…">
<!ENTITY offlineStorageNotifyExceptions.accesskey "x">
-<!ENTITY offlineAppsList2.label "The following websites are allowed to store data for offline use:">
+<!ENTITY offlineAppsList3.label "The following websites are allowed to store data for offline use">
<!ENTITY offlineAppsList.height "7em">
<!ENTITY offlineAppsListRemove.label "Remove…">
<!ENTITY offlineAppsListRemove.accesskey "R">
<!ENTITY offlineAppRemove.confirm "Remove offline data">
<!ENTITY certificateTab.label "Certificates">
<!ENTITY certPersonal2.description "When a server requests your personal certificate">
<!ENTITY selectCerts.auto "Select one automatically">
--- a/browser/locales/en-US/chrome/browser/preferences/colors.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/colors.dtd
@@ -9,22 +9,22 @@
<!ENTITY overrideDefaultPageColors.label "Override the colors specified by the page with your selections above:">
<!ENTITY overrideDefaultPageColors.accesskey "O">
<!ENTITY overrideDefaultPageColors.always.label "Always">
<!ENTITY overrideDefaultPageColors.auto.label "Only with High Contrast themes">
<!ENTITY overrideDefaultPageColors.never.label "Never">
<!ENTITY color "Text and Background">
-<!ENTITY textColor.label "Text:">
-<!ENTITY textColor.accesskey "T">
-<!ENTITY backgroundColor.label "Background:">
-<!ENTITY backgroundColor.accesskey "B">
+<!ENTITY textColor2.label "Text">
+<!ENTITY textColor2.accesskey "T">
+<!ENTITY backgroundColor2.label "Background">
+<!ENTITY backgroundColor2.accesskey "B">
<!ENTITY useSystemColors.label "Use system colors">
<!ENTITY useSystemColors.accesskey "s">
<!ENTITY underlineLinks.label "Underline links">
<!ENTITY underlineLinks.accesskey "U">
<!ENTITY links "Link Colors">
-<!ENTITY linkColor.label "Unvisited Links:">
-<!ENTITY linkColor.accesskey "L">
-<!ENTITY visitedLinkColor.label "Visited Links:">
-<!ENTITY visitedLinkColor.accesskey "V">
+<!ENTITY linkColor2.label "Unvisited Links">
+<!ENTITY linkColor2.accesskey "L">
+<!ENTITY visitedLinkColor2.label "Visited Links">
+<!ENTITY visitedLinkColor2.accesskey "V">
--- a/browser/locales/en-US/chrome/browser/preferences/connection.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/connection.dtd
@@ -9,41 +9,41 @@
<!ENTITY proxyTitle.label "Configure Proxies to Access the Internet">
<!ENTITY noProxyTypeRadio.label "No proxy">
<!ENTITY noProxyTypeRadio.accesskey "y">
<!ENTITY systemTypeRadio.label "Use system proxy settings">
<!ENTITY systemTypeRadio.accesskey "u">
<!ENTITY WPADTypeRadio.label "Auto-detect proxy settings for this network">
<!ENTITY WPADTypeRadio.accesskey "w">
-<!ENTITY manualTypeRadio.label "Manual proxy configuration:">
-<!ENTITY manualTypeRadio.accesskey "m">
-<!ENTITY autoTypeRadio.label "Automatic proxy configuration URL:">
-<!ENTITY autoTypeRadio.accesskey "A">
+<!ENTITY manualTypeRadio2.label "Manual proxy configuration">
+<!ENTITY manualTypeRadio2.accesskey "m">
+<!ENTITY autoTypeRadio2.label "Automatic proxy configuration URL">
+<!ENTITY autoTypeRadio2.accesskey "A">
<!ENTITY reload.label "Reload">
<!ENTITY reload.accesskey "e">
-<!ENTITY ftp.label "FTP Proxy:">
-<!ENTITY ftp.accesskey "F">
-<!ENTITY http.label "HTTP Proxy:">
-<!ENTITY http.accesskey "x">
-<!ENTITY ssl.label "SSL Proxy:">
-<!ENTITY ssl.accesskey "L">
-<!ENTITY socks.label "SOCKS Host:">
-<!ENTITY socks.accesskey "C">
+<!ENTITY ftp2.label "FTP Proxy">
+<!ENTITY ftp2.accesskey "F">
+<!ENTITY http2.label "HTTP Proxy">
+<!ENTITY http2.accesskey "x">
+<!ENTITY ssl2.label "SSL Proxy">
+<!ENTITY ssl2.accesskey "L">
+<!ENTITY socks2.label "SOCKS Host">
+<!ENTITY socks2.accesskey "C">
<!ENTITY socks4.label "SOCKS v4">
<!ENTITY socks4.accesskey "K">
<!ENTITY socks5.label "SOCKS v5">
<!ENTITY socks5.accesskey "v">
<!ENTITY socksRemoteDNS.label2 "Proxy DNS when using SOCKS v5">
<!ENTITY socksRemoteDNS.accesskey "d">
-<!ENTITY port.label "Port:">
+<!ENTITY port2.label "Port">
<!ENTITY HTTPport.accesskey "P">
<!ENTITY SSLport.accesskey "o">
<!ENTITY FTPport.accesskey "r">
<!ENTITY SOCKSport.accesskey "t">
-<!ENTITY noproxy.label "No Proxy for:">
-<!ENTITY noproxy.accesskey "n">
+<!ENTITY noproxy2.label "No Proxy for">
+<!ENTITY noproxy2.accesskey "n">
<!ENTITY noproxyExplain.label "Example: .mozilla.org, .net.nz, 192.168.1.0/24">
<!ENTITY shareproxy.label "Use this proxy server for all protocols">
<!ENTITY shareproxy.accesskey "s">
<!ENTITY autologinproxy.label "Do not prompt for authentication if password is saved">
<!ENTITY autologinproxy.accesskey "i">
<!ENTITY autologinproxy.tooltip "This option silently authenticates you to proxies when you have saved credentials for them. You will be prompted if authentication fails.">
--- a/browser/locales/en-US/chrome/browser/preferences/containers.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/containers.dtd
@@ -7,20 +7,19 @@
<!ENTITY preferencesButton.label "Preferences">
<!ENTITY removeButton.label "Remove">
<!-- « is « however it's not defined in XML -->
<!ENTITY backLink2.label "« Go Back">
<!ENTITY window.title "Add New Container">
<!ENTITY window.width "45em">
-<!ENTITY name.label "Name:">
-<!ENTITY name.accesskey "N">
+<!ENTITY name2.label "Name">
+<!ENTITY name2.accesskey "N">
<!ENTITY name.placeholder "Enter a container name">
-<!ENTITY icon.label "Icon:">
-<!ENTITY icon.accesskey "I">
-<!ENTITY color.label "Color:">
-<!ENTITY color.accesskey "o">
+<!ENTITY icon2.label "Icon">
+<!ENTITY icon2.accesskey "I">
+<!ENTITY color2.label "Color">
+<!ENTITY color2.accesskey "o">
<!ENTITY windowClose.key "w">
<!ENTITY button.ok.label "Done">
<!ENTITY button.ok.accesskey "D">
-
--- a/browser/locales/en-US/chrome/browser/preferences/fonts.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/fonts.dtd
@@ -1,30 +1,30 @@
<!-- 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/. -->
<!ENTITY fontsDialog.title "Fonts">
-<!ENTITY language.label "Fonts for:">
-<!ENTITY language.accesskey "F">
+<!ENTITY fonts.label "Fonts for">
+<!ENTITY fonts.accesskey "F">
-<!ENTITY size.label "Size:">
+<!ENTITY size2.label "Size">
<!ENTITY sizeProportional.accesskey "z">
<!ENTITY sizeMonospace.accesskey "e">
-<!ENTITY proportional.label "Proportional:">
-<!ENTITY proportional.accesskey "P">
+<!ENTITY proportional2.label "Proportional">
+<!ENTITY proportional2.accesskey "P">
-<!ENTITY serif.label "Serif:">
-<!ENTITY serif.accesskey "S">
-<!ENTITY sans-serif.label "Sans-serif:">
-<!ENTITY sans-serif.accesskey "n">
-<!ENTITY monospace.label "Monospace:">
-<!ENTITY monospace.accesskey "M">
+<!ENTITY serif2.label "Serif">
+<!ENTITY serif2.accesskey "S">
+<!ENTITY sans-serif2.label "Sans-serif">
+<!ENTITY sans-serif2.accesskey "n">
+<!ENTITY monospace2.label "Monospace">
+<!ENTITY monospace2.accesskey "M">
<!-- LOCALIZATION NOTE (font.langGroup.latin) :
Translate "Latin" as the name of Latin (Roman) script, not as the name of the Latin language. -->
<!ENTITY font.langGroup.latin "Latin">
<!ENTITY font.langGroup.japanese "Japanese">
<!ENTITY font.langGroup.trad-chinese "Traditional Chinese (Taiwan)">
<!ENTITY font.langGroup.simpl-chinese "Simplified Chinese">
<!ENTITY font.langGroup.trad-chinese-hk "Traditional Chinese (Hong Kong)">
@@ -48,30 +48,30 @@
<!ENTITY font.langGroup.malayalam "Malayalam">
<!ENTITY font.langGroup.math "Mathematics">
<!ENTITY font.langGroup.odia "Odia">
<!ENTITY font.langGroup.telugu "Telugu">
<!ENTITY font.langGroup.kannada "Kannada">
<!ENTITY font.langGroup.sinhala "Sinhala">
<!ENTITY font.langGroup.tibetan "Tibetan">
<!-- Minimum font size -->
-<!ENTITY minSize.label "Minimum font size:">
-<!ENTITY minSize.accesskey "o">
+<!ENTITY minSize2.label "Minimum font size">
+<!ENTITY minSize2.accesskey "o">
<!ENTITY minSize.none "None">
<!-- default font type -->
<!ENTITY useDefaultFontSerif.label "Serif">
<!ENTITY useDefaultFontSansSerif.label "Sans Serif">
<!ENTITY allowPagesToUseOwn.label "Allow pages to choose their own fonts, instead of your selections above">
<!ENTITY allowPagesToUseOwn.accesskey "A">
<!ENTITY languages.customize.Fallback2.grouplabel "Text Encoding for Legacy Content">
-<!ENTITY languages.customize.Fallback2.label "Fallback Text Encoding:">
-<!ENTITY languages.customize.Fallback2.accesskey "T">
+<!ENTITY languages.customize.Fallback3.label "Fallback Text Encoding">
+<!ENTITY languages.customize.Fallback3.accesskey "T">
<!ENTITY languages.customize.Fallback2.desc "This text encoding is used for legacy content that fails to declare its encoding.">
<!ENTITY languages.customize.Fallback.auto "Default for Current Locale">
<!-- LOCALIZATION NOTE (languages.customize.Fallback.arabic):
Translate "Arabic" as an adjective for an encoding, not as the name of the language. -->
<!ENTITY languages.customize.Fallback.arabic "Arabic">
<!ENTITY languages.customize.Fallback.baltic "Baltic">
<!ENTITY languages.customize.Fallback.ceiso "Central European, ISO">
--- a/browser/locales/en-US/chrome/browser/preferences/languages.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/languages.dtd
@@ -1,16 +1,16 @@
<!-- 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/. -->
<!ENTITY window.width "30em">
<!ENTITY languages.customize.Header "Languages">
-<!ENTITY languages.customize.description "Web pages are sometimes offered in more than one language. Choose languages for displaying these web pages, in order of preference:">
+<!ENTITY languages.customize2.description "Web pages are sometimes offered in more than one language. Choose languages for displaying these web pages, in order of preference">
<!ENTITY languages.customize.moveUp.label "Move Up">
<!ENTITY languages.customize.moveUp.accesskey "U">
<!ENTITY languages.customize.moveDown.label "Move Down">
<!ENTITY languages.customize.moveDown.accesskey "D">
<!ENTITY languages.customize.deleteButton.label "Remove">
<!ENTITY languages.customize.deleteButton.accesskey "R">
<!ENTITY languages.customize.selectLanguage.label "Select a language to add…">
<!ENTITY languages.customize.addButton.label "Add">
--- a/browser/locales/en-US/chrome/browser/preferences/permissions.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/permissions.dtd
@@ -6,18 +6,18 @@
<!ENTITY window.width "45em">
<!ENTITY treehead.sitename2.label "Website">
<!ENTITY treehead.status.label "Status">
<!ENTITY removepermission2.label "Remove Website">
<!ENTITY removepermission2.accesskey "R">
<!ENTITY removeallpermissions2.label "Remove All Websites">
<!ENTITY removeallpermissions2.accesskey "e">
-<!ENTITY address.label "Address of website:">
-<!ENTITY address.accesskey "d">
+<!ENTITY address2.label "Address of website">
+<!ENTITY address2.accesskey "d">
<!ENTITY block.label "Block">
<!ENTITY block.accesskey "B">
<!ENTITY session.label "Allow for Session">
<!ENTITY session.accesskey "S">
<!ENTITY allow.label "Allow">
<!ENTITY allow.accesskey "A">
<!ENTITY windowClose.key "w">
--- a/browser/locales/en-US/chrome/browser/preferences/preferences.properties
+++ b/browser/locales/en-US/chrome/browser/preferences/preferences.properties
@@ -27,17 +27,17 @@ addonspermissionstext=You can specify wh
addons_permissions_title2=Allowed Websites - Add-ons Installation
popuppermissionstext=You can specify which websites are allowed to open pop-up windows. Type the exact address of the site you want to allow and then click Allow.
popuppermissionstitle2=Allowed Websites - Pop-ups
notificationspermissionstext5=The following websites have requested to send you notifications. You can specify which websites are allowed to send you notifications.
notificationspermissionstitle2=Settings - Notification Permissions
invalidURI=Please enter a valid hostname
invalidURITitle=Invalid Hostname Entered
savedLoginsExceptions_title=Exceptions - Saved Logins
-savedLoginsExceptions_desc2=Logins for the following websites will not be saved:
+savedLoginsExceptions_desc2=Logins for the following websites will not be saved
#### Block List Manager
blockliststext=You can choose which list Firefox will use to block Web elements that may track your browsing activity.
blockliststitle=Block Lists
# LOCALIZATION NOTE (mozNameTemplate): This template constructs the name of the
# block list in the block lists dialog. It combines the list name and
# description.
--- a/browser/locales/en-US/chrome/browser/preferences/privacy.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/privacy.dtd
@@ -44,24 +44,24 @@
<!ENTITY locbar.searches.label "Related searches from the default search engine">
<!ENTITY locbar.searches.accesskey "d">
<!ENTITY suggestionSettings2.label "Change preferences for search engine suggestions">
<!ENTITY acceptCookies2.label "Accept cookies from websites">
<!ENTITY acceptCookies2.accesskey "A">
-<!ENTITY acceptThirdParty.pre.label "Accept third-party cookies:">
-<!ENTITY acceptThirdParty.pre.accesskey "y">
+<!ENTITY acceptThirdParty2.pre.label "Accept third-party cookies">
+<!ENTITY acceptThirdParty2.pre.accesskey "y">
<!ENTITY acceptThirdParty.always.label "Always">
<!ENTITY acceptThirdParty.never.label "Never">
<!ENTITY acceptThirdParty.visited.label "From visited">
-<!ENTITY keepUntil.label "Keep until:">
-<!ENTITY keepUntil.accesskey "u">
+<!ENTITY keepUntil2.label "Keep until">
+<!ENTITY keepUntil2.accesskey "u">
<!ENTITY expire.label "they expire">
<!ENTITY close.label "I close &brandShortName;">
<!ENTITY cookieExceptions.label "Exceptions…">
<!ENTITY cookieExceptions.accesskey "E">
<!ENTITY showCookies.label "Show Cookies…">
--- a/security/manager/locales/en-US/chrome/pippki/certManager.dtd
+++ b/security/manager/locales/en-US/chrome/pippki/certManager.dtd
@@ -5,21 +5,21 @@
<!ENTITY certmgr.title "Certificate Manager">
<!ENTITY certmgr.tab.mine "Your Certificates">
<!ENTITY certmgr.tab.others2 "People">
<!ENTITY certmgr.tab.websites3 "Servers">
<!ENTITY certmgr.tab.ca "Authorities">
<!ENTITY certmgr.tab.orphan2 "Others">
-<!ENTITY certmgr.mine "You have certificates from these organizations that identify you:">
-<!ENTITY certmgr.others "You have certificates on file that identify these people:">
-<!ENTITY certmgr.websites2 "You have certificates on file that identify these servers:">
-<!ENTITY certmgr.cas "You have certificates on file that identify these certificate authorities:">
-<!ENTITY certmgr.orphans "You have certificates on file that do not fit in any of the other categories:">
+<!ENTITY certmgr.mine2 "You have certificates from these organizations that identify you">
+<!ENTITY certmgr.others2 "You have certificates on file that identify these people">
+<!ENTITY certmgr.websites3 "You have certificates on file that identify these servers">
+<!ENTITY certmgr.cas2 "You have certificates on file that identify these certificate authorities">
+<!ENTITY certmgr.orphans2 "You have certificates on file that do not fit in any of the other categories">
<!ENTITY certmgr.detail.general_tab.title "General">
<!ENTITY certmgr.detail.general_tab.accesskey "G">
<!ENTITY certmgr.detail.prettyprint_tab.title "Details">
<!ENTITY certmgr.detail.prettyprint_tab.accesskey "D">
<!ENTITY certmgr.pending.label "Currently verifying certificate…">
<!ENTITY certmgr.subjectinfo.label "Issued To">
--- a/security/manager/locales/en-US/chrome/pippki/deviceManager.dtd
+++ b/security/manager/locales/en-US/chrome/pippki/deviceManager.dtd
@@ -20,17 +20,17 @@
<!ENTITY devmgr.button.changepw.accesskey "P">
<!ENTITY devmgr.button.load.label "Load">
<!ENTITY devmgr.button.load.accesskey "L">
<!ENTITY devmgr.button.unload.label "Unload">
<!ENTITY devmgr.button.unload.accesskey "U">
<!ENTITY devmgr.button.fips.accesskey "F">
<!ENTITY loaddevice.info "Enter the information for the module you want to add.">
-<!ENTITY loaddevice.modname "Module Name:">
-<!ENTITY loaddevice.modname.accesskey "M">
+<!ENTITY loaddevice.modname2 "Module Name">
+<!ENTITY loaddevice.modname2.accesskey "M">
<!ENTITY loaddevice.modname.default "New PKCS#11 Module">
-<!ENTITY loaddevice.filename "Module filename:">
-<!ENTITY loaddevice.filename.accesskey "f">
+<!ENTITY loaddevice.filename2 "Module filename">
+<!ENTITY loaddevice.filename2.accesskey "f">
<!ENTITY loaddevice.browse "Browse…">
<!ENTITY loaddevice.browse.accesskey "B">
<!ENTITY loaddevice.title2 "Load PKCS#11 Device Driver">
--- a/security/manager/pki/resources/content/CAOverlay.xul
+++ b/security/manager/pki/resources/content/CAOverlay.xul
@@ -2,28 +2,28 @@
<!-- 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/. -->
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<!DOCTYPE overlay SYSTEM "chrome://pippki/locale/certManager.dtd">
-<overlay id="CAOverlay"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:cert="http://netscape.com/rdf-cert#"
+<overlay id="CAOverlay"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:cert="http://netscape.com/rdf-cert#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<vbox id="CACerts">
- <description>&certmgr.cas;</description>
+ <description>&certmgr.cas2;</description>
<separator class="thin"/>
<tree id="ca-tree" flex="1" enableColumnDrag="true"
onselect="ca_enableButtons()">
<treecols>
- <treecol id="certcol" label="&certmgr.certname;" primary="true"
+ <treecol id="certcol" label="&certmgr.certname;" primary="true"
persist="hidden width ordinal" flex="1"/>
<splitter class="tree-splitter"/>
<treecol id="tokencol" label="&certmgr.tokenname;"
persist="hidden width ordinal" flex="1"/>
</treecols>
<treechildren ondblclick="viewCerts();"/>
</tree>
--- a/security/manager/pki/resources/content/MineOverlay.xul
+++ b/security/manager/pki/resources/content/MineOverlay.xul
@@ -2,28 +2,28 @@
<!-- 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/. -->
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<!DOCTYPE overlay SYSTEM "chrome://pippki/locale/certManager.dtd">
-<overlay id="MineOverlay"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:cert="http://netscape.com/rdf-cert#"
+<overlay id="MineOverlay"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:cert="http://netscape.com/rdf-cert#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<vbox id="myCerts">
- <description>&certmgr.mine;</description>
+ <description>&certmgr.mine2;</description>
<separator class="thin"/>
<tree id="user-tree" flex="1" enableColumnDrag="true"
onselect="mine_enableButtons()">
<treecols>
- <treecol id="certcol" label="&certmgr.certname;" primary="true"
+ <treecol id="certcol" label="&certmgr.certname;" primary="true"
persist="hidden width ordinal" flex="1"/>
<splitter class="tree-splitter"/>
<treecol id="tokencol" label="&certmgr.tokenname;"
persist="hidden width ordinal" flex="1"/>
<splitter class="tree-splitter"/>
<treecol id="serialnumcol" label="&certmgr.serial;"
persist="hidden width ordinal" flex="1"/>
<splitter class="tree-splitter"/>
--- a/security/manager/pki/resources/content/OrphanOverlay.xul
+++ b/security/manager/pki/resources/content/OrphanOverlay.xul
@@ -2,46 +2,46 @@
<!-- 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/. -->
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<!DOCTYPE overlay SYSTEM "chrome://pippki/locale/certManager.dtd">
-<overlay id="OrphanOverlay"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:cert="http://netscape.com/rdf-cert#"
+<overlay id="OrphanOverlay"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:cert="http://netscape.com/rdf-cert#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<vbox id="OrphanCerts">
- <description>&certmgr.orphans;</description>
+ <description>&certmgr.orphans2;</description>
<separator class="thin"/>
<tree id="orphan-tree" flex="1" enableColumnDrag="true"
onselect="orphan_enableButtons()">
<treecols>
- <treecol id="certcol" label="&certmgr.certname;" primary="true"
+ <treecol id="certcol" label="&certmgr.certname;" primary="true"
persist="hidden width ordinal" flex="1"/>
<splitter class="tree-splitter"/>
<treecol id="tokencol" label="&certmgr.tokenname;"
persist="hidden width ordinal" flex="1"/>
</treecols>
<treechildren ondblclick="viewCerts();"/>
</tree>
-
+
<separator class="thin"/>
<hbox>
- <button id="orphan_viewButton" class="normal"
+ <button id="orphan_viewButton" class="normal"
label="&certmgr.view2.label;"
accesskey="&certmgr.view2.accesskey;"
disabled="true" oncommand="viewCerts();"/>
- <button id="orphan_exportButton" class="normal"
+ <button id="orphan_exportButton" class="normal"
label="&certmgr.export.label;"
accesskey="&certmgr.export.accesskey;"
disabled="true" oncommand="exportCerts();"/>
- <button id="orphan_deleteButton" class="normal"
+ <button id="orphan_deleteButton" class="normal"
label="&certmgr.delete2.label;"
accesskey="&certmgr.delete2.accesskey;"
disabled="true" oncommand="deleteCerts();"/>
</hbox>
</vbox>
</overlay>
--- a/security/manager/pki/resources/content/OthersOverlay.xul
+++ b/security/manager/pki/resources/content/OthersOverlay.xul
@@ -3,27 +3,27 @@
- 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/. -->
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<!DOCTYPE overlay SYSTEM "chrome://pippki/locale/certManager.dtd">
<overlay id="OthersOverlay"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:cert="http://netscape.com/rdf-cert#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:cert="http://netscape.com/rdf-cert#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<vbox id="othersCerts">
- <description>&certmgr.others;</description>
+ <description>&certmgr.others2;</description>
<separator class="thin"/>
<tree id="email-tree" flex="1"
onselect="email_enableButtons()">
<treecols>
- <treecol id="certcol" label="&certmgr.certname;" primary="true"
+ <treecol id="certcol" label="&certmgr.certname;" primary="true"
flex="1"/>
<splitter class="tree-splitter"/>
<treecol id="emailcol" label="&certmgr.email;"
flex="1"/>
<splitter class="tree-splitter"/>
<treecol id="expiredcol" label="&certmgr.expires;"
flex="1"/>
</treecols>
--- a/security/manager/pki/resources/content/WebSitesOverlay.xul
+++ b/security/manager/pki/resources/content/WebSitesOverlay.xul
@@ -2,34 +2,34 @@
<!-- 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/. -->
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<!DOCTYPE overlay SYSTEM "chrome://pippki/locale/certManager.dtd">
-<overlay id="WebSitesOverlay"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:cert="http://netscape.com/rdf-cert#"
+<overlay id="WebSitesOverlay"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:cert="http://netscape.com/rdf-cert#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<vbox id="webCerts">
- <description>&certmgr.websites2;</description>
+ <description>&certmgr.websites3;</description>
<separator class="thin"/>
<tree id="server-tree" flex="1" enableColumnDrag="true"
onselect="websites_enableButtons()">
<treecols>
- <treecol id="certcol" label="&certmgr.certname;" primary="true"
+ <treecol id="certcol" label="&certmgr.certname;" primary="true"
persist="hidden width ordinal" flex="1"/>
<splitter class="tree-splitter"/>
- <treecol id="sitecol" label="&certmgr.certserver;"
+ <treecol id="sitecol" label="&certmgr.certserver;"
persist="hidden width ordinal" flex="1"/>
<splitter class="tree-splitter"/>
- <treecol id="lifetimecol" label="&certmgr.override_lifetime;"
+ <treecol id="lifetimecol" label="&certmgr.override_lifetime;"
persist="hidden width ordinal" flex="1"/>
<splitter class="tree-splitter"/>
<treecol id="expiredcol" label="&certmgr.expires;"
persist="hidden width ordinal" flex="1"/>
</treecols>
<treechildren ondblclick="viewCerts();"/>
</tree>
--- a/security/manager/pki/resources/content/load_device.xul
+++ b/security/manager/pki/resources/content/load_device.xul
@@ -22,22 +22,22 @@
</stringbundleset>
<script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
<script type="application/javascript"
src="chrome://pippki/content/load_device.js"/>
<description>&loaddevice.info;</description>
<hbox align="center">
- <label value="&loaddevice.modname;" accesskey="&loaddevice.modname.accesskey;"
+ <label value="&loaddevice.modname2;" accesskey="&loaddevice.modname2.accesskey;"
control="device_name"/>
<textbox id="device_name" flex="1" value="&loaddevice.modname.default;"/>
</hbox>
<hbox align="center">
- <label value="&loaddevice.filename;" accesskey="&loaddevice.filename.accesskey;"
+ <label value="&loaddevice.filename2;" accesskey="&loaddevice.filename2.accesskey;"
control="device_path"/>
<textbox id="device_path" flex="1"/>
<button id="browse" label="&loaddevice.browse;" flex="1"
accesskey="&loaddevice.browse.accesskey;"
oncommand="onBrowseBtnPress();"/>
</hbox>
</dialog>
--- a/toolkit/components/passwordmgr/content/passwordManager.js
+++ b/toolkit/components/passwordmgr/content/passwordManager.js
@@ -75,17 +75,17 @@ function Startup() {
filterField = document.getElementById("filter");
togglePasswordsButton = document.getElementById("togglePasswords");
signonsIntro = document.getElementById("signonsIntro");
removeButton = document.getElementById("removeSignon");
removeAllButton = document.getElementById("removeAllSignons");
togglePasswordsButton.label = kSignonBundle.getString("showPasswords");
togglePasswordsButton.accessKey = kSignonBundle.getString("showPasswordsAccessKey");
- signonsIntro.textContent = kSignonBundle.getString("loginsDescriptionAll");
+ signonsIntro.textContent = kSignonBundle.getString("loginsDescriptionAll2");
removeAllButton.setAttribute("label", kSignonBundle.getString("removeAll.label"));
removeAllButton.setAttribute("accesskey", kSignonBundle.getString("removeAll.accesskey"));
document.getElementsByTagName("treecols")[0].addEventListener("click", (event) => {
let { target, button } = event;
let sortField = target.getAttribute("data-field-name");
if (target.nodeName != "treecol" || button != 0 || !sortField) {
return;
@@ -553,17 +553,17 @@ function SignonClearFilter() {
let range = signonsTreeView._lastSelectedRanges[i];
signonsTreeView.selection.rangedSelect(range.min, range.max, true);
}
} else {
signonsTreeView.selection.select(0);
}
signonsTreeView._lastSelectedRanges = [];
- signonsIntro.textContent = kSignonBundle.getString("loginsDescriptionAll");
+ signonsIntro.textContent = kSignonBundle.getString("loginsDescriptionAll2");
removeAllButton.setAttribute("label", kSignonBundle.getString("removeAll.label"));
removeAllButton.setAttribute("accesskey", kSignonBundle.getString("removeAll.accesskey"));
}
function FocusFilterBox() {
if (filterField.getAttribute("focused") != "true") {
filterField.focus();
}
--- a/toolkit/locales/en-US/chrome/mozapps/update/history.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/update/history.dtd
@@ -1,16 +1,16 @@
<!-- 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/. -->
<!ENTITY history.title "Update History">
-<!ENTITY history.intro "The following updates have been installed:">
+<!ENTITY history2.intro "The following updates have been installed">
<!ENTITY closebutton.label "Close">
-
+
<!ENTITY noupdates.label "No updates installed yet">
<!ENTITY name.header "Update Name">
<!ENTITY date.header "Install Date">
<!ENTITY type.header "Type">
<!ENTITY state.header "State">
--- a/toolkit/locales/en-US/chrome/passwordmgr/passwordmgr.properties
+++ b/toolkit/locales/en-US/chrome/passwordmgr/passwordmgr.properties
@@ -54,17 +54,17 @@ hidePasswords=Hide Passwords
hidePasswordsAccessKey=P
showPasswords=Show Passwords
showPasswordsAccessKey=P
noMasterPasswordPrompt=Are you sure you wish to show your passwords?
removeAllPasswordsPrompt=Are you sure you wish to remove all passwords?
removeAllPasswordsTitle=Remove all passwords
removeLoginPrompt=Are you sure you wish to remove this login?
removeLoginTitle=Remove login
-loginsDescriptionAll=Logins for the following sites are stored on your computer:
+loginsDescriptionAll2=Logins for the following sites are stored on your computer
loginsDescriptionFiltered=The following logins match your search:
# LOCALIZATION NOTE (loginHostAge):
# This is used to show the context menu login items with their age.
# 1st string is the username for the login, 2nd is the login's age.
loginHostAge=%1$S (%2$S)
# LOCALIZATION NOTE (noUsername):
# String is used on the context menu when a login doesn't have a username.
noUsername=No username
--- a/toolkit/mozapps/update/content/history.xul
+++ b/toolkit/mozapps/update/content/history.xul
@@ -25,15 +25,15 @@
onload="gUpdateHistory.onLoad();">
<script type="application/javascript"
src="chrome://mozapps/content/update/history.js"/>
<stringbundle id="updateBundle"
src="chrome://mozapps/locale/update/updates.properties"/>
- <label>&history.intro;</label>
+ <label>&history2.intro;</label>
<separator class="thin"/>
<richlistbox id="historyItems" flex="1">
<label>&noupdates.label;</label>
</richlistbox>
<separator class="thin"/>
</dialog>