Bug 1399699 - Remove redundant colon signs in cookies.dtd, siteDataSettings.dtd, translation.dtd r=jaws
authorRicky Chien <ricky060709@gmail.com>
Thu, 14 Sep 2017 10:59:04 +0800
changeset 432876 3907243d5b86eff477f92aa81152cbd6570ace11
parent 432875 a794ed07b821173cd09561afb4a56c6f449e0e3b
child 432877 c1744a3f7a8ed5b45dd2a3cf3e5bcdd14dbaebf6
push id1567
push userjlorenzo@mozilla.com
push dateThu, 02 Nov 2017 12:36:05 +0000
treeherdermozilla-release@e512c14a0406 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjaws
bugs1399699
milestone57.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 1399699 - Remove redundant colon signs in cookies.dtd, siteDataSettings.dtd, translation.dtd r=jaws MozReview-Commit-ID: L3D5tRJjY3x
browser/components/preferences/cookies.xul
browser/components/preferences/siteDataRemoveSelected.xul
browser/components/preferences/translation.xul
browser/locales/en-US/chrome/browser/preferences/cookies.dtd
browser/locales/en-US/chrome/browser/preferences/siteDataSettings.dtd
browser/locales/en-US/chrome/browser/preferences/translation.dtd
--- a/browser/components/preferences/cookies.xul
+++ b/browser/components/preferences/cookies.xul
@@ -33,17 +33,17 @@
     <hbox align="center">
       <textbox type="search" id="filter" flex="1"
                aria-controls="cookiesList"
                oncommand="gCookiesWindow.filter();"
                placeholder="&searchFilter.label;"
                accesskey="&searchFilter.accesskey;"/>
     </hbox>
     <separator class="thin"/>
-    <label control="cookiesList" id="cookiesIntro">&cookiesonsystem.label;</label>
+    <label control="cookiesList" id="cookiesIntro">&cookiesonsystem2.label;</label>
     <separator class="thin"/>
     <tree id="cookiesList" flex="1" style="height: 10em;"
           onkeypress="gCookiesWindow.onCookieKeyPress(event)"
           onselect="gCookiesWindow.onCookieSelected();"
           hidecolumnpicker="true" seltype="single">
       <treecols>
         <treecol id="domainCol" label="&cookiedomain.label;" flex="2" primary="true"
                  persist="width" onclick="gCookiesWindow.sort('rawHost');"/>
--- a/browser/components/preferences/siteDataRemoveSelected.xul
+++ b/browser/components/preferences/siteDataRemoveSelected.xul
@@ -39,17 +39,17 @@
         <separator class="thin"/>
         <description id="removing-description">&removingSelected.description;</description>
       </vbox>
     </hbox>
 
     <separator />
 
     <vbox flex="1">
-      <label>&siteTree.label;</label>
+      <label>&siteTree2.label;</label>
       <separator class="thin"/>
       <tree id="sitesTree" flex="1" seltype="single" hidecolumnpicker="true">
         <treecols>
           <treecol primary="true" flex="1" hideheader="true"/>
         </treecols>
         <treechildren />
       </tree>
     </vbox>
--- a/browser/components/preferences/translation.xul
+++ b/browser/components/preferences/translation.xul
@@ -25,17 +25,17 @@
                 src="chrome://browser/locale/preferences/preferences.properties"/>
 
   <keyset>
     <key key="&windowClose.key;" modifiers="accel" oncommand="window.close();"/>
   </keyset>
 
   <vbox class="largeDialogContainer">
     <vbox class="contentPane" flex="1">
-      <label id="languagesLabel" control="permissionsTree">&noTranslationForLanguages.label;</label>
+      <label id="languagesLabel" control="permissionsTree">&noTranslationForLanguages2.label;</label>
       <separator class="thin"/>
       <tree id="languagesTree" flex="1" style="height: 12em;"
             hidecolumnpicker="true"
             onkeypress="gTranslationExceptions.onLanguageKeyPress(event)"
             onselect="gTranslationExceptions.onLanguageSelected();">
         <treecols>
           <treecol id="languageCol" label="&treehead.languageName.label;" flex="1"/>
         </treecols>
