# HG changeset patch
# User Pascal Volk <user@localhost.localdomain.org>
# Date 1402236187 0
# Node ID bc796a554ca2e2b6b463de8bfd7a507e08c63f59
# Parent  ee3c6c826b4285d99ca932235c03a052a21c74dc# Parent  659c4476c57ce41a673c9a7a98a5d33db5b345f0
merged changes from default(659c4476c57c).

diff -r ee3c6c826b42 -r bc796a554ca2 po/de.po
--- a/po/de.po	Sun Mar 23 20:38:45 2014 +0000
+++ b/po/de.po	Sun Jun 08 14:03:07 2014 +0000
@@ -2,111 +2,106 @@
 # Copyright (C) 2009 Free Software Foundation, Inc.
 # This file is distributed under the same license as the vmm package.
 # Pascal Volk <p.volk@veb-it.de>, 2009.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2011.
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2011, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vmm 0.6.0\n"
+"Project-Id-Version: vmm 0.6.3-pre1\n"
 "Report-Msgid-Bugs-To: user+vmm/tp@localhost.localdomain.org\n"
-"POT-Creation-Date: 2011-11-07 05:20+0100\n"
-"PO-Revision-Date: 2011-11-07 12:57+0100\n"
+"POT-Creation-Date: 2014-03-23 20:10+0000\n"
+"PO-Revision-Date: 2014-03-24 18:14+0100\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
-"Language: \n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Language: German\n"
-"X-Poedit-Country: GERMANY\n"
+"X-Generator: Poedit 1.5.4\n"
 
 #. TP: Hm, what “quotation marks” should be used?
 #. If you are unsure have a look at:
 #. http://en.wikipedia.org/wiki/Quotation_mark,_non-English_usage
-#: VirtualMailManager/account.py:58 VirtualMailManager/alias.py:35
-#: VirtualMailManager/domain.py:120 VirtualMailManager/relocated.py:38
+#: VirtualMailManager/account.py:60 VirtualMailManager/alias.py:35
+#: VirtualMailManager/catchall.py:44 VirtualMailManager/domain.py:131
+#: VirtualMailManager/relocated.py:39
 #, python-format
 msgid "The domain '%s' does not exist."
 msgstr "Die Domain »%s« existiert nicht."
 
-#: VirtualMailManager/account.py:106
+#: VirtualMailManager/account.py:123
 #, python-format
 msgid "The mailbox format '%(mbfmt)s' requires Dovecot >= v%(version)s."
 msgstr "Das Postfachformat »%(mbfmt)s« benötigt Dovecot >= v%(version)s."
 
-#: VirtualMailManager/account.py:113 VirtualMailManager/account.py:305
-#, python-format
-msgid "Invalid transport '%(transport)s' for mailbox format '%(mbfmt)s'."
-msgstr "Ungültiger Transport »%(transport)s« für Postfachformat »%(mbfmt)s«."
-
-#: VirtualMailManager/account.py:153 VirtualMailManager/cli/handler.py:93
-#: VirtualMailManager/handler.py:628 VirtualMailManager/handler.py:679
-#: VirtualMailManager/handler.py:705 VirtualMailManager/handler.py:716
-#: VirtualMailManager/handler.py:727 VirtualMailManager/handler.py:739
-#: VirtualMailManager/handler.py:753
+#: VirtualMailManager/account.py:166 VirtualMailManager/cli/handler.py:93
+#: VirtualMailManager/handler.py:683 VirtualMailManager/handler.py:789
+#: VirtualMailManager/handler.py:815 VirtualMailManager/handler.py:823
+#: VirtualMailManager/handler.py:831 VirtualMailManager/handler.py:839
+#: VirtualMailManager/handler.py:858 VirtualMailManager/handler.py:870
 #, python-format
 msgid "The account '%s' does not exist."
 msgstr "Das Konto »%s« existiert nicht."
 
-#: VirtualMailManager/account.py:204 VirtualMailManager/account.py:214
-#: VirtualMailManager/cli/handler.py:77 VirtualMailManager/handler.py:596
+#: VirtualMailManager/account.py:222 VirtualMailManager/account.py:243
+#: VirtualMailManager/cli/handler.py:77 VirtualMailManager/handler.py:651
 #, python-format
 msgid "The account '%s' already exists."
 msgstr "Das Konto »%s« existiert bereits."
 
-#: VirtualMailManager/account.py:207 VirtualMailManager/handler.py:701
+#: VirtualMailManager/account.py:225 VirtualMailManager/handler.py:811
 #, python-format
 msgid "Could not accept password: '%s'"
 msgstr "Passwort konnte nicht akzeptiert werden: »%s«"
 
-#: VirtualMailManager/account.py:217
+#: VirtualMailManager/account.py:246
 #, python-format
 msgid "No password set for account: '%s'"
 msgstr "Kein Passwort festgelegt für Konto: »%s«"
 
-#: VirtualMailManager/account.py:245
+#: VirtualMailManager/account.py:285
 #, python-format
 msgid "Unknown field: '%s'"
 msgstr "Unbekanntes Feld: »%s«"
 
-#: VirtualMailManager/account.py:267 VirtualMailManager/domain.py:292
+#: VirtualMailManager/account.py:307 VirtualMailManager/domain.py:331
 msgid "PostgreSQL-based dictionary quota requires Dovecot >= v1.1.2."
-msgstr "PostgreSQL-basierte Datenbank-Nutzungsbeschränkung benötigt Dovecot >= v1.1.2."
+msgstr "PostgreSQL-basierte Kontingentbeschränkung benötigt Dovecot >= v1.1.2."
 
 #. TP: A service (e.g. pop3 or imap) may be enabled/usable or
 #. disabled/unusable for a user.
-#: VirtualMailManager/account.py:332
+#: VirtualMailManager/account.py:370
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: VirtualMailManager/account.py:332
+#: VirtualMailManager/account.py:370
 msgid "enabled"
 msgstr "aktiviert"
 
-#: VirtualMailManager/account.py:343
+#: VirtualMailManager/account.py:409
 #, python-format
 msgid "Could not fetch information for account: '%s'"
 msgstr "Informationen zum Konto konnten nicht geholt werden: »%s«"
 
-#: VirtualMailManager/account.py:387
+#: VirtualMailManager/account.py:453
 #, python-format
 msgid "There are %(count)d aliases with the destination address '%(address)s'."
 msgstr "Es gibt %(count)d Alias(e) mit der Zieladresse »%(address)s«."
 
-#: VirtualMailManager/account.py:416
+#: VirtualMailManager/account.py:482
 msgid "UID must be an int/long."
 msgstr "Die UID muss eine Ganzzahl sein."
 
-#: VirtualMailManager/account.py:418
+#: VirtualMailManager/account.py:484
 msgid "UID must be greater than 0."
 msgstr "Die UID muss größer als 0 sein."
 
-#: VirtualMailManager/account.py:427
+#: VirtualMailManager/account.py:493
 #, python-format
 msgid "There is no account with the UID: '%d'"
 msgstr "Es existiert kein Konto mit der UID »%d«."
 
-#: VirtualMailManager/alias.py:60
+#: VirtualMailManager/alias.py:61
 #, python-format
 msgid ""
 "Cannot add %(count_new)i new destination(s) to alias '%(address)s'.\n"
@@ -120,7 +115,7 @@
 "unbenutzbar.\n"
 "Hinweis: Erhöhen Sie den Wert für »virtual_alias_expansion_limit« in Postfix."
 
-#: VirtualMailManager/alias.py:67
+#: VirtualMailManager/alias.py:68
 #, python-format
 msgid ""
 "Cannot add %(count_new)i new destination(s) to alias '%(address)s'.\n"
@@ -134,16 +129,16 @@
 "diesen Alias adressierten Nachrichten werden zurückgehalten.\n"
 "Hinweis: Löschen Sie einige Zieladressen."
 
-#: VirtualMailManager/alias.py:142 VirtualMailManager/alias.py:154
-#: VirtualMailManager/alias.py:161 VirtualMailManager/handler.py:657
+#: VirtualMailManager/alias.py:155 VirtualMailManager/alias.py:172
+#: VirtualMailManager/alias.py:179 VirtualMailManager/handler.py:712
 #, python-format
 msgid "The alias '%s' does not exist."
 msgstr "Der Alias »%s« existiert nicht."
 
-#: VirtualMailManager/alias.py:145
+#: VirtualMailManager/alias.py:163
 #, python-format
-msgid "The address '%(addr)s' is not a destination of the alias '%(alias)s'."
-msgstr "Die Adresse »%(addr)s« ist kein Ziel für den Alias »%(alias)s«."
+msgid "No suitable destinations left to remove from alias '%s'."
+msgstr "Aus dem Alias »%s« können keine weiteren Ziele mehr entfernt werden."
 
 #: VirtualMailManager/aliasdomain.py:50
 #, python-format
@@ -180,6 +175,46 @@
 msgid "The alias domain '%(alias)s' is already assigned to the domain '%(domain)s'."
 msgstr "Die Alias-Domain »%(alias)s« ist bereits der Domain »%(domain)s« zugeordnet."
 
+#: VirtualMailManager/catchall.py:69
+#, python-format
+msgid ""
+"Cannot add %(count_new)i new destination(s) to catch-all alias for\n"
+"domain '%(domain)s'. Currently this alias expands into %(count)i/%(limit)i\n"
+"recipients. %(count_new)i additional destination(s) will render this alias\n"
+"unusable.\n"
+"Hint: Increase Postfix' virtual_alias_expansion_limit"
+msgstr ""
+"%(count_new)i neu(e) Ziel(e) konnten nicht zum Catch-All-Alias für die\n"
+"Domain »%(domain)s« hinzugefügt werden. Gegenwärtig gilt dieser Alias für\n"
+"%(count)i/%(limit)i Empfänger. Durch Hinzufügen von %(count_new)i Ziel(en)\n"
+"wird dieser Alias unbenutzbar.\n"
+"Hinweis: Erhöhen Sie den Wert für »virtual_alias_expansion_limit« in Postfix."
+
+#: VirtualMailManager/catchall.py:77
+#, python-format
+msgid ""
+"Cannot add %(count_new)i new destination(s) to catch-all alias for domain\n"
+"'%(domain)s'. This alias already exceeds its expansion limit (%(count)i/%(limit)i).\n"
+"So its unusable, all messages addressed to this alias will be bounced.\n"
+"Hint: Delete some destination addresses."
+msgstr ""
+"%(count_new)i neu(e) Ziel(e) konnten nicht zum Catch-All-Alias für die\n"
+"Domain »%(domain)s« hinzugefügt werden. Dieser Alias übersteigt bereits\n"
+"die Begrenzung auf (%(count)i/%(limit)i). Daher wird er unbenutzbar, und\n"
+"alle an diesen Alias adressierten Nachrichten werden zurückgehalten.\n"
+"Hinweis: Löschen Sie einige Zieladressen."
+
+#: VirtualMailManager/catchall.py:151 VirtualMailManager/catchall.py:169
+#: VirtualMailManager/catchall.py:176
+#, python-format
+msgid "There are no catch-all aliases defined for domain '%s'."
+msgstr "Für die Domain »%s« sind keine Catch-All-Aliase definiert."
+
+#: VirtualMailManager/catchall.py:159
+#, python-format
+msgid "No suitable destinations left to remove from the catch-all alias of domain '%s'."
+msgstr "Für die Entfernung aus dem Catch-All-Alias für die Domain »%s« sind keine Ziele mehr verfügbar."
+
 #. TP: Please preserve the trailing space.
 #: VirtualMailManager/cli/__init__.py:78
 msgid "Enter new password: "
@@ -192,7 +227,7 @@
 
 #: VirtualMailManager/cli/__init__.py:85 VirtualMailManager/cli/config.py:53
 msgid "Too many failures - try again later."
-msgstr "Zu viele Fehlschläge - versuchen Sie es später erneut."
+msgstr "Zu viele Fehlschläge – versuchen Sie es später erneut."
 
 #: VirtualMailManager/cli/__init__.py:91
 msgid "Sorry, passwords do not match."
@@ -202,6 +237,715 @@
 msgid "Sorry, empty passwords are not permitted."
 msgstr "Entschuldigung, leere Passwörter sind nicht zulässig."
 
