mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 394100: move Languages from Advanced to Content, below Fonts & Colors, in preferences dialog. r=mano, ui/a=mconnor
This commit is contained in:
steffen.wilberg@web.de
parent
f1f8f5b6ab
commit
1d7840f579
@ -128,15 +128,6 @@ var gAdvancedPane = {
|
||||
return checkbox.checked ? (this._storedSpellCheck == 2 ? 2 : 1) : 0;
|
||||
},
|
||||
|
||||
/**
|
||||
* Shows a dialog in which the preferred language for web content may be set.
|
||||
*/
|
||||
showLanguages: function ()
|
||||
{
|
||||
document.documentElement.openSubDialog("chrome://browser/content/preferences/languages.xul",
|
||||
"", null);
|
||||
},
|
||||
|
||||
// NETWORK TAB
|
||||
|
||||
/*
|
||||
|
||||
@ -169,19 +169,6 @@
|
||||
preference="layout.spellcheckDefault"/>
|
||||
</groupbox>
|
||||
|
||||
<!-- Languages -->
|
||||
<groupbox id="languagesGroup">
|
||||
<caption label="&languages.label;"/>
|
||||
|
||||
<hbox id="languagesBox" align="center">
|
||||
<description flex="1" control="chooseLanguage">&chooseLanguage.label;</description>
|
||||
<button id="chooseLanguage"
|
||||
label="&chooseButton.label;"
|
||||
accesskey="&chooseButton.accesskey;"
|
||||
oncommand="gAdvancedPane.showLanguages();"/>
|
||||
</hbox>
|
||||
</groupbox>
|
||||
|
||||
</tabpanel>
|
||||
|
||||
<!-- Network -->
|
||||
|
||||
@ -262,6 +262,16 @@ var gContentPane = {
|
||||
{
|
||||
document.documentElement.openSubDialog("chrome://browser/content/preferences/colors.xul",
|
||||
"", null);
|
||||
}
|
||||
},
|
||||
|
||||
// LANGUAGES
|
||||
|
||||
/**
|
||||
* Shows a dialog in which the preferred language for web content may be set.
|
||||
*/
|
||||
showLanguages: function ()
|
||||
{
|
||||
document.documentElement.openSubDialog("chrome://browser/content/preferences/languages.xul",
|
||||
"", null);
|
||||
}
|
||||
};
|
||||
|
||||
@ -202,6 +202,19 @@
|
||||
</grid>
|
||||
</groupbox>
|
||||
|
||||
<!-- Languages -->
|
||||
<groupbox id="languagesGroup">
|
||||
<caption label="&languages.label;"/>
|
||||
|
||||
<hbox id="languagesBox" align="center">
|
||||
<description flex="1" control="chooseLanguage">&chooseLanguage.label;</description>
|
||||
<button id="chooseLanguage"
|
||||
label="&chooseButton.label;"
|
||||
accesskey="&chooseButton.accesskey;"
|
||||
oncommand="gContentPane.showLanguages();"/>
|
||||
</hbox>
|
||||
</groupbox>
|
||||
|
||||
</prefpane>
|
||||
|
||||
</overlay>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<!-- Note: due to bug 143065, the only remaining accesskeys available to be used
|
||||
in the Advanced pane are: "j", "q", "z" -->
|
||||
in the Advanced pane are: "j", "o", "q", "z" -->
|
||||
|
||||
<!ENTITY generalTab.label "General">
|
||||
|
||||
@ -21,13 +21,6 @@
|
||||
<!ENTITY checkSpelling.label "Check my spelling as I type">
|
||||
<!ENTITY checkSpelling.accesskey "t">
|
||||
|
||||
<!ENTITY languages.label "Languages">
|
||||
|
||||
<!ENTITY chooseLanguage.label "Choose your preferred language for displaying pages">
|
||||
<!ENTITY chooseButton.label "Choose...">
|
||||
<!ENTITY chooseButton.accesskey "o">
|
||||
|
||||
|
||||
<!ENTITY networkTab.label "Network">
|
||||
|
||||
<!ENTITY connection.label "Connection">
|
||||
|
||||
@ -29,3 +29,9 @@
|
||||
|
||||
<!ENTITY colors.label "Colors...">
|
||||
<!ENTITY colors.accesskey "C">
|
||||
|
||||
|
||||
<!ENTITY languages.label "Languages">
|
||||
<!ENTITY chooseLanguage.label "Choose your preferred language for displaying pages">
|
||||
<!ENTITY chooseButton.label "Choose...">
|
||||
<!ENTITY chooseButton.accesskey "o">
|
||||
|
||||
@ -279,6 +279,18 @@ Contributors:
|
||||
author. Disabling this &pref.singular; will force all sites to use your
|
||||
default colors instead.</p>
|
||||
|
||||
<h3 id="languages">Languages</h3>
|
||||
<p>Some web pages are offered in more than one language. Click the
|
||||
<em>Choose...</em> button to specify your preferred language or
|
||||
languages.</p>
|
||||
|
||||
<p><strong>Languages Dialog</strong><br/>
|
||||
To add a language, click <em>Select a language to add...</em>, choose the
|
||||
language, and click the <em>Add</em> button. Remove a language by
|
||||
selecting it in the list of active languages and clicking the
|
||||
<em>Remove</em> button. You can also reorder languages using the <em>Move
|
||||
Up</em> and <em>Move Down</em> buttons to determine the most preferred one
|
||||
in case a page is provided in multiple languages .</p>
|
||||
|
||||
<h2 id="applications_options">Applications &pref.pluralCaps;</h2>
|
||||
|
||||
@ -536,19 +548,6 @@ Contributors:
|
||||
then use the provided <span class="menuPath">Languages</span> menu to
|
||||
download a dictionary.</p>
|
||||
|
||||
<h4 id="languages">Languages</h4>
|
||||
<p>Some web pages are offered in more than one language. Click the
|
||||
<em>Choose...</em> button to specify your preferred language or
|
||||
languages.</p>
|
||||
|
||||
<p><strong>Languages Dialog</strong><br/>
|
||||
To add a language, click <em>Select a language to add...</em>, choose the
|
||||
language, and click the <em>Add</em> button. Remove a language by
|
||||
selecting it in the list of active languages and clicking the
|
||||
<em>Remove</em> button. You can also reorder languages using the <em>Move
|
||||
Up</em> and <em>Move Down</em> buttons to determine the most preferred one
|
||||
in case a page is provided in multiple languages .</p>
|
||||
|
||||
<h3 id="advanced_network">Network tab</h3>
|
||||
|
||||
<h4 id="connection_settings">Connection</h4>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user