Bug 1118032 - adjust UI describing color behaviour, r=jaws
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Wed, 07 Jan 2015 12:22:31 +0000
changeset 249024 28624e12ad87b0145e0247e0b1af0974cff7816c
parent 249023 8194656eca34a652ee6c99bf24321aca50a7325f
child 249025 55758d00de0249fe0debe3e661627d77fc79b999
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjaws
bugs1118032
milestone37.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 1118032 - adjust UI describing color behaviour, r=jaws
browser/components/preferences/colors.xul
browser/locales/en-US/chrome/browser/preferences/colors.dtd
--- a/browser/components/preferences/colors.xul
+++ b/browser/components/preferences/colors.xul
@@ -75,21 +75,28 @@
         </hbox>
         <separator class="thin"/>
         <hbox align="center">
           <checkbox id="browserUnderlineAnchors" label="&underlineLinks.label;" accesskey="&underlineLinks.accesskey;"
                     preference="browser.underline_anchors"/>
         </hbox>
       </groupbox>
     </hbox>
+#ifdef XP_WIN
     <vbox align="start">
-      <label accesskey="&allowPagesToUseColors.accesskey;"
-             control="useDocumentColors">&allowPagesToUseColors.label;</label>
+#else
+    <vbox>
+#endif
+      <label accesskey="&overridePageColors.accesskey;"
+             control="useDocumentColors">&overridePageColors.label;</label>
       <menulist id="useDocumentColors" preference="browser.display.document_color_use">
         <menupopup>
-          <menuitem label="&allowPagesToUseColors.automatic.label;" value="0" id="documentColorAutomatic"/>
-          <menuitem label="&allowPagesToUseColors.always.label;"    value="1" id="documentColorAlways"/>
-          <menuitem label="&allowPagesToUseColors.never.label;"     value="2" id="documentColorNever"/>
+          <menuitem label="&overridePageColors.always.label;"
+                    value="2" id="documentColorAlways"/>
+          <menuitem label="&overridePageColors.auto.label;"
+                    value="0" id="documentColorAutomatic"/>
+          <menuitem label="&overridePageColors.never.label;"
+                    value="1" id="documentColorNever"/>
         </menupopup>
       </menulist>
     </vbox>
   </prefpane>
 </prefwindow>
--- a/browser/locales/en-US/chrome/browser/preferences/colors.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/colors.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  colorsDialog.title              "Colors">
 <!ENTITY  window.width                    "38em">
 <!ENTITY  window.macWidth                 "41em">
 
-<!ENTITY  allowPagesToUseColors.label           "Allow pages to choose their own colors, instead of my selections above:">
-<!ENTITY  allowPagesToUseColors.accesskey       "A">
+<!ENTITY  overridePageColors.label        "Override the colors specified by the page with my selections above:">
+<!ENTITY  overridePageColors.accesskey    "O">
 
-<!ENTITY  allowPagesToUseColors.automatic.label "Automatic">
-<!ENTITY  allowPagesToUseColors.always.label    "Always">
-<!ENTITY  allowPagesToUseColors.never.label     "Never">
+<!ENTITY  overridePageColors.always.label "Always">
+<!ENTITY  overridePageColors.auto.label   "Only with High Contrast themes">
+<!ENTITY  overridePageColors.never.label  "Never">
 
 <!ENTITY  color                           "Text and Background">
 <!ENTITY  textColor.label                 "Text:">
 <!ENTITY  textColor.accesskey             "T">
 <!ENTITY  backgroundColor.label           "Background:">
 <!ENTITY  backgroundColor.accesskey       "B">
 <!ENTITY  useSystemColors.label           "Use system colors">
 <!ENTITY  useSystemColors.accesskey       "s">