+#. TP: There are some words enclosed within angle brackets '<'word'>'. They
+#. are used to indicate replaceable arguments. Please do not translate them.
+#.
+#. The descriptions of subcommands may contain the both keywords 'domain'
+#. and 'force', enclosed within single quotes. Please keep them as they are.
+#.
+#. TP: description of subcommand configget
+#: VirtualMailManager/cli/clihelp.py:21
+msgid ""
+"This subcommand is used to display the actual value\n"
+"of the given configuration <option>."
+msgstr ""
+"Dieser Unterbefehl wird dazu verwendet, den derzeitigen\n"
+"Wert der angegebenen Konfigurationsoption <option> anzuzeigen."
+
+#. TP: description of subcommand configset
+#: VirtualMailManager/cli/clihelp.py:24
+msgid ""
+"Use this subcommand to set or update a single\n"
+"configuration option's value. <option> is the configuration option, <value>\n"
+"is the <option>'s new value."
+msgstr ""
+"Verwenden Sie diesen Unterbefehl, um den Wert einer\n"
+"einzelnen Konfigurationsoption festzulegen oder zu\n"
+"aktualisieren. <option> ist die Konfigurationsoption,\n"
+"<value> ist der neue Wert der Option."
+
+#: VirtualMailManager/cli/clihelp.py:27 VirtualMailManager/cli/clihelp.py:42
+msgid ""
+"Note: This subcommand will create a new vmm.cfg without any comments.\n"
+"Your current configuration file will be backed as vmm.cfg.bak."
+msgstr ""
+"Hinweis: Dieser Unterbefehl erzeugt eine neue vmm.cfg ohne\n"
+"jegliche Kommentare. Ihre derzeitige Konfigurationsdatei\n"
+"wird als vmm.cfg.bak gesichert."
+
+#. TP: description of subcommand configure
+#: VirtualMailManager/cli/clihelp.py:30
+msgid ""
+"Starts the interactive configuration for all\n"
+"configuration sections."
+msgstr ""
+"Startet den interaktiven Konfigurationsmodus für\n"
+"alle Konfigurationsabschnitte."
+
+#: VirtualMailManager/cli/clihelp.py:32
+msgid ""
+"In this process the currently set value of each option will be displayed\n"
+"in square brackets. If no value is configured, the default value of each\n"
+"option will be displayed in square brackets. Press the return key, to accept\n"
+"the displayed value."
+msgstr ""
+"In diesem Prozess wird der gegenwärtig für jede Option gesetzte Wert\n"
+"in eckigen Klammern angezeigt. Falls kein Wert eingestellt ist, wird\n"
+"der Vorgabewert jeder Option in eckigen Klammern angezeigt. Drücken Sie\n"
+"die Eingabetaste, um die angezeigten Werte zu übernehmen."
+
+#: VirtualMailManager/cli/clihelp.py:36
+msgid ""
+"If the optional argument <section> is given, only the configuration\n"
+"options from the given section will be displayed and will be configurable.\n"
+"The following sections are available:\n"
+msgstr ""
+"Falls das optionale Argument <section> angegeben wird, dann werden\n"
+"nur die Konfigurationsoptionen aus dem entsprechenden Abschnitt\n"
+"angezeigt und konfigurierbar sein. Die folgenden Abschnitte sind\n"
+"verfügbar:\n"
+
+#: VirtualMailManager/cli/clihelp.py:41
+msgid "All configuration options are described in vmm.cfg(5)."
+msgstr "Alle Konfigurationsoptionen sind in vmm.cfg(5) beschrieben."
+
+#. TP: description of subcommand getuser
+#: VirtualMailManager/cli/clihelp.py:45
+msgid ""
+"If only the <uid> is available, for example from process\n"
+"list, the subcommand getuser will show the user's address."
+msgstr ""
+"Falls nur die <uid> verfügbar ist, zum Beispiel aus der Prozess-\n"
+"liste, zeigt der Unterbefehl getuser die Adresse des Benutzers an."
+
+#. TP: description of subcommand listaddresses
+#: VirtualMailManager/cli/clihelp.py:48
+msgid ""
+"This command lists all defined addresses.\n"
+"Addresses belonging to alias-domains are prefixed with a '-', addresses of\n"
+"regular domains with a '+'. Additionally, the letters 'u', 'a', and 'r'\n"
+"indicate the type of each address: user, alias and relocated respectively.\n"
+"The output can be limited with an optional <pattern>."
+msgstr ""
+"Dieser Befehl listet alle definierten Adressen auf. Adressen, die zu\n"
+"Alias-Domains gehören, erhalten das Präfix »-«, Adressen regulärer\n"
+"Domains das Präfix »+«. Zusätzlich geben die Buchstaben »u«, »a« und\n"
+"»r« den Typ jeder Adresse an: »user«, »alias« bzw. »relocated«. Die\n"
+"Ausgabe kann durch ein optionales Muster <pattern> begrenzt werden."
+
+#: VirtualMailManager/cli/clihelp.py:53 VirtualMailManager/cli/clihelp.py:60
+#: VirtualMailManager/cli/clihelp.py:67 VirtualMailManager/cli/clihelp.py:82
+#: VirtualMailManager/cli/clihelp.py:88
+#, no-python-format
+msgid ""
+"To perform a wild card search, the % character can be used at the start\n"
+"and/or the end of the <pattern>."
+msgstr ""
+"Um eine Suche mit Platzhaltern auszuführen, kann das %-Zeichen am Anfang\n"
+"und/oder am Ende des Musters <pattern> verwendet werden."
+
+#. TP: description of subcommand listaliases
+#: VirtualMailManager/cli/clihelp.py:56
+msgid ""
+"This command lists all defined aliases. Aliases\n"
+"belonging to alias-domains are prefixed with a '-', addresses of regular\n"
+"domains with a '+'. The output can be limited with an optional <pattern>."
+msgstr ""
+"Dieser Befehl listet alle definierten Aliase auf. Aliase, die zu\n"
+"Alias-Domains gehören, erhalten das Präfix »-«, Adressen regulärer\n"
+"Domains das Präfix »+«. Die Ausgabe kann durch ein optionales\n"
+"Muster <pattern> begrenzt werden."
+
+#. TP: description of subcommand listdomains
+#: VirtualMailManager/cli/clihelp.py:63
+msgid ""
+"This subcommand lists all available domains. All\n"
+"domain names will be prefixed either with `[+]', if the domain is a primary\n"
+"domain, or with `[-]', if it is an alias domain name. The output can be\n"
+"limited with an optional <pattern>."
+msgstr ""
+"Dieser Unterbefehl listet alle verfügbaren Domains auf.\n"
+"Allen Domainnamen wird entweder das Präfix [+] vorangestellt,\n"
+"wenn die Domain eine primäre Domain ist, oder ein [-], falls\n"
+"es ein Alias-Domainname ist. Die Ausgabe kann durch ein optionales\n"
+"Muster <pattern> begrenzt werden."
+
+#. TP: description of subcommand listpwschemes
+#: VirtualMailManager/cli/clihelp.py:70
+msgid ""
+"This subcommand lists all password schemes which\n"
+"could be used in the vmm.cfg as value of the misc.password_scheme option.\n"
+"The output varies, depending on the used Dovecot version and the system's\n"
+"libc."
+msgstr ""
+"Dieser Unterbefehl listet alle Passwortschemata auf, die\n"
+"in vmm.cfg als Wert für die Option misc.password_scheme\n"
+"verwendet werden können. Die Ausgabe ist von der verwendeten\n"
+"Dovecot-Version und der im System installierten libc abhängig."
+
+#: VirtualMailManager/cli/clihelp.py:74
+msgid ""
+"When your Dovecot installation isn't too old, you will see additionally\n"
+"a few usable encoding suffixes. One of them can be appended to the password\n"
+"scheme."
+msgstr ""
+"Sofern Ihre Dovecot-Installation nicht zu alt ist, sehen Sie\n"
+"zusätzlich einige verwendbare Kodierungs-Suffixe. Eines davon\n"
+"kann an das Passwort-Schema angehängt werden."
+
+#. TP: description of subcommand listrelocated
+#: VirtualMailManager/cli/clihelp.py:78
+msgid ""
+"This command lists all defined relocated addresses.\n"
+"Relocated entries belonging to alias-domains are prefixed with a '-', addresses\n"
+"of regular domains with a '+'. The output can be limited with an optional\n"
+"<pattern>."
+msgstr ""
+"Dieser Unterbefehl listet alle definierten Umzugs-Adressen auf.\n"
+"Allen Domainnamen wird entweder das Präfix [+] vorangestellt,\n"
+"wenn die Domain eine primäre Domain ist, oder ein [-], falls\n"
+"es ein Alias-Domainname ist. Die Ausgabe kann durch ein optionales\n"
+"Muster <pattern> begrenzt werden."
+
+#. TP: description of subcommand listusers
+#: VirtualMailManager/cli/clihelp.py:85
+msgid ""
+"This command lists all user accounts. User accounts\n"
+"belonging to alias-domains are prefixed with a '-', addresses of regular\n"
+"domains with a '+'. The output can be limited with an optional <pattern>."
+msgstr ""
+"Dieser Unterbefehl listet alle Benutzerkonten auf.\n"
+"Allen Domainnamen wird entweder das Präfix [+] vorangestellt,\n"
+"wenn die Domain eine primäre Domain ist, oder ein [-], falls\n"
+"es ein Alias-Domainname ist. Die Ausgabe kann durch ein optionales\n"
+"Muster <pattern> begrenzt werden."
+
+#. TP: description of subcommand version
+#: VirtualMailManager/cli/clihelp.py:91
+msgid ""
+"Prints vmm's version and copyright information to stdout.\n"
+"After this vmm exits."
+msgstr ""
+"Gibt die Version von vmm und die Copyright-Informationen\n"
+"in die Standardausgabe aus, danach wird vmm beendet."
+
+#. TP: description of subcommand domainadd
+#: VirtualMailManager/cli/clihelp.py:94
+msgid ""
+"Adds the new domain into the database and creates the\n"
+"domain directory."
+msgstr ""
+"Fügt die neue Domain zur Datenbank hinzu und erstellt\n"
+"das Domain-Verzeichnis."
+
+#: VirtualMailManager/cli/clihelp.py:96
+msgid ""
+"If the optional argument <transport> is given, it will override the\n"
+"default transport (domain.transport) from vmm.cfg. The specified <transport>\n"
+"will be the default transport for all new accounts in this domain."
+msgstr ""
+"Falls das optionale Argument <transport> angegeben ist, wird dadurch der\n"
+"in vmm.cfg (domain.transport) angegebene Transport außer Kraft gesetzt. Der\n"
+"angegebene <transport> wird dadurch der Vorgabe-Transport für alle\n"
+"neuen Konten in dieser Domain."
+
+#: VirtualMailManager/cli/clihelp.py:99
+msgid "Configuration-related behavior:"
+msgstr "Konfigurationsbezogenes Verhalten:"
+
+#: VirtualMailManager/cli/clihelp.py:101
+msgid ""
+"When that option is set to true (default) vmm will automatically create\n"
+"the postmaster account for the new domain and prompt for postmaster@<fqdn>'s\n"
+"password."
+msgstr ""
+"Wenn der Wert dieser Option auf »true« gesetzt ist (Vorgabe), erstellt\n"
+"vmm das Postmaster-Konto für die neue Domain und erfragt das\n"
+"Passwort für postmaster@<fqdn>."
+
+#: VirtualMailManager/cli/clihelp.py:105
+msgid ""
+"When the value of that option is also set to true, vmm will automatically\n"
+"create the postmaster account for the new domain and print the generated\n"
+"postmaster password to stdout."
+msgstr ""
+"Wenn der Wert dieser Option auch auf »true« gesetzt ist, erstellt vmm\n"
+"automatisch das Postmaster-Konto für die neue Domain und gibt das\n"
+"generierte Passwort in die Standardausgabe aus."
+
+#. TP: description of subcommand domaindelete
+#: VirtualMailManager/cli/clihelp.py:109
+msgid ""
+"This subcommand deletes the domain specified by\n"
+"<fqdn>."
+msgstr ""
+"Dieser Unterbefehl löscht die durch <fqdn>\n"
+"angegebene Domain."
+
+#: VirtualMailManager/cli/clihelp.py:111
+msgid ""
+"If there are accounts, aliases and/or relocated users assigned to the\n"
+"given domain, vmm will abort the requested operation and show an error\n"
+"message. If you know, what you are doing, you can specify the optional keyword\n"
+"'force'."
+msgstr ""
+"Falls der angegebenen Domain Konten, Aliase oder umgezogene Benutzer\n"
+"zugeordnet sind, bricht vmm den angeforderten Vorgang ab und zeigt eine\n"
+"Fehlermeldung an. Falls Sie genau wissen, was Sie tun, können Sie das\n"
+"spezielle Schlüsselwort »force« angeben."
+
+#: VirtualMailManager/cli/clihelp.py:115
+msgid ""
+"If you really always know what you are doing, edit your vmm.cfg and set\n"
+"the option domain.force_deletion to true."
+msgstr ""
+"Wenn Sie wirklich wissen, was Sie tun, bearbeiten Sie Ihre vmm.cfg\n"
+"und setzen Sie die Option domain.force_deletion auf »true«."
+
+#. TP: description of subcommand domaininfo
+#: VirtualMailManager/cli/clihelp.py:118
+msgid ""
+"This subcommand shows some information about the\n"
+"given domain."
+msgstr ""
+"Dieser Unterbefehl zeigt Informationen über die\n"
+"angegebene Domain an."
+
+#: VirtualMailManager/cli/clihelp.py:120
+msgid ""
+"For a more detailed information about the domain the optional argument\n"
+"<details> can be specified. A possible <details> value can be one of the\n"
+"following six keywords:"
+msgstr ""
+"Für detailliertere Informationen zur Domain kann optional das Argument\n"
+"<details> angegeben werden. Mögliche Werte für <details> sind die\n"
+"folgenden sechs Schlüsselwörter:"
+
+#. TP: description of subcommand domainquota
+#: VirtualMailManager/cli/clihelp.py:125
+msgid ""
+"This subcommand is used to configure a new quota\n"
+"limit for the accounts of the domain - not for the domain itself."
+msgstr ""
+"Dieser Unterbefehl wird dazu verwendet, die neue Kontingent-\n"
+"Begrenzung für die Konten der Domain festzulegen – nicht für\n"
+"die Domain selbst."
+
+#: VirtualMailManager/cli/clihelp.py:127
+msgid ""
+"The default quota limit for accounts is defined in the vmm.cfg\n"
+"(domain.quota_bytes and domain.quota_messages)."
+msgstr ""
+"Die vorgegebene Kontingentbegrenzung für Konten ist in der\n"
+"vmm.cfg festgelegt (domain.quota_bytes und domain.quota_messages)."
+
+#: VirtualMailManager/cli/clihelp.py:129
+msgid ""
+"The new quota limit will affect only those accounts for which the limit\n"
+"has not been overridden. If you want to restore the default to all accounts,\n"
+"you may pass the keyword 'force'. When the argument <messages> was omitted the\n"
+"default number of messages 0 (zero) will be applied."
+msgstr ""
+"Die neue Kontingentbegrenzung wirkt sich nur auf Konten aus, für die die\n"
+"Kontingentbegrenzung nicht außer Kraft gesetzt wurde. Falls Sie die Vorgabe\n"
+"für alle Konten wiederherstellen wollen, können Sie das Schlüsselwort\n"
+"»force« angeben. Falls das Argument <messages> fehlt, wird die vorgegebene\n"
+"Nachrichtenanzahl 0 (null) verwendet."
+
+#. TP: description of subcommand domainservices
+#: VirtualMailManager/cli/clihelp.py:134
+msgid ""
+"To define which services could be used by the\n"
+"users of the domain — with the given <fqdn> — use this subcommand."
+msgstr ""
+"Verwenden Sie diesen Unterbefehl, um mit der angegebenen\n"
+"<fqdn> festzulegen, welche Dienste von welchen Benutzern\n"
+"dieser Domain genutzt werden dürfen."
+
+#: VirtualMailManager/cli/clihelp.py:136
+msgid ""
+"Each specified <service> will be enabled/usable. All other services\n"
+"will be deactivated/unusable. Possible <service> names are:"
+msgstr ""
+"Jeder angegebene <service> wird aktiviert und benutzbar.\n"
+"Alle anderen Dienste werden deaktiviert und nicht nutzbar.\n"
+"Mögliche Namen für <service> sind:"
+
+#: VirtualMailManager/cli/clihelp.py:139
+msgid ""
+"The new service set will affect only those accounts for which the set has\n"
+"not been overridden. If you want to restore the default to all accounts, you\n"
+"may pass the keyword 'force'."
+msgstr ""
+"Die neue Service-Festlegung beeinflusst nur jene Konten, für die die\n"
+"Festlegung nicht außer Kraft gesetzt wird. Falls Sie die Vorgabe für\n"
+"alle Konten wiederherstellen wollen, können Sie das Schlüsselwort\n"
+"»force« übergeben."
+
+#. TP: description of subcommand domaintransport
+#: VirtualMailManager/cli/clihelp.py:143
+msgid ""
+"A new transport for the indicated domain can be\n"
+"set with this subcommand."
+msgstr ""
+"Ein neuer Transport für die angegebene Domain\n"
+"kann mit diesem Unterbefehl festgelegt werden."
+
+#: VirtualMailManager/cli/clihelp.py:145
+msgid ""
+"The new transport will affect only those accounts for which the transport\n"
+"has not been overridden. If you want to restore the default to all accounts,\n"
+"you may pass the keyword 'force'."
+msgstr ""
+"Ein neuer Transport wirkt sich nur auf jene Konten aus, für die der Transport\n"
+"nicht außer Kraft gesetzt wurde. Wenn Sie die Vorgabe für alle Konten\n"
+"wiederherstellen wollen, können Sie das Schlüsselwort »force« übergeben."
+
+#. TP: description of subcommand domainnote
+#: VirtualMailManager/cli/clihelp.py:149
+msgid ""
+"With this subcommand, it is possible to attach a\n"
+"note to the specified domain. Without an argument, an existing note is\n"
+"removed."
+msgstr ""
+"Mit diesem Unterbefehl können Sie eine Notiz an die angegebene\n"
+"Domain anhängen. Wenn kein Argument angegeben ist, wird eine\n"
+"existierende Notiz gelöscht."
+
+#. TP: description of subcommand aliasdomainadd
+#: VirtualMailManager/cli/clihelp.py:153
+msgid ""
+"This subcommand adds the new alias domain\n"
+"(<fqdn>) to the destination <domain> that should be aliased."
+msgstr ""
+"Dieser Unterbefehl fügt eine neue Alias-Domain (<fqdn>)\n"
+"zur gewünschten Ziel-<domain> hinzu."
+
+#. TP: description of subcommand aliasdomaindelete
+#: VirtualMailManager/cli/clihelp.py:156
+msgid ""
+"Use this subcommand if the alias domain\n"
+"<fqdn> should be removed."
+msgstr ""
+"Verwenden Sie diesen Unterbefehl, falls die Alias-\n"
+"Domain <fqdn> entfernt werden soll."
+
+#. TP: description of subcommand aliasdomaininfo
+#: VirtualMailManager/cli/clihelp.py:159
+msgid ""
+"This subcommand shows to which domain the alias\n"
+"domain <fqdn> is assigned to."
+msgstr ""
+"Dieser Unterbefehl zeigt, welcher Domain die Alias-Domain\n"
+"<fqdn> zugeordnet ist."
+
+#. TP: description of subcommand aliasdomainswitch
+#: VirtualMailManager/cli/clihelp.py:162
+msgid ""
+"If the destination of the existing alias\n"
+"domain <fqdn> should be switched to another <destination> use this\n"
+"subcommand."
+msgstr ""
+"Falls das Ziel der existierenden Alias-Domain <fqdn> in\n"
+"ein anderes Ziel (<destination>) geändert werden soll,\n"
+"verwenden Sie diesen Unterbefehl."
+
+#. TP: description of subcommand useradd
+#: VirtualMailManager/cli/clihelp.py:166
+msgid ""
+"Use this subcommand to create a new e-mail account for\n"
+"the given <address>."
+msgstr ""
+"Verwenden Sie diesen Unterbefehl, um ein neues E-Mail-\n"
+"Konto für die angegebene <address> anzulegen."
+
+#: VirtualMailManager/cli/clihelp.py:168
+msgid ""
+"If the <password> is not provided, vmm will prompt for it interactively.\n"
+"When no <password> is provided and account.random_password is set to true, vmm\n"
+"will generate a random password and print it to stdout after the account has\n"
+"been created."
+msgstr ""
+"Falls <password> nicht angegeben ist, fragt vmm interaktiv danach.\n"
+"Wenn kein <password> angegeben ist und account.random_password auf\n"
+"»true« gesetzt ist, generiert vmm ein zufälliges Passwort und gibt\n"
+"es in die Standardausgabe aus, nachdem das Konto erstellt wurde."
+
+#. TP: description of subcommand userdelete
+#: VirtualMailManager/cli/clihelp.py:173
+msgid ""
+"Use this subcommand to delete the account with the\n"
+"given <address>."
+msgstr ""
+"Verwenden Sie diesen Unterbefehl, um das Konto mit der\n"
+"angegebenen Adresse <address> zu löschen."
+
+#: VirtualMailManager/cli/clihelp.py:175
+msgid ""
+"If there are one or more aliases with an identical destination address,\n"
+"vmm will abort the requested operation and show an error message. To prevent\n"
+"this, specify the optional keyword 'force'."
+msgstr ""
+"Falls ein oder mehrere Aliase mit identischer Zieladresse existieren,\n"
+"bricht vmm den angeforderten Vorgang ab und zeigt eine Fehlermeldung an.\n"
+"Um dies zu verhindern, geben Sie das optionale Schlüsselwort »force« an."
+
+#. TP: description of subcommand userinfo
+#: VirtualMailManager/cli/clihelp.py:179
+msgid ""
+"This subcommand displays some information about the\n"
+"account specified by <address>."
+msgstr ""
+"Dieser Unterbefehl zeigt einige Informationen zu dem mit\n"
+"<address> angegebenen Konto an."
+
+#: VirtualMailManager/cli/clihelp.py:181
+msgid ""
+"If the optional argument <details> is given some more information will be\n"
+"displayed. Possible values for <details> are:"
+msgstr ""
+"Wenn das optionale Argument <details> angegeben ist, werden weitere\n"
+"Informationen angezeigt. Mögliche Werte für <details> sind:"
+
+#. TP: description of subcommand username
+#: VirtualMailManager/cli/clihelp.py:185
+msgid ""
+"The user's real <name> can be set/updated with this\n"
+"subcommand."
+msgstr ""
+"Der echte Name (<name>) dieses Benutzers kann mit diesem\n"
+"Unterbefehl festgelegt oder aktualisiert werden."
+
+#: VirtualMailManager/cli/clihelp.py:187
+msgid "If no <name> is given, the value stored for the account is erased."
+msgstr ""
+"Falls kein <name> angegebenen ist, wird der für dieses Konto\n"
+"gespeicherte Wert gelöscht."
+
+#. TP: description of subcommand userpassword
+#: VirtualMailManager/cli/clihelp.py:190
+msgid ""
+"The password of an account can be updated with this\n"
+"subcommand."
+msgstr ""
+"Das Passwort eines Kontos kann mit diesem Unterbefehl\n"
+"aktualisiert werden."
+
+#: VirtualMailManager/cli/clihelp.py:192
+msgid "If no <password> was provided, vmm will prompt for it interactively."
+msgstr "Falls kein <password> angegeben wird, bittet vmm interaktiv um die Eingabe des Passworts."
+
+#. TP: description of subcommand usernote
+#: VirtualMailManager/cli/clihelp.py:195
+msgid ""
+"With this subcommand, it is possible to attach a note\n"
+"to the specified account. Without an argument, an existing note is\n"
+"removed."
+msgstr ""
+"Mit diesem Unterbefehl können Sie eine Notiz an das angegebene\n"
+"Konto anhängen. Wenn kein Argument angegeben ist, wird eine\n"
+"existierende Notiz gelöscht."
+
+#. TP: description of subcommand userquota
+#: VirtualMailManager/cli/clihelp.py:199
+msgid ""
+"This subcommand is used to set a new quota limit for\n"
+"the given account."
+msgstr ""
+"Dieser Unterbefehl wird verwendet, um eine neue Kontingent-\n"
+"begrenzung für das angegebene Konto festzulegen."
+
+#: VirtualMailManager/cli/clihelp.py:201
+msgid ""
+"When the argument <messages> was omitted the default number of messages\n"
+"0 (zero) will be applied."
+msgstr ""
+"Wenn das Argument <messages> fehlt, wird die vorgegebene Anzahl\n"
+"0 (null) verwendet."
+
+#: VirtualMailManager/cli/clihelp.py:203
+msgid ""
+"Instead of <storage> pass the keyword 'domain' to remove the\n"
+"account-specific override, causing the domain's value to be in effect."
+msgstr ""
+"Anstelle von <storage> übergeben Sie das Schlüsselwort »domain«,\n"
+"um die kontenbezogene Außerkraftsetzung zu entfernen, wodurch der Wert\n"
+"für die Domain wieder angewendet wird."
+
+#. TP: description of subcommand userservices
+#: VirtualMailManager/cli/clihelp.py:206
+msgid ""
+"To grant a user access to the specified services,\n"
+"use this command."
+msgstr ""
+"Verwenden Sie diesen Unterbefehl, um einem Benutzer\n"
+"Zugriff auf die angegebenen Dienste zu gewähren."
+
+#: VirtualMailManager/cli/clihelp.py:208
+msgid ""
+"All omitted services will be deactivated/unusable for the user with the\n"
+"given <address>."
+msgstr ""
+"Alle nicht aufgeführten Dienste werden für den Benutzer mit der\n"
+"angegebenen Adresse <address> deaktiviert bzw. nicht mehr nutzbar sein."
+
+#: VirtualMailManager/cli/clihelp.py:210
+msgid ""
+"Instead of <service> pass 'domain' to remove the account-specific\n"
+"override, causing the domain's value to be in effect."
+msgstr ""
+"Anstelle von <service> übergeben Sie »domain« um die kontenspezifische\n"
+"Außerkraftsetzung zu entfernen, wodurch der für die Domain angegebene\n"
+"Wert wirksam wird."
+
+#. TP: description of subcommand usertransport
+#: VirtualMailManager/cli/clihelp.py:213
+msgid ""
+"A different <transport> for an account can be\n"
+"specified with this subcommand."
+msgstr ""
+"Mit diesem Unterbefehl geben Sie einen anderen\n"
+"<transport> für dieses Konto an."
+
+#: VirtualMailManager/cli/clihelp.py:215
+msgid ""
+"Instead of <transport> pass 'domain' to remove the account-specific\n"
+"override, causing the domain's value to be in effect."
+msgstr ""
+"Anstelle von <transport> übergeben Sie »domain« um die kontenspezifische\n"
+"Außerkraftsetzung zu entfernen, wodurch der für die Domain angegebene\n"
+"Wert wirksam wird."
+
+#. TP: description of subcommand aliasadd
+#: VirtualMailManager/cli/clihelp.py:218
+msgid ""
+"This subcommand is used to create a new alias\n"
+"<address> with one or more <destination> addresses."
+msgstr ""
+"Dieser Unterbefehl wird verwendet, um eine neue Alias-Adresse\n"
+"<address> mit einer oder mehrerer Zieladressen <destination>\n"
+"einzurichten."
+
+#: VirtualMailManager/cli/clihelp.py:220
+msgid ""
+"Within the destination address, the placeholders '%n', '%d', and '%='\n"
+"will be replaced by the local part, the domain, or the email address with '@'\n"
+"replaced by '=' respectively. In combination with alias domains, this enables\n"
+"domain-specific destinations."
+msgstr ""
+"Innerhalb der Zieladresse werden die Platzhalter »%n«, »%d« und »%=«\n"
+"durch den local-Teil, die Domain oder die E-Mail-Adresse ersetzt, wobei\n"
+"dort »@« zu »=« wird. In Kombination mit Alias-Domains werden dadurch\n"
+"domainspezifische Ziele aktiviert. "
+
+#. TP: description of subcommand aliasdelete
+#: VirtualMailManager/cli/clihelp.py:225
+msgid ""
+"This subcommand is used to delete one or multiple\n"
+"<destination>s from the alias with the given <address>."
+msgstr ""
+"Verwenden Sie diesen Unterbefehl, um eine oder mehrere Ziele\n"
+"<destination> aus dem Alias mit der angegebenen <address> zu löschen."
+
+#: VirtualMailManager/cli/clihelp.py:227
+msgid ""
+"When no <destination> address was specified the alias with all its\n"
+"destinations will be deleted."
+msgstr ""
+"Wenn keine Zieladresse mit <destination> angegeben wirde, dann wird der\n"
+"Alias mit allen seinen Zielen gelöscht."
+
+#. TP: description of subcommand aliasinfo
+#: VirtualMailManager/cli/clihelp.py:230
+msgid ""
+"Information about the alias with the given <address>\n"
+"can be displayed with this subcommand."
+msgstr ""
+"Mit diesem Unterbefehl können Informationen über den Alias\n"
+"mit der angegebenen Adresse <address> angezeigt werden."
+
+#. TP: description of subcommand relocatedadd
+#: VirtualMailManager/cli/clihelp.py:233
+msgid ""
+"A new relocated user can be created with this\n"
+"subcommand."
+msgstr ""
+"Mit diesem Unterbefehl kann ein neuer umgezogener\n"
+"Benutzer angelegt werden."
+
+#: VirtualMailManager/cli/clihelp.py:235
+msgid ""
+"<address> is the user's ex-email address, for example\n"
+"b.user@example.com, and <newaddress> points to the new email address where\n"
+"the user can be reached."
+msgstr ""
+"<adress> ist die ehemalige E-Mail-Adresse des Benutzers,\n"
+"zum Beispiel be.nutzer@example.com, und <newaddress> bezeichnet\n"
+"die neue E-Mail-Adresse, unter der der Benutzer erreichbar ist. "
+
+#. TP: description of subcommand relocatedinfo
+#: VirtualMailManager/cli/clihelp.py:239
+msgid ""
+"This subcommand shows the new address of the\n"
+"relocated user with the given <address>."
+msgstr ""
+"Dieser Unterbefehl zeigt die neue Adresse des umgezogenen\n"
+"Benutzers mit der angegebenen <address> an."
+
+#. TP: description of subcommand relocateddelete
+#: VirtualMailManager/cli/clihelp.py:242
+msgid ""
+"Use this subcommand in order to delete the\n"
+"relocated user with the given <address>."
+msgstr ""
+"Verwenden Sie diesen Unterbefehl, um den umgezogenen\n"
+"Benutzer mit der angegebenen <address> zu löschen."
+
+#. TP: description of subcommand catchalladd
+#: VirtualMailManager/cli/clihelp.py:245
+msgid ""
+"This subcommand allows to specify destination\n"
+"addresses for a domain, which shall receive mail addressed to unknown\n"
+"local-parts within that domain. Those catch-all aliases hence \"catch all\" mail\n"
+"to any address in the domain (unless a more specific alias, mailbox or\n"
+"relocated user exists)."
+msgstr ""
+"Dieser Unterbefehl ermöglicht die Angabe von Zieladressen für\n"
+"eine Domain, die Mails empfangen solle, die an unbekannte\n"
+"local-Teile in dieser Domain adressiert sind. Diese Catch-All-Aliase\n"
+"fangen so alle Mails an jede Adresse in dieser Domain auf, sofern dafür\n"
+"kein spezifischerer Alias, Postfach oder umgezogener Benutzer existiert."
+
+#: VirtualMailManager/cli/clihelp.py:250
+msgid ""
+"WARNING: Catch-all addresses can cause mail server flooding because\n"
+"spammers like to deliver mail to all possible combinations of names, e.g.\n"
+"to all addresses between abba@example.org and zztop@example.org."
+msgstr ""
+"WARNUNG: Catch-All-Adressen können den Mailserver mit Spam überfluten, da\n"
+"Spammer Mails an alle möglichen Namenskombinationen ausliefern wollen, zum\n"
+"Beispiel alle Adressen zwischen abba@example.org und zztop@example.org."
+
+#. TP: description of subcommand catchallinfo
+#: VirtualMailManager/cli/clihelp.py:254
+msgid ""
+"This subcommand displays information about catch-all\n"
+"aliases defined for the domain <fqdn>."
+msgstr ""
+"Dieser Unterbefehl zeigt Informationen über Catch-All-\n"
+"Aliase an, die für die Domain <fqdn> definiert sind."
+
+#. TP: description of subcommand catchalldelete
+#: VirtualMailManager/cli/clihelp.py:257
+msgid ""
+"With this subcommand, catch-all aliases defined\n"
+"for a domain can be removed, either all of them, or those <destination>s which\n"
+"were specified explicitly."
+msgstr ""
+"Mit diesem Unterbefehl können die für eine Domain definierten\n"
+"Catch-All-Aliase entfernt werden, entweder alle, oder einen, der\n"
+"mit <destination> explizit angegeben werden muss."
+
 #: VirtualMailManager/cli/config.py:32
 #, python-format
 msgid "Enter new value for option %(option)s [%(current_value)s]: "
@@ -227,9 +971,9 @@
 msgid "Invalid section: '%s'"
 msgstr "Ungültiger Abschnitt: »%s«"
 
-#: VirtualMailManager/cli/main.py:32 VirtualMailManager/cli/main.py:65
-#: VirtualMailManager/cli/main.py:68 VirtualMailManager/cli/subcommands.py:629
-#: VirtualMailManager/cli/subcommands.py:649
+#: VirtualMailManager/cli/main.py:32 VirtualMailManager/cli/main.py:67
+#: VirtualMailManager/cli/main.py:70 VirtualMailManager/cli/subcommands.py:756
+#: VirtualMailManager/cli/subcommands.py:776
 #, python-format
 msgid "Error: %s"
 msgstr "Fehler: %s"
@@ -249,231 +993,248 @@
 msgid "Ouch!"
 msgstr "Autsch!"
 
-#: VirtualMailManager/cli/main.py:71
+#: VirtualMailManager/cli/main.py:66 VirtualMailManager/cli/main.py:79
+msgid "Warnings:"
+msgstr "Warnungen:"
+
+#: VirtualMailManager/cli/main.py:73
 #, python-format
 msgid "Error: Unknown section: '%s'"
 msgstr "Fehler: Unbekannter Abschnitt: »%s«"
 
-#: VirtualMailManager/cli/main.py:74
+#: VirtualMailManager/cli/main.py:76
 #, python-format
 msgid "Error: No option '%(option)s' in section: '%(section)s'"
 msgstr "Fehler: Keine Option »%(option)s« im Abschnitt: »%(section)s«"
 
-#: VirtualMailManager/cli/main.py:77
-msgid "Warnings:"
-msgstr "Warnungen:"
+#: VirtualMailManager/cli/subcommands.py:101
+#, python-format
+msgid "Subcommand '%s' is not yet documented."
+msgstr "Der Unterbefehl »%s« ist noch nicht dokumentiert."
 
-#: VirtualMailManager/cli/subcommands.py:78
+#: VirtualMailManager/cli/subcommands.py:108
 #, python-format
 msgid "Plan A failed ... trying Plan B: %(subcommand)s %(object)s"
 msgstr "Plan A ist gescheitert … Plan B wird versucht: %(subcommand)s %(object)s"
 
-#: VirtualMailManager/cli/subcommands.py:92
+#: VirtualMailManager/cli/subcommands.py:122
 msgid "Missing alias address and destination."
 msgstr "Alias- und Ziel-Adresse fehlen."
 
-#: VirtualMailManager/cli/subcommands.py:95
-#: VirtualMailManager/cli/subcommands.py:453
+#: VirtualMailManager/cli/subcommands.py:125
+#: VirtualMailManager/cli/subcommands.py:212
+#: VirtualMailManager/cli/subcommands.py:559
 msgid "Missing destination address."
 msgstr "Die Ziel-Adresse fehlt."
 
-#: VirtualMailManager/cli/subcommands.py:102
-#: VirtualMailManager/cli/subcommands.py:112
+#: VirtualMailManager/cli/subcommands.py:132
+#: VirtualMailManager/cli/subcommands.py:142
 msgid "Missing alias address."
 msgstr "Die Alias-Adresse fehlt."
 
-#: VirtualMailManager/cli/subcommands.py:134
-#: VirtualMailManager/cli/subcommands.py:168
+#: VirtualMailManager/cli/subcommands.py:164
+#: VirtualMailManager/cli/subcommands.py:198
 msgid "Missing alias domain name and destination domain name."
 msgstr "Domain-Namen für Alias- und Ziel-Domain fehlen."
 
-#: VirtualMailManager/cli/subcommands.py:137
-#: VirtualMailManager/cli/subcommands.py:171
+#: VirtualMailManager/cli/subcommands.py:167
+#: VirtualMailManager/cli/subcommands.py:201
 msgid "Missing destination domain name."
 msgstr "Keine Ziel-Domain angegeben."
 
-#: VirtualMailManager/cli/subcommands.py:145
-#: VirtualMailManager/cli/subcommands.py:152
+#: VirtualMailManager/cli/subcommands.py:175
+#: VirtualMailManager/cli/subcommands.py:182
 msgid "Missing alias domain name."
 msgstr "Keine Alias-Domain angegeben."
 
-#: VirtualMailManager/cli/subcommands.py:179
+#: VirtualMailManager/cli/subcommands.py:209
+msgid "Missing domain and destination."
+msgstr "Domain und Ziel-Adresse fehlen."
+
+#: VirtualMailManager/cli/subcommands.py:219
+#: VirtualMailManager/cli/subcommands.py:229
+#: VirtualMailManager/cli/subcommands.py:271
+#: VirtualMailManager/cli/subcommands.py:287
+#: VirtualMailManager/cli/subcommands.py:300
+#: VirtualMailManager/cli/subcommands.py:394
+#: VirtualMailManager/cli/subcommands.py:443
+msgid "Missing domain name."
+msgstr "Kein Domain-Name angegeben."
+
+#: VirtualMailManager/cli/subcommands.py:237
 msgid "Missing option name."
 msgstr "Kein Optionsname angegeben."
 
-#: VirtualMailManager/cli/subcommands.py:195
+#: VirtualMailManager/cli/subcommands.py:253
 msgid "Missing option and new value."
 msgstr "Option und neuer Wert fehlen."
 
-#: VirtualMailManager/cli/subcommands.py:197
+#: VirtualMailManager/cli/subcommands.py:255
 msgid "Missing new configuration value."
 msgstr "Neuer Konfigurationswert fehlt."
 
-#: VirtualMailManager/cli/subcommands.py:213
-#: VirtualMailManager/cli/subcommands.py:229
-#: VirtualMailManager/cli/subcommands.py:242
-#: VirtualMailManager/cli/subcommands.py:331
-msgid "Missing domain name."
-msgstr "Kein Domain-Name angegeben."
-
-#: VirtualMailManager/cli/subcommands.py:219
+#: VirtualMailManager/cli/subcommands.py:277
 #, python-format
 msgid "Creating account for postmaster@%s"
 msgstr "Konto für postmaster@%s wird angelegt"
 
-#: VirtualMailManager/cli/subcommands.py:235
-#: VirtualMailManager/cli/subcommands.py:249
-#: VirtualMailManager/cli/subcommands.py:322
-#: VirtualMailManager/cli/subcommands.py:343
-#: VirtualMailManager/cli/subcommands.py:372
-#: VirtualMailManager/cli/subcommands.py:509
-#: VirtualMailManager/cli/subcommands.py:522 VirtualMailManager/handler.py:453
-#: VirtualMailManager/handler.py:466 VirtualMailManager/handler.py:481
-#: VirtualMailManager/handler.py:510 VirtualMailManager/handler.py:674
+#: VirtualMailManager/cli/subcommands.py:293
+#: VirtualMailManager/cli/subcommands.py:307
+#: VirtualMailManager/cli/subcommands.py:385
+#: VirtualMailManager/cli/subcommands.py:406
+#: VirtualMailManager/cli/subcommands.py:435
+#: VirtualMailManager/cli/subcommands.py:615
+#: VirtualMailManager/cli/subcommands.py:628 VirtualMailManager/handler.py:459
+#: VirtualMailManager/handler.py:472 VirtualMailManager/handler.py:487
+#: VirtualMailManager/handler.py:521 VirtualMailManager/handler.py:784
 #, python-format
 msgid "Invalid argument: '%s'"
 msgstr "Ungültiges Argument: »%s«"
 
-#: VirtualMailManager/cli/subcommands.py:267
-#: VirtualMailManager/cli/subcommands.py:273
+#: VirtualMailManager/cli/subcommands.py:326
+#: VirtualMailManager/cli/subcommands.py:333
 msgid "Domain"
 msgstr "Domain"
 
-#: VirtualMailManager/cli/subcommands.py:275
-#: VirtualMailManager/cli/subcommands.py:284
+#: VirtualMailManager/cli/subcommands.py:335
+#: VirtualMailManager/cli/subcommands.py:346
 msgid "accounts"
 msgstr "Konten"
 
-#: VirtualMailManager/cli/subcommands.py:277
-#: VirtualMailManager/cli/subcommands.py:283
-#: VirtualMailManager/cli/subcommands.py:831
+#: VirtualMailManager/cli/subcommands.py:337
+#: VirtualMailManager/cli/subcommands.py:345
+#: VirtualMailManager/cli/subcommands.py:1007
 msgid "alias domains"
 msgstr "Alias-Domains"
 
-#: VirtualMailManager/cli/subcommands.py:279
-#: VirtualMailManager/cli/subcommands.py:285
+#: VirtualMailManager/cli/subcommands.py:339
+#: VirtualMailManager/cli/subcommands.py:347
+#: VirtualMailManager/cli/subcommands.py:1077
 msgid "aliases"
 msgstr "Aliase"
 
-#: VirtualMailManager/cli/subcommands.py:281
-#: VirtualMailManager/cli/subcommands.py:286
+#: VirtualMailManager/cli/subcommands.py:341
+#: VirtualMailManager/cli/subcommands.py:348
+#: VirtualMailManager/cli/subcommands.py:1078
 msgid "relocated users"
-msgstr "Verschobene Benutzer"
+msgstr "Umgezogene Benutzer"
 
-#: VirtualMailManager/cli/subcommands.py:292
+#: VirtualMailManager/cli/subcommands.py:343
+#: VirtualMailManager/cli/subcommands.py:349
+msgid "catch-all destinations"
+msgstr "Catch-All-Ziele"
+
+#: VirtualMailManager/cli/subcommands.py:355
 msgid "Missing domain name and storage value."
 msgstr "Domain-Name und neuer Speicher-Wert fehlen."
 
-#: VirtualMailManager/cli/subcommands.py:295
-#: VirtualMailManager/cli/subcommands.py:582
+#: VirtualMailManager/cli/subcommands.py:358
+#: VirtualMailManager/cli/subcommands.py:706
 msgid "Missing storage value."
 msgstr "Speicher-Wert fehlt."
 
-#: VirtualMailManager/cli/subcommands.py:301
-#: VirtualMailManager/cli/subcommands.py:586
+#: VirtualMailManager/cli/subcommands.py:364
+#: VirtualMailManager/cli/subcommands.py:711
 #, python-format
 msgid "Invalid storage value: '%s'"
 msgstr "Ungültiger Speicher-Wert: »%s«"
 
-#: VirtualMailManager/cli/subcommands.py:311
+#: VirtualMailManager/cli/subcommands.py:374
 #, python-format
 msgid "Neither a valid number of messages nor the keyword 'force': '%s'"
 msgstr "Weder eine gültige Nachrichtenanzahl noch das Schlüsselwort »force«: »%s«"
 
-#: VirtualMailManager/cli/subcommands.py:319
-#: VirtualMailManager/cli/subcommands.py:595
+#: VirtualMailManager/cli/subcommands.py:382
+#: VirtualMailManager/cli/subcommands.py:722
 #, python-format
 msgid "Not a valid number of messages: '%s'"
 msgstr "Ungültige Nachrichtenanzahl: »%s«"
 
-#: VirtualMailManager/cli/subcommands.py:354
-#: VirtualMailManager/cli/subcommands.py:609
+#: VirtualMailManager/cli/subcommands.py:417
+#: VirtualMailManager/cli/subcommands.py:736
 #, python-format
 msgid "Invalid service arguments: %s"
 msgstr "Ungültige Dienst-Argumente: »%s«"
 
-#: VirtualMailManager/cli/subcommands.py:363
+#: VirtualMailManager/cli/subcommands.py:426
 msgid "Missing domain name and new transport."
 msgstr "Domain-Name und neuer Transport fehlen."
 
-#: VirtualMailManager/cli/subcommands.py:366
+#: VirtualMailManager/cli/subcommands.py:429
 msgid "Missing new transport."
 msgstr "Neuer Transport fehlt."
 
-#: VirtualMailManager/cli/subcommands.py:380
+#: VirtualMailManager/cli/subcommands.py:455
 msgid "Missing UID."
 msgstr "Keine UID angegeben."
 
-#: VirtualMailManager/cli/subcommands.py:381
-#: VirtualMailManager/cli/subcommands.py:545
-#: VirtualMailManager/cli/subcommands.py:551
+#: VirtualMailManager/cli/subcommands.py:456
+#: VirtualMailManager/cli/subcommands.py:653
+#: VirtualMailManager/cli/subcommands.py:661
 msgid "Account"
 msgstr "Konto"
 
-#: VirtualMailManager/cli/subcommands.py:396
+#: VirtualMailManager/cli/subcommands.py:471
 #, python-format
 msgid "Unknown help topic: '%s'"
 msgstr "Unbekanntes Hilfethema: »%s«"
 
-#: VirtualMailManager/cli/subcommands.py:409
+#: VirtualMailManager/cli/subcommands.py:484
 msgid "List of available subcommands:"
 msgstr "Liste der verfügbaren Unterbefehle:"
 
-#: VirtualMailManager/cli/subcommands.py:430
+#: VirtualMailManager/cli/subcommands.py:507
 msgid "Usable encoding suffixes:"
 msgstr "Verwendbare Encoding-Suffixe:"
 
-#: VirtualMailManager/cli/subcommands.py:430
+#: VirtualMailManager/cli/subcommands.py:507
 msgid "Usable password schemes:"
 msgstr "Verfügbare Passwort-Schemata:"
 
-#: VirtualMailManager/cli/subcommands.py:451
+#: VirtualMailManager/cli/subcommands.py:557
 msgid "Missing relocated address and destination."
-msgstr "Die Adresse des verschobenen Benutzers und Ziel-Adresse fehlen."
+msgstr "Die Adresse des umgezogenen Benutzers und die Ziel-Adresse fehlen."
 
-#: VirtualMailManager/cli/subcommands.py:460
-#: VirtualMailManager/cli/subcommands.py:467
+#: VirtualMailManager/cli/subcommands.py:566
+#: VirtualMailManager/cli/subcommands.py:573
 msgid "Missing relocated address."
-msgstr "Die Adresse des verschobenen Benutzers fehlt."
+msgstr "Die Adresse des umgezogenen Benutzers fehlt."
 
-#: VirtualMailManager/cli/subcommands.py:490
-#: VirtualMailManager/cli/subcommands.py:503
-#: VirtualMailManager/cli/subcommands.py:516
-#: VirtualMailManager/cli/subcommands.py:568
-#: VirtualMailManager/cli/subcommands.py:603
+#: VirtualMailManager/cli/subcommands.py:596
+#: VirtualMailManager/cli/subcommands.py:609
+#: VirtualMailManager/cli/subcommands.py:622
+#: VirtualMailManager/cli/subcommands.py:680
+#: VirtualMailManager/cli/subcommands.py:691
+#: VirtualMailManager/cli/subcommands.py:730
 msgid "Missing e-mail address."
 msgstr "E-Mail-Adresse fehlt."
 
-#: VirtualMailManager/cli/subcommands.py:497
+#: VirtualMailManager/cli/subcommands.py:603
 #, python-format
 msgid "Generated password: %s"
 msgstr "Erzeugtes Passwort: %s"
 
-#: VirtualMailManager/cli/subcommands.py:552
+#: VirtualMailManager/cli/subcommands.py:662
 msgid "alias addresses"
 msgstr "Alias-Adressen"
 
-#: VirtualMailManager/cli/subcommands.py:558
+#: VirtualMailManager/cli/subcommands.py:668
 msgid "Missing e-mail address and user's name."
 msgstr "E-Mail-Adresse und der Name des Benutzers fehlen."
 
-#: VirtualMailManager/cli/subcommands.py:561
-msgid "Missing user's name."
-msgstr "Name des Benutzers fehlt."
-
-#: VirtualMailManager/cli/subcommands.py:579
+#: VirtualMailManager/cli/subcommands.py:703
 msgid "Missing e-mail address and storage value."
 msgstr "E-Mail-Adresse und Speicher-Wert fehlen."
 
-#: VirtualMailManager/cli/subcommands.py:617
+#: VirtualMailManager/cli/subcommands.py:744
 msgid "Missing e-mail address and transport."
 msgstr "E-Mail-Adresse und Transport fehlen."
 
-#: VirtualMailManager/cli/subcommands.py:620
+#: VirtualMailManager/cli/subcommands.py:747
 msgid "Missing transport."
 msgstr "Transport fehlt."
 
-#: VirtualMailManager/cli/subcommands.py:630
+#: VirtualMailManager/cli/subcommands.py:757
 msgid "usage: "
 msgstr "Aufruf:"
 
@@ -485,7 +1246,7 @@
 #.
 #. da    domainadd           fqdn [transport]
 #. dd    domaindelete        fqdn [force]
-#: VirtualMailManager/cli/subcommands.py:640
+#: VirtualMailManager/cli/subcommands.py:767
 #, python-format
 msgid ""
 "usage: %s subcommand arguments\n"
@@ -496,7 +1257,7 @@
 "  kurz lang\n"
 "  Unterbefehl                Argumente\n"
 
-#: VirtualMailManager/cli/subcommands.py:659
+#: VirtualMailManager/cli/subcommands.py:786
 msgid "from"
 msgstr "vom"
 
@@ -504,296 +1265,297 @@
 #. the version information, e.g.:
 #. vmm, version 0.5.2 (from 09/09/09)
 #. Python 2.5.4 on FreeBSD
-#: VirtualMailManager/cli/subcommands.py:659
+#: VirtualMailManager/cli/subcommands.py:786
 msgid "version"
 msgstr "Version"
 
-#: VirtualMailManager/cli/subcommands.py:662
+#: VirtualMailManager/cli/subcommands.py:789
 msgid "on"
 msgstr "auf"
 
-#: VirtualMailManager/cli/subcommands.py:664
+#: VirtualMailManager/cli/subcommands.py:791
 msgid "is free software and comes with ABSOLUTELY NO WARRANTY."
 msgstr "ist freie Software und wird OHNE JEGLICHE GARANTIE bereitgestellt."
 
-#: VirtualMailManager/cli/subcommands.py:672
-msgid "uid"
-msgstr "uid"
-
-#: VirtualMailManager/cli/subcommands.py:673
+#: VirtualMailManager/cli/subcommands.py:800
 msgid "get the address of the user with the given UID"
 msgstr "Die Adresse des Benutzers mit der angegebenen UID ermitteln"
 
-#: VirtualMailManager/cli/subcommands.py:674
-#: VirtualMailManager/cli/subcommands.py:684
-msgid "address [password]"
-msgstr "address [Passwort]"
-
-#: VirtualMailManager/cli/subcommands.py:675
+#: VirtualMailManager/cli/subcommands.py:802
 msgid "create a new e-mail user with the given address"
 msgstr "Einen neuen E-Mail-Benutzer mit der angegebenen Adresse anlegen"
 
-#: VirtualMailManager/cli/subcommands.py:677
-#: VirtualMailManager/cli/subcommands.py:704
-#: VirtualMailManager/cli/subcommands.py:744
-#: VirtualMailManager/cli/subcommands.py:746
-msgid "address"
-msgstr "Adresse"
-
-#: VirtualMailManager/cli/subcommands.py:678
+#: VirtualMailManager/cli/subcommands.py:804
 msgid "delete the specified user"
 msgstr "Den angegebenen Benutzer löschen"
 
-#: VirtualMailManager/cli/subcommands.py:679
-msgid "address [details]"
-msgstr "address [Details]"
-
-#: VirtualMailManager/cli/subcommands.py:680
+#: VirtualMailManager/cli/subcommands.py:806
 msgid "display information about the given address"
 msgstr "Informationen über die angegebene Adresse anzeigen"
 
-#: VirtualMailManager/cli/subcommands.py:681
-msgid "address name"
-msgstr "address Name"
+#: VirtualMailManager/cli/subcommands.py:808
+msgid "set, update or delete the real name for an address"
+msgstr "Den echten Namen für eine Adresse festlegen, aktualisieren oder löschen"
 
-#: VirtualMailManager/cli/subcommands.py:682
-msgid "set or update the real name for an address"
-msgstr "Den echten Namen für eine Adresse festlegen oder aktualisieren"
-
-#: VirtualMailManager/cli/subcommands.py:685
+#: VirtualMailManager/cli/subcommands.py:811
 msgid "update the password for the given address"
 msgstr "Das Passwort für die angegebene Adresse aktualisieren"
 
-#: VirtualMailManager/cli/subcommands.py:687
-msgid "address storage [messages]"
-msgstr "address storage [Nachrichten]"
-
-#: VirtualMailManager/cli/subcommands.py:688
+#: VirtualMailManager/cli/subcommands.py:814
 msgid "update the quota limit for the given address"
 msgstr "Die Nutzungsbeschränkung für die angegebene Adresse aktualisieren"
 
-#: VirtualMailManager/cli/subcommands.py:690
-msgid "address [service ...]"
-msgstr "address [Dienst …]"
-
-#: VirtualMailManager/cli/subcommands.py:691
+#: VirtualMailManager/cli/subcommands.py:817
 msgid "enables the specified services and disables all not specified services"
 msgstr "Die angegebenen Dienste aktivieren und alle nicht angegebenen Dienste deaktivieren"
 
-#: VirtualMailManager/cli/subcommands.py:694
-msgid "address transport"
-msgstr "address Transport"
-
-#: VirtualMailManager/cli/subcommands.py:695
+#: VirtualMailManager/cli/subcommands.py:821
 msgid "update the transport of the given address"
 msgstr "Den Transport für die angegebene Adresse aktualisieren"
 
-#: VirtualMailManager/cli/subcommands.py:697
-msgid "address destination ..."
-msgstr "address Ziel …"
+#: VirtualMailManager/cli/subcommands.py:823
+msgid "set, update or delete the note of the given address"
+msgstr "Die Notiz der angegebenen Adresse setzen, aktualisieren oder löschen"
 
-#: VirtualMailManager/cli/subcommands.py:698
+#: VirtualMailManager/cli/subcommands.py:826
 msgid "create a new alias e-mail address with one or more destinations"
 msgstr "Eine neue Alias-E-Mail-Adresse mit einem oder mehreren Zielen anlegen"
 
-#: VirtualMailManager/cli/subcommands.py:701
-msgid "address [destination]"
-msgstr "address [Ziel]"
-
-#: VirtualMailManager/cli/subcommands.py:702
+#: VirtualMailManager/cli/subcommands.py:830
 msgid "delete the specified alias e-mail address or one of its destinations"
 msgstr "Die angegebene Alias-E-Mail-Adresse oder eines ihrer Ziele löschen"
 
-#: VirtualMailManager/cli/subcommands.py:705
+#: VirtualMailManager/cli/subcommands.py:833
 msgid "show the destination(s) of the specified alias"
 msgstr "Das/die Ziel(e) des angegebenen Alias anzeigen"
 
-#: VirtualMailManager/cli/subcommands.py:708
-#: VirtualMailManager/cli/subcommands.py:717
-msgid "fqdn destination"
-msgstr "fqdn Ziel"
-
-#: VirtualMailManager/cli/subcommands.py:709
+#: VirtualMailManager/cli/subcommands.py:837
 msgid "create a new alias for an existing domain"
 msgstr "Einen neuen Alias für eine existierende Domain anlegen"
 
-#: VirtualMailManager/cli/subcommands.py:711
-#: VirtualMailManager/cli/subcommands.py:714
-#: VirtualMailManager/cli/subcommands.py:723
-msgid "fqdn"
-msgstr "fqdn"
+#: VirtualMailManager/cli/subcommands.py:839
+msgid "delete the specified alias domain"
+msgstr "Die angegebene Alias-Domain löschen"
 
-#: VirtualMailManager/cli/subcommands.py:712
-msgid "delete the specified alias domain"
-msgstr "Die angegebene Domain löschen"
-
-#: VirtualMailManager/cli/subcommands.py:715
+#: VirtualMailManager/cli/subcommands.py:841
 msgid "show the destination of the given alias domain"
 msgstr "Das Ziel der angegebenen Alias-Domain anzeigen"
 
-#: VirtualMailManager/cli/subcommands.py:718
+#: VirtualMailManager/cli/subcommands.py:843
 msgid "assign the given alias domain to an other domain"
 msgstr "Die angegebene Alias-Domain einer anderen Domain zuordnen"
 
-#: VirtualMailManager/cli/subcommands.py:720
-msgid "fqdn [transport]"
-msgstr "fqdn [Transport]"
+#: VirtualMailManager/cli/subcommands.py:848
+msgid "add one or more catch-all destinations for a domain"
+msgstr "Ein oder mehrere Catch-All-Zile für eine Domain hinzufügen"
 
-#: VirtualMailManager/cli/subcommands.py:721
+#: VirtualMailManager/cli/subcommands.py:852
+msgid "delete the specified catch-all destination or all of a domain's destinations"
+msgstr "Das angegebene Catch-All-Ziel oder alle Ziele einer Domain löschen"
+
+#: VirtualMailManager/cli/subcommands.py:855
+msgid "show the catch-all destination(s) of the specified domain"
+msgstr "Das/die Catch-All-Ziel(e) der angegebenen Domain anzeigen"
+
+#: VirtualMailManager/cli/subcommands.py:859
 msgid "create a new domain"
 msgstr "Eine neue Domain anlegen"
 
-#: VirtualMailManager/cli/subcommands.py:724
+#: VirtualMailManager/cli/subcommands.py:861
 msgid "delete the given domain and all its alias domains"
 msgstr "Die angegebene Domain und alle ihre Alias-Domains löschen"
 
-#: VirtualMailManager/cli/subcommands.py:725
-msgid "fqdn [details]"
-msgstr "fqdn [Details]"
-
-#: VirtualMailManager/cli/subcommands.py:726
+#: VirtualMailManager/cli/subcommands.py:863
 msgid "display information about the given domain"
 msgstr "Informationen über die angegebene Domain anzeigen"
 
-#: VirtualMailManager/cli/subcommands.py:728
-msgid "fqdn storage [messages]"
-msgstr "fqdn storage [Nachrichten]"
-
-#: VirtualMailManager/cli/subcommands.py:729
+#: VirtualMailManager/cli/subcommands.py:866
 msgid "update the quota limit of the specified domain"
-msgstr "Nutzungsbeschränkung der angegebenen Domain aktualisieren"
+msgstr "Kontingentbeschränkung der angegebenen Domain aktualisieren"
 
-#: VirtualMailManager/cli/subcommands.py:731
-msgid "fqdn [service ...]"
-msgstr "fqdn [Dienst …]"
-
-#: VirtualMailManager/cli/subcommands.py:732
+#: VirtualMailManager/cli/subcommands.py:869
 msgid "enables the specified services and disables all not specified services of the given domain"
 msgstr "Aktiviert die angegebenen Dienste und deaktiviert alle nicht angegebenen Dienste der angegebenen Domain"
 
-#: VirtualMailManager/cli/subcommands.py:735
-msgid "fqdn transport"
-msgstr "fqdn Transport"
-
-#: VirtualMailManager/cli/subcommands.py:736
+#: VirtualMailManager/cli/subcommands.py:873
 msgid "update the transport of the specified domain"
 msgstr "Den Transport der angegebenen Domain aktualisieren"
 
-#: VirtualMailManager/cli/subcommands.py:737
-msgid "[pattern]"
-msgstr "[Muster]"
+#: VirtualMailManager/cli/subcommands.py:875
+msgid "set, update or delete the note of the given domain"
+msgstr "Die Notiz der angegebenen Domain setzen, aktualisieren oder löschen"
+
+#: VirtualMailManager/cli/subcommands.py:878
+msgid "list all domains or search for domains by pattern"
+msgstr "Alle Domains nach Muster auflisten oder danach suchen"
+
+#: VirtualMailManager/cli/subcommands.py:880
+msgid "list all addresses or search for addresses by pattern"
+msgstr "Alle Adressen nach Muster auflisten oder danach suchen"
 
-#: VirtualMailManager/cli/subcommands.py:738
-msgid "list all domains / search domains by pattern"
-msgstr "Alle Domains/Suchdomains nach Muster auflisten"
+#: VirtualMailManager/cli/subcommands.py:883
+msgid "list all user accounts or search for accounts by pattern"
+msgstr "Alle Benutzerkonten anhand des Musters auflisten oder danach suchen"
 
-#: VirtualMailManager/cli/subcommands.py:741
-msgid "address newaddress"
-msgstr "address Neue_Adresse"
+#: VirtualMailManager/cli/subcommands.py:886
+msgid "list all aliases or search for aliases by pattern"
+msgstr "Alle Aliase anhand des Musters auflisten oder danach suchen"
 
-#: VirtualMailManager/cli/subcommands.py:742
+#: VirtualMailManager/cli/subcommands.py:888
+msgid "list all relocated users or search for relocated users by pattern"
+msgstr "Alle umgezogenen Benutzer anhand des Musters auflisten oder danach suchen"
+
+#: VirtualMailManager/cli/subcommands.py:893
 msgid "create a new record for a relocated user"
-msgstr "Einen neuen Datensatz für einen verschobenen Benutzer anlegen"
+msgstr "Einen neuen Datensatz für einen umgezogenen Benutzer anlegen"
 
-#: VirtualMailManager/cli/subcommands.py:745
+#: VirtualMailManager/cli/subcommands.py:896
 msgid "delete the record of the relocated user"
-msgstr "Den Datensatz eines verschobenen Benutzers löschen"
+msgstr "Den Datensatz eines umgezogenen Benutzers löschen"
 
-#: VirtualMailManager/cli/subcommands.py:747
+#: VirtualMailManager/cli/subcommands.py:898
 msgid "print information about a relocated user"
-msgstr "Informationen über einen verschobenen Benutzer anzeigen"
+msgstr "Informationen über einen umgezogenen Benutzer anzeigen"
 
-#: VirtualMailManager/cli/subcommands.py:749
-msgid "option"
-msgstr "Option"
-
-#: VirtualMailManager/cli/subcommands.py:750
+#: VirtualMailManager/cli/subcommands.py:901
 msgid "show the actual value of the configuration option"
 msgstr "Den tatsächlichen Wert der Konfigurationsoption anzeigen"
 
-#: VirtualMailManager/cli/subcommands.py:751
-msgid "option value"
-msgstr "Optionswert"
-
-#: VirtualMailManager/cli/subcommands.py:752
+#: VirtualMailManager/cli/subcommands.py:903
 msgid "set a new value for the configuration option"
 msgstr "Einen neuen Wert für die Konfigurationsoption festlegen"
 
-#: VirtualMailManager/cli/subcommands.py:753
-msgid "[section]"
-msgstr "[Abschnitt]"
-
-#: VirtualMailManager/cli/subcommands.py:754
-msgid "start interactive configuration modus"
+#: VirtualMailManager/cli/subcommands.py:905
+msgid "start interactive configuration mode"
 msgstr "Den interaktiven Konfigurationsmodus starten"
 
-#: VirtualMailManager/cli/subcommands.py:756
+#: VirtualMailManager/cli/subcommands.py:907
 msgid "lists all usable password schemes and password encoding suffixes"
 msgstr "Alle verwendbaren Passwort-Schemata und Encodierungs-Suffixe für Passwörter auflisten"
 
-#: VirtualMailManager/cli/subcommands.py:758
-msgid "[subcommand]"
-msgstr "[Unterbefehl]"
-
-#: VirtualMailManager/cli/subcommands.py:759
+#: VirtualMailManager/cli/subcommands.py:910
 msgid "show a help overview or help for the given subcommand"
 msgstr "Eine Hilfe-Übersicht oder Hilfe für einen angegebenen Unterbefehl anzeigen"
 
-#: VirtualMailManager/cli/subcommands.py:761
+#: VirtualMailManager/cli/subcommands.py:912
 msgid "show version and copyright information"
 msgstr "Version und urheberrechtliche Informationen anzeigen"
 
-#: VirtualMailManager/cli/subcommands.py:809
+#. TP: e.g.: [  0.00%] 21.09 KiB/1.00 GiB
+#: VirtualMailManager/cli/subcommands.py:968
 #, python-format
 msgid "[%(percent)s%%] %(used)s/%(limit)s"
 msgstr "[%(percent)s%%] %(used)s/%(limit)s"
 
 #. TP: used in e.g. 'Domain information' or 'Account information'
-#: VirtualMailManager/cli/subcommands.py:815
+#: VirtualMailManager/cli/subcommands.py:974
 msgid "information"
 msgstr "Informationen"
 
+#: VirtualMailManager/cli/subcommands.py:988
+msgid "Note"
+msgstr "Notiz"
+
 #. TP: used in e.g. 'Existing alias addresses' or 'Existing accounts'
-#: VirtualMailManager/cli/subcommands.py:828
+#: VirtualMailManager/cli/subcommands.py:1004
 msgid "Existing"
 msgstr "Vorhandene"
 
-#: VirtualMailManager/cli/subcommands.py:841
-#: VirtualMailManager/cli/subcommands.py:883
+#: VirtualMailManager/cli/subcommands.py:1017
+#: VirtualMailManager/cli/subcommands.py:1069
+#: VirtualMailManager/cli/subcommands.py:1113
 msgid "\tNone"
 msgstr "\tKeine"
 
-#: VirtualMailManager/cli/subcommands.py:846
+#: VirtualMailManager/cli/subcommands.py:1022
 msgid "Alias information"
 msgstr "Alias-Informationen"
 
-#: VirtualMailManager/cli/subcommands.py:848
+#: VirtualMailManager/cli/subcommands.py:1024
 #, python-format
 msgid "\tMail for %s will be redirected to:"
 msgstr "\tE-Mails für %s werden weitergeleitet an:"
 
-#: VirtualMailManager/cli/subcommands.py:855
+#: VirtualMailManager/cli/subcommands.py:1031
+msgid "Catch-all information"
+msgstr "Catch-All-Information"
+
+#: VirtualMailManager/cli/subcommands.py:1033
+#, python-format
+msgid "\tMail to unknown local-parts in domain %s will be sent to:"
+msgstr "\tMails an unbekannte local-Teile in der Domain %s werden gesendet an:"
+
+#: VirtualMailManager/cli/subcommands.py:1041
 msgid "Relocated information"
 msgstr "Verschiebe-Informationen"
 
-#: VirtualMailManager/cli/subcommands.py:857
+#: VirtualMailManager/cli/subcommands.py:1043
 #, python-format
 msgid "\tUser '%(addr)s' has moved to '%(dest)s'"
-msgstr "\tDer Benutzer »%(addr)s« wurde nach »%(dest)s« verschoben"
+msgstr "\tDer Benutzer »%(addr)s« ist nach »%(dest)s« umgezogen"
 
-#: VirtualMailManager/cli/subcommands.py:872
+#: VirtualMailManager/cli/subcommands.py:1058
 msgid "Matching domains"
 msgstr "Übereinstimmende Domains"
 
-#: VirtualMailManager/cli/subcommands.py:874
+#: VirtualMailManager/cli/subcommands.py:1060
 msgid "Existing domains"
 msgstr "Existierende Domains"
 
-#: VirtualMailManager/cli/subcommands.py:889
+#: VirtualMailManager/cli/subcommands.py:1076
+msgid "user accounts"
+msgstr "Benutzerkonten"
+
+#: VirtualMailManager/cli/subcommands.py:1079
+msgid "user accounts and aliases"
+msgstr "Benutzerkonten und Aliase"
+
+#: VirtualMailManager/cli/subcommands.py:1080
+msgid "user accounts and relocated users"
+msgstr "Benutzerkonten und umgezogene Benutzer"
+
+#: VirtualMailManager/cli/subcommands.py:1081
+msgid "aliases and relocated users"
+msgstr "Aliase und umgezogene Benutzer"
+
+#: VirtualMailManager/cli/subcommands.py:1082
+msgid "addresses"
+msgstr "Adressen"
+
+#: VirtualMailManager/cli/subcommands.py:1086
+#, python-format
+msgid "Matching %s"
+msgstr "Übereinstimmende %s"
+
+#: VirtualMailManager/cli/subcommands.py:1088
+#, python-format
+msgid "Existing %s"
+msgstr "Vorhandenes %s"
+
+#: VirtualMailManager/cli/subcommands.py:1091
+#, python-format
+msgid "Invalid address type for list: '%s'"
+msgstr "Ungültiger Adresstyp für Liste: »%s«"
+
+#. TP: the letters 'u', 'a' and 'r' are abbreviations of user,
+#. alias and relocated user
+#: VirtualMailManager/cli/subcommands.py:1101
+msgid "u"
+msgstr "u"
+
+#: VirtualMailManager/cli/subcommands.py:1102
+msgid "a"
+msgstr "a"
+
+#: VirtualMailManager/cli/subcommands.py:1103
+msgid "r"
+msgstr "r"
+
+#: VirtualMailManager/cli/subcommands.py:1119
 msgid "Alias domain information"
-msgstr "Alias-Domain Informationen"
+msgstr "Alias-Domain-Informationen"
 
-#: VirtualMailManager/cli/subcommands.py:894
+#: VirtualMailManager/cli/subcommands.py:1124
 #, python-format
 msgid ""
 "\tThe alias domain %(alias)s belongs to:\n"
@@ -812,28 +1574,42 @@
 msgid "File is not executable: '%s'"
 msgstr "Datei ist nicht ausführbar: »%s«"
 
-#: VirtualMailManager/common.py:82
+#: VirtualMailManager/common.py:83
 msgid "GiB"
 msgstr "GiB"
 
-#: VirtualMailManager/common.py:82
+#. TP: abbreviations of gibibyte, tebibyte kibibyte and mebibyte
+#: VirtualMailManager/common.py:83
 msgid "TiB"
 msgstr "TiB"
 
-#: VirtualMailManager/common.py:83
+#: VirtualMailManager/common.py:84
 msgid "KiB"
 msgstr "KiB"
 
-#: VirtualMailManager/common.py:83
+#: VirtualMailManager/common.py:84
 msgid "MiB"
 msgstr "MiB"
 
 #. TP: e.g.: '%(size)s %(prefix)s' -> '118.30 MiB'
-#: VirtualMailManager/common.py:87
+#: VirtualMailManager/common.py:88
 #, python-format
 msgid "%(size)s %(prefix)s"
 msgstr "%(size)s %(prefix)s"
 
+#: VirtualMailManager/common.py:139
+#, python-format
+msgid "Invalid transport '%(transport)s' for mailbox format '%(mbfmt)s'."
+msgstr "Ungültiger Transport »%(transport)s« für Postfachformat »%(mbfmt)s«."
+
+#. TP: [domain default] indicates that a user's setting is the same as
+#. configured in the user's domain.
+#. e.g.: [  0.84%] 42/5,000 [domain default]
+#: VirtualMailManager/common.py:217
+#, python-format
+msgid "%s [domain default]"
+msgstr "%s [Domain-Vorgabe]"
+
 #: VirtualMailManager/config.py:89
 #, python-format
 msgid "Not a boolean: '%s'"
@@ -844,77 +1620,77 @@
 msgid "Bad format: '%s' - expected: section.option"
 msgstr "Falsches Format: »%s« - erwartet: Abschnitt.Option"
 
-#: VirtualMailManager/config.py:380
+#: VirtualMailManager/config.py:378
 #, python-format
 msgid "* Section: %s\n"
 msgstr "* Abschnitt: %s\n"
 
-#: VirtualMailManager/config.py:390 VirtualMailManager/config.py:398
+#: VirtualMailManager/config.py:388 VirtualMailManager/config.py:396
 #, python-format
 msgid "Check of configuration file %s failed.\n"
 msgstr "Überprüfen der Konfigurationsdatei %s ist fehlgeschlagen.\n"
 
-#: VirtualMailManager/config.py:392
+#: VirtualMailManager/config.py:390
 msgid "Missing options, which have no default value.\n"
 msgstr "Optionen fehlen, für die kein Vorgabewert besteht.\n"
 
-#: VirtualMailManager/config.py:400 VirtualMailManager/config.py:402
+#: VirtualMailManager/config.py:398 VirtualMailManager/config.py:400
 msgid "Invalid configuration values.\n"
 msgstr "Ungültige Konfigurationswerte.\n"
 
-#: VirtualMailManager/config.py:441 VirtualMailManager/config.py:525
+#: VirtualMailManager/config.py:439 VirtualMailManager/config.py:523
 #, python-format
 msgid "Not a valid Dovecot version: '%s'"
 msgstr "Keine gültige Dovecot-Version: »%s«"
 
-#: VirtualMailManager/config.py:447 VirtualMailManager/config.py:482
+#: VirtualMailManager/config.py:445 VirtualMailManager/config.py:480
 #, python-format
 msgid "Unsupported database module: '%s'"
 msgstr "Nicht unterstütztes Datenbankmodul: »%s«"
 
-#: VirtualMailManager/config.py:452 VirtualMailManager/config.py:490
+#: VirtualMailManager/config.py:450 VirtualMailManager/config.py:488
 #, python-format
 msgid "Unknown pgsql SSL mode: '%s'"
 msgstr "Unbekannter SSL-Modus für PostgreSQL: »%s«"
 
-#: VirtualMailManager/config.py:459 VirtualMailManager/config.py:503
+#: VirtualMailManager/config.py:457 VirtualMailManager/config.py:501
 #: VirtualMailManager/maillocation.py:70
 #, python-format
 msgid "Unsupported mailbox format: '%s'"
 msgstr "Nicht unterstütztes Postfachformat: »%s«"
 
-#: VirtualMailManager/config.py:475 VirtualMailManager/handler.py:283
-#: VirtualMailManager/handler.py:357 VirtualMailManager/handler.py:362
-#: VirtualMailManager/handler.py:390
+#: VirtualMailManager/config.py:473 VirtualMailManager/handler.py:287
+#: VirtualMailManager/handler.py:363 VirtualMailManager/handler.py:368
+#: VirtualMailManager/handler.py:396
 #, python-format
 msgid "No such directory: %s"
-msgstr "Ordner nicht gefunden: %s"
+msgstr "Verzeichnis nicht gefunden: %s"
 
-#: VirtualMailManager/config.py:514
+#: VirtualMailManager/config.py:512
 #, python-format
 msgid "Not a valid size value: '%s'"
 msgstr "Ungültiger Größenwert: »%s«"
 
-#: VirtualMailManager/domain.py:78
+#: VirtualMailManager/domain.py:84
 #, python-format
 msgid "The domain '%s' is an alias domain."
 msgstr "Die Domain »%s« ist eine Alias-Domain."
 
-#: VirtualMailManager/domain.py:108
+#: VirtualMailManager/domain.py:119
 #, python-format
 msgid "There are %(account_count)u accounts, %(alias_count)u aliases and %(relocated_count)u relocated users."
-msgstr "Es gibt %(account_count)u Konten, %(alias_count)u Aliase und %(relocated_count)u verschobene Benutzer."
+msgstr "Es gibt %(account_count)u Konten, %(alias_count)u Aliase und %(relocated_count)u umgezogene Benutzer."
 
-#: VirtualMailManager/domain.py:123
+#: VirtualMailManager/domain.py:134
 #, python-format
 msgid "The domain '%s' already exists."
 msgstr "Die Domain »%s« existiert bereits."
 
-#: VirtualMailManager/domain.py:437
+#: VirtualMailManager/domain.py:507
 msgid "The domain name is too long"
 msgstr "Der Domain-Name ist zu lang."
 
-#: VirtualMailManager/domain.py:439
+#: VirtualMailManager/domain.py:509
 #, python-format
 msgid "The domain name '%s' is invalid"
 msgstr "Der Domain-Name »%s« ist ungültig"
@@ -932,7 +1708,7 @@
 #: VirtualMailManager/emailaddress.py:79
 #, python-format
 msgid "Missing local-part in address: '%s'"
-msgstr "Fehlender local-part in Adresse: »%s«"
+msgstr "Fehlender local-Part in Adresse: »%s«"
 
 #: VirtualMailManager/emailaddress.py:82
 #, python-format
@@ -942,31 +1718,31 @@
 #: VirtualMailManager/emailaddress.py:145
 #, python-format
 msgid "The local-part '%s' is too long."
-msgstr "Der local-part »%s« ist zu lang."
+msgstr "Der local-Part »%s« ist zu lang."
 
 #: VirtualMailManager/emailaddress.py:150
 #, python-format
 msgid "The local-part '%(l_part)s' contains invalid characters: %(i_chars)s"
-msgstr "Der local-part »%(l_part)s« enthält ungültige Zeichen: %(i_chars)s"
+msgstr "Der local-Part »%(l_part)s« enthält ungültige Zeichen: %(i_chars)s"
 
 #: VirtualMailManager/ext/postconf.py:84
 #, python-format
-msgid "The value '%s' does not look like a valid postfix configuration parameter name."
-msgstr "»%s« sieht nicht wie ein gültiger Konfigurationsparametername für Postfix aus."
+msgid "The value '%s' does not look like a valid Postfix configuration parameter name."
+msgstr "Der Wert »%s« sieht nicht wie ein gültiger Konfigurationsparametername für Postfix aus."
 
-#: VirtualMailManager/handler.py:56
+#: VirtualMailManager/handler.py:54
 msgid "an account"
 msgstr "ein Konto"
 
-#: VirtualMailManager/handler.py:57
+#: VirtualMailManager/handler.py:55
 msgid "an alias"
 msgstr "ein Alias"
 
-#: VirtualMailManager/handler.py:58
+#: VirtualMailManager/handler.py:56
 msgid "a relocated user"
-msgstr "ein verschobener Benutzer"
+msgstr "ein umgezogener Benutzer"
 
-#: VirtualMailManager/handler.py:84
+#: VirtualMailManager/handler.py:82
 msgid ""
 "You are not root.\n"
 "\tGood bye!\n"
@@ -974,12 +1750,13 @@
 "Sie sind kein Administrator.\n"
 "\tAuf Wiedersehen.\n"
 
-#: VirtualMailManager/handler.py:104
+#: VirtualMailManager/handler.py:102
 #, python-format
 msgid "Could not find '%(cfg_file)s' in: '%(cfg_path)s'"
 msgstr "»%(cfg_file)s« konnte nicht in »%(cfg_path)s« gefunden werden"
 
-#: VirtualMailManager/handler.py:115
+#. TP: Please keep the backticks around the command. `chmod 0600 …`
+#: VirtualMailManager/handler.py:114
 #, python-format
 msgid ""
 "wrong permissions for '%(file)s': %(perms)s\n"
@@ -988,16 +1765,16 @@
 "Bitte Zugriffsrechte (%(perms)s) für »%(file)s« anpassen\n"
 "»chmod 0600 %(file)s« wäre großartig."
 
-#: VirtualMailManager/handler.py:135
+#: VirtualMailManager/handler.py:134
 #, python-format
 msgid ""
 "'%(path)s' is not a directory.\n"
 "(%(cfg_file)s: section 'misc', option 'base_directory')"
 msgstr ""
-"»%(path)s« ist kein Ordner.\n"
+"»%(path)s« ist kein Verzeichnis.\n"
 "(%(cfg_file)s: Abschnitt »misc«, Option »base_directory«)"
 
-#: VirtualMailManager/handler.py:144
+#: VirtualMailManager/handler.py:143
 #, python-format
 msgid ""
 "\n"
@@ -1006,76 +1783,79 @@
 "\n"
 "(%(cfg_file)s: Abschnitt »bin«, Option »%(option)s«)"
 
-#: VirtualMailManager/handler.py:158 VirtualMailManager/handler.py:165
+#: VirtualMailManager/handler.py:157 VirtualMailManager/handler.py:164
 #, python-format
 msgid "Unable to import database module '%s'."
 msgstr "Datenbankmodul »%s« konnte nicht importiert werden."
 
 #. TP: %(a_type)s will be one of: 'an account', 'an alias' or
 #. 'a relocated user'
-#: VirtualMailManager/handler.py:244
+#: VirtualMailManager/handler.py:243
 #, python-format
 msgid "There is already %(a_type)s with the address '%(address)s'."
 msgstr "Es existiert bereits %(a_type)s mit der Adresse »%(address)s«."
 
-#: VirtualMailManager/handler.py:297
+#: VirtualMailManager/handler.py:302
 #, python-format
 msgid "'%s' is not a directory."
-msgstr "»%s« ist kein Ordner."
+msgstr "»%s« ist kein Verzeichnis."
 
-#: VirtualMailManager/handler.py:300
+#: VirtualMailManager/handler.py:305
 #, python-format
 msgid "The file/directory '%s' already exists."
-msgstr "Die Datei oder der Ordner »%s« existiert bereits."
+msgstr "Die Datei oder das Verzeichnis »%s« existiert bereits."
 
-#: VirtualMailManager/handler.py:329
+#: VirtualMailManager/handler.py:335
 msgid "Skipped mailbox folders:"
 msgstr "Übersprungene Postfach-Ordner:"
 
-#: VirtualMailManager/handler.py:349
+#: VirtualMailManager/handler.py:355
 #, python-format
 msgid "UID '%(uid)u' and/or GID '%(gid)u' are less than %(min_uid)u/%(min_gid)u."
 msgstr "UID »%(uid)u« und/oder GID »%(gid)u« sind kleiner als %(min_uid)u/%(min_gid)u."
 
-#: VirtualMailManager/handler.py:354 VirtualMailManager/handler.py:387
+#: VirtualMailManager/handler.py:360 VirtualMailManager/handler.py:393
 #, python-format
 msgid "Found \"..\" in domain directory path: %s"
-msgstr "»..« im Pfad zum Benutzerordner entdeckt: %s"
+msgstr "»..« im Pfad zum Domain-Verzeichnis entdeckt: %s"
 
-#: VirtualMailManager/handler.py:367
+#: VirtualMailManager/handler.py:373
 msgid "Detected owner/group mismatch in home directory."
-msgstr "Benutzerordner gehört dem/der falschen Benutzer/Gruppe."
+msgstr "Benutzerverzeichnis gehört dem/der falschen Benutzer/Gruppe."
 
-#: VirtualMailManager/handler.py:383
+#: VirtualMailManager/handler.py:389
 #, python-format
 msgid "GID '%(gid)u' is less than '%(min_gid)u'."
 msgstr "GID »%(gid)u« ist kleiner als »%(min_gid)u«."
 
-#: VirtualMailManager/handler.py:394
+#: VirtualMailManager/handler.py:400
 #, python-format
 msgid "Detected group mismatch in domain directory: %s"
-msgstr "Domain-Ordner gehört der falschen Gruppe: %s"
+msgstr "Domain-Verzeichnis gehört der falschen Gruppe: %s"
 
-#: VirtualMailManager/handler.py:470 VirtualMailManager/handler.py:748
+#: VirtualMailManager/handler.py:476 VirtualMailManager/handler.py:878
 #, python-format
 msgid "Unknown service: '%s'"
 msgstr "Unbekannter Dienst: »%s«."
 
-#: VirtualMailManager/handler.py:587
+#: VirtualMailManager/handler.py:601 VirtualMailManager/handler.py:625
+#: VirtualMailManager/handler.py:639
 #, python-format
 msgid "The pattern '%s' contains invalid characters."
 msgstr "Das Muster »%s« enthält ungültige Zeichen."
 
-#: VirtualMailManager/handler.py:614
+#: VirtualMailManager/handler.py:669 VirtualMailManager/handler.py:732
+#: VirtualMailManager/handler.py:746 VirtualMailManager/handler.py:776
 msgid "Ignored destination addresses:"
-msgstr "Ziel-Adressen werden ignoriert:"
+msgstr "Ignorierte Ziel-Adressen:"
 
-#: VirtualMailManager/handler.py:619 VirtualMailManager/handler.py:769
+#: VirtualMailManager/handler.py:674 VirtualMailManager/handler.py:751
+#: VirtualMailManager/handler.py:895
 #, python-format
 msgid "The destination account/alias '%s' does not exist."
-msgstr "Das/der Ziel-konto/-Alias »%s« existiert nicht."
+msgstr "Das/der Ziel-Konto/-Alias »%s« existiert nicht."
 
-#: VirtualMailManager/handler.py:641
+#: VirtualMailManager/handler.py:696
 #, python-format
 msgid ""
 "The account has been successfully deleted from the database.\n"
@@ -1084,25 +1864,20 @@
 "    Reason: %(reason)s"
 msgstr ""
 "Das Konto wurde erfolgreich aus der Datenbank gelöscht.\n"
-"    Aber es trat ein Fehler auf beim Löschen des folgenden Ordners:\n"
-"    „%(directory)s“\n"
+"    Aber es trat ein Fehler auf beim Löschen des folgenden Verzeichnisses:\n"
+"    »%(directory)s«\n"
 "    Grund: %(reason)s"
 
-#: VirtualMailManager/handler.py:712
-#, python-format
-msgid "Could not accept name: '%s'"
-msgstr "Name kann nicht akzeptiert werden: »%s«"
-
-#: VirtualMailManager/handler.py:735
+#: VirtualMailManager/handler.py:854
 #, python-format
 msgid "Could not accept transport: '%s'"
 msgstr "Transport kann nicht akzeptiert werden: »%s«"
 
-#: VirtualMailManager/handler.py:779 VirtualMailManager/relocated.py:98
-#: VirtualMailManager/relocated.py:105
+#: VirtualMailManager/handler.py:905 VirtualMailManager/relocated.py:106
+#: VirtualMailManager/relocated.py:113
 #, python-format
 msgid "The relocated user '%s' does not exist."
-msgstr "Der verschobene Benutzer »%s« existiert nicht."
+msgstr "Der umgezogene Benutzer »%s« existiert nicht."
 
 #: VirtualMailManager/mailbox.py:260
 #, python-format
@@ -1111,37 +1886,41 @@
 
 #: VirtualMailManager/maillocation.py:74
 msgid "Empty directory name"
-msgstr "Ordnername ist leer"
+msgstr "Verzeichnisname ist leer"
 
 #: VirtualMailManager/maillocation.py:76
 #, python-format
 msgid "Directory name is too long: '%s'"
-msgstr "Ordnername ist zu lang: »%s«"
+msgstr "Verzeichnisname ist zu lang: »%s«"
 
-#: VirtualMailManager/password.py:388
+#: VirtualMailManager/password.py:389
 #, python-format
 msgid "Unsupported password scheme: '%s'"
 msgstr "Nicht unterstütztes Passwortschema: »%s«"
 
-#: VirtualMailManager/password.py:391
+#: VirtualMailManager/password.py:392
 #, python-format
 msgid "The password scheme '%(scheme)s' requires Dovecot >= v%(version)s."
-msgstr "Das Passworschema »%(scheme)s« benötigt Dovecot >= v%(version)s."
+msgstr "Das Passwortschema »%(scheme)s« benötigt Dovecot >= v%(version)s."
 
-#: VirtualMailManager/password.py:397
+#: VirtualMailManager/password.py:398
 msgid "Encoding suffixes for password schemes require Dovecot >= v1.1.alpha1."
 msgstr "Encoding-Suffixe für Passwort-Schemata benötigen Dovecot >= v1.1.alpha1."
 
-#: VirtualMailManager/password.py:400
+#: VirtualMailManager/password.py:401
 #, python-format
 msgid "Unsupported password encoding: '%s'"
 msgstr "Nicht unterstützte Encodierung des Passworts: »%s«"
 
-#: VirtualMailManager/relocated.py:71
+#: VirtualMailManager/relocated.py:62 VirtualMailManager/relocated.py:76
+msgid "The destination address' domain name must not be localhost."
+msgstr "Der Domainname der Zieladresse darf nicht localhost sein."
+
+#: VirtualMailManager/relocated.py:79
 msgid "Address and destination are identical."
 msgstr "Alias- und Ziel-Adresse sind identisch."
 
-#: VirtualMailManager/relocated.py:75
+#: VirtualMailManager/relocated.py:83
 #, python-format
 msgid "The relocated user '%s' already exists."
-msgstr "Der verschobene Benutzer »%s« existiert bereits."
+msgstr "Der umgezogene Benutzer »%s« existiert bereits."
diff -r ee3c6c826b42 -r bc796a554ca2 po/fi.po
--- a/po/fi.po	Sun Mar 23 20:38:45 2014 +0000
+++ b/po/fi.po	Sun Jun 08 14:03:07 2014 +0000
@@ -1,14 +1,14 @@
 # Finnish messages for vmm.
-# Copyright © 2010, 2012 Free Software Foundation, Inc.
+# Copyright © 2010, 2012, 2014 Free Software Foundation, Inc.
 # This file is distributed under the same license as the vmm package.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2010, 2012.
+# Jorma Karvonen <karvonen.jorma@gmail.com>, 2010, 2012, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vmm 0.6.1-pre1\n"
+"Project-Id-Version: vmm 0.6.3-pre1\n"
 "Report-Msgid-Bugs-To: user+vmm/tp@localhost.localdomain.org\n"
-"POT-Creation-Date: 2012-09-04 00:39+0200\n"
-"PO-Revision-Date: 2012-11-21 13:52+0200\n"
+"POT-Creation-Date: 2014-03-23 20:10+0000\n"
+"PO-Revision-Date: 2014-03-24 19:14+0200\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
@@ -20,93 +20,88 @@
 #. TP: Hm, what “quotation marks” should be used?
 #. If you are unsure have a look at:
 #. http://en.wikipedia.org/wiki/Quotation_mark,_non-English_usage
-#: VirtualMailManager/account.py:59 VirtualMailManager/alias.py:35
-#: VirtualMailManager/catchall.py:44 VirtualMailManager/domain.py:127
+#: VirtualMailManager/account.py:60 VirtualMailManager/alias.py:35
+#: VirtualMailManager/catchall.py:44 VirtualMailManager/domain.py:131
 #: VirtualMailManager/relocated.py:39
 #, python-format
 msgid "The domain '%s' does not exist."
-msgstr "Verkkotunnus ’%s’ ei ole vielä olemassa."
+msgstr "Verkkotunnus ’%s’ ei ole olemassa."
 
-#: VirtualMailManager/account.py:122
+#: VirtualMailManager/account.py:123
 #, python-format
 msgid "The mailbox format '%(mbfmt)s' requires Dovecot >= v%(version)s."
 msgstr "Sähköpostilaatikkomuoto ’%(mbfmt)s’ vaatii Dovecot >= v%(version)s."
 
-#: VirtualMailManager/account.py:129 VirtualMailManager/account.py:354
-#, python-format
-msgid "Invalid transport '%(transport)s' for mailbox format '%(mbfmt)s'."
-msgstr "Virheellinen siirto ’%(transport)s’ sähköpostilaatikkomuodolle ’%(mbfmt)s’."
-
-#: VirtualMailManager/account.py:169 VirtualMailManager/cli/handler.py:93
-#: VirtualMailManager/handler.py:680 VirtualMailManager/handler.py:764
-#: VirtualMailManager/handler.py:790 VirtualMailManager/handler.py:798
-#: VirtualMailManager/handler.py:806 VirtualMailManager/handler.py:814
-#: VirtualMailManager/handler.py:833 VirtualMailManager/handler.py:845
+#: VirtualMailManager/account.py:166 VirtualMailManager/cli/handler.py:93
+#: VirtualMailManager/handler.py:683 VirtualMailManager/handler.py:789
+#: VirtualMailManager/handler.py:815 VirtualMailManager/handler.py:823
+#: VirtualMailManager/handler.py:831 VirtualMailManager/handler.py:839
+#: VirtualMailManager/handler.py:858 VirtualMailManager/handler.py:870
 #, python-format
 msgid "The account '%s' does not exist."
 msgstr "Tiliä ’%s’ ei ole olemassa."
 
-#: VirtualMailManager/account.py:225 VirtualMailManager/account.py:246
-#: VirtualMailManager/cli/handler.py:77 VirtualMailManager/handler.py:648
+#: VirtualMailManager/account.py:222 VirtualMailManager/account.py:243
+#: VirtualMailManager/cli/handler.py:77 VirtualMailManager/handler.py:651
 #, python-format
 msgid "The account '%s' already exists."
 msgstr "Tili ’%s’ on jo olemassa."
 
-#: VirtualMailManager/account.py:228 VirtualMailManager/handler.py:786
+#: VirtualMailManager/account.py:225 VirtualMailManager/handler.py:811
 #, python-format
 msgid "Could not accept password: '%s'"
-msgstr "Ei voitu hyväksyä salasanaa: ’%s’"
+msgstr "Salasanan hyväksyminen epäonnistui: ’%s’"
 
-#: VirtualMailManager/account.py:249
+#: VirtualMailManager/account.py:246
 #, python-format
 msgid "No password set for account: '%s'"
 msgstr "Tilille ei ole asetettu salasanaa: ’%s’"
 
-#: VirtualMailManager/account.py:288
+#: VirtualMailManager/account.py:285
 #, python-format
 msgid "Unknown field: '%s'"
 msgstr "Tuntematon kenttä: ’%s’"
 
-#: VirtualMailManager/account.py:310 VirtualMailManager/domain.py:323
+#: VirtualMailManager/account.py:307 VirtualMailManager/domain.py:331
 msgid "PostgreSQL-based dictionary quota requires Dovecot >= v1.1.2."
 msgstr "PostgreSQL-perustainen sanakirjakiintiö vaatii Dovecot >= v1.1.2"
 
 #. TP: A service (e.g. pop3 or imap) may be enabled/usable or
 #. disabled/unusable for a user.
-#: VirtualMailManager/account.py:378
+#: VirtualMailManager/account.py:370
 msgid "disabled"
 msgstr "poistettu käytöstä"
 
-#: VirtualMailManager/account.py:378
+#: VirtualMailManager/account.py:370
 msgid "enabled"
 msgstr "otettu käyttöön"
 
-#: VirtualMailManager/account.py:417
+#: VirtualMailManager/account.py:409
 #, python-format
 msgid "Could not fetch information for account: '%s'"
 msgstr "Tiedojen noutaminen tilille epäonnistui: ’%s’"
 
 #  Alla "count" ja "address" ovat muuttujia, jotka korvautuvat suorituksen yhteydessä koodilla.
-#: VirtualMailManager/account.py:461
+#: VirtualMailManager/account.py:453
 #, python-format
 msgid "There are %(count)d aliases with the destination address '%(address)s'."
 msgstr "On %(count)d aliasta kohdeosoitteella ’%(address)s’."
 
-#: VirtualMailManager/account.py:490
+#: VirtualMailManager/account.py:482
 msgid "UID must be an int/long."
 msgstr "UID-käyttäjätunnisteen on oltava tyypiltään int/long."
 
-#: VirtualMailManager/account.py:492
+#: VirtualMailManager/account.py:484
 msgid "UID must be greater than 0."
 msgstr "UID-käyttäjätunnisteen on oltava suurempi kuin 0."
 
-#: VirtualMailManager/account.py:501
+#: VirtualMailManager/account.py:493
 #, python-format
 msgid "There is no account with the UID: '%d'"
 msgstr "Ei ole tiliä UID-käyttäjätunnisteella: ’%d’"
 
 #  Alla "address" ja "count" ovat muuttuja, jotka korvautuvat suorituksen yhteydessä koodilla.
-#: VirtualMailManager/alias.py:60
+#: VirtualMailManager/alias.py:61
 #, python-format
 msgid ""
 "Cannot add %(count_new)i new destination(s) to alias '%(address)s'.\n"
@@ -119,7 +114,7 @@
 "%(count_new)i lisäkohdetta tekee tämän aliaksen käyttökelvottomaksi.\n"
 "Vihje: Kasvata Postfix-arvoa virtual_alias_expansion_limit"
 
-#: VirtualMailManager/alias.py:67
+#: VirtualMailManager/alias.py:68
 #, python-format
 msgid ""
 "Cannot add %(count_new)i new destination(s) to alias '%(address)s'.\n"
@@ -129,20 +124,20 @@
 msgstr ""
 "Ei voida lisätä %(count_new)i uutta kohdetta aliakseen ’%(address)s’.\n"
 "Tämä alias ylittää jo laajennusrajansa (%(count)i/%(limit)i).\n"
-"Joten se on käyttökelvoton. Kaikki tähän osoitteeseen suunnatut viestit\n"
+"Joten se on käyttökelvoton. Kaikki tähän aliakseen suunnatut viestit\n"
 "ponnahtavat takaisin.\n"
 "Vihje: Poista joitakin kohdeosoitteita."
 
-#: VirtualMailManager/alias.py:142 VirtualMailManager/alias.py:154
-#: VirtualMailManager/alias.py:161 VirtualMailManager/handler.py:709
+#: VirtualMailManager/alias.py:155 VirtualMailManager/alias.py:172
+#: VirtualMailManager/alias.py:179 VirtualMailManager/handler.py:712
 #, python-format
 msgid "The alias '%s' does not exist."
 msgstr "Alias ’%s’ ei ole olemassa."
 
-#: VirtualMailManager/alias.py:145
+#: VirtualMailManager/alias.py:163
 #, python-format
-msgid "The address '%(addr)s' is not a destination of the alias '%(alias)s'."
-msgstr "Osoite ’%(addr)s’ ei ole aliaksen ’%(alias)s’ kohde."
+msgid "No suitable destinations left to remove from alias '%s'."
+msgstr "Aliakselle ’%s’ ei ole jätetty sopivia kohteita poistettavaksi."
 
 #: VirtualMailManager/aliasdomain.py:50
 #, python-format
@@ -190,7 +185,7 @@
 "unusable.\n"
 "Hint: Increase Postfix' virtual_alias_expansion_limit"
 msgstr ""
-"Ei voida lisätä %(count_new)i uutta kohdetta catch-all aliakselle\n"
+"Ei voida lisätä %(count_new)i uutta kohdetta sieppaa-kaikki-aliakselle\n"
 "verkkoalueelle ’%(domain)s’. Nykyisin tämä alias laajenee %(count)i/%(limit)i\n"
 "vastaanottajaan. %(count_new)i lisäkohdetta tekee tämän aliaksen\n"
 "käyttökelvottomaksi.\n"
@@ -199,27 +194,26 @@
 #: VirtualMailManager/catchall.py:77
 #, python-format
 msgid ""
-"Cannot add %(count_new)i new destination(s) to catch-all alias for\n"
-"domain '%(domain)s'. This alias already exceeds its expansion limit (%(count)i/%(limit)i).\n"
+"Cannot add %(count_new)i new destination(s) to catch-all alias for domain\n"
+"'%(domain)s'. This alias already exceeds its expansion limit (%(count)i/%(limit)i).\n"
 "So its unusable, all messages addressed to this alias will be bounced.\n"
 "Hint: Delete some destination addresses."
 msgstr ""
 "Ei voida lisätä %(count_new)i uutta kohdetta sieppaa-kaikki-aliakseen\n"
 "verkkoalueelle ’%(domain)s’. Tämä alias ylittää jo laajennusrajansa (%(count)i/%(limit)i).\n"
-"Joten se on käyttökelvoton. Kaikki tähän osoitteeseen suunnatut viestit\n"
-"ponnahtavat takaisin.\n"
+"Joten se on käyttökelvoton. Kaikki tähän aliakseen suunnatut viestit ponnahtavat takaisin.\n"
 "Vihje: Poista joitakin kohdeosoitteita."
 
-#: VirtualMailManager/catchall.py:146 VirtualMailManager/catchall.py:159
-#: VirtualMailManager/catchall.py:166
+#: VirtualMailManager/catchall.py:151 VirtualMailManager/catchall.py:169
+#: VirtualMailManager/catchall.py:176
 #, python-format
 msgid "There are no catch-all aliases defined for domain '%s'."
 msgstr "Ei ole sieppaa-kaikki-aliasta verkkotunnukselle ’%s’."
 
-#: VirtualMailManager/catchall.py:149
+#: VirtualMailManager/catchall.py:159
 #, python-format
-msgid "The address '%(addr)s' is not a destination of the catch-all alias for domain '%(domain)s'."
-msgstr "Osoite ’%(addr)s’ ei ole sieppaa-kaikki-aliaksen kohde verkkotunnukselle ’%(domain)s’."
+msgid "No suitable destinations left to remove from the catch-all alias of domain '%s'."
+msgstr "Verkkotunnuksen ’%s’ sieppaa-kaikki-aliakselle ei ole jätetty sopivia kohteita poistettaviksi."
 
 #. TP: Please preserve the trailing space.
 #: VirtualMailManager/cli/__init__.py:78
@@ -321,8 +315,45 @@
 "Jos vain käyttäjätunniste <uid> on käytettävissä, esimerkiksi\n"
 "prosessiluettelosta, alikomento getuser näyttää käyttäjän osoitteen."
 
+#. TP: description of subcommand listaddresses
+#: VirtualMailManager/cli/clihelp.py:48
+msgid ""
+"This command lists all defined addresses.\n"
+"Addresses belonging to alias-domains are prefixed with a '-', addresses of\n"
+"regular domains with a '+'. Additionally, the letters 'u', 'a', and 'r'\n"
+"indicate the type of each address: user, alias and relocated respectively.\n"
+"The output can be limited with an optional <pattern>."
+msgstr ""
+"Tämä komento luetteloi kaikki määritellyt osoitteet.\n"
+"Aliasverkkotunnuksiin kuuluvilla osoitteilla on etuliite ’-’, tavallisilla\n"
+"verkkotunnuksilla etuliite ’+’. Lisäksi kirjaimet ’u’, ’a’, ja ’r’ osoittavat\n"
+"vastaavasti jokaisen osoitteen tyypin: käyttäjä, alias ja sijoitettu.\n"
+"Tulostusta voidaan rajoittaa valinnaisella valitsimella <pattern>."
+
+#: VirtualMailManager/cli/clihelp.py:53 VirtualMailManager/cli/clihelp.py:60
+#: VirtualMailManager/cli/clihelp.py:67 VirtualMailManager/cli/clihelp.py:82
+#: VirtualMailManager/cli/clihelp.py:88
+#, no-python-format
+msgid ""
+"To perform a wild card search, the % character can be used at the start\n"
+"and/or the end of the <pattern>."
+msgstr ""
+"Jokerimerkkihaun suorittamiseksi merkkiä % voidaan käyttää valitsimen <pattern>\n"
+"alussa ja/tai lopussa."
+
+#. TP: description of subcommand listaliases
+#: VirtualMailManager/cli/clihelp.py:56
+msgid ""
+"This command lists all defined aliases. Aliases\n"
+"belonging to alias-domains are prefixed with a '-', addresses of regular\n"
+"domains with a '+'. The output can be limited with an optional <pattern>."
+msgstr ""
+"Tämä komento luetteloi kaikki käytettävissä olevat aliakset. Aliasverkkotunnuksiin\n"
+"kuuluvilla aliaksilla on etuliite ’[-]’, tavallisilla verkkotunnuksilla etuliite ’[+]’.\n"
+"Tulostusta voidaan rajoittaa valinnaisella valitsimella <pattern>."
+
 #. TP: description of subcommand listdomains
-#: VirtualMailManager/cli/clihelp.py:48
+#: VirtualMailManager/cli/clihelp.py:63
 msgid ""
 "This subcommand lists all available domains. All\n"
 "domain names will be prefixed either with `[+]', if the domain is a primary\n"
@@ -331,20 +362,11 @@
 msgstr ""
 "Tämä alikomento luetteloi kaikki käytettävissä olevat verkkotunnukset.\n"
 "Kaikkia verkkotunnuksia edeltää joko ”[+]”, jos verkkotunnus on ensisijainen\n"
-"verkkotunnus, tai ”[-]”, jos se on alias-verkkotunnus. Tulostusta voidaan\n"
+"verkkotunnus, tai ”[-]”, jos se on aliasverkkotunnus. Tulostusta voidaan\n"
 "rajoittaa valinnaisella valitsimella <pattern>."
 
-#: VirtualMailManager/cli/clihelp.py:52
-#, python-format
-msgid ""
-"To perform a wild card search, the % character can be used at the start\n"
-"and/or the end of the <pattern>."
-msgstr ""
-"Jokerimerkkihaun suorittamiseksi merkkiä %c voidaan käyttää valitsimen <pattern>\n"
-"alussa ja/tai lopussa."
-
 #. TP: description of subcommand listpwschemes
-#: VirtualMailManager/cli/clihelp.py:55
+#: VirtualMailManager/cli/clihelp.py:70
 msgid ""
 "This subcommand lists all password schemes which\n"
 "could be used in the vmm.cfg as value of the misc.password_scheme option.\n"
@@ -356,18 +378,42 @@
 "arvona. Tulostus vaihtelee riippuen käytetystä Dovecot-versiosta ja\n"
 "järjestelmän libc-kirjastosta. "
 
-#: VirtualMailManager/cli/clihelp.py:59
+#: VirtualMailManager/cli/clihelp.py:74
 msgid ""
 "When your Dovecot installation isn't too old, you will see additionally\n"
 "a few usable encoding suffixes. One of them can be appended to the password\n"
 "scheme."
 msgstr ""
 "Kun Dovecot-asennuksesi ei ole liian vanha, näet lisäksi muutamia\n"
-"käyttäkelpoisia koodausloppuliitteitä. Yksi niistä voidaan liittäää salasana-\n"
+"käyttäkelpoisia koodausloppuliitteitä. Yksi niistä voidaan liittää salasana-\n"
 "kaavaan."
 
+#. TP: description of subcommand listrelocated
+#: VirtualMailManager/cli/clihelp.py:78
+msgid ""
+"This command lists all defined relocated addresses.\n"
+"Relocated entries belonging to alias-domains are prefixed with a '-', addresses\n"
+"of regular domains with a '+'. The output can be limited with an optional\n"
+"<pattern>."
+msgstr ""
+"Tämä komento luetteloi kaikki käytettävissä olevat sijoitusosoitteet.\n"
+"Sijoitusosoitteisiin kuuluvilla alias-verkkotunnuksilla on etuliite ’-’,\n"
+"tavallisilla sijoitusosoitteilla etuliite ’+’. Tulostusta voidaan rajoittaa\n"
+"valinnaisella valitsimella <pattern>."
+
+#. TP: description of subcommand listusers
+#: VirtualMailManager/cli/clihelp.py:85
+msgid ""
+"This command lists all user accounts. User accounts\n"
+"belonging to alias-domains are prefixed with a '-', addresses of regular\n"
+"domains with a '+'. The output can be limited with an optional <pattern>."
+msgstr ""
+"Tämä komento luetteloi kaikki käyttäjätilit. Aliasverkkotunnuksiin kuuluvilla\n"
+"käyttäjätileillä on etuliite ’-’, tavallisilla verkkotunnuksilla etuliite\n"
+"’+’. Tulostusta voidaan rajoittaa valinnaisella valitsimella <pattern>."
+
 #. TP: description of subcommand version
-#: VirtualMailManager/cli/clihelp.py:63
+#: VirtualMailManager/cli/clihelp.py:91
 msgid ""
 "Prints vmm's version and copyright information to stdout.\n"
 "After this vmm exits."
@@ -376,7 +422,7 @@
 "Tämän jälkeen vmm sulkeutuu."
 
 #. TP: description of subcommand domainadd
-#: VirtualMailManager/cli/clihelp.py:66
+#: VirtualMailManager/cli/clihelp.py:94
 msgid ""
 "Adds the new domain into the database and creates the\n"
 "domain directory."
@@ -384,7 +430,7 @@
 "Lisää uuden verkkotunnuksen tietokantaan ja luo\n"
 "verkkotunnushakemiston."
 
-#: VirtualMailManager/cli/clihelp.py:68
+#: VirtualMailManager/cli/clihelp.py:96
 msgid ""
 "If the optional argument <transport> is given, it will override the\n"
 "default transport (domain.transport) from vmm.cfg. The specified <transport>\n"
@@ -395,11 +441,11 @@
 "Määritelty <transport> on oletus-transport-argumentti kaikille tämän\n"
 "verkkotunnuksen uusille tileille."
 
-#: VirtualMailManager/cli/clihelp.py:71
+#: VirtualMailManager/cli/clihelp.py:99
 msgid "Configuration-related behavior:"
 msgstr "Asetuskohtainen käyttäytyminen:"
 
-#: VirtualMailManager/cli/clihelp.py:73
+#: VirtualMailManager/cli/clihelp.py:101
 msgid ""
 "When that option is set to true (default) vmm will automatically create\n"
 "the postmaster account for the new domain and prompt for postmaster@<fqdn>'s\n"
@@ -409,7 +455,7 @@
 "postimestari-tilin uudelle verkkotunnukselle ja kysyy postmaster@<fqdn>-\n"
 "salasanaa."
 
-#: VirtualMailManager/cli/clihelp.py:77
+#: VirtualMailManager/cli/clihelp.py:105
 msgid ""
 "When the value of that option is also set to true, vmm will automatically\n"
 "create the postmaster account for the new domain and print the generated\n"
@@ -420,7 +466,7 @@
 "postmaster-salasanan vakiotulosteeseen."
 
 #. TP: description of subcommand domaindelete
-#: VirtualMailManager/cli/clihelp.py:81
+#: VirtualMailManager/cli/clihelp.py:109
 msgid ""
 "This subcommand deletes the domain specified by\n"
 "<fqdn>."
@@ -428,7 +474,7 @@
 "Tämä alikomento poistaa <fqdn>:n määrittelemän\n"
 "verkkotunnuksen."
 
-#: VirtualMailManager/cli/clihelp.py:83
+#: VirtualMailManager/cli/clihelp.py:111
 msgid ""
 "If there are accounts, aliases and/or relocated users assigned to the\n"
 "given domain, vmm will abort the requested operation and show an error\n"
@@ -440,16 +486,16 @@
 "Jos tiedät, mitä olet tekemässä, voit määritellä valinnaisen avainsanan\n"
 "’force’."
 
-#: VirtualMailManager/cli/clihelp.py:87
+#: VirtualMailManager/cli/clihelp.py:115
 msgid ""
 "If you really always know what you are doing, edit your vmm.cfg and set\n"
 "the option domain.force_deletion to true."
 msgstr ""
-"Jos todella aina tiedät, mitä olet tekemässä, muokkaa tiedostoa vmm.cfg\n"
+"Jos aina todella tiedät, mitä olet tekemässä, muokkaa tiedostoa vmm.cfg\n"
 "ja aseta valitsin domain.force_deletion arvoon true."
 
 #. TP: description of subcommand domaininfo
-#: VirtualMailManager/cli/clihelp.py:90
+#: VirtualMailManager/cli/clihelp.py:118
 msgid ""
 "This subcommand shows some information about the\n"
 "given domain."
@@ -457,7 +503,7 @@
 "Tämä alikomento näyttää joitain tietoja annetusta\n"
 "verkkotunnuksesta."
 
-#: VirtualMailManager/cli/clihelp.py:92
+#: VirtualMailManager/cli/clihelp.py:120
 msgid ""
 "For a more detailed information about the domain the optional argument\n"
 "<details> can be specified. A possible <details> value can be one of the\n"
@@ -468,15 +514,15 @@
 "yksi seuraavista kuudesta avainsanasta:"
 
 #. TP: description of subcommand domainquota
-#: VirtualMailManager/cli/clihelp.py:97
+#: VirtualMailManager/cli/clihelp.py:125
 msgid ""
 "This subcommand is used to configure a new quota\n"
 "limit for the accounts of the domain - not for the domain itself."
 msgstr ""
-"Tätä alikomentoa käytetään asettamaan uuden kiintiörajan\n"
+"Tätä alikomentoa käytetään asettamaan uusi kiintiöraja\n"
 "verkkotunnuksen tileille - ei verkkotunnukselle itselle."
 
-#: VirtualMailManager/cli/clihelp.py:99
+#: VirtualMailManager/cli/clihelp.py:127
 msgid ""
 "The default quota limit for accounts is defined in the vmm.cfg\n"
 "(domain.quota_bytes and domain.quota_messages)."
@@ -484,7 +530,7 @@
 "Tilien oletuskiintiöraja on määritelty tiedostossa vmm.cfg\n"
 "(domain.quota_bytes ja domain.quota_messages)."
 
-#: VirtualMailManager/cli/clihelp.py:101
+#: VirtualMailManager/cli/clihelp.py:129
 msgid ""
 "The new quota limit will affect only those accounts for which the limit\n"
 "has not been overridden. If you want to restore the default to all accounts,\n"
@@ -497,7 +543,7 @@
 "käytetään 0 (nolla)."
 
 #. TP: description of subcommand domainservices
-#: VirtualMailManager/cli/clihelp.py:106
+#: VirtualMailManager/cli/clihelp.py:134
 msgid ""
 "To define which services could be used by the\n"
 "users of the domain — with the given <fqdn> — use this subcommand."
@@ -505,7 +551,7 @@
 "Käytä tätä alikomentoa määrittämään, että mitä palveluja\n"
 "verkkotunnuksen käyttäjät — annetulla <fqdn>:lla — voivat käyttää."
 
-#: VirtualMailManager/cli/clihelp.py:108
+#: VirtualMailManager/cli/clihelp.py:136
 msgid ""
 "Each specified <service> will be enabled/usable. All other services\n"
 "will be deactivated/unusable. Possible <service> names are:"
@@ -514,7 +560,7 @@
 "Kaikki muut palvelut ovat ei-aktiivisia/käyttökelvottomia. Mahdollisia\n"
 "<service>-palvelunimiä ovat:"
 
-#: VirtualMailManager/cli/clihelp.py:111
+#: VirtualMailManager/cli/clihelp.py:139
 msgid ""
 "The new service set will affect only those accounts for which the set has\n"
 "not been overridden. If you want to restore the default to all accounts, you\n"
@@ -525,7 +571,7 @@
 "’force’."
 
 #. TP: description of subcommand domaintransport
-#: VirtualMailManager/cli/clihelp.py:115
+#: VirtualMailManager/cli/clihelp.py:143
 msgid ""
 "A new transport for the indicated domain can be\n"
 "set with this subcommand."
@@ -533,7 +579,7 @@
 "Tällä alikomennolla voidaan asettaa siirto ilmoitettuun\n"
 "verkkotunnukseen."
 
-#: VirtualMailManager/cli/clihelp.py:117
+#: VirtualMailManager/cli/clihelp.py:145
 msgid ""
 "The new transport will affect only those accounts for which the transport\n"
 "has not been overridden. If you want to restore the default to all accounts,\n"
@@ -544,7 +590,7 @@
 "tileihin, voit välittää avainsanan ’force’."
 
 #. TP: description of subcommand domainnote
-#: VirtualMailManager/cli/clihelp.py:121
+#: VirtualMailManager/cli/clihelp.py:149
 msgid ""
 "With this subcommand, it is possible to attach a\n"
 "note to the specified domain. Without an argument, an existing note is\n"
@@ -555,7 +601,7 @@
 "muistio poistetaan."
 
 #. TP: description of subcommand aliasdomainadd
-#: VirtualMailManager/cli/clihelp.py:125
+#: VirtualMailManager/cli/clihelp.py:153
 msgid ""
 "This subcommand adds the new alias domain\n"
 "(<fqdn>) to the destination <domain> that should be aliased."
@@ -564,7 +610,7 @@
 "kohde-<domain>-verkkotunnukseen, josta pitäisi tehdä alias."
 
 #. TP: description of subcommand aliasdomaindelete
-#: VirtualMailManager/cli/clihelp.py:128
+#: VirtualMailManager/cli/clihelp.py:156
 msgid ""
 "Use this subcommand if the alias domain\n"
 "<fqdn> should be removed."
@@ -573,7 +619,7 @@
 "<fqdn> olisi poistettava."
 
 #. TP: description of subcommand aliasdomaininfo
-#: VirtualMailManager/cli/clihelp.py:131
+#: VirtualMailManager/cli/clihelp.py:159
 msgid ""
 "This subcommand shows to which domain the alias\n"
 "domain <fqdn> is assigned to."
@@ -582,7 +628,7 @@
 "verkkotunnus <fqdn> on liitetty."
 
 #. TP: description of subcommand aliasdomainswitch
-#: VirtualMailManager/cli/clihelp.py:134
+#: VirtualMailManager/cli/clihelp.py:162
 msgid ""
 "If the destination of the existing alias\n"
 "domain <fqdn> should be switched to another <destination> use this\n"
@@ -593,7 +639,7 @@
 "verkkotunnukseen."
 
 #. TP: description of subcommand useradd
-#: VirtualMailManager/cli/clihelp.py:138
+#: VirtualMailManager/cli/clihelp.py:166
 msgid ""
 "Use this subcommand to create a new e-mail account for\n"
 "the given <address>."
@@ -601,7 +647,7 @@
 "Käytä tätä alikomentoa luomaan uusi sähköpostitili\n"
 "annetulla osoitteelle <address>."
 
-#: VirtualMailManager/cli/clihelp.py:140
+#: VirtualMailManager/cli/clihelp.py:168
 msgid ""
 "If the <password> is not provided, vmm will prompt for it interactively.\n"
 "When no <password> is provided and account.random_password is set to true, vmm\n"
@@ -614,15 +660,15 @@
 "sen vakiotulosteeseen tilin luomisen jälkeen."
 
 #. TP: description of subcommand userdelete
-#: VirtualMailManager/cli/clihelp.py:145
+#: VirtualMailManager/cli/clihelp.py:173
 msgid ""
 "Use this subcommand to delete the account with the\n"
 "given <address>."
 msgstr ""
-"Käytä tätä alikomentoa poistamaan tilin annetusta\n"
+"Käytä tätä alikomentoa poistamaan tili annetusta\n"
 "osoitteesta <address>."
 
-#: VirtualMailManager/cli/clihelp.py:147
+#: VirtualMailManager/cli/clihelp.py:175
 msgid ""
 "If there are one or more aliases with an identical destination address,\n"
 "vmm will abort the requested operation and show an error message. To prevent\n"
@@ -633,7 +679,7 @@
 "estämiseksi määritä avainsana ’force’."
 
 #. TP: description of subcommand userinfo
-#: VirtualMailManager/cli/clihelp.py:151
+#: VirtualMailManager/cli/clihelp.py:179
 msgid ""
 "This subcommand displays some information about the\n"
 "account specified by <address>."
@@ -641,7 +687,7 @@
 "Tämä alikomento näyttää joitain tietoja osoitteen\n"
 "<address> määrittämästä tilistä."
 
-#: VirtualMailManager/cli/clihelp.py:153
+#: VirtualMailManager/cli/clihelp.py:181
 msgid ""
 "If the optional argument <details> is given some more information will be\n"
 "displayed. Possible values for <details> are:"
@@ -650,7 +696,7 @@
 "lisätietoja. Mahdollisia <details>-arvoja ovat:"
 
 #. TP: description of subcommand username
-#: VirtualMailManager/cli/clihelp.py:157
+#: VirtualMailManager/cli/clihelp.py:185
 msgid ""
 "The user's real <name> can be set/updated with this\n"
 "subcommand."
@@ -658,23 +704,23 @@
 "Tällä alikomennolla voidaan asettaa/päivittää\n"
 "käyttäjän oikea nimi <name>."
 
-#: VirtualMailManager/cli/clihelp.py:159
+#: VirtualMailManager/cli/clihelp.py:187
 msgid "If no <name> is given, the value stored for the account is erased."
 msgstr "Jos mitään nimeä <name> ei anneta, tiliin tallennettu arvo poistetaan."
 
 #. TP: description of subcommand userpassword
-#: VirtualMailManager/cli/clihelp.py:162
+#: VirtualMailManager/cli/clihelp.py:190
 msgid ""
 "The password of an account can be updated with this\n"
 "subcommand."
 msgstr "Tällä alikomennolla voidaan päivittää tilin salasana."
 
-#: VirtualMailManager/cli/clihelp.py:164
+#: VirtualMailManager/cli/clihelp.py:192
 msgid "If no <password> was provided, vmm will prompt for it interactively."
 msgstr "Jos mitään salasanaa <password> ei tarjota, vmm kyselee sen vuorovaikutteisesti."
 
 #. TP: description of subcommand usernote
-#: VirtualMailManager/cli/clihelp.py:167
+#: VirtualMailManager/cli/clihelp.py:195
 msgid ""
 "With this subcommand, it is possible to attach a note\n"
 "to the specified account. Without an argument, an existing note is\n"
@@ -685,7 +731,7 @@
 "poistetaan."
 
 #. TP: description of subcommand userquota
-#: VirtualMailManager/cli/clihelp.py:171
+#: VirtualMailManager/cli/clihelp.py:199
 msgid ""
 "This subcommand is used to set a new quota limit for\n"
 "the given account."
@@ -693,7 +739,7 @@
 "Tätä alikomentoa käytetään asettamaan uusi kiintiöraja\n"
 "tietylle tilille."
 
-#: VirtualMailManager/cli/clihelp.py:173
+#: VirtualMailManager/cli/clihelp.py:201
 msgid ""
 "When the argument <messages> was omitted the default number of messages\n"
 "0 (zero) will be applied."
@@ -701,7 +747,7 @@
 "Kun ohitetaan argumentti <messages>, käytetään viestien\n"
 "oletuslukumäärää 0 (nolla)."
 
-#: VirtualMailManager/cli/clihelp.py:175
+#: VirtualMailManager/cli/clihelp.py:203
 msgid ""
 "Instead of <storage> pass the keyword 'domain' to remove the\n"
 "account-specific override, causing the domain's value to be in effect."
@@ -710,7 +756,7 @@
 "poistaa tilikohtaisen korvauksen, mikä tuo verkkotunnuksen arvon voimaan."
 
 #. TP: description of subcommand userservices
-#: VirtualMailManager/cli/clihelp.py:178
+#: VirtualMailManager/cli/clihelp.py:206
 msgid ""
 "To grant a user access to the specified services,\n"
 "use this command."
@@ -718,7 +764,7 @@
 "Käytä tätä komentoa käyttäjäoikeuksien myöntämiseksi\n"
 "määriteltyihin palveluihin."
 
-#: VirtualMailManager/cli/clihelp.py:180
+#: VirtualMailManager/cli/clihelp.py:208
 msgid ""
 "All omitted services will be deactivated/unusable for the user with the\n"
 "given <address>."
@@ -726,7 +772,7 @@
 "Kaikki ohitetut palvelut ovat ei-aktiivisia/käyttökelvottomia\n"
 "käyttäjälle tietyllä osoitteella <address>."
 
-#: VirtualMailManager/cli/clihelp.py:182
+#: VirtualMailManager/cli/clihelp.py:210
 msgid ""
 "Instead of <service> pass 'domain' to remove the account-specific\n"
 "override, causing the domain's value to be in effect."
@@ -736,7 +782,7 @@
 "arvon voimaan."
 
 #. TP: description of subcommand usertransport
-#: VirtualMailManager/cli/clihelp.py:185
+#: VirtualMailManager/cli/clihelp.py:213
 msgid ""
 "A different <transport> for an account can be\n"
 "specified with this subcommand."
@@ -744,7 +790,7 @@
 "Tällä alikomennolla voidaan määritellä tilille\n"
 "erilainen argumentti <transport>."
 
-#: VirtualMailManager/cli/clihelp.py:187
+#: VirtualMailManager/cli/clihelp.py:215
 msgid ""
 "Instead of <transport> pass 'domain' to remove the account-specific\n"
 "override, causing the domain's value to be in effect."
@@ -753,7 +799,7 @@
 "poistaa tilikohtaisen korvauksen, mikä tuo verkkotunnuksen arvon voimaan."
 
 #. TP: description of subcommand aliasadd
-#: VirtualMailManager/cli/clihelp.py:190
+#: VirtualMailManager/cli/clihelp.py:218
 msgid ""
 "This subcommand is used to create a new alias\n"
 "<address> with one or more <destination> addresses."
@@ -762,7 +808,7 @@
 "<address>-osoitteita yhdellä tai useammalla\n"
 "<destination>-kohdeosoitteella."
 
-#: VirtualMailManager/cli/clihelp.py:192
+#: VirtualMailManager/cli/clihelp.py:220
 msgid ""
 "Within the destination address, the placeholders '%n', '%d', and '%='\n"
 "will be replaced by the local part, the domain, or the email address with '@'\n"
@@ -771,11 +817,28 @@
 msgstr ""
 "Kohdeosoitteen sisällä paikkakorvaukset ’%n’, ’%d’, ja ’%=’\n"
 "korvaavat paikallisen osan, verkkotunnuksen, tai sähköpostiosoitteen merkki ’@’\n"
-"korvataan vastaavasti merkillä ’=’. Yhdessä alias-verkkotunnuksen kanssa\n"
+"korvataan vastaavasti merkillä ’=’. Yhdessä aliasverkkotunnuksen kanssa\n"
 "tämä ottaa käyttöön verkkotunnuskohtaiset kohteet."
 
+#. TP: description of subcommand aliasdelete
+#: VirtualMailManager/cli/clihelp.py:225
+msgid ""
+"This subcommand is used to delete one or multiple\n"
+"<destination>s from the alias with the given <address>."
+msgstr ""
+"Tätä alikomentoa käytetään poistamaan yksi tai useita\n"
+"<destination>-kohteita tietyn <address>-osoitteen aliaksista."
+
+#: VirtualMailManager/cli/clihelp.py:227
+msgid ""
+"When no <destination> address was specified the alias with all its\n"
+"destinations will be deleted."
+msgstr ""
+"Kun yhtään <destination>-osoitetta ei ole määritelty, alias kaikkine\n"
+"kohteineen poistetaan."
+
 #. TP: description of subcommand aliasinfo
-#: VirtualMailManager/cli/clihelp.py:197
+#: VirtualMailManager/cli/clihelp.py:230
 msgid ""
 "Information about the alias with the given <address>\n"
 "can be displayed with this subcommand."
@@ -784,7 +847,7 @@
 "osoitteen <address> aliaksesta."
 
 #. TP: description of subcommand relocatedadd
-#: VirtualMailManager/cli/clihelp.py:200
+#: VirtualMailManager/cli/clihelp.py:233
 msgid ""
 "A new relocated user can be created with this\n"
 "subcommand."
@@ -792,7 +855,7 @@
 "Tällä alikomennolla voidaan luoda uusi sijoitettu\n"
 "käyttäjä."
 
-#: VirtualMailManager/cli/clihelp.py:202
+#: VirtualMailManager/cli/clihelp.py:235
 msgid ""
 "<address> is the user's ex-email address, for example\n"
 "b.user@example.com, and <newaddress> points to the new email address where\n"
@@ -803,7 +866,7 @@
 "josta käyttäjä tavoitetaan."
 
 #. TP: description of subcommand relocatedinfo
-#: VirtualMailManager/cli/clihelp.py:206
+#: VirtualMailManager/cli/clihelp.py:239
 msgid ""
 "This subcommand shows the new address of the\n"
 "relocated user with the given <address>."
@@ -812,7 +875,7 @@
 "osoitteen annetulla <address>-osoitteella."
 
 #. TP: description of subcommand relocateddelete
-#: VirtualMailManager/cli/clihelp.py:209
+#: VirtualMailManager/cli/clihelp.py:242
 msgid ""
 "Use this subcommand in order to delete the\n"
 "relocated user with the given <address>."
@@ -821,7 +884,7 @@
 "käyttäjä annetulla <address>-osoitteella."
 
 #. TP: description of subcommand catchalladd
-#: VirtualMailManager/cli/clihelp.py:212
+#: VirtualMailManager/cli/clihelp.py:245
 msgid ""
 "This subcommand allows to specify destination\n"
 "addresses for a domain, which shall receive mail addressed to unknown\n"
@@ -836,7 +899,7 @@
 "osoitteeseen (ellei tarkemmin määriteltyä alias-, sähköpostilaatikko-\n"
 "tai siirrettyä käyttäjää ole olemassa=."
 
-#: VirtualMailManager/cli/clihelp.py:217
+#: VirtualMailManager/cli/clihelp.py:250
 msgid ""
 "WARNING: Catch-all addresses can cause mail server flooding because\n"
 "spammers like to deliver mail to all possible combinations of names, e.g.\n"
@@ -848,7 +911,7 @@
 "välillä abba@example.org ... zztop@example.org."
 
 #. TP: description of subcommand catchallinfo
-#: VirtualMailManager/cli/clihelp.py:221
+#: VirtualMailManager/cli/clihelp.py:254
 msgid ""
 "This subcommand displays information about catch-all\n"
 "aliases defined for the domain <fqdn>."
@@ -857,15 +920,15 @@
 "aliaksesta, jonka verkkotunnus <fqdn> määrittää."
 
 #. TP: description of subcommand catchalldelete
-#: VirtualMailManager/cli/clihelp.py:224
+#: VirtualMailManager/cli/clihelp.py:257
 msgid ""
 "With this subcommand, catch-all aliases defined\n"
-"for a domain can be removed, either all of them, or a single one if specified\n"
-"explicitly."
+"for a domain can be removed, either all of them, or those <destination>s which\n"
+"were specified explicitly."
 msgstr ""
 "Tällä alikomennolla voidaan poistaa verkkotunnukselle\n"
-"määritellyt sieppaa-kaikki-aliakset, joko ne kaikki, tai yksittäinen, jos se on\n"
-"määritelty eksplisiittisesti."
+"määritellyt sieppaa-kaikki-aliakset, joko ne kaikki, tai ne\n"
+"<destination>-osoitteet, jotka on määritelty eksplisiittisesti."
 
 #  Alla "opt" ja "val" ovat muuttujia, jotka korvautuvat suorituksen yhteydessä koodilla.
 #: VirtualMailManager/cli/config.py:32
@@ -893,9 +956,9 @@
 msgid "Invalid section: '%s'"
 msgstr "Virheellinen lohko: ’%s’"
 
-#: VirtualMailManager/cli/main.py:32 VirtualMailManager/cli/main.py:65
-#: VirtualMailManager/cli/main.py:68 VirtualMailManager/cli/subcommands.py:752
-#: VirtualMailManager/cli/subcommands.py:772
+#: VirtualMailManager/cli/main.py:32 VirtualMailManager/cli/main.py:67
+#: VirtualMailManager/cli/main.py:70 VirtualMailManager/cli/subcommands.py:756
+#: VirtualMailManager/cli/subcommands.py:776
 #, python-format
 msgid "Error: %s"
 msgstr "Virhe: %s"
@@ -915,20 +978,20 @@
 msgid "Ouch!"
 msgstr "Auh!"
 
-#: VirtualMailManager/cli/main.py:71
+#: VirtualMailManager/cli/main.py:66 VirtualMailManager/cli/main.py:79
+msgid "Warnings:"
+msgstr "Varoitukset:"
+
+#: VirtualMailManager/cli/main.py:73
 #, python-format
 msgid "Error: Unknown section: '%s'"
 msgstr "Virhe: Tuntematon lohko: ’%s’"
 
-#: VirtualMailManager/cli/main.py:74
+#: VirtualMailManager/cli/main.py:76
 #, python-format
 msgid "Error: No option '%(option)s' in section: '%(section)s'"
 msgstr "Virhe: Ei valitsinta ’%(option)s’ lohkossa: ’%(section)s’"
 
-#: VirtualMailManager/cli/main.py:77
-msgid "Warnings:"
-msgstr "Varoitukset:"
-
 #: VirtualMailManager/cli/subcommands.py:101
 #, python-format
 msgid "Subcommand '%s' is not yet documented."
@@ -945,7 +1008,7 @@
 
 #: VirtualMailManager/cli/subcommands.py:125
 #: VirtualMailManager/cli/subcommands.py:212
-#: VirtualMailManager/cli/subcommands.py:557
+#: VirtualMailManager/cli/subcommands.py:559
 msgid "Missing destination address."
 msgstr "Puuttuva kohdeosoite."
 
@@ -1005,10 +1068,10 @@
 #: VirtualMailManager/cli/subcommands.py:385
 #: VirtualMailManager/cli/subcommands.py:406
 #: VirtualMailManager/cli/subcommands.py:435
-#: VirtualMailManager/cli/subcommands.py:613
-#: VirtualMailManager/cli/subcommands.py:626 VirtualMailManager/handler.py:458
-#: VirtualMailManager/handler.py:471 VirtualMailManager/handler.py:486
-#: VirtualMailManager/handler.py:520 VirtualMailManager/handler.py:759
+#: VirtualMailManager/cli/subcommands.py:615
+#: VirtualMailManager/cli/subcommands.py:628 VirtualMailManager/handler.py:459
+#: VirtualMailManager/handler.py:472 VirtualMailManager/handler.py:487
+#: VirtualMailManager/handler.py:521 VirtualMailManager/handler.py:784
 #, python-format
 msgid "Invalid argument: '%s'"
 msgstr "Virheellinen argumentti: ’%s’"
@@ -1025,19 +1088,19 @@
 
 #: VirtualMailManager/cli/subcommands.py:337
 #: VirtualMailManager/cli/subcommands.py:345
-#: VirtualMailManager/cli/subcommands.py:999
+#: VirtualMailManager/cli/subcommands.py:1007
 msgid "alias domains"
 msgstr "aliasverkkotunnukset"
 
 #: VirtualMailManager/cli/subcommands.py:339
 #: VirtualMailManager/cli/subcommands.py:347
-#: VirtualMailManager/cli/subcommands.py:1068
+#: VirtualMailManager/cli/subcommands.py:1077
 msgid "aliases"
 msgstr "aliakset"
 
 #: VirtualMailManager/cli/subcommands.py:341
 #: VirtualMailManager/cli/subcommands.py:348
-#: VirtualMailManager/cli/subcommands.py:1069
+#: VirtualMailManager/cli/subcommands.py:1078
 msgid "relocated users"
 msgstr "sijoitetut käyttäjät"
 
@@ -1051,12 +1114,12 @@
 msgstr "Puuttuva verkkotunnusnimi ja tallennusarvo."
 
 #: VirtualMailManager/cli/subcommands.py:358
-#: VirtualMailManager/cli/subcommands.py:702
+#: VirtualMailManager/cli/subcommands.py:706
 msgid "Missing storage value."
 msgstr "Puuttuva tallennusarvo."
 
 #: VirtualMailManager/cli/subcommands.py:364
-#: VirtualMailManager/cli/subcommands.py:707
+#: VirtualMailManager/cli/subcommands.py:711
 #, python-format
 msgid "Invalid storage value: '%s'"
 msgstr "Virheellinen argumentti: ’%s’"
@@ -1067,13 +1130,13 @@
 msgstr "Ei ole kelvollinen viestien lukumäärä eikä avainsana ’force’: ’%s’"
 
 #: VirtualMailManager/cli/subcommands.py:382
-#: VirtualMailManager/cli/subcommands.py:718
+#: VirtualMailManager/cli/subcommands.py:722
 #, python-format
 msgid "Not a valid number of messages: '%s'"
 msgstr "Viestien lukumäärä ei ole kelvollinen: ’%s’"
 
 #: VirtualMailManager/cli/subcommands.py:417
-#: VirtualMailManager/cli/subcommands.py:732
+#: VirtualMailManager/cli/subcommands.py:736
 #, python-format
 msgid "Invalid service arguments: %s"
 msgstr "Virheelliset palveluargumentit: %s"
@@ -1091,8 +1154,8 @@
 msgstr "Puuttuva käyttäjätunniste."
 
 #: VirtualMailManager/cli/subcommands.py:456
-#: VirtualMailManager/cli/subcommands.py:649
-#: VirtualMailManager/cli/subcommands.py:657
+#: VirtualMailManager/cli/subcommands.py:653
+#: VirtualMailManager/cli/subcommands.py:661
 msgid "Account"
 msgstr "Tilit"
 
@@ -1113,50 +1176,50 @@
 msgid "Usable password schemes:"
 msgstr "Käyttökelpoiset salasanakaavat:"
 
-#: VirtualMailManager/cli/subcommands.py:555
+#: VirtualMailManager/cli/subcommands.py:557
 msgid "Missing relocated address and destination."
 msgstr "Puuttuva sijoitusosoite ja -kohde."
 
-#: VirtualMailManager/cli/subcommands.py:564
-#: VirtualMailManager/cli/subcommands.py:571
+#: VirtualMailManager/cli/subcommands.py:566
+#: VirtualMailManager/cli/subcommands.py:573
 msgid "Missing relocated address."
 msgstr "Puuttuva sijoitusosoite."
 
-#: VirtualMailManager/cli/subcommands.py:594
-#: VirtualMailManager/cli/subcommands.py:607
-#: VirtualMailManager/cli/subcommands.py:620
-#: VirtualMailManager/cli/subcommands.py:676
-#: VirtualMailManager/cli/subcommands.py:687
-#: VirtualMailManager/cli/subcommands.py:726
+#: VirtualMailManager/cli/subcommands.py:596
+#: VirtualMailManager/cli/subcommands.py:609
+#: VirtualMailManager/cli/subcommands.py:622
+#: VirtualMailManager/cli/subcommands.py:680
+#: VirtualMailManager/cli/subcommands.py:691
+#: VirtualMailManager/cli/subcommands.py:730
 msgid "Missing e-mail address."
 msgstr "Puuttuva sähköpostiosoite."
 
-#: VirtualMailManager/cli/subcommands.py:601
+#: VirtualMailManager/cli/subcommands.py:603
 #, python-format
 msgid "Generated password: %s"
 msgstr "Tuotettu salasana: %s"
 
-#: VirtualMailManager/cli/subcommands.py:658
+#: VirtualMailManager/cli/subcommands.py:662
 msgid "alias addresses"
 msgstr "aliasosoitteet"
 
-#: VirtualMailManager/cli/subcommands.py:664
+#: VirtualMailManager/cli/subcommands.py:668
 msgid "Missing e-mail address and user's name."
 msgstr "Puuttuva sähköpostiosoite ja käyttäjän nimi."
 
-#: VirtualMailManager/cli/subcommands.py:699
+#: VirtualMailManager/cli/subcommands.py:703
 msgid "Missing e-mail address and storage value."
 msgstr "Puuttuva sähköpostiosoite ja käyttäjän nimi."
 
-#: VirtualMailManager/cli/subcommands.py:740
+#: VirtualMailManager/cli/subcommands.py:744
 msgid "Missing e-mail address and transport."
 msgstr "Puuttuva sähköpostiosoite ja siirto."
 
-#: VirtualMailManager/cli/subcommands.py:743
+#: VirtualMailManager/cli/subcommands.py:747
 msgid "Missing transport."
 msgstr "Puuttuva siirto."
 
-#: VirtualMailManager/cli/subcommands.py:753
+#: VirtualMailManager/cli/subcommands.py:757
 msgid "usage: "
 msgstr "käyttö: "
 
@@ -1168,7 +1231,7 @@
 #.
 #. da    domainadd           fqdn [transport]
 #. dd    domaindelete        fqdn [force]
-#: VirtualMailManager/cli/subcommands.py:763
+#: VirtualMailManager/cli/subcommands.py:767
 #, python-format
 msgid ""
 "usage: %s subcommand arguments\n"
@@ -1179,7 +1242,7 @@
 "  lyhyt pitkä\n"
 "  alikomento                argumentit\n"
 
-#: VirtualMailManager/cli/subcommands.py:782
+#: VirtualMailManager/cli/subcommands.py:786
 msgid "from"
 msgstr "kohteesta"
 
@@ -1187,299 +1250,299 @@
 #. the version information, e.g.:
 #. vmm, version 0.5.2 (from 09/09/09)
 #. Python 2.5.4 on FreeBSD
-#: VirtualMailManager/cli/subcommands.py:782
+#: VirtualMailManager/cli/subcommands.py:786
 msgid "version"
 msgstr "versio"
 
-#: VirtualMailManager/cli/subcommands.py:785
+#: VirtualMailManager/cli/subcommands.py:789
 msgid "on"
 msgstr "kohteessa"
 
-#: VirtualMailManager/cli/subcommands.py:787
+#: VirtualMailManager/cli/subcommands.py:791
 msgid "is free software and comes with ABSOLUTELY NO WARRANTY."
 msgstr "on vapaa ohjelmisto ja tulee EHDOTTOMASTI ILMAN TAKUUTA."
 
-#: VirtualMailManager/cli/subcommands.py:796
+#: VirtualMailManager/cli/subcommands.py:800
 msgid "get the address of the user with the given UID"
 msgstr "hae käyttäjän osoite annetulla käyttäjätunnuksella"
 
-#: VirtualMailManager/cli/subcommands.py:798
+#: VirtualMailManager/cli/subcommands.py:802
 msgid "create a new e-mail user with the given address"
 msgstr "luo uusi sähköpostikäyttäj annetulla osoitteella"
 
-#: VirtualMailManager/cli/subcommands.py:800
+#: VirtualMailManager/cli/subcommands.py:804
 msgid "delete the specified user"
 msgstr "poista määritelty käyttäjä"
 
-#: VirtualMailManager/cli/subcommands.py:802
+#: VirtualMailManager/cli/subcommands.py:806
 msgid "display information about the given address"
 msgstr "näytä tietoja annetusta osoitteesta"
 
-#: VirtualMailManager/cli/subcommands.py:804
+#: VirtualMailManager/cli/subcommands.py:808
 msgid "set, update or delete the real name for an address"
 msgstr "aseta, päivitä tai poista osoitteen todellinen nimi"
 
-#: VirtualMailManager/cli/subcommands.py:807
+#: VirtualMailManager/cli/subcommands.py:811
 msgid "update the password for the given address"
 msgstr "päivitä annetun osoitteen salasana"
 
-#: VirtualMailManager/cli/subcommands.py:810
+#: VirtualMailManager/cli/subcommands.py:814
 msgid "update the quota limit for the given address"
 msgstr "päivitä annetun osoitteen kiintiöraja"
 
-#: VirtualMailManager/cli/subcommands.py:813
+#: VirtualMailManager/cli/subcommands.py:817
 msgid "enables the specified services and disables all not specified services"
 msgstr "ottaa käyttöön määritellyt palvelut ja ottaa pois käytöstä määrittelemättömät palvelut"
 
-#: VirtualMailManager/cli/subcommands.py:817
+#: VirtualMailManager/cli/subcommands.py:821
 msgid "update the transport of the given address"
 msgstr "päivitä annetun osoitteen siirto"
 
-#: VirtualMailManager/cli/subcommands.py:819
+#: VirtualMailManager/cli/subcommands.py:823
 msgid "set, update or delete the note of the given address"
 msgstr "aseta, päivitä tai poista annetun osoitteen muistiinpano"
 
-#: VirtualMailManager/cli/subcommands.py:822
+#: VirtualMailManager/cli/subcommands.py:826
 msgid "create a new alias e-mail address with one or more destinations"
 msgstr "luo uusi aliassähköpostiosoite yhdellä tai useammalla kohteella"
 
-#: VirtualMailManager/cli/subcommands.py:826
+#: VirtualMailManager/cli/subcommands.py:830
 msgid "delete the specified alias e-mail address or one of its destinations"
 msgstr "poista määritellyn aliaksen sähköpostiosoite tai yksi sen kohteista"
 
-#: VirtualMailManager/cli/subcommands.py:829
+#: VirtualMailManager/cli/subcommands.py:833
 msgid "show the destination(s) of the specified alias"
 msgstr "näytä määritellyn aliaksen kohteet"
 
-#: VirtualMailManager/cli/subcommands.py:833
+#: VirtualMailManager/cli/subcommands.py:837
 msgid "create a new alias for an existing domain"
 msgstr "luotu uusi alias olemassaolevaan verkkotunnukseen"
 
-#: VirtualMailManager/cli/subcommands.py:835
+#: VirtualMailManager/cli/subcommands.py:839
 msgid "delete the specified alias domain"
 msgstr "poista määritelty aliasverkkotunnus"
 
-#: VirtualMailManager/cli/subcommands.py:837
+#: VirtualMailManager/cli/subcommands.py:841
 msgid "show the destination of the given alias domain"
 msgstr "näytä annetun aliasverkkotunnuksen kohde"
 
-#: VirtualMailManager/cli/subcommands.py:839
+#: VirtualMailManager/cli/subcommands.py:843
 msgid "assign the given alias domain to an other domain"
 msgstr "liitä annettu aliasverkkotunnus toiseen verkkotunnukseen"
 
-#: VirtualMailManager/cli/subcommands.py:844
+#: VirtualMailManager/cli/subcommands.py:848
 msgid "add one or more catch-all destinations for a domain"
 msgstr "lisää yksi tai useampi sieppaa-kaikki-kohde verkkotunnukselle"
 
-#: VirtualMailManager/cli/subcommands.py:848
+#: VirtualMailManager/cli/subcommands.py:852
 msgid "delete the specified catch-all destination or all of a domain's destinations"
 msgstr "poista määritelty sieppaa-kaikki-kohde tai kaikki verkkotunnuksen kohteet"
 
-#: VirtualMailManager/cli/subcommands.py:851
+#: VirtualMailManager/cli/subcommands.py:855
 msgid "show the catch-all destination(s) of the specified domain"
 msgstr "näytä määritellyn aliaksen sieppaa-kaikki-kohteet"
 
-#: VirtualMailManager/cli/subcommands.py:854
+#: VirtualMailManager/cli/subcommands.py:859
 msgid "create a new domain"
 msgstr "luo uusi verkkotunnus"
 
-#: VirtualMailManager/cli/subcommands.py:856
+#: VirtualMailManager/cli/subcommands.py:861
 msgid "delete the given domain and all its alias domains"
 msgstr "poista annettu verkkotunnus ja kaikki sen aliasverkkotunnukset"
 
-#: VirtualMailManager/cli/subcommands.py:858
+#: VirtualMailManager/cli/subcommands.py:863
 msgid "display information about the given domain"
 msgstr "näytä tiedot annetusta verkkotunnuksesta"
 
-#: VirtualMailManager/cli/subcommands.py:861
+#: VirtualMailManager/cli/subcommands.py:866
 msgid "update the quota limit of the specified domain"
 msgstr "päivitä määritellyn verkkotunnuksen kiintiöraja"
 
-#: VirtualMailManager/cli/subcommands.py:864
+#: VirtualMailManager/cli/subcommands.py:869
 msgid "enables the specified services and disables all not specified services of the given domain"
 msgstr "ottaa käyttöön määritellyt palvelut ja ottaa pois käytöstä kaikki määrittelemättömät annetun verkkotunnuksen palvelut"
 
-#: VirtualMailManager/cli/subcommands.py:868
+#: VirtualMailManager/cli/subcommands.py:873
 msgid "update the transport of the specified domain"
 msgstr "päivitä määritellyn verkkotunnuksen siirto"
 
-#: VirtualMailManager/cli/subcommands.py:870
+#: VirtualMailManager/cli/subcommands.py:875
 msgid "set, update or delete the note of the given domain"
 msgstr "aseta, päivitä tai poista määritellyn verkkotunnuksen muistiinpano"
 
-#: VirtualMailManager/cli/subcommands.py:873
+#: VirtualMailManager/cli/subcommands.py:878
 msgid "list all domains or search for domains by pattern"
 msgstr "luettele kaikki mallin mukaiset verkkotunnukset / verkkotunnushaut"
 
-#: VirtualMailManager/cli/subcommands.py:875
+#: VirtualMailManager/cli/subcommands.py:880
 msgid "list all addresses or search for addresses by pattern"
 msgstr "luettele kaikki mallin mukaiset osoitteet / osoitehaut"
 
-#: VirtualMailManager/cli/subcommands.py:877
+#: VirtualMailManager/cli/subcommands.py:883
 msgid "list all user accounts or search for accounts by pattern"
 msgstr "luettele kaikki mallin mukaiset käyttäjätilit / tilihaut"
 
-#: VirtualMailManager/cli/subcommands.py:879
+#: VirtualMailManager/cli/subcommands.py:886
 msgid "list all aliases or search for aliases by pattern"
 msgstr "luettele kaikki mallin mukaiset aliakset / aliashaut"
 
-#: VirtualMailManager/cli/subcommands.py:881
+#: VirtualMailManager/cli/subcommands.py:888
 msgid "list all relocated users or search for relocated users by pattern"
 msgstr "luettele kaikki mallin mukaiset sijoitetut käyttäjät / sijoitettujen käyttäjien haut"
 
-#: VirtualMailManager/cli/subcommands.py:886
+#: VirtualMailManager/cli/subcommands.py:893
 msgid "create a new record for a relocated user"
 msgstr "luo uusi tietue sijoitettavalle käyttäjälle"
 
-#: VirtualMailManager/cli/subcommands.py:889
+#: VirtualMailManager/cli/subcommands.py:896
 msgid "delete the record of the relocated user"
 msgstr "poista sijoitetun käyttäjän tietue"
 
-#: VirtualMailManager/cli/subcommands.py:891
+#: VirtualMailManager/cli/subcommands.py:898
 msgid "print information about a relocated user"
 msgstr "tulosta tiedot sijoitetusta käyttäjästä"
 
-#: VirtualMailManager/cli/subcommands.py:894
+#: VirtualMailManager/cli/subcommands.py:901
 msgid "show the actual value of the configuration option"
 msgstr "näytä asetusvalitsimen todellinen arvo"
 
-#: VirtualMailManager/cli/subcommands.py:896
+#: VirtualMailManager/cli/subcommands.py:903
 msgid "set a new value for the configuration option"
 msgstr "aseta asetusvalitsimelle uusi arvo"
 
-#: VirtualMailManager/cli/subcommands.py:898
+#: VirtualMailManager/cli/subcommands.py:905
 msgid "start interactive configuration mode"
 msgstr "aloita vuorovaikutteinen asetustila"
 
-#: VirtualMailManager/cli/subcommands.py:900
+#: VirtualMailManager/cli/subcommands.py:907
 msgid "lists all usable password schemes and password encoding suffixes"
 msgstr "luettelee kaikki käytettävät salasanakaavat ja salasanakoodausloppuliitteet"
 
-#: VirtualMailManager/cli/subcommands.py:903
+#: VirtualMailManager/cli/subcommands.py:910
 msgid "show a help overview or help for the given subcommand"
 msgstr "näytä opasteyhteenveto tai opaste annetusta alikomennosta"
 
-#: VirtualMailManager/cli/subcommands.py:905
+#: VirtualMailManager/cli/subcommands.py:912
 msgid "show version and copyright information"
 msgstr "näytä versio ja copyright-tiedot"
 
 #. TP: e.g.: [  0.00%] 21.09 KiB/1.00 GiB
-#: VirtualMailManager/cli/subcommands.py:961
+#: VirtualMailManager/cli/subcommands.py:968
 #, python-format
 msgid "[%(percent)s%%] %(used)s/%(limit)s"
 msgstr "[%(percent)s%%] %(used)s/%(limit)s"
 
 #. TP: used in e.g. 'Domain information' or 'Account information'
-#: VirtualMailManager/cli/subcommands.py:967
+#: VirtualMailManager/cli/subcommands.py:974
 msgid "information"
 msgstr "tiedot"
 
-#: VirtualMailManager/cli/subcommands.py:981
+#: VirtualMailManager/cli/subcommands.py:988
 msgid "Note"
 msgstr "Muistiinpano"
 
 #. TP: used in e.g. 'Existing alias addresses' or 'Existing accounts'
-#: VirtualMailManager/cli/subcommands.py:996
+#: VirtualMailManager/cli/subcommands.py:1004
 msgid "Existing"
 msgstr "Olemassa oleva"
 
-#: VirtualMailManager/cli/subcommands.py:1009
-#: VirtualMailManager/cli/subcommands.py:1061
-#: VirtualMailManager/cli/subcommands.py:1109
+#: VirtualMailManager/cli/subcommands.py:1017
+#: VirtualMailManager/cli/subcommands.py:1069
+#: VirtualMailManager/cli/subcommands.py:1113
 msgid "\tNone"
 msgstr "\tEi mitään"
 
-#: VirtualMailManager/cli/subcommands.py:1014
+#: VirtualMailManager/cli/subcommands.py:1022
 msgid "Alias information"
 msgstr "Aliastiedot"
 
-#: VirtualMailManager/cli/subcommands.py:1016
+#: VirtualMailManager/cli/subcommands.py:1024
 #, python-format
 msgid "\tMail for %s will be redirected to:"
 msgstr "\tSähköposti %s ohjataan edelleen osoitteeseen:"
 
-#: VirtualMailManager/cli/subcommands.py:1023
+#: VirtualMailManager/cli/subcommands.py:1031
 msgid "Catch-all information"
 msgstr "Sieppaa-kaikki-tiedot"
 
-#: VirtualMailManager/cli/subcommands.py:1025
+#: VirtualMailManager/cli/subcommands.py:1033
 #, python-format
 msgid "\tMail to unknown local-parts in domain %s will be sent to:"
 msgstr "\tSähköposti tuntemattomaan paikallisosaan verkkotunnuksessa %s lähetetään osoitteeseen:"
 
-#: VirtualMailManager/cli/subcommands.py:1033
+#: VirtualMailManager/cli/subcommands.py:1041
 msgid "Relocated information"
 msgstr "Sijaintitiedot"
 
 #  Alla "addr" ja "dest" ovat muuttujia, jotka korvautuvat suorituksen yhteydessä koodilla.
-#: VirtualMailManager/cli/subcommands.py:1035
+#: VirtualMailManager/cli/subcommands.py:1043
 #, python-format
 msgid "\tUser '%(addr)s' has moved to '%(dest)s'"
 msgstr "\tKäyttäjä ’%(addr)s’ on siirretty kohteeseen ’%(dest)s’"
 
-#: VirtualMailManager/cli/subcommands.py:1050
+#: VirtualMailManager/cli/subcommands.py:1058
 msgid "Matching domains"
 msgstr "Täsmäävät verkkotunnukset"
 
-#: VirtualMailManager/cli/subcommands.py:1052
+#: VirtualMailManager/cli/subcommands.py:1060
 msgid "Existing domains"
 msgstr "Olemassaolevat verkkotunnukset"
 
-#: VirtualMailManager/cli/subcommands.py:1067
+#: VirtualMailManager/cli/subcommands.py:1076
 msgid "user accounts"
 msgstr "käyttäjätilit"
 
-#: VirtualMailManager/cli/subcommands.py:1071
+#: VirtualMailManager/cli/subcommands.py:1079
 msgid "user accounts and aliases"
 msgstr "käyttäjätilit ja aliakset"
 
-#: VirtualMailManager/cli/subcommands.py:1073
+#: VirtualMailManager/cli/subcommands.py:1080
 msgid "user accounts and relocated users"
 msgstr "käyttäjätilit ja sijoitetut käyttäjät"
 
-#: VirtualMailManager/cli/subcommands.py:1075
+#: VirtualMailManager/cli/subcommands.py:1081
 msgid "aliases and relocated users"
 msgstr "aliakset ja sijoitetut käyttäjät"
 
-#: VirtualMailManager/cli/subcommands.py:1076
+#: VirtualMailManager/cli/subcommands.py:1082
 msgid "addresses"
 msgstr "osoitteet"
 
-#: VirtualMailManager/cli/subcommands.py:1080
+#: VirtualMailManager/cli/subcommands.py:1086
 #, python-format
 msgid "Matching %s"
 msgstr "Täsmäävät %s"
 
-#: VirtualMailManager/cli/subcommands.py:1082
+#: VirtualMailManager/cli/subcommands.py:1088
 #, python-format
 msgid "Existing %s"
 msgstr "Olemassa oleva %s"
 
-#: VirtualMailManager/cli/subcommands.py:1085
+#: VirtualMailManager/cli/subcommands.py:1091
 #, python-format
 msgid "Invalid address type for list: '%s'"
 msgstr "Virheellinen osoitetyyppi luettelolle: ’%s’"
 
 #. TP: the letters 'u', 'a' and 'r' are abbreviations of user,
 #. alias and relocated user
-#: VirtualMailManager/cli/subcommands.py:1097
+#: VirtualMailManager/cli/subcommands.py:1101
 msgid "u"
 msgstr "u"
 
-#: VirtualMailManager/cli/subcommands.py:1098
+#: VirtualMailManager/cli/subcommands.py:1102
 msgid "a"
 msgstr "a"
 
-#: VirtualMailManager/cli/subcommands.py:1099
+#: VirtualMailManager/cli/subcommands.py:1103
 msgid "r"
 msgstr "r"
 
-#: VirtualMailManager/cli/subcommands.py:1115
+#: VirtualMailManager/cli/subcommands.py:1119
 msgid "Alias domain information"
 msgstr "Aliasverkkotunnustiedot"
 
 #  Alla "alias" ja "domain" ovat muuttujia, jotka korvautuvat suorituksen yhteydessä koodilla.
-#: VirtualMailManager/cli/subcommands.py:1120
+#: VirtualMailManager/cli/subcommands.py:1124
 #, python-format
 msgid ""
 "\tThe alias domain %(alias)s belongs to:\n"
@@ -1521,10 +1584,15 @@
 msgid "%(size)s %(prefix)s"
 msgstr "%(size)s %(prefix)s"
 
+#: VirtualMailManager/common.py:139
+#, python-format
+msgid "Invalid transport '%(transport)s' for mailbox format '%(mbfmt)s'."
+msgstr "Virheellinen siirto ’%(transport)s’ sähköpostilaatikkomuodolle ’%(mbfmt)s’."
+
 #. TP: [domain default] indicates that a user's setting is the same as
 #. configured in the user's domain.
 #. e.g.: [  0.84%] 42/5,000 [domain default]
-#: VirtualMailManager/common.py:195
+#: VirtualMailManager/common.py:217
 #, python-format
 msgid "%s [domain default]"
 msgstr "%s [verkkotunnusoletus]"
@@ -1579,9 +1647,9 @@
 msgstr "Tukematon sähköpostilaatikkomuoto: ’%s’"
 
 #  Tässä argumentti saattaa olla hakemistonimi tai sitten virheilmoitus.
-#: VirtualMailManager/config.py:473 VirtualMailManager/handler.py:286
-#: VirtualMailManager/handler.py:362 VirtualMailManager/handler.py:367
-#: VirtualMailManager/handler.py:395
+#: VirtualMailManager/config.py:473 VirtualMailManager/handler.py:287
+#: VirtualMailManager/handler.py:363 VirtualMailManager/handler.py:368
+#: VirtualMailManager/handler.py:396
 #, python-format
 msgid "No such directory: %s"
 msgstr "Ei löydy hakemistoa: %s"
@@ -1591,26 +1659,26 @@
 msgid "Not a valid size value: '%s'"
 msgstr "Ei ole kelvollinen kokoarvo: ’%s’"
 
-#: VirtualMailManager/domain.py:80
+#: VirtualMailManager/domain.py:84
 #, python-format
 msgid "The domain '%s' is an alias domain."
 msgstr "Verkkotunnus ’%s’ on aliasverkkotunnus."
 
-#: VirtualMailManager/domain.py:115
+#: VirtualMailManager/domain.py:119
 #, python-format
 msgid "There are %(account_count)u accounts, %(alias_count)u aliases and %(relocated_count)u relocated users."
 msgstr "On %(account_count)u -tiliä, %(alias_count)u -aliasta ja %(relocated_count)u sijoitettua käyttäjää."
 
-#: VirtualMailManager/domain.py:130
+#: VirtualMailManager/domain.py:134
 #, python-format
 msgid "The domain '%s' already exists."
 msgstr "Verkkotunnus ’%s’ on jo olemassa."
 
-#: VirtualMailManager/domain.py:495
+#: VirtualMailManager/domain.py:507
 msgid "The domain name is too long"
 msgstr "Verkkotunnusnimi on liian pitkä"
 
-#: VirtualMailManager/domain.py:497
+#: VirtualMailManager/domain.py:509
 #, python-format
 msgid "The domain name '%s' is invalid"
 msgstr "Verkkotunnusnimi ’%s’ on virheellinen"
@@ -1663,7 +1731,7 @@
 msgid "a relocated user"
 msgstr "sijoitettu käyttäjä"
 
-#: VirtualMailManager/handler.py:81
+#: VirtualMailManager/handler.py:82
 msgid ""
 "You are not root.\n"
 "\tGood bye!\n"
@@ -1671,14 +1739,14 @@
 "Et ole root-käyttäjä.\n"
 "\tNäkemiin!\n"
 
-#: VirtualMailManager/handler.py:101
+#: VirtualMailManager/handler.py:102
 #, python-format
 msgid "Could not find '%(cfg_file)s' in: '%(cfg_path)s'"
-msgstr "Ei voiru löytää ’%(cfg_file)s’ kohteessa: ’%(cfg_path)s’"
+msgstr "Ei voitu löytää ’%(cfg_file)s’ kohteessa: ’%(cfg_path)s’"
 
 #  Alla "perms" ja "file" ovat muuttujia, jotka korvautuvat suorituksen yhteydessä koodilla. Lainausmerkit jätettiin paikallistamatta, koska ne saattavat olla skriptin toiminnan kannalta kriittisiä.
 #. TP: Please keep the backticks around the command. `chmod 0600 …`
-#: VirtualMailManager/handler.py:113
+#: VirtualMailManager/handler.py:114
 #, python-format
 msgid ""
 "wrong permissions for '%(file)s': %(perms)s\n"
@@ -1687,7 +1755,7 @@
 "korjaa käyttöoikeudet tiedostolle ’%(file)s’: %(perms)s\n"
 "’chmod 0600 %(file)s’ olisi erinomainen."
 
-#: VirtualMailManager/handler.py:133
+#: VirtualMailManager/handler.py:134
 #, python-format
 msgid ""
 "'%(path)s' is not a directory.\n"
@@ -1696,7 +1764,7 @@
 "’%(path)s’ ei ole hakemisto.\n"
 "(%(cfg_file)s: lohko ’misc’, valitsin ’base_directory’)"
 
-#: VirtualMailManager/handler.py:142
+#: VirtualMailManager/handler.py:143
 #, python-format
 msgid ""
 "\n"
@@ -1705,79 +1773,80 @@
 "\n"
 "(%(cfg_file)s: lohko ’bin’, valitsin ’%(option)s’)"
 
-#: VirtualMailManager/handler.py:156 VirtualMailManager/handler.py:163
+#: VirtualMailManager/handler.py:157 VirtualMailManager/handler.py:164
 #, python-format
 msgid "Unable to import database module '%s'."
 msgstr "Tietokantamoduulin ’%s’ tuominen epäonnistui."
 
 #. TP: %(a_type)s will be one of: 'an account', 'an alias' or
 #. 'a relocated user'
-#: VirtualMailManager/handler.py:242
+#: VirtualMailManager/handler.py:243
 #, python-format
 msgid "There is already %(a_type)s with the address '%(address)s'."
 msgstr "On jo %(a_type)s osoitteessa ’%(address)s’."
 
-#: VirtualMailManager/handler.py:301
+#: VirtualMailManager/handler.py:302
 #, python-format
 msgid "'%s' is not a directory."
 msgstr "’%s’ ei ole hakemisto."
 
-#: VirtualMailManager/handler.py:304
+#: VirtualMailManager/handler.py:305
 #, python-format
 msgid "The file/directory '%s' already exists."
 msgstr "Tiedosto/hakemisto ’%s’ on jo olemassa."
 
-#: VirtualMailManager/handler.py:334
+#: VirtualMailManager/handler.py:335
 msgid "Skipped mailbox folders:"
 msgstr "Ohitettiin sähköpostilaatikkokansiot:"
 
-#: VirtualMailManager/handler.py:354
+#: VirtualMailManager/handler.py:355
 #, python-format
 msgid "UID '%(uid)u' and/or GID '%(gid)u' are less than %(min_uid)u/%(min_gid)u."
 msgstr "Käyttäjätunniste ’%(uid)u’ ja/tai käyttäjätunniste ’%(gid)u’ ovat pienempiä kuin %(min_uid)u/%(min_gid)u."
 
-#: VirtualMailManager/handler.py:359 VirtualMailManager/handler.py:392
+#: VirtualMailManager/handler.py:360 VirtualMailManager/handler.py:393
 #, python-format
 msgid "Found \"..\" in domain directory path: %s"
 msgstr "Löytyi ”..” verkkotunnuksen hakemistopolussa: %s"
 
-#: VirtualMailManager/handler.py:372
+#: VirtualMailManager/handler.py:373
 msgid "Detected owner/group mismatch in home directory."
 msgstr "Havaittu omistaja-/ryhmätäsmäämättömyys kotihakemistossa."
 
-#: VirtualMailManager/handler.py:388
+#: VirtualMailManager/handler.py:389
 #, python-format
 msgid "GID '%(gid)u' is less than '%(min_gid)u'."
 msgstr "Käyttäjätunniste ’%(gid)u’ on pienempi kuin ’%(min_gid)u’."
 
-#: VirtualMailManager/handler.py:399
+#: VirtualMailManager/handler.py:400
 #, python-format
 msgid "Detected group mismatch in domain directory: %s"
 msgstr "Havaittu ryhmätäsmäämättömyys verkkotunnushakemistossa: %s"
 
-#: VirtualMailManager/handler.py:475 VirtualMailManager/handler.py:853
+#: VirtualMailManager/handler.py:476 VirtualMailManager/handler.py:878
 #, python-format
 msgid "Unknown service: '%s'"
 msgstr "Tuntematon palvelu: ’%s’"
 
-#: VirtualMailManager/handler.py:599 VirtualMailManager/handler.py:623
-#: VirtualMailManager/handler.py:636
+#: VirtualMailManager/handler.py:601 VirtualMailManager/handler.py:625
+#: VirtualMailManager/handler.py:639
 #, python-format
 msgid "The pattern '%s' contains invalid characters."
 msgstr "Säännöllinen lauseke ’%s’ sisältää virheellisiä merkkejä."
 
-#: VirtualMailManager/handler.py:666 VirtualMailManager/handler.py:732
+#: VirtualMailManager/handler.py:669 VirtualMailManager/handler.py:732
+#: VirtualMailManager/handler.py:746 VirtualMailManager/handler.py:776
 msgid "Ignored destination addresses:"
 msgstr "Ohitetut kohdeosoitteet:"
 
-#: VirtualMailManager/handler.py:671 VirtualMailManager/handler.py:737
-#: VirtualMailManager/handler.py:870
+#: VirtualMailManager/handler.py:674 VirtualMailManager/handler.py:751
+#: VirtualMailManager/handler.py:895
 #, python-format
 msgid "The destination account/alias '%s' does not exist."
 msgstr "Kohdetili/-alias ’%s’ ei ole olemassa."
 
 #  Alla "directory" ja "reason" ovat muuttujia, jotka korvautuvat suorituksen yhteydessä koodilla.
-#: VirtualMailManager/handler.py:693
+#: VirtualMailManager/handler.py:696
 #, python-format
 msgid ""
 "The account has been successfully deleted from the database.\n"
@@ -1790,12 +1859,12 @@
 "    ’%(directory)s’\n"
 "    Syy: %(reason)s"
 
-#: VirtualMailManager/handler.py:829
+#: VirtualMailManager/handler.py:854
 #, python-format
 msgid "Could not accept transport: '%s'"
-msgstr "Ei voitu hyväksyä siirtoa: ’%s’"
+msgstr "Siirron hyväksyminen epäonnistui: ’%s’"
 
-#: VirtualMailManager/handler.py:880 VirtualMailManager/relocated.py:106
+#: VirtualMailManager/handler.py:905 VirtualMailManager/relocated.py:106
 #: VirtualMailManager/relocated.py:113
 #, python-format
 msgid "The relocated user '%s' does not exist."
@@ -1815,21 +1884,21 @@
 msgid "Directory name is too long: '%s'"
 msgstr "Verkkotunnusnimi on liian pitkä: ’%s’"
 
-#: VirtualMailManager/password.py:388
+#: VirtualMailManager/password.py:389
 #, python-format
 msgid "Unsupported password scheme: '%s'"
 msgstr "Tukematon salasanakaava: ’%s’"
 
-#: VirtualMailManager/password.py:391
+#: VirtualMailManager/password.py:392
 #, python-format
 msgid "The password scheme '%(scheme)s' requires Dovecot >= v%(version)s."
 msgstr "Salasanakaava ’%(scheme)s’ vaatii Dovecot >= v%(version)s."
 
-#: VirtualMailManager/password.py:397
+#: VirtualMailManager/password.py:398
 msgid "Encoding suffixes for password schemes require Dovecot >= v1.1.alpha1."
 msgstr "Koodausloppuliitteet salasanakaavoille vaativat Dovecot >= v1.1.alpha1."
 
-#: VirtualMailManager/password.py:400
+#: VirtualMailManager/password.py:401
 #, python-format
 msgid "Unsupported password encoding: '%s'"
 msgstr "Tukematon salasanakoodaus: ’%s’"
@@ -1847,6 +1916,9 @@
 msgid "The relocated user '%s' already exists."
 msgstr "Sijoitettu käyttäjä ’%s’ on jo olemassa."
 
+#~ msgid "The address '%(addr)s' is not a destination of the alias '%(alias)s'."
+#~ msgstr "Osoite ’%(addr)s’ ei ole aliaksen ’%(alias)s’ kohde."
+
 #~ msgid "Missing user's name."
 #~ msgstr "Puuttuva käyttäjän nimi."