Bug 283754 - Awkward phrasing in language selection dialog - "in order of preference" used twice. r=dao
authorNikhil Johny <nikhiljohny@gmail.com>
Tue, 25 Feb 2014 08:18:56 -0500
changeset 170517 382ae10f777c7cd2953d560488f7f90f9787f092
parent 170516 3290585588fed81079cd088e0d7d99a707604941
child 170518 ee23500859a47d389f125f073311a8f218d44eeb
push id40235
push userryanvm@gmail.com
push dateTue, 25 Feb 2014 20:31:24 +0000
treeherdermozilla-inbound@d11a993d7846 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdao
bugs283754
milestone30.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 283754 - Awkward phrasing in language selection dialog - "in order of preference" used twice. r=dao
browser/components/preferences/languages.xul
browser/locales/en-US/chrome/browser/preferences/languages.dtd
--- a/browser/components/preferences/languages.xul
+++ b/browser/components/preferences/languages.xul
@@ -42,18 +42,17 @@
 
     <stringbundleset id="languageSet">
       <stringbundle id="bundleRegions"      src="chrome://global/locale/regionNames.properties"/>
       <stringbundle id="bundleLanguages"    src="chrome://global/locale/languageNames.properties"/>
       <stringbundle id="bundlePreferences"  src="chrome://browser/locale/preferences/preferences.properties"/>
       <stringbundle id="bundleAccepted"     src="resource://gre/res/language.properties"/>
     </stringbundleset>
 
-    <description>&languages.customize.prefLangDescript;</description>
-    <label>&languages.customize.active.label;</label>
+    <description>&languages.customize.description;</description>
     <grid flex="1">
       <columns>
         <column flex="1"/>
         <column/>
       </columns>
       <rows>
         <row flex="1">
           <listbox id="activeLanguages" flex="1" rows="6"
--- a/browser/locales/en-US/chrome/browser/preferences/languages.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/languages.dtd
@@ -1,17 +1,16 @@
 <!-- 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 window.width                                   "30em">
 
 <!ENTITY languages.customize.Header                     "Languages">
-<!ENTITY languages.customize.prefLangDescript           "Web pages are sometimes offered in more than one language. Choose languages for displaying these web pages, in order of preference.">
-<!ENTITY languages.customize.active.label               "Languages in order of preference:">
+<!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.customize.moveUp.label               "Move Up">
 <!ENTITY languages.customize.moveUp.accesskey           "U">
 <!ENTITY languages.customize.moveDown.label             "Move Down">
 <!ENTITY languages.customize.moveDown.accesskey         "D">
 <!ENTITY languages.customize.deleteButton.label         "Remove">
 <!ENTITY languages.customize.deleteButton.accesskey     "R">
 <!ENTITY languages.customize.selectLanguage.label       "Select a language to add…">
 <!ENTITY languages.customize.addButton.label            "Add">