@@ -52,17 +52,17 @@
                 icon="clear" label="&removeAllLanguages.label;"
                 accesskey="&removeAllLanguages.accesskey;"
                 oncommand="gTranslationExceptions.onAllLanguagesDeleted();"/>
         <spacer flex="1"/>
       </hbox>
     </hbox>
     <separator/>
     <vbox class="contentPane" flex="1">
-      <label id="languagesLabel" control="permissionsTree">&noTranslationForSites.label;</label>
+      <label id="languagesLabel" control="permissionsTree">&noTranslationForSites2.label;</label>
       <separator class="thin"/>
       <tree id="sitesTree" flex="1" style="height: 12em;"
             hidecolumnpicker="true"
             onkeypress="gTranslationExceptions.onSiteKeyPress(event)"
             onselect="gTranslationExceptions.onSiteSelected();">
         <treecols>
           <treecol id="siteCol" label="&treehead.siteName2.label;" flex="1"/>
         </treecols>
--- a/browser/locales/en-US/chrome/browser/preferences/cookies.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/cookies.dtd
@@ -1,15 +1,15 @@
 <!-- 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                       "36em">
 
-<!ENTITY     cookiesonsystem.label          "The following cookies are stored on your computer:">
+<!ENTITY     cookiesonsystem2.label         "The following cookies are stored on your computer">
 <!ENTITY     cookiename.label               "Cookie Name">
 <!ENTITY     cookiedomain.label             "Site">
 
 <!ENTITY     props.name.label               "Name:">
 <!ENTITY     props.value.label              "Content:">
 <!ENTITY     props.domain.label             "Host:">
 <!ENTITY     props.path.label               "Path:">
 <!ENTITY     props.secure.label             "Send For:">
--- a/browser/locales/en-US/chrome/browser/preferences/siteDataSettings.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/siteDataSettings.dtd
@@ -11,9 +11,9 @@
 <!ENTITY     removeSelected.label          "Remove Selected">
 <!ENTITY     removeSelected.accesskey      "r">
 <!ENTITY     save.label                    "Save Changes">
 <!ENTITY     save.accesskey                "a">
 <!ENTITY     cancel.label                  "Cancel">
 <!ENTITY     cancel.accesskey              "C">
 <!ENTITY     removingDialog.title          "Removing Site Data">
 <!ENTITY     removingSelected.description  "Removing site data will also remove related cookies and offline web content. This may log you out of websites. Are you sure you want to make the changes?">
-<!ENTITY     siteTree.label                "The following website cookies will be removed:">
+<!ENTITY     siteTree2.label               "The following website cookies will be removed">
--- a/browser/locales/en-US/chrome/browser/preferences/translation.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/translation.dtd
@@ -1,24 +1,24 @@
 <!-- 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.title                     "Exceptions - Translation">
 <!ENTITY window.width                     "36em">
 <!ENTITY windowClose.key                  "w">
 
-<!ENTITY noTranslationForLanguages.label  "Translation will not be offered for the following languages:">
+<!ENTITY noTranslationForLanguages2.label "Translation will not be offered for the following languages">
 <!ENTITY treehead.languageName.label      "Languages">
 <!ENTITY removeLanguage.label             "Remove Language">
 <!ENTITY removeLanguage.accesskey         "R">
 <!ENTITY removeAllLanguages.label         "Remove All Languages">
 <!ENTITY removeAllLanguages.accesskey     "e">
 
-<!ENTITY noTranslationForSites.label      "Translation will not be offered for the following sites:">
+<!ENTITY noTranslationForSites2.label     "Translation will not be offered for the following sites">
 <!ENTITY treehead.siteName2.label         "Websites">
 <!ENTITY removeSite.label                 "Remove Site">
 <!ENTITY removeSite.accesskey             "S">
 <!ENTITY removeAllSites.label             "Remove All Sites">
 <!ENTITY removeAllSites.accesskey         "i">
 
 <!ENTITY button.close.label               "Close">
 <!ENTITY button.close.accesskey           "C">