Bug 1356006 - Fix inconsistencies with strings in about:preferences#general. r?gijs
MozReview-Commit-ID: 8hUKm1DeGgr
--- a/browser/components/preferences/in-content/main.xul
+++ b/browser/components/preferences/in-content/main.xul
@@ -250,18 +250,18 @@
</deck>
<separator class="thin"/>
</vbox>
#endif
<html:table id="startupTable">
<html:tr>
<html:td class="label-cell">
- <label accesskey="&startupPage.accesskey;"
- control="browserStartupPage">&startupPage.label;</label>
+ <label accesskey="&startupPage2.accesskey;"
+ control="browserStartupPage">&startupPage2.label;</label>
</html:td>
<html:td class="content-cell">
<menulist id="browserStartupPage"
class="content-cell-item"
preference="browser.startup.page">
<menupopup>
<menuitem label="&startupUserHomePage.label;"
value="1"
@@ -273,18 +273,18 @@
value="3"
id="browserStartupLastSession"/>
</menupopup>
</menulist>
</html:td>
</html:tr>
<html:tr>
<html:td class="label-cell">
- <label accesskey="&homepage.accesskey;"
- control="browserHomePage">&homepage.label;</label>
+ <label accesskey="&homepage2.accesskey;"
+ control="browserHomePage">&homepage2.label;</label>
</html:td>
<html:td class="content-cell">
<textbox id="browserHomePage"
class="padded uri-element content-cell-item"
type="autocomplete"
autocompletesearch="unifiedcomplete"
onsyncfrompreference="return gMainPane.syncFromHomePref();"
onsynctopreference="return gMainPane.syncToHomePref(this.value);"
@@ -366,17 +366,17 @@
accesskey="&removeEngine.accesskey;"
disabled="true"
/>
</hbox>
<separator class="thin"/>
<hbox id="addEnginesBox" pack="start">
- <label id="addEngines" class="text-link" value="&addMoreSearchEngines.label;"/>
+ <label id="addEngines" class="text-link" value="&addMoreSearchEngines2.label;"/>
</hbox>
</groupbox>
<!-- Tab preferences -->
<groupbox data-category="paneGeneral"
hidden="true" align="start">
<caption><label>&tabsGroup.label;</label></caption>
@@ -481,19 +481,19 @@
<grid id="fontsGrid">
<columns>
<column flex="1"/>
<column/>
</columns>
<rows id="fontsRows">
<row id="fontRow">
<hbox align="center">
- <label control="defaultFont" accesskey="&defaultFont.accesskey;">&defaultFont.label;</label>
+ <label control="defaultFont" accesskey="&defaultFont2.accesskey;">&defaultFont2.label;</label>
<menulist id="defaultFont" delayprefsave="true" onsyncfrompreference="return FontBuilder.readFontSelection(this);"/>
- <label id="defaultFontSizeLabel" control="defaultFontSize" accesskey="&defaultSize.accesskey;">&defaultSize.label;</label>
+ <label id="defaultFontSizeLabel" control="defaultFontSize" accesskey="&defaultSize2.accesskey;">&defaultSize2.label;</label>
<menulist id="defaultFontSize" delayprefsave="true">
<menupopup>
<menuitem value="9" label="9"/>
<menuitem value="10" label="10"/>
<menuitem value="11" label="11"/>
<menuitem value="12" label="12"/>
<menuitem value="13" label="13"/>
<menuitem value="14" label="14"/>
--- a/browser/locales/en-US/chrome/browser/preferences/content.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/content.dtd
@@ -16,20 +16,20 @@
<!ENTITY notificationsDoNotDisturb.accesskey "n">
<!ENTITY notificationsDoNotDisturbDetails.value "No notification will be shown until you restart &brandShortName;">
<!ENTITY popupExceptions.label "Exceptions…">
<!ENTITY popupExceptions.accesskey "E">
<!ENTITY fontsAndColors.label "Fonts & Colors">
-<!ENTITY defaultFont.label "Default font:">
-<!ENTITY defaultFont.accesskey "D">
-<!ENTITY defaultSize.label "Size:">
-<!ENTITY defaultSize.accesskey "S">
+<!ENTITY defaultFont2.label "Default font">
+<!ENTITY defaultFont2.accesskey "D">
+<!ENTITY defaultSize2.label "Size">
+<!ENTITY defaultSize2.accesskey "S">
<!ENTITY advancedFonts.label "Advanced…">
<!ENTITY advancedFonts.accesskey "A">
<!ENTITY colors.label "Colors…">
<!ENTITY colors.accesskey "C">
--- a/browser/locales/en-US/chrome/browser/preferences/main.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/main.dtd
@@ -1,22 +1,22 @@
<!-- 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 startup.label "Startup">
-<!ENTITY startupPage.label "When &brandShortName; starts:">
-<!ENTITY startupPage.accesskey "s">
+<!ENTITY startupPage2.label "When &brandShortName; starts">
+<!ENTITY startupPage2.accesskey "s">
<!ENTITY startupUserHomePage.label "Show your home page">
<!ENTITY startupBlankPage.label "Show a blank page">
<!ENTITY startupPrevSession.label "Show your windows and tabs from last time">
-<!ENTITY homepage.label "Home Page:">
-<!ENTITY homepage.accesskey "P">
+<!ENTITY homepage2.label "Home Page">
+<!ENTITY homepage2.accesskey "P">
<!ENTITY useCurrentPage.label "Use Current Page">
<!ENTITY useCurrentPage.accesskey "C">
<!ENTITY useMultiple.label "Use Current Pages">
<!ENTITY chooseBookmark.label "Use Bookmark…">
<!ENTITY chooseBookmark.accesskey "B">
<!ENTITY restoreDefault.label "Restore to Default">
<!ENTITY restoreDefault.accesskey "R">
--- a/browser/locales/en-US/chrome/browser/preferences/search.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/search.dtd
@@ -8,22 +8,22 @@
<!ENTITY provideSearchSuggestions.label "Provide search suggestions">
<!ENTITY provideSearchSuggestions.accesskey "s">
<!ENTITY showURLBarSuggestions.label "Show search suggestions in location bar results">
<!ENTITY showURLBarSuggestions.accesskey "l">
<!ENTITY urlBarSuggestionsPermanentPB.label "Search suggestions will not be shown in location bar results because you have configured &brandShortName; to never remember history.">
-<!ENTITY oneClickSearchEngines.label "One-click Search Engines">
+<!ENTITY oneClickSearchEngines.label "One-Click Search Engines">
<!ENTITY chooseWhichOneToDisplay.label "The search bar lets you search alternate engines directly. Choose which ones to display.">
<!ENTITY engineNameColumn.label "Search Engine">
<!ENTITY engineKeywordColumn.label "Keyword">
<!ENTITY restoreDefaultSearchEngines.label "Restore Default Search Engines">
<!ENTITY restoreDefaultSearchEngines.accesskey "d">
<!ENTITY removeEngine.label "Remove">
<!ENTITY removeEngine.accesskey "r">
-<!ENTITY addMoreSearchEngines.label "Add more search engines…">
+<!ENTITY addMoreSearchEngines2.label "Add more search engines">