Update .gecko_rev.yml to pull from mozilla-release by default a=releasemerge ba=releasemerge CLOSED TREE
authorPatrick Cloke <clokep@gmail.com>
Mon, 10 Feb 2020 16:10:20 -0500
changeset 12647 9877b55bbd725ad1806a94043729a367160001be
parent 12646 abd99182850bec22966b094b21b70b714c17046a
child 12648 f1f77c36d6c3af3e29c95911c012b73a66daf891
push id219
push userflodolo@mozilla.com
push dateThu, 13 Feb 2020 07:27:39 +0000
reviewersreleasemerge
Update .gecko_rev.yml to pull from mozilla-release by default a=releasemerge ba=releasemerge CLOSED TREE X-Channel-Repo: comm-central X-Channel-Revision: 3f3fc2c0d80474dff5953969f765e16937dde150 X-Channel-Repo: releases/comm-beta X-Channel-Revision: 560911f4360eb9798dfd75f9138037c4b2373757 X-Channel-Repo: releases/comm-release X-Channel-Converted-Revision: dc2694f035fa318992cb34e15bc3a0a11e2d7b70 X-Channel-Repo: releases/comm-esr68 X-Channel-Revision: d05d4d87d25c5d290afeb0353f218dbb7b735bf2
mail/chrome/messenger/messengercompose/EditorReplace.dtd
mail/chrome/messenger/preferences/connection.dtd
--- a/mail/chrome/messenger/messengercompose/EditorReplace.dtd
+++ b/mail/chrome/messenger/messengercompose/EditorReplace.dtd
@@ -1,14 +1,12 @@
 <!-- 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/. -->
 
-<!-- extracted from EdReplace.xul -->
-
 <!-- extracted from EdReplace.xhtml -->
 
 <!ENTITY replaceDialog.title "Find and Replace">
 <!ENTITY findField.label "Find text:">
 <!ENTITY findField.accesskey "n">
 <!ENTITY replaceField.label "Replace with:">
 <!ENTITY replaceField.accesskey "e">
 <!ENTITY caseSensitiveCheckbox.label "Match exact case">
--- a/mail/chrome/messenger/preferences/connection.dtd
+++ b/mail/chrome/messenger/preferences/connection.dtd
@@ -35,22 +35,22 @@
 <!ENTITY  HTTPport.accesskey            "p">
 <!ENTITY  SSLport.label                 "Port:">
 <!ENTITY  SSLport.accesskey             "o">
 <!ENTITY  SOCKSport.label               "Port:">
 <!ENTITY  SOCKSport.accesskey           "t">
 <!ENTITY  noproxy.label                 "No proxy for:">
 <!ENTITY  noproxy.accesskey             "n">
 <!ENTITY  noproxyExplain.label          "Example: .mozilla.org, .net.nz, 192.168.1.0/24">
+<!ENTITY  shareproxy.label              "Use this proxy server for all protocols">
+<!ENTITY  shareproxy.accesskey          "x">
 <!-- LOCALIZATION NOTE (noproxyLocalhostDesc.label): Do not translate
   localhost, 127.0.0.1 and ::1.
 -->
 <!ENTITY  noproxyLocalhostDesc.label    "Connections to localhost, 127.0.0.1, and ::1 are never proxied.">
-<!ENTITY  shareproxy.label              "Use this proxy server for all protocols">
-<!ENTITY  shareproxy.accesskey          "x">
 <!ENTITY  proxyHttpSharing.label        "Also use this proxy for HTTPS">
 <!ENTITY  proxyHttpSharing.accesskey    "x">
 <!ENTITY  autologinproxy.label          "Do not prompt for authentication if password is saved">
 <!ENTITY  autologinproxy.accesskey      "i">
 <!ENTITY  autologinproxy.tooltip        "This option silently authenticates you to proxies when you have saved credentials for them. You will be prompted if authentication fails.">
 <!ENTITY  socksRemoteDNS.label          "Proxy DNS when using SOCKS v5">
 <!ENTITY  socksRemoteDNS.accesskey      "d">
 <!ENTITY  dnsOverHttps.label            "Enable DNS over HTTPS">