Bug 1356008 - Fix inconsistencies with strings in about:preferences#applications. r?gijs
MozReview-Commit-ID: 5VN48CyHbvx
--- a/browser/components/preferences/in-content/applications.xul
+++ b/browser/components/preferences/in-content/applications.xul
@@ -58,17 +58,17 @@
<key key="&focusSearch1.key;" modifiers="accel" id="focusSearch1" oncommand=";"/>
<key key="&focusSearch2.key;" modifiers="accel" id="focusSearch2" oncommand=";"/>
</keyset>
<hbox id="header-applications"
class="header"
hidden="true"
data-category="paneApplications">
- <label class="header-name" flex="1">&paneDownloadLinks.title;</label>
+ <label class="header-name" flex="1">&paneFilesApplications.title;</label>
<html:a class="help-button" target="_blank" aria-label="&helpButton.label;"></html:a>
</hbox>
<vbox id="applicationsContent"
data-category="paneApplications"
hidden="true"
flex="1">
@@ -104,30 +104,31 @@
<hbox>
<radio id="alwaysAsk"
value="false"
label="&alwaysAskWhere.label;"
accesskey="&alwaysAskWhere.accesskey;"/>
</hbox>
</radiogroup>
</groupbox>
- <hbox>
+
+ <groupbox id="applicationsGroup">
+ <caption><label>&applications.label;</label></caption>
+ <description>&applications.description;</description>
<textbox id="filter" flex="1"
type="search"
- placeholder="&filter.emptytext;"
+ placeholder="&filter2.emptytext;"
aria-controls="handlersView"/>
- </hbox>
-
- <separator class="thin"/>
- <richlistbox id="handlersView" orient="vertical" persist="lastSelectedType"
- preference="pref.downloads.disable_button.edit_actions"
- flex="1">
- <listheader equalsize="always">
- <treecol id="typeColumn" label="&typeColumn.label;" value="type"
- accesskey="&typeColumn.accesskey;" persist="sortDirection"
- flex="1" sortDirection="ascending"/>
- <treecol id="actionColumn" label="&actionColumn2.label;" value="action"
- accesskey="&actionColumn2.accesskey;" persist="sortDirection"
- flex="1"/>
- </listheader>
- </richlistbox>
+ <richlistbox id="handlersView" orient="vertical" persist="lastSelectedType"
+ preference="pref.downloads.disable_button.edit_actions"
+ flex="1">
+ <listheader equalsize="always">
+ <treecol id="typeColumn" label="&typeColumn.label;" value="type"
+ accesskey="&typeColumn.accesskey;" persist="sortDirection"
+ flex="1" sortDirection="ascending"/>
+ <treecol id="actionColumn" label="&actionColumn2.label;" value="action"
+ accesskey="&actionColumn2.accesskey;" persist="sortDirection"
+ flex="1"/>
+ </listheader>
+ </richlistbox>
+ </groupbox>
</vbox>
--- a/browser/components/preferences/in-content/preferences.xul
+++ b/browser/components/preferences/in-content/preferences.xul
@@ -113,20 +113,20 @@
<image class="category-icon"/>
<label class="category-name" flex="1">&paneGeneral.title;</label>
</richlistitem>
<richlistitem id="category-application"
class="category"
value="paneApplications"
helpTopic="prefs-applications"
- tooltiptext="&paneDownloadLinks.title;"
+ tooltiptext="&paneFilesApplications.title;"
align="center">
<image class="category-icon"/>
- <label class="category-name" flex="1">&paneDownloadLinks.title;</label>
+ <label class="category-name" flex="1">&paneFilesApplications.title;</label>
</richlistitem>
<richlistitem id="category-containers"
class="category"
value="paneContainers"
helpTopic="prefs-containers"
hidden="true"/>
--- a/browser/locales/en-US/chrome/browser/preferences/applications.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/applications.dtd
@@ -1,14 +1,17 @@
<!-- 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 applications.label "Applications">
+<!ENTITY applications.description "Choose how &brandShortName; handles the files you download from the Web or the applications you use while browsing.">
+
<!ENTITY typeColumn.label "Content Type">
<!ENTITY typeColumn.accesskey "T">
<!ENTITY actionColumn2.label "Action">
<!ENTITY actionColumn2.accesskey "A">
<!ENTITY focusSearch1.key "f">
<!ENTITY focusSearch2.key "k">
-<!ENTITY filter.emptytext "Search">
+<!ENTITY filter2.emptytext "Search file types or applications">
--- a/browser/locales/en-US/chrome/browser/preferences/preferences.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/preferences.dtd
@@ -10,17 +10,17 @@
<!-- When making changes to prefWindow.styleWin test both Windows Classic and
Luna since widget heights are different based on the OS theme -->
<!ENTITY prefWinMinSize.styleWin2 "width: 42em; min-height: 37.5em;">
<!ENTITY prefWinMinSize.styleMac "width: 47em; min-height: 40em;">
<!ENTITY prefWinMinSize.styleGNOME "width: 45.5em; min-height: 40.5em;">
<!ENTITY paneSearchResults.title "Search Results">
<!ENTITY paneGeneral.title "General">
-<!ENTITY paneDownloadLinks.title "Downloads & Links">
+<!ENTITY paneFilesApplications.title "Files & Applications">
<!ENTITY panePrivacySecurity.title "Privacy & Security">
<!ENTITY paneContainers.title "Container Tabs">
<!ENTITY paneUpdates.title "Updates">
<!-- LOCALIZATION NOTE (paneSync1.title): This should match syncBrand.fxAccount.label in ../syncBrand.dtd -->
<!ENTITY paneSync1.title "Firefox Account">
<!ENTITY helpButton.label "Help">
--- a/browser/themes/shared/incontentprefs/preferences.inc.css
+++ b/browser/themes/shared/incontentprefs/preferences.inc.css
@@ -178,20 +178,16 @@ treecol {
#defaultFontSizeLabel {
/* !important needed to override common !important rule */
margin-inline-start: 4px !important;
}
/* Applications Pane Styles */
-#applicationsContent {
- padding: 15px 0;
-}
-
#filter {
margin-inline-start: 0;
}
#handlersView {
height: 25em;
}