[mail] Bug 389139 - Do not show the current account in the folderpicker as a target for deferring. Allow hiding/disabling accounts in the picker.
authorBenoit Leseul
Thu, 27 Jun 2013 23:44:31 +0200
changeset 3587 842240a6dcd1a5161441aa7a6c54708881846aed
parent 3586 b581b2fdbc8f9d6d6197c53cef3115f200a36a0d
child 3588 a65bb5931238dbd321e332774f98ffe231f2c848
push id3222
push userbenoit.leseul@gmail.com
push dateThu, 27 Jun 2013 21:45:27 +0000
bugs389139
[mail] Bug 389139 - Do not show the current account in the folderpicker as a target for deferring. Allow hiding/disabling accounts in the picker.
mail/chrome/messenger/am-server-advanced.dtd
mail/chrome/messenger/folderWidgets.properties
suite/chrome/mailnews/folderWidgets.properties
suite/chrome/mailnews/pref/am-server-advanced.dtd
--- a/mail/chrome/messenger/am-server-advanced.dtd
+++ b/mail/chrome/messenger/am-server-advanced.dtd
@@ -20,16 +20,14 @@
 <!ENTITY personalNamespace.accesskey "E">
 <!ENTITY publicNamespace.label   "Public (partagé) :">
 <!ENTITY publicNamespace.accesskey "P">
 <!ENTITY otherUsersNamespace.label    "Autres utilisateurs :">
 <!ENTITY otherUsersNamespace.accesskey "u">
 <!ENTITY overrideNamespaces.label "Permettre au serveur d'outrepasser ces espaces de noms">
 <!ENTITY overrideNamespaces.accesskey "r">
 <!ENTITY pop3Desc.label "Lors du téléchargement des messages POP pour ce serveur, utiliser le dossier suivant pour le nouveau courrier :" >
-<!ENTITY globalInbox.label "Boîte globale (compte Dossiers locaux)">
-<!ENTITY globalInbox.accesskey "B">
 <!ENTITY accountDirectory.label "Courrier entrant de ce compte">
 <!ENTITY accountDirectory.accesskey "C">
 <!ENTITY deferToServer.label "Courrier entrant d'un autre compte">
 <!ENTITY deferToServer.accesskey "o">
 <!ENTITY deferGetNewMail.label "Inclure ce serveur lors de la récupération des messages">
 <!ENTITY deferGetNewMail.accesskey "I">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/folderWidgets.properties
@@ -0,0 +1,7 @@
+# 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/.
+
+# LOCALIZATION NOTE(globalInbox)
+# %S=name of the Local folders account
+globalInbox=Boîte globale (%S)
new file mode 100644
--- /dev/null
+++ b/suite/chrome/mailnews/folderWidgets.properties
@@ -0,0 +1,7 @@
+# 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/.
+
+# LOCALIZATION NOTE(globalInbox)
+# %S=name of the Local folders account
+globalInbox=Boîte globale (%S)
--- a/suite/chrome/mailnews/pref/am-server-advanced.dtd
+++ b/suite/chrome/mailnews/pref/am-server-advanced.dtd
@@ -20,16 +20,14 @@
 <!ENTITY personalNamespace.accesskey "p">
 <!ENTITY publicNamespace.label "Public (partagé) :">
 <!ENTITY publicNamespace.accesskey "u">
 <!ENTITY otherUsersNamespace.label "Autres utilisateurs :">
 <!ENTITY otherUsersNamespace.accesskey "A">
 <!ENTITY overrideNamespaces.label "Permettre au serveur d'ignorer ces espaces de noms">
 <!ENTITY overrideNamespaces.accesskey "o">
 <!ENTITY pop3Desc.label "Lorsque vous téléchargez du courrier via le protocole POP3 de ce serveur, utiliser les répertoires de Courrier entrant suivant :" >
-<!ENTITY globalInbox.label "Courrier entrant global (compte Dossiers locaux)">
-<!ENTITY globalInbox.accesskey "C">
 <!ENTITY accountDirectory.label "Courrier entrant de ce compte">
 <!ENTITY accountDirectory.accesskey "e">
 <!ENTITY deferToServer.label "Courrier entrant d'un autre compte">
 <!ENTITY deferToServer.accesskey "a">
 <!ENTITY deferGetNewMail.label "Inclure ce serveur lors de la relève du nouveau courrier">
 <!ENTITY deferGetNewMail.accesskey "I">