Bug 1521024 - Remove unused am-server-top.xul and username.label from am-server-top.dtd. r=Paenglab
authorJorg K <jorgk@jorgk.com>
Mon, 21 Jan 2019 12:53:32 +0100
changeset 34257 fe3c8a49ad2ff4bddd158dd42211eef464fefb2c
parent 34256 611baef2655fa4f370f2494b0126bfbbf738327f
child 34258 1b078853f30d219f19371ae10886e80874a039ff
push id389
push userclokep@gmail.com
push dateMon, 18 Mar 2019 19:01:53 +0000
reviewersPaenglab
bugs1521024
Bug 1521024 - Remove unused am-server-top.xul and username.label from am-server-top.dtd. r=Paenglab
mail/locales/en-US/chrome/messenger/am-server-top.dtd
mailnews/base/prefs/content/am-server-top.xul
mailnews/jar.mn
suite/locales/en-US/chrome/mailnews/pref/am-server-top.dtd
--- a/mail/locales/en-US/chrome/messenger/am-server-top.dtd
+++ b/mail/locales/en-US/chrome/messenger/am-server-top.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 am-server-top.xul -->
-
 <!ENTITY messageStorage.label "Message Storage">
 <!ENTITY securitySettings.label "Security Settings">
 <!ENTITY serverSettings.label "Server Settings">
 <!ENTITY serverType.label "Server Type:">
 <!ENTITY serverName.label "Server Name:">
 <!ENTITY serverName.accesskey "S">
 <!ENTITY userName.label "User Name:">
 <!ENTITY userName.accesskey "N">
@@ -39,17 +37,16 @@
 <!ENTITY headersOnly.accesskey "e">
 <!ENTITY deleteByAgeFromServer.label "For at most">
 <!ENTITY deleteByAgeFromServer.accesskey "o">
 <!ENTITY daysEnd.label "days">
 <!ENTITY deleteOnServer2.label "Until I delete them">
 <!ENTITY deleteOnServer2.accesskey "d">
 <!ENTITY downloadOnBiff.label "Automatically download new messages">
 <!ENTITY downloadOnBiff.accesskey "m">
-<!ENTITY username.label "Your Login Name">
 <!ENTITY deleteMessagePrefix.label "When I delete a message:">
 <!ENTITY modelMoveToTrash.label "Move it to this folder:">
 <!ENTITY modelMoveToTrash.accesskey "o">
 <!ENTITY modelMarkDeleted.label "Just mark it as deleted">
 <!ENTITY modelMarkDeleted.accesskey "k">
 <!ENTITY modelDeleteImmediately.label "Remove it immediately">
 <!ENTITY modelDeleteImmediately.accesskey "d">
 <!-- LOCALIZATION NOTE (expungeOnExit.label) : do not translate two of "&quot;" in below line -->
deleted file mode 100644
--- a/mailnews/base/prefs/content/am-server-top.xul
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<!-- 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/. -->
-
-
-<?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
-
-<!DOCTYPE page SYSTEM "chrome://messenger/locale/am-server-top.dtd" >
-
-<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-</page>
--- a/mailnews/jar.mn
+++ b/mailnews/jar.mn
@@ -23,17 +23,16 @@ messenger.jar:
     content/messenger/AccountManager.js                                        (base/prefs/content/AccountManager.js)
     content/messenger/am-main.xul                                              (base/prefs/content/am-main.xul)
     content/messenger/am-main.js                                               (base/prefs/content/am-main.js)
     content/messenger/am-help.js                                               (base/prefs/content/am-help.js)
     content/messenger/am-server.xul                                            (base/prefs/content/am-server.xul)
     content/messenger/am-serverwithnoidentities.xul                            (base/prefs/content/am-serverwithnoidentities.xul)
     content/messenger/am-serverwithnoidentities.js                             (base/prefs/content/am-serverwithnoidentities.js)
     content/messenger/am-server.js                                             (base/prefs/content/am-server.js)
-    content/messenger/am-server-top.xul                                        (base/prefs/content/am-server-top.xul)
 *   content/messenger/am-copies.xul                                            (base/prefs/content/am-copies.xul)
     content/messenger/am-copies.js                                             (base/prefs/content/am-copies.js)
     content/messenger/am-junk.xul                                              (base/prefs/content/am-junk.xul)
     content/messenger/am-junk.js                                               (base/prefs/content/am-junk.js)
     content/messenger/am-offline.xul                                           (base/prefs/content/am-offline.xul)
     content/messenger/am-offline.js                                            (base/prefs/content/am-offline.js)
 *   content/messenger/am-addressing.xul                                        (base/prefs/content/am-addressing.xul)
     content/messenger/am-addressing.js                                         (base/prefs/content/am-addressing.js)
--- a/suite/locales/en-US/chrome/mailnews/pref/am-server-top.dtd
+++ b/suite/locales/en-US/chrome/mailnews/pref/am-server-top.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 am-server-top.xul -->
-
 <!ENTITY messageStorage.label "Message Storage">
 <!ENTITY securitySettings.label "Security Settings">
 <!ENTITY serverSettings.label "Server Settings">
 <!ENTITY serverType.label "Server Type:">
 <!ENTITY serverName.label "Server Name:">
 <!ENTITY serverName.accesskey "S">
 <!ENTITY userName.label "User Name:">
 <!ENTITY userName.accesskey "N">
@@ -39,17 +37,16 @@
 <!ENTITY headersOnly.accesskey "e">
 <!ENTITY deleteByAgeFromServer.label "For at most">
 <!ENTITY deleteByAgeFromServer.accesskey "o">
 <!ENTITY daysEnd.label "days">
 <!ENTITY deleteOnServer2.label "Until I delete them">
 <!ENTITY deleteOnServer2.accesskey "d">
 <!ENTITY downloadOnBiff.label "Automatically download new messages">
 <!ENTITY downloadOnBiff.accesskey "m">
-<!ENTITY username.label "Your Login Name">
 <!ENTITY deleteMessagePrefix.label "When I delete a message:">
 <!ENTITY modelMoveToTrash.label "Move it to this folder:">
 <!ENTITY modelMoveToTrash.accesskey "o">
 <!ENTITY modelMarkDeleted.label "Just mark it as deleted">
 <!ENTITY modelMarkDeleted.accesskey "k">
 <!ENTITY modelDeleteImmediately.label "Remove it immediately">
 <!ENTITY modelDeleteImmediately.accesskey "d">
 <!-- LOCALIZATION NOTE (expungeOnExit.label) : do not translate two of "&quot;" in below line -->