Mercurial Mercurial > vmm / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added a deprecated warning for managesieve. Updated translation.
authorPascal Volk <neverseen@users.sourceforge.net>
Sun, 23 Aug 2009 17:08:18 +0000
changeset 132 fa22bd13b4d1
parent 131 2b8154cc7ebe
child 133 2d5c4745efec
Added a deprecated warning for managesieve. Updated translation.
VirtualMailManager/VirtualMailManager.py file | annotate | diff | comparison | revisions
po/de.po file | annotate | diff | comparison | revisions
po/vmm.pot file | annotate | diff | comparison | revisions 
--- a/VirtualMailManager/VirtualMailManager.py	Sat Aug 22 20:24:50 2009 +0000
+++ b/VirtualMailManager/VirtualMailManager.py	Sun Aug 23 17:08:18 2009 +0000
@@ -517,10 +517,9 @@
                     ERR.INVALID_AGUMENT)
         if details == 'detailed':
             details = 'full'
-            warning = _(u"""\
-The keyword »detailed« is deprecated and will be removed in a future release.
-    Please use the keyword »full« to get full details.""")
-            self.__warnings.append(warning)
+            self.__warnings.append(_(u'\
+The keyword »detailed« is deprecated and will be removed in a future release.\n\
+   Please use the keyword »full« to get full details.'))
         dom = self.__getDomain(domainname)
         dominfo = dom.getInfo()
         if dominfo['domainname'].startswith('xn--'):
@@ -688,10 +687,22 @@
         acc.modify('transport', transport)
 
     def userDisable(self, emailaddress, service=None):
+        if service == 'managesieve':
+            service = 'sieve'
+            self.__warnings.append(_(u'\
+The service name »managesieve« is deprecated and will be removed\n\
+   in a future release.\n\
+   Please use the service name »sieve« instead.'))
         acc = self.__getAccount(emailaddress)
         acc.disable(self.__Cfg.getint('misc', 'dovecotvers'), service)
 
     def userEnable(self, emailaddress, service=None):
+        if service == 'managesieve':
+            service = 'sieve'
+            self.__warnings.append(_(u'\
+The service name »managesieve« is deprecated and will be removed\n\
+   in a future release.\n\
+   Please use the service name »sieve« instead.'))
         acc = self.__getAccount(emailaddress)
         acc.enable(self.__Cfg.getint('misc', 'dovecotvers'), service)
 
--- a/po/de.po	Sat Aug 22 20:24:50 2009 +0000
+++ b/po/de.po	Sun Aug 23 17:08:18 2009 +0000
@@ -1,13 +1,13 @@
 # German translations for vmm package.
-# Copyright (C) 2008 VEB IT
-# Pascal Volk <p.volk@veb-it.de>, 2008.
+# Copyright (C) 2009 VEB IT
+# Pascal Volk <p.volk@veb-it.de>, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: vmm 0.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-21 20:17+0200\n"
-"PO-Revision-Date: 2009-08-21 20:31+0200\n"
+"POT-Creation-Date: 2009-08-23 17:45+0200\n"
+"PO-Revision-Date: 2009-08-21 18:01+0200\n"
 "Last-Translator: Pascal Volk <p.volk@veb-it.de>\n"
 "Language-Team: German\n"
 "MIME-Version: 1.0\n"
@@ -391,8 +391,8 @@
 
 #: VirtualMailManager/VirtualMailManager.py:497
 #: VirtualMailManager/VirtualMailManager.py:516
-#: VirtualMailManager/VirtualMailManager.py:625
-#: VirtualMailManager/VirtualMailManager.py:656
+#: VirtualMailManager/VirtualMailManager.py:624
+#: VirtualMailManager/VirtualMailManager.py:655
 #, python-format
 msgid "Invalid argument: »%s«"
 msgstr "Ungültiges Argument: »%s«"
@@ -401,23 +401,23 @@
 msgid ""
 "The keyword »detailed« is deprecated and will be removed in a future "
 "release.\n"
-"    Please use the keyword »full« to get full details."
+"   Please use the keyword »full« to get full details."
 msgstr ""
 "Das Schlüsselwort »detailed« ist veraltet und wird in einer zukünftigen\n"
-"    Version entfernt werden.\n"
-"    Verwenden Sie bitte das Schlüsselwort »full«, um alle Details zu erhalten."
+"   Version entfernt werden.\n"
+"   Verwenden Sie bitte das Schlüsselwort »full«, um alle Details zu erhalten."
 
-#: VirtualMailManager/VirtualMailManager.py:594
+#: VirtualMailManager/VirtualMailManager.py:593
 #, python-format
 msgid "The pattern »%s« contains invalid characters."
 msgstr "Das Muster »%s« enthält ungültige Zeichen."
 
-#: VirtualMailManager/VirtualMailManager.py:620
+#: VirtualMailManager/VirtualMailManager.py:619
 #, python-format
 msgid "The destination account/alias »%s« doesn't exists yet."
 msgstr "Der Ziel-Account/-Alias »%s« existiert noch nicht."
 
-#: VirtualMailManager/VirtualMailManager.py:637
+#: VirtualMailManager/VirtualMailManager.py:636
 #, python-format
 msgid ""
 "The account has been successfully deleted from the database.\n"
@@ -430,10 +430,21 @@
 "    »%(directory)s«\n"
 "    Grund: %(raeson)s"
 
-#: VirtualMailManager/VirtualMailManager.py:677
+#: VirtualMailManager/VirtualMailManager.py:676
 msgid "Account doesn't exists"
 msgstr "Der Account existiert nicht"
 
+#: VirtualMailManager/VirtualMailManager.py:692
+#: VirtualMailManager/VirtualMailManager.py:702
+msgid ""
+"The service name »managesieve« is deprecated and will be removed\n"
+"   in a future release.\n"
+"   Please use the service name »sieve« instead."
+msgstr ""
+"Der Servicename »managesieve« ist veraltet und wird in einer zukünftigen\n"
+"   Version entfernt werden.\n"
+"   Verwenden Sie stattdessen bitte den Servicename »sieve«."
+
 #: VirtualMailManager/ext/Postconf.py:44
 #, python-format
 msgid ""
--- a/po/vmm.pot	Sat Aug 22 20:24:50 2009 +0000
+++ b/po/vmm.pot	Sun Aug 23 17:08:18 2009 +0000
@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2009 VEB IT
-# This file is distributed under the same license as the vmm package.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: vmm 0.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-21 20:17+0200\n"
+"POT-Creation-Date: 2009-08-23 17:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -373,8 +373,8 @@
 
 #: VirtualMailManager/VirtualMailManager.py:497
 #: VirtualMailManager/VirtualMailManager.py:516
-#: VirtualMailManager/VirtualMailManager.py:625
-#: VirtualMailManager/VirtualMailManager.py:656
+#: VirtualMailManager/VirtualMailManager.py:624
+#: VirtualMailManager/VirtualMailManager.py:655
 #, python-format
 msgid "Invalid argument: »%s«"
 msgstr ""
@@ -383,20 +383,20 @@
 msgid ""
 "The keyword »detailed« is deprecated and will be removed in a future "
 "release.\n"
-"    Please use the keyword »full« to get full details."
+"   Please use the keyword »full« to get full details."
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:594
+#: VirtualMailManager/VirtualMailManager.py:593
 #, python-format
 msgid "The pattern »%s« contains invalid characters."
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:620
+#: VirtualMailManager/VirtualMailManager.py:619
 #, python-format
 msgid "The destination account/alias »%s« doesn't exists yet."
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:637
+#: VirtualMailManager/VirtualMailManager.py:636
 #, python-format
 msgid ""
 "The account has been successfully deleted from the database.\n"
@@ -405,10 +405,18 @@
 "    Reason: %(raeson)s"
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:677
+#: VirtualMailManager/VirtualMailManager.py:676
 msgid "Account doesn't exists"
 msgstr ""
 
+#: VirtualMailManager/VirtualMailManager.py:692
+#: VirtualMailManager/VirtualMailManager.py:702
+msgid ""
+"The service name »managesieve« is deprecated and will be removed\n"
+"   in a future release.\n"
+"   Please use the service name »sieve« instead."
+msgstr ""
+
 #: VirtualMailManager/ext/Postconf.py:44
 #, python-format
 msgid ""
vmm

Repositories index