wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 951695 - Rename 'Character Encoding' to 'Text Encoding'. r=jaws

Browse Source
This commit is contained in:
Abhinav Koppula 2015-02-27 18:10:30 -05:00
parent 98df9ecb9d
commit 474070eded
11 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/base/content/browser-charsetmenu.inc
View File

@ -3,9 +3,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
<menu id="charsetMenu"
label="&charsetMenu.label;"
label="&charsetMenu2.label;"
#ifndef OMIT_ACCESSKEYS
accesskey="&charsetMenu.accesskey;"
accesskey="&charsetMenu2.accesskey;"
#endif
oncommand="BrowserSetForcedCharacterSet(event.target.getAttribute('charset'));"
#ifdef OMIT_ACCESSKEYS

2
browser/base/content/pageinfo/pageInfo.xul
View File

@ -115,7 +115,7 @@
<textbox readonly="true" crop="end" id="modetext"/>
</row>
<row id="generalEncodingRow">
<label control="encodingtext" value="&generalEncoding;"/>
<label control="encodingtext" value="&generalEncoding2;"/>
<separator/>
<textbox readonly="true" id="encodingtext"/>
</row>

3
browser/components/customizableui/CustomizableWidgets.jsm
View File

@ -756,9 +756,10 @@ const CustomizableWidgets = [
}
}, {
id: "characterencoding-button",
label: "characterencoding-button2.label",
type: "view",
viewId: "PanelUI-characterEncodingView",
tooltiptext: "characterencoding-button.tooltiptext2",
tooltiptext: "characterencoding-button2.tooltiptext",
defaultArea: CustomizableUI.AREA_PANEL,
maybeDisableMenu: function(aDocument) {
let window = aDocument.defaultView;

2
browser/components/customizableui/content/panelUI.inc.xul
View File

@ -179,7 +179,7 @@
</panelview>
<panelview id="PanelUI-characterEncodingView" flex="1">
<label value="&charsetMenu.label;" class="panel-subview-header"/>
<label value="&charsetMenu2.label;" class="panel-subview-header"/>
<vbox class="panel-subview-body">
<vbox id="PanelUI-characterEncodingView-pinned"
class="PanelUI-characterEncodingView-list"/>

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

@ -244,13 +244,13 @@
</hbox>
</groupbox>
<!-- Character Encoding -->
<!-- Text Encoding -->
<groupbox>
<caption label="&languages.customize.Fallback.grouplabel;"/>
<description>&languages.customize.Fallback.desc;</description>
<caption label="&languages.customize.Fallback2.grouplabel;"/>
<description>&languages.customize.Fallback2.desc;</description>
<hbox align="center">
<label value="&languages.customize.Fallback.label;"
accesskey="&languages.customize.Fallback.accesskey;"
<label value="&languages.customize.Fallback2.label;"
accesskey="&languages.customize.Fallback2.accesskey;"
control="DefaultCharsetList"/>
<menulist id="DefaultCharsetList" preference="intl.charset.fallback.override">
<menupopup>

6
browser/locales/en-US/chrome/browser/browser.properties
View File

@ -408,12 +408,12 @@ safeModeRestartPromptMessage=Are you sure you want to disable all add-ons and re
safeModeRestartButton=Restart
# LOCALIZATION NOTE (browser.menu.showCharacterEncoding): Set to the string
# "true" (spelled and capitalized exactly that way) to show the "Character
# "true" (spelled and capitalized exactly that way) to show the "Text
# Encoding" menu in the main Firefox button on Windows. Any other value will
# hide it. Regardless of the value of this setting, the "Character Encoding"
# hide it. Regardless of the value of this setting, the "Text Encoding"
# menu will always be accessible via the "Web Developer" menu.
# This is not a string to translate; it just controls whether the menu shows
# up in the Firefox button. If users frequently use the "Character Encoding"
# up in the Firefox button. If users frequently use the "Text Encoding"
# menu, set this to "true". Otherwise, you can leave it as "false".
browser.menu.showCharacterEncoding=false

6
browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties
View File

@ -81,11 +81,11 @@ paste-button.tooltiptext2 = Paste (%S)
feed-button.label = Subscribe
feed-button.tooltiptext2 = Subscribe to this page
# LOCALIZATION NOTE (characterencoding-button.label): The \u00ad character at the beginning
# LOCALIZATION NOTE (characterencoding-button2.label): The \u00ad text at the beginning
# of the string is used to disable auto hyphenation on the button text when it is displayed
# in the menu panel.
characterencoding-button.label = \u00adCharacter Encoding
characterencoding-button.tooltiptext2 = Show character encoding options
characterencoding-button2.label = \u00adText Encoding
characterencoding-button2.tooltiptext = Show text encoding options
email-link-button.label = Email Link
email-link-button.tooltiptext3 = Email a link to this page

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

@ -22,7 +22,7 @@
<!ENTITY generalReferrer "Referring URL:">
<!ENTITY generalSource "Cache Source:">
<!ENTITY generalModified "Modified:">
<!ENTITY generalEncoding "Encoding:">
<!ENTITY generalEncoding2 "Text Encoding:">
<!ENTITY generalMetaName "Name">
<!ENTITY generalMetaContent "Content">

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

@ -63,10 +63,10 @@
<!ENTITY allowPagesToUse.label "Allow pages to choose their own fonts, instead of my selections above">
<!ENTITY allowPagesToUse.accesskey "A">
<!ENTITY languages.customize.Fallback.grouplabel "Character Encoding for Legacy Content">
<!ENTITY languages.customize.Fallback.label "Fallback Character Encoding:">
<!ENTITY languages.customize.Fallback.accesskey "C">
<!ENTITY languages.customize.Fallback.desc "This character encoding is used for legacy content that fails to declare its encoding.">
<!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.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):

4
toolkit/components/viewsource/content/viewSource.xul
View File

@ -206,8 +206,8 @@
<!-- Charset Menu -->
<menu id="charsetMenu"
label="&charsetMenu.label;"
accesskey="&charsetMenu.accesskey;"
label="&charsetMenu2.label;"
accesskey="&charsetMenu2.accesskey;"
oncommand="BrowserSetCharacterSet(event);"
onpopupshowing="CharsetMenu.build(event.target);"
onpopupshown="CharsetMenu.update(event.target, content.document.characterSet);">

4
toolkit/locales/en-US/chrome/global/charsetMenu.dtd
View File

@ -2,5 +2,5 @@
- 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 charsetMenu.label "Character Encoding">
<!ENTITY charsetMenu.accesskey "C">
<!ENTITY charsetMenu2.label "Text Encoding">
<!ENTITY charsetMenu2.accesskey "c">