Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 23:31:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1382135 - Remove all colon signs on sub-dialogs because we already removed them all on each category pane and we should make same thing for sub-dialogs. r=jaws

Browse Source 
MozReview-Commit-ID: 8md6CFBSM3B

--HG--
extra : rebase_source : 80bff2dec6a20d7710aa3252c3e2fb295286b294
This commit is contained in:
Evan Tseng 2017-08-01 11:54:54 +08:00
parent 0b94d0fe3e
commit 4697753e00
30 changed files with 167 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
browser/components/preferences/colors.xul
View File

@ -41,13 +41,13 @@
<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"/>
@ -62,13 +62,13 @@
<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"/>

22
browser/components/preferences/connection.xul
View File

@ -72,7 +72,7 @@
<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/>
@ -81,12 +81,12 @@
<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>
@ -101,36 +101,36 @@
</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>
@ -145,12 +145,12 @@
</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();"/>

6
browser/components/preferences/containers.xul
View File

@ -31,14 +31,14 @@
<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>

20
browser/components/preferences/fonts.xul
View File

@ -42,7 +42,7 @@
<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>
@ -98,7 +98,7 @@
<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>
@ -111,7 +111,7 @@
</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>
@ -148,7 +148,7 @@
</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"
@ -158,7 +158,7 @@
</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"
@ -168,7 +168,7 @@
</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"
@ -176,7 +176,7 @@
</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">
@ -216,7 +216,7 @@
<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">
@ -268,8 +268,8 @@
<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">

42
browser/components/preferences/in-content-new/main.xul
View File

@ -507,12 +507,12 @@
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;
@ -542,13 +542,13 @@
&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;
@ -581,10 +581,13 @@
&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>
@ -603,7 +606,7 @@
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;
@ -770,7 +773,7 @@
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>
@ -992,17 +995,18 @@
&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;"/>

2
browser/components/preferences/in-content-new/privacy.js
View File

@ -253,7 +253,7 @@ var gPrivacyPane = {
bundlePrefs.getString("savedLoginsExceptions_desc2"),
]);
appendSearchKeywords("showPasswords", [
signonBundle.getString("loginsDescriptionAll"),
signonBundle.getString("loginsDescriptionAll2"),
]);
appendSearchKeywords("trackingProtectionExceptions", [
bundlePrefs.getString("trackingprotectionpermissionstitle"),

26
browser/components/preferences/in-content-new/privacy.xul
View File

@ -196,7 +196,7 @@
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">
@ -252,11 +252,11 @@
&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;
@ -324,7 +324,7 @@
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();">
@ -340,7 +340,7 @@
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>
@ -578,7 +578,7 @@
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>
@ -595,7 +595,7 @@
class="accessory-button"
label="&addonExceptions.label;"
accesskey="&addonExceptions.accesskey;"
searchkeywords="&address.label;
searchkeywords="&address2.label;
&allow.label;
&removepermission2.label;
&removeallpermissions2.label;
@ -709,11 +709,11 @@
&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;
@ -771,7 +771,7 @@
</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">

2
browser/components/preferences/languages.xul
View File

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

2
browser/components/preferences/permissions.xul
View File

@ -32,7 +32,7 @@
<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);"

2
browser/locales/en-US/chrome/browser/preferences/advanced.dtd
View File

@ -116,7 +116,7 @@ available. -->
<!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">

16
browser/locales/en-US/chrome/browser/preferences/colors.dtd
View File

@ -14,17 +14,17 @@
<!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">

30
browser/locales/en-US/chrome/browser/preferences/connection.dtd
View File

@ -14,33 +14,33 @@
<!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">

13
browser/locales/en-US/chrome/browser/preferences/containers.dtd
View File

@ -12,15 +12,14 @@
<!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">

30
browser/locales/en-US/chrome/browser/preferences/fonts.dtd
View File

@ -4,22 +4,22 @@
<!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. -->
@ -53,8 +53,8 @@
<!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 -->
@ -65,8 +65,8 @@
<!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">

2
browser/locales/en-US/chrome/browser/preferences/languages.dtd
View File

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

4
browser/locales/en-US/chrome/browser/preferences/permissions.dtd
View File

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

2
browser/locales/en-US/chrome/browser/preferences/preferences.properties
View File

@ -32,7 +32,7 @@ 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

8
browser/locales/en-US/chrome/browser/preferences/privacy.dtd
View File

@ -49,14 +49,14 @@
<!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;">

10
security/manager/locales/en-US/chrome/pippki/certManager.dtd
View File

@ -10,11 +10,11 @@
<!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">

8
security/manager/locales/en-US/chrome/pippki/deviceManager.dtd
View File

@ -25,11 +25,11 @@
<!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">

10
security/manager/pki/resources/content/CAOverlay.xul
View File

@ -7,18 +7,18 @@
<!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;"

10
security/manager/pki/resources/content/MineOverlay.xul
View File

@ -7,18 +7,18 @@
<!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;"

18
security/manager/pki/resources/content/OrphanOverlay.xul
View File

@ -7,18 +7,18 @@
<!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;"
@ -26,19 +26,19 @@
</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();"/>

8
security/manager/pki/resources/content/OthersOverlay.xul
View File

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

14
security/manager/pki/resources/content/WebSitesOverlay.xul
View File

@ -7,24 +7,24 @@
<!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;"

4
security/manager/pki/resources/content/load_device.xul
View File

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

4
toolkit/components/passwordmgr/content/passwordManager.js
View File

@ -80,7 +80,7 @@ function Startup() {
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) => {
@ -558,7 +558,7 @@ function SignonClearFilter() {
}
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"));
}

4
toolkit/locales/en-US/chrome/mozapps/update/history.dtd
View File

@ -4,9 +4,9 @@
<!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">

2
toolkit/locales/en-US/chrome/passwordmgr/passwordmgr.properties
View File

@ -59,7 +59,7 @@ 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.

2
toolkit/mozapps/update/content/history.xul
View File

@ -30,7 +30,7 @@
<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>