--- a/VirtualMailManager/account.py	Thu Aug 05 05:08:02 2010 +0000
+++ b/VirtualMailManager/account.py	Thu Aug 05 23:26:23 2010 +0000
@@ -52,6 +52,9 @@
         self._dbh = dbh
         self._domain = Domain(self._dbh, self._addr.domainname)
         if not self._domain.gid:
+            # 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
             raise AErr(_(u"The domain '%s' doesn't exist.") %
                        self._addr.domainname, NO_SUCH_DOMAIN)
         self._uid = 0
@@ -122,7 +125,7 @@
             services = set(services)
             for service in services:
                 if service not in SERVICES:
-                    raise AErr(_(u"Unknown service: '%s'.") % service,
+                    raise AErr(_(u"Unknown service: '%s'") % service,
                                UNKNOWN_SERVICE)
         else:
             services = SERVICES
@@ -205,7 +208,7 @@
           The password for the new Account.
         """
         if not isinstance(password, basestring) or not password:
-            raise AErr(_(u"Couldn't accept password: '%s'") % password,
+            raise AErr(_(u"Could not accept password: '%s'") % password,
                        ACCOUNT_MISSING_PASSWORD)
         self._passwd = password
 
@@ -337,7 +340,7 @@
             info['uid'] = self._uid
             return info
         # nearly impossible‽
-        raise AErr(_(u"Couldn't fetch information for account: '%s'") %
+        raise AErr(_(u"Could not fetch information for account: '%s'") %
                    self._addr, NO_SUCH_ACCOUNT)
 
     def get_aliases(self):

--- a/VirtualMailManager/cli/config.py	Thu Aug 05 05:08:02 2010 +0000
+++ b/VirtualMailManager/cli/config.py	Thu Aug 05 23:26:23 2010 +0000
@@ -35,7 +35,7 @@
 
         w_std(_(u'Using configuration file: %s\n') % self._cfg_filename)
         for section in sections:
-            w_std(_(u'* Configuration section: %r') % section)
+            w_std(_(u"* Configuration section: '%s'") % section)
             for opt, val in self.items(section):
                 failures = 0
                 while True:

--- a/VirtualMailManager/cli/handler.py	Thu Aug 05 05:08:02 2010 +0000
+++ b/VirtualMailManager/cli/handler.py	Thu Aug 05 23:26:23 2010 +0000
@@ -65,7 +65,7 @@
         elif self._cfg.has_section(section):
             self._cfg.configure([section])
         else:
-            raise VMMError(_(u'Invalid section: “%s”') % section,
+            raise VMMError(_(u"Invalid section: '%s'") % section,
                            INVALID_SECTION)
 
     def user_add(self, emailaddress, password=None):

--- a/VirtualMailManager/cli/subcommands.py	Thu Aug 05 05:08:02 2010 +0000
+++ b/VirtualMailManager/cli/subcommands.py	Thu Aug 05 23:26:23 2010 +0000
@@ -441,10 +441,10 @@
 def user_name(ctx):
     """set or update the real name for an address"""
     if ctx.argc < 3:
-        usage(EX_MISSING_ARGS, _(u'Missing e-mail address and user’s name.'),
+        usage(EX_MISSING_ARGS, _(u"Missing e-mail address and user's name."),
               ctx.scmd)
     if ctx.argc < 4:
-        usage(EX_MISSING_ARGS, _(u'Missing user’s name.'), ctx.scmd)
+        usage(EX_MISSING_ARGS, _(u"Missing user's name."), ctx.scmd)
     ctx.hdlr.user_name(ctx.args[2].lower(), ctx.args[3])
 
 

--- a/VirtualMailManager/emailaddress.py	Thu Aug 05 05:08:02 2010 +0000
+++ b/VirtualMailManager/emailaddress.py	Thu Aug 05 23:26:23 2010 +0000
@@ -68,16 +68,16 @@
         parts = address.split('@')
         p_len = len(parts)
         if p_len < 2:
-            raise EAErr(_(u"Missing the '@' sign in address %r") % address,
+            raise EAErr(_(u"Missing the '@' sign in address '%s'") % address,
                         INVALID_ADDRESS)
         elif p_len > 2:
-            raise EAErr(_(u"Too many '@' signs in address %r") % address,
+            raise EAErr(_(u"Too many '@' signs in address '%s'") % address,
                         INVALID_ADDRESS)
         if not parts[0]:
-            raise EAErr(_(u'Missing local-part in address %r') % address,
+            raise EAErr(_(u"Missing local-part in address '%s'") % address,
                         LOCALPART_INVALID)
         if not parts[1]:
-            raise EAErr(_(u'Missing domain name in address %r') % address,
+            raise EAErr(_(u"Missing domain name in address '%s'") % address,
                         DOMAIN_NO_NAME)
         self._localpart = check_localpart(parts[0])
         self._domainname = check_domainname(parts[1])

--- a/VirtualMailManager/handler.py	Thu Aug 05 05:08:02 2010 +0000
+++ b/VirtualMailManager/handler.py	Thu Aug 05 23:26:23 2010 +0000
@@ -200,6 +200,8 @@
         other = self._chk_other_address_types(address, exclude)
         if not other:
             return False
+        # TP: %(a_type)s will be one of: 'an account', 'an alias' or
+        # 'a relocated user'
         msg = _(u"There is already %(a_type)s with the address '%(address)s'.")
         raise VMMError(msg % {'a_type': OTHER_TYPES[other][0],
                               'address': address}, OTHER_TYPES[other][1])
@@ -424,7 +426,7 @@
         Domain.get_relocated."""
         if details not in [None, 'accounts', 'aliasdomains', 'aliases', 'full',
                            'relocated']:
-            raise VMMError(_(u'Invalid argument: “%s”') % details,
+            raise VMMError(_(u"Invalid argument: '%s'") % details,
                            INVALID_ARGUMENT)
         dom = self._get_domain(domainname)
         dominfo = dom.get_info()

--- a/VirtualMailManager/relocated.py	Thu Aug 05 05:08:02 2010 +0000
+++ b/VirtualMailManager/relocated.py	Thu Aug 05 23:26:23 2010 +0000
@@ -35,7 +35,7 @@
         self._dbh = dbh
         self._gid = get_gid(self._dbh, self._addr.domainname)
         if not self._gid:
-            raise RErr(_(u"The domain %r doesn't exist.") %
+            raise RErr(_(u"The domain '%s' doesn't exist.") %
                        self._addr.domainname, NO_SUCH_DOMAIN)
         self._dest = None
 

--- a/po/vmm.pot	Thu Aug 05 05:08:02 2010 +0000
+++ b/po/vmm.pot	Thu Aug 05 23:26:23 2010 +0000
@@ -8,659 +8,869 @@
 msgstr ""
 "Project-Id-Version: vmm 0.6.0\n"
 "Report-Msgid-Bugs-To: neverseen@users.sourceforge.net\n"
-"POT-Creation-Date: 2010-01-29 23:22+0100\n"
+"POT-Creation-Date: 2010-08-05 23:17+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. TP: Hm, what quotation marks should be used?
+#. 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:37 VirtualMailManager/Relocated.py:42
+#: VirtualMailManager/account.py:58 VirtualMailManager/alias.py:34
+#: VirtualMailManager/domain.py:109 VirtualMailManager/relocated.py:38
 #, python-format
-msgid "There is already an alias with the address “%s”."
+msgid "The domain '%s' doesn't exist."
 msgstr ""
 
-#: VirtualMailManager/Account.py:42 VirtualMailManager/Alias.py:41
+#: VirtualMailManager/account.py:99
+#, python-format
+msgid "The mailbox format '%(mbfmt)s' requires Dovecot >= v%(version)s"
+msgstr ""
+
+#: VirtualMailManager/account.py:105
 #, python-format
-msgid "There is already a relocated user with the address “%s”."
+msgid "Invalid transport '%(transport)s' for mailbox format '%(mbfmt)s'"
+msgstr ""
+
+#: VirtualMailManager/account.py:128
+#, python-format
+msgid "Unknown service: '%s'"
 msgstr ""
 
-#: VirtualMailManager/Account.py:62 VirtualMailManager/Alias.py:57
-#: VirtualMailManager/Domain.py:161 VirtualMailManager/Domain.py:187
-#: VirtualMailManager/Domain.py:218 VirtualMailManager/Relocated.py:58
+#: VirtualMailManager/account.py:160 VirtualMailManager/cli/handler.py:89
+#: VirtualMailManager/handler.py:543 VirtualMailManager/handler.py:593
+#: VirtualMailManager/handler.py:619 VirtualMailManager/handler.py:630
+#: VirtualMailManager/handler.py:641 VirtualMailManager/handler.py:653
+#: VirtualMailManager/handler.py:665
 #, python-format
-msgid "The domain “%s” doesn't exist."
+msgid "The account '%s' doesn't exist."
 msgstr ""
 
-#: VirtualMailManager/Account.py:81
+#: VirtualMailManager/account.py:211 VirtualMailManager/handler.py:615
 #, python-format
-msgid "Unknown service “%s”."
+msgid "Could not accept password: '%s'"
 msgstr ""
 
-#: VirtualMailManager/Account.py:84 VirtualMailManager/Account.py:157
-#: VirtualMailManager/Account.py:188 VirtualMailManager/Account.py:223
+#: VirtualMailManager/account.py:251 VirtualMailManager/cli/handler.py:76
+#: VirtualMailManager/handler.py:515
 #, python-format
-msgid "The account “%s” doesn't exist."
+msgid "The account '%s' already exists."
 msgstr ""
 
-#: VirtualMailManager/Account.py:152
+#: VirtualMailManager/account.py:254
 #, python-format
-msgid "The account “%s” already exists."
+msgid "No password set for '%s'."
 msgstr ""
 
-#. TP: A service (pop3/imap/…) is enabled/usable for a user
-#: VirtualMailManager/Account.py:197
+#: VirtualMailManager/account.py:289
+#, python-format
+msgid "Unknown field: '%s'"
+msgstr ""
+
+#. TP: A service (pop3/imap) is enabled/usable for a user
+#: VirtualMailManager/account.py:331
 msgid "enabled"
 msgstr ""
 
 #. TP: A service (pop3/imap) isn't enabled/usable for a user
-#: VirtualMailManager/Account.py:200
+#: VirtualMailManager/account.py:334
 msgid "disabled"
 msgstr ""
 
-#: VirtualMailManager/Account.py:244
+#: VirtualMailManager/account.py:343
 #, python-format
-msgid "There are %(count)d aliases with the destination address “%(address)s”."
+msgid "Could not fetch information for account: '%s'"
 msgstr ""
 
-#: VirtualMailManager/Account.py:252
-msgid "uid must be an int/long."
+#: VirtualMailManager/account.py:387
+#, python-format
+msgid "There are %(count)d aliases with the destination address '%(address)s'."
 msgstr ""
 
-#: VirtualMailManager/Account.py:254
-msgid "uid must be greater than 0."
+#: VirtualMailManager/account.py:416
+msgid "UID must be an int/long."
 msgstr ""
 
-#: VirtualMailManager/Account.py:262
-#, python-format
-msgid "There is no account with the UID “%d”."
+#: VirtualMailManager/account.py:418
+msgid "UID must be greater than 0."
 msgstr ""
 
-#: VirtualMailManager/Alias.py:28 VirtualMailManager/Relocated.py:28
-msgid "Address and destination are identical."
+#: VirtualMailManager/account.py:427
+#, python-format
+msgid "There is no account with the UID '%d'."
 msgstr ""
 
-#: VirtualMailManager/Alias.py:37 VirtualMailManager/Relocated.py:37
+#: VirtualMailManager/alias.py:59
 #, python-format
-msgid "There is already an account with address “%s”."
+msgid ""
+"Can't add %(count_new)i new destination(s) to alias '%(address)s'.\n"
+"Currently this alias expands into %(count)i/%(limit)i recipients.\n"
+"%(count_new)i additional destination(s) will render this alias unusable.\n"
+"Hint: Increase Postfix' virtual_alias_expansion_limit"
 msgstr ""
 
-#: VirtualMailManager/Alias.py:67
+#: VirtualMailManager/alias.py:66
 #, python-format
 msgid ""
-"Can't add new destination to alias “%(address)s”.\n"
-"Currently this alias expands into %(count)i recipients.\n"
-"One more destination will render this alias unusable.\n"
-"Hint: Increase Postfix' virtual_alias_expansion_limit\n"
+"Can't add %(count_new)i new destination(s) to alias '%(address)s'.\n"
+"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 ""
 
-#: VirtualMailManager/Alias.py:76
-msgid "No destination address specified for alias."
+#: VirtualMailManager/alias.py:140 VirtualMailManager/alias.py:152
+#: VirtualMailManager/alias.py:159 VirtualMailManager/handler.py:572
+#, python-format
+msgid "The alias '%s' doesn't exist."
 msgstr ""
 
-#: VirtualMailManager/Alias.py:87
+#: VirtualMailManager/alias.py:143
 #, python-format
-msgid "The alias “%(a)s” with destination “%(d)s” already exists."
+msgid "The address '%(addr)s' isn't a destination of the alias '%(alias)s'."
 msgstr ""
 
-#: VirtualMailManager/Alias.py:100 VirtualMailManager/Alias.py:117
+#: VirtualMailManager/aliasdomain.py:50
 #, python-format
-msgid "The alias “%s” doesn't exist."
+msgid "The domain '%s' is a primary domain."
 msgstr ""
 
-#: VirtualMailManager/Alias.py:119
+#: VirtualMailManager/aliasdomain.py:69
 #, python-format
-msgid "The alias “%(a)s” with destination “%(d)s” doesn't exist."
+msgid "The alias domain '%s' already exists."
 msgstr ""
 
-#: VirtualMailManager/AliasDomain.py:30
-#, python-format
-msgid "The domain “%s” is a primary domain."
+#: VirtualMailManager/aliasdomain.py:72 VirtualMailManager/aliasdomain.py:106
+msgid "No destination domain set for the alias domain."
 msgstr ""
 
-#: VirtualMailManager/AliasDomain.py:35
+#: VirtualMailManager/aliasdomain.py:75 VirtualMailManager/aliasdomain.py:109
 #, python-format
-msgid "The alias domain “%s” already exists."
+msgid "The target domain '%s' doesn't exist."
 msgstr ""
 
-#: VirtualMailManager/AliasDomain.py:38 VirtualMailManager/AliasDomain.py:68
-msgid "No destination domain specified for alias domain."
+#: VirtualMailManager/aliasdomain.py:88 VirtualMailManager/aliasdomain.py:112
+#: VirtualMailManager/aliasdomain.py:133
+#, python-format
+msgid "The alias domain '%s' doesn't exist."
 msgstr ""
 
-#: VirtualMailManager/AliasDomain.py:41 VirtualMailManager/AliasDomain.py:71
+#: VirtualMailManager/aliasdomain.py:98
 #, python-format
-msgid "The target domain “%s” doesn't exist."
+msgid "There is no primary domain for the alias domain '%s'."
 msgstr ""
 
-#: VirtualMailManager/AliasDomain.py:60
-#, python-format
-msgid "There is no primary domain for the alias domain “%s”."
-msgstr ""
-
-#: VirtualMailManager/AliasDomain.py:63 VirtualMailManager/AliasDomain.py:74
-#: VirtualMailManager/AliasDomain.py:97
-#, python-format
-msgid "The alias domain “%s” doesn't exist."
-msgstr ""
-
-#: VirtualMailManager/AliasDomain.py:77
+#: VirtualMailManager/aliasdomain.py:115
 #, python-format
 msgid ""
-"The alias domain “%(alias)s” is already assigned to the domain “%(domain)s”."
+"The alias domain '%(alias)s' is already assigned to the domain '%(domain)s'."
 msgstr ""
 
-#: VirtualMailManager/Config.py:105
-#, python-format
-msgid "Not a boolean: “%s”"
+#. TP: Please preserve the trailing space.
+#: VirtualMailManager/cli/__init__.py:78
+msgid "Enter new password: "
+msgstr ""
+
+#. TP: Please preserve the trailing space.
+#: VirtualMailManager/cli/__init__.py:80
+msgid "Retype new password: "
 msgstr ""
 
-#: VirtualMailManager/Config.py:134
-#, python-format
-msgid "Bad format: “%s” - expected: section.option"
+#: VirtualMailManager/cli/__init__.py:85 VirtualMailManager/cli/config.py:53
+msgid "Too many failures - try again later."
+msgstr ""
+
+#: VirtualMailManager/cli/__init__.py:91
+msgid "Sorry, passwords do not match"
 msgstr ""
 
-#: VirtualMailManager/Config.py:347
-msgid "Missing options, which have no default value.\n"
+#: VirtualMailManager/cli/__init__.py:95
+msgid "Sorry, empty passwords are not permitted"
 msgstr ""
 
-#: VirtualMailManager/Config.py:348 VirtualMailManager/Config.py:416
+#: VirtualMailManager/cli/config.py:32
+#, python-format
+msgid "Enter new value for option %(option)s [%(current_value)s]: "
+msgstr ""
+
+#: VirtualMailManager/cli/config.py:36 VirtualMailManager/config.py:377
 #, python-format
 msgid "Using configuration file: %s\n"
 msgstr ""
 
-#: VirtualMailManager/Config.py:351
-#, python-format
-msgid "* Section: %s\n"
-msgstr ""
-
-#: VirtualMailManager/Config.py:367
+#: VirtualMailManager/cli/config.py:38
 #, python-format
-msgid "“%s” is not a directory"
-msgstr ""
-
-#: VirtualMailManager/Config.py:379
-#, python-format
-msgid "“%s” is not a file"
+msgid "* Configuration section: '%s'"
 msgstr ""
 
-#: VirtualMailManager/Config.py:382
-#, python-format
-msgid "File is not executable: “%s”"
-msgstr ""
-
-#: VirtualMailManager/Config.py:408
-#, python-format
-msgid "Enter new value for option %(option)s [%(current_value)s]: "
-msgstr ""
-
-#: VirtualMailManager/Config.py:418
-#, python-format
-msgid "* Configuration section: “%s”"
-msgstr ""
-
-#: VirtualMailManager/Config.py:429
+#: VirtualMailManager/cli/config.py:50
 #, python-format
 msgid "Warning: %s"
 msgstr ""
 
-#: VirtualMailManager/Config.py:433
-#: VirtualMailManager/VirtualMailManager.py:198
-msgid "Too many failures - try again later."
-msgstr ""
-
-#: VirtualMailManager/Domain.py:37
+#: VirtualMailManager/cli/handler.py:68
 #, python-format
-msgid "The domain “%s” is an alias domain."
+msgid "Invalid section: '%s'"
 msgstr ""
 
-#: VirtualMailManager/Domain.py:122
-msgid "There are accounts and aliases."
-msgstr ""
-
-#: VirtualMailManager/Domain.py:125
-msgid "There are accounts."
+#: VirtualMailManager/cli/main.py:29 VirtualMailManager/cli/main.py:60
+#: VirtualMailManager/cli/subcommands.py:477
+#: VirtualMailManager/cli/subcommands.py:497
+#, python-format
+msgid "Error: %s"
 msgstr ""
 
-#: VirtualMailManager/Domain.py:128
-msgid "There are aliases."
-msgstr ""
-
-#: VirtualMailManager/Domain.py:143
-#, python-format
-msgid "The domain “%s” already exists."
+#: VirtualMailManager/cli/main.py:36
+msgid "You must specify a subcommand at least"
 msgstr ""
 
-#: VirtualMailManager/EmailAddress.py:42
+#: VirtualMailManager/cli/main.py:48
 #, python-format
-msgid "Missing '@' sign in e-mail address “%s”."
+msgid "Unknown subcommand: '%s'"
 msgstr ""
 
-#: VirtualMailManager/EmailAddress.py:45
-#, python-format
-msgid "“%s” doesn't look like an e-mail address."
+#. TP: We have to cry, because root has killed/interrupted vmm
+#. with Ctrl+C or Ctrl+D.
+#: VirtualMailManager/cli/main.py:57
+msgid "Ouch!"
 msgstr ""
 
-#: VirtualMailManager/EmailAddress.py:50
-#, python-format
-msgid "Missing domain name after “%s@”."
-msgstr ""
-
-#: VirtualMailManager/EmailAddress.py:62
-msgid "No local-part specified."
+#: VirtualMailManager/cli/main.py:63
+msgid "Warnings:"
 msgstr ""
 
-#: VirtualMailManager/EmailAddress.py:65
+#: VirtualMailManager/cli/subcommands.py:74
 #, python-format
-msgid "The local-part “%s” is too long"
+msgid "Plan A failed ... trying Plan B: %(subcommand)s %(object)s"
 msgstr ""
 
-#: VirtualMailManager/EmailAddress.py:72
-#, python-format
-msgid "The local-part “%(lpart)s” contains invalid characters: %(ichrs)s"
+#: VirtualMailManager/cli/subcommands.py:88
+msgid "Missing alias address and destination."
 msgstr ""
 
-#: VirtualMailManager/MailLocation.py:28
-msgid "Either mid or maillocation must be specified."
-msgstr ""
-
-#: VirtualMailManager/MailLocation.py:34
-msgid "mid must be an int/long."
+#: VirtualMailManager/cli/subcommands.py:91
+#: VirtualMailManager/cli/subcommands.py:319
+msgid "Missing destination address."
 msgstr ""
 
-#: VirtualMailManager/MailLocation.py:42
-#, python-format
-msgid ""
-"Invalid folder name “%s”, it may consist only of\n"
-"1 - 20 single byte characters (A-Z, a-z, 0-9 and _)."
+#: VirtualMailManager/cli/subcommands.py:98
+#: VirtualMailManager/cli/subcommands.py:108
+msgid "Missing alias address."
 msgstr ""
 
-#: VirtualMailManager/MailLocation.py:55
-msgid "Unknown mid specified."
+#: VirtualMailManager/cli/subcommands.py:130
+#: VirtualMailManager/cli/subcommands.py:164
+msgid "Missing alias domain name and destination domain name."
 msgstr ""
 
-#: VirtualMailManager/Relocated.py:64
-msgid "No destination address specified for relocated user."
-msgstr ""
-
-#: VirtualMailManager/Relocated.py:74
-#, python-format
-msgid "The relocated user “%s” already exists."
+#: VirtualMailManager/cli/subcommands.py:133
+#: VirtualMailManager/cli/subcommands.py:167
+msgid "Missing destination domain name."
 msgstr ""
 
-#: VirtualMailManager/Relocated.py:88 VirtualMailManager/Relocated.py:101
-#, python-format
-msgid "The relocated user “%s” doesn't exist."
+#: VirtualMailManager/cli/subcommands.py:141
+#: VirtualMailManager/cli/subcommands.py:148
+msgid "Missing alias domain name."
 msgstr ""
 
-#: VirtualMailManager/Transport.py:27
-msgid "Either tid or transport must be specified."
-msgstr ""
-
-#: VirtualMailManager/Transport.py:33
-msgid "tid must be an int/long."
+#: VirtualMailManager/cli/subcommands.py:183
+#: VirtualMailManager/cli/subcommands.py:193
+#: VirtualMailManager/cli/subcommands.py:206
+msgid "Missing domain name."
 msgstr ""
 
-#: VirtualMailManager/Transport.py:61
-msgid "Unknown tid specified."
-msgstr ""
-
-#: VirtualMailManager/VirtualMailManager.py:47
-msgid ""
-"You are not root.\n"
-"\tGood bye!\n"
+#: VirtualMailManager/cli/subcommands.py:199
+#: VirtualMailManager/cli/subcommands.py:213
+#: VirtualMailManager/cli/subcommands.py:257
+#: VirtualMailManager/cli/subcommands.py:373
+#: VirtualMailManager/cli/subcommands.py:416 VirtualMailManager/handler.py:400
+#: VirtualMailManager/handler.py:429 VirtualMailManager/handler.py:588
+#, python-format
+msgid "Invalid argument: '%s'"
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:66
-msgid "No “vmm.cfg” found in: /root:/usr/local/etc:/etc"
-msgstr ""
-
-#: VirtualMailManager/VirtualMailManager.py:77
-#, python-format
-msgid ""
-"fix permissions (%(perms)s) for “%(file)s”\n"
-"`chmod 0600 %(file)s` would be great."
+#: VirtualMailManager/cli/subcommands.py:227
+#: VirtualMailManager/cli/subcommands.py:229
+msgid "Domain"
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:92
-#, python-format
-msgid ""
-"“%s” is not a directory.\n"
-"(vmm.cfg: section \"misc\", option \"base_directory\")"
-msgstr ""
-
-#: VirtualMailManager/VirtualMailManager.py:97
-#, python-format
-msgid ""
-"“%(binary)s” doesn't exist.\n"
-"(vmm.cfg: section \"bin\", option \"%(option)s\")"
+#: VirtualMailManager/cli/subcommands.py:231
+#: VirtualMailManager/cli/subcommands.py:240
+msgid "accounts"
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:101
-#, python-format
-msgid ""
-"“%(binary)s” is not executable.\n"
-"(vmm.cfg: section \"bin\", option \"%(option)s\")"
+#: VirtualMailManager/cli/subcommands.py:233
+#: VirtualMailManager/cli/subcommands.py:239
+#: VirtualMailManager/cli/subcommands.py:634
+msgid "alias domains"
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:149
-msgid "The domain name is too long."
+#: VirtualMailManager/cli/subcommands.py:235
+#: VirtualMailManager/cli/subcommands.py:241
+msgid "aliases"
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:152
-#, python-format
-msgid "The domain name “%s” is invalid."
+#: VirtualMailManager/cli/subcommands.py:237
+#: VirtualMailManager/cli/subcommands.py:242
+msgid "relocated users"
 msgstr ""
 
-#. TP: Please preserve the trailing space.
-#: VirtualMailManager/VirtualMailManager.py:191
-msgid "Enter new password: "
+#: VirtualMailManager/cli/subcommands.py:248
+msgid "Missing domain name and new transport."
 msgstr ""
 
-#. TP: Please preserve the trailing space.
-#: VirtualMailManager/VirtualMailManager.py:193
-msgid "Retype new password: "
-msgstr ""
-
-#: VirtualMailManager/VirtualMailManager.py:204
-msgid "Sorry, passwords do not match"
+#: VirtualMailManager/cli/subcommands.py:251
+msgid "Missing new transport."
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:208
-msgid "Sorry, empty passwords are not permitted"
+#: VirtualMailManager/cli/subcommands.py:265
+msgid "Missing userid."
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:256
-#: VirtualMailManager/VirtualMailManager.py:343
-#, python-format
-msgid "No such directory: %s"
+#: VirtualMailManager/cli/subcommands.py:266
+#: VirtualMailManager/cli/subcommands.py:435
+#: VirtualMailManager/cli/subcommands.py:437
+msgid "Account"
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:331
-msgid "Found \"..\" in home directory path."
-msgstr ""
-
-#: VirtualMailManager/VirtualMailManager.py:339
-msgid "Detected owner/group mismatch in home directory."
+#: VirtualMailManager/cli/subcommands.py:281
+#, python-format
+msgid "Unknown help topic: '%s'"
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:354
-msgid "Found \"..\" in domain directory path."
+#: VirtualMailManager/cli/subcommands.py:294
+msgid "List of available subcommands:"
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:360
-msgid "Detected group mismatch in domain directory."
-msgstr ""
-
-#: VirtualMailManager/VirtualMailManager.py:455
-#, python-format
-msgid "Invalid section: “%s”"
+#: VirtualMailManager/cli/subcommands.py:317
+msgid "Missing relocated address and destination."
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:465
-#: VirtualMailManager/VirtualMailManager.py:475
-#: VirtualMailManager/VirtualMailManager.py:494
-#: VirtualMailManager/VirtualMailManager.py:602
-#: VirtualMailManager/VirtualMailManager.py:633
-#, python-format
-msgid "Invalid argument: “%s”"
+#: VirtualMailManager/cli/subcommands.py:326
+#: VirtualMailManager/cli/subcommands.py:333
+msgid "Missing relocated address."
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:498
-msgid ""
-"The keyword “detailed” is deprecated and will be removed in a future "
-"release.\n"
-"   Please use the keyword “full” to get full details."
+#: VirtualMailManager/cli/subcommands.py:356
+#: VirtualMailManager/cli/subcommands.py:367
+#: VirtualMailManager/cli/subcommands.py:380
+#: VirtualMailManager/cli/subcommands.py:395
+#: VirtualMailManager/cli/subcommands.py:410
+#: VirtualMailManager/cli/subcommands.py:454
+msgid "Missing e-mail address."
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:571
+#: VirtualMailManager/cli/subcommands.py:387
+#: VirtualMailManager/cli/subcommands.py:402
 #, python-format
-msgid "The pattern “%s” contains invalid characters."
+msgid "Invalid service arguments: %s"
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:597
-#, python-format
-msgid "The destination account/alias “%s” doesn't exist."
+#: VirtualMailManager/cli/subcommands.py:438
+msgid "alias addresses"
+msgstr ""
+
+#: VirtualMailManager/cli/subcommands.py:444
+msgid "Missing e-mail address and user's name."
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:614
-#, python-format
-msgid ""
-"The account has been successfully deleted from the database.\n"
-"    But an error occurred while deleting the following directory:\n"
-"    “%(directory)s”\n"
-"    Reason: %(reason)s"
-msgstr ""
-
-#: VirtualMailManager/VirtualMailManager.py:653
-msgid "Account doesn't exist"
+#: VirtualMailManager/cli/subcommands.py:447
+msgid "Missing user's name."
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:669
-#: VirtualMailManager/VirtualMailManager.py:679
-msgid ""
-"The service name “managesieve” is deprecated and will be removed\n"
-"   in a future release.\n"
-"   Please use the service name “sieve” instead."
+#: VirtualMailManager/cli/subcommands.py:465
+msgid "Missing e-mail address and transport."
 msgstr ""
 
-#: VirtualMailManager/ext/Postconf.py:41
-#, python-format
-msgid ""
-"The value “%s” doesn't look like a valid postfix configuration parameter "
-"name."
+#: VirtualMailManager/cli/subcommands.py:468
+msgid "Missing transport."
+msgstr ""
+
+#: VirtualMailManager/cli/subcommands.py:478
+msgid "usage: "
 msgstr ""
 
 #. TP: Please adjust translated words like the original text.
 #. (It's a table header.) Extract from usage text:
-#. Usage: vmm SUBCOMMAND OBJECT ARGS*
+#. usage: vmm subcommand arguments
 #. short long
-#. subcommand               object             args (* = optional)
+#. subcommand                arguments
 #.
-#. da    domainadd          domain.tld         transport*
-#. di    domaininfo         domain.tld         details*
-#: vmm:26
+#. da    domainadd           fqdn [transport]
+#. dd    domaindelete        fqdn [force]
+#: VirtualMailManager/cli/subcommands.py:488
 #, python-format
 msgid ""
-"Usage: %s SUBCOMMAND OBJECT ARGS*\n"
+"usage: %s subcommand arguments\n"
 "  short long\n"
-"  subcommand               object             args (* = optional)\n"
+"  subcommand                arguments\n"
+msgstr ""
+
+#: VirtualMailManager/cli/subcommands.py:507
+msgid "from"
+msgstr ""
+
+#. TP: The words 'from', 'version' and 'on' are used in
+#. the version information, e.g.:
+#. vmm, version 0.5.2 (from 09/09/09)
+#. Python 2.5.4 on FreeBSD
+#: VirtualMailManager/cli/subcommands.py:507
+msgid "version"
+msgstr ""
+
+#: VirtualMailManager/cli/subcommands.py:510
+msgid "on"
+msgstr ""
+
+#: VirtualMailManager/cli/subcommands.py:512
+msgid "is free software and comes with ABSOLUTELY NO WARRANTY."
+msgstr ""
+
+#: VirtualMailManager/cli/subcommands.py:518
+msgid "get the address of the user with the given UID"
+msgstr ""
+
+#: VirtualMailManager/cli/subcommands.py:520
+msgid "create a new e-mail user with the given address"
+msgstr ""
+
+#: VirtualMailManager/cli/subcommands.py:522
+msgid "delete the specified user"
+msgstr ""
+
+#: VirtualMailManager/cli/subcommands.py:525
+msgid "deactivate all/the given service(s) for a user"
+msgstr ""
+
+#: VirtualMailManager/cli/subcommands.py:527
+msgid "activate all or the given service(s) for a user"
+msgstr ""
+
+#: VirtualMailManager/cli/subcommands.py:529
+msgid "display information about the given address"
+msgstr ""
+
+#: VirtualMailManager/cli/subcommands.py:531
+msgid "set or update the real name for an address"
+msgstr ""
+
+#: VirtualMailManager/cli/subcommands.py:534
+msgid "update the password for the given address"
+msgstr ""
+
+#: VirtualMailManager/cli/subcommands.py:537
+msgid "update the transport of the given address"
+msgstr ""
+
+#: VirtualMailManager/cli/subcommands.py:540
+msgid "create a new alias e-mail address"
 msgstr ""
 
-#: vmm:65 vmm:76
-#, python-format
-msgid "Error: %s\n"
+#: VirtualMailManager/cli/subcommands.py:543
+msgid "delete the specified alias e-mail address or one of its destinations"
+msgstr ""
+
+#: VirtualMailManager/cli/subcommands.py:546
+msgid "show the destination(s) of the specified alias"
+msgstr ""
+
+#: VirtualMailManager/cli/subcommands.py:550
+msgid "create a new alias for an existing domain"
+msgstr ""
+
+#: VirtualMailManager/cli/subcommands.py:552
+msgid "delete the specified alias domain"
+msgstr ""
+
+#: VirtualMailManager/cli/subcommands.py:554
+msgid "show the destination of the given alias domain"
+msgstr ""
+
+#: VirtualMailManager/cli/subcommands.py:557
+msgid "assign the given alias domain to an other domain"
+msgstr ""
+
+#: VirtualMailManager/cli/subcommands.py:560
+msgid "create a new domain"
+msgstr ""
+
+#: VirtualMailManager/cli/subcommands.py:562
+msgid "delete the given domain and all its alias domains"
 msgstr ""
 
-#. TP: e.g. 'Domain information' or 'Account information'
-#: vmm:104
+#: VirtualMailManager/cli/subcommands.py:564
+msgid "display information about the given domain"
+msgstr ""
+
+#: VirtualMailManager/cli/subcommands.py:567
+msgid "update the transport of the specified domain"
+msgstr ""
+
+#: VirtualMailManager/cli/subcommands.py:569
+msgid "list all domains / search domains by pattern"
+msgstr ""
+
+#: VirtualMailManager/cli/subcommands.py:573
+msgid "create a new record for a relocated user"
+msgstr ""
+
+#: VirtualMailManager/cli/subcommands.py:576
+msgid "delete the record of the relocated user"
+msgstr ""
+
+#: VirtualMailManager/cli/subcommands.py:578
+msgid "print information about a relocated user"
+msgstr ""
+
+#: VirtualMailManager/cli/subcommands.py:581
+msgid "start interactive configuration modus"
+msgstr ""
+
+#: VirtualMailManager/cli/subcommands.py:583
+msgid "show a help overview or help for the given subcommand"
+msgstr ""
+
+#: VirtualMailManager/cli/subcommands.py:585
+msgid "show version and copyright information"
+msgstr ""
+
+#. TP: used in e.g. 'Domain information' or 'Account information'
+#: VirtualMailManager/cli/subcommands.py:618
 msgid "information"
 msgstr ""
 
-#. TP: e.g. 'Available alias addresses' or 'Available accounts'
-#: vmm:115
+#. TP: used in e.g. 'Available alias addresses' or 'Available accounts'
+#: VirtualMailManager/cli/subcommands.py:631
 msgid "Available"
 msgstr ""
 
-#: vmm:118 vmm:218 vmm:224
-msgid "alias domains"
-msgstr ""
-
-#: vmm:128 vmm:139 vmm:163
+#: VirtualMailManager/cli/subcommands.py:644
+#: VirtualMailManager/cli/subcommands.py:686
 msgid "\tNone"
 msgstr ""
 
-#: vmm:132
+#: VirtualMailManager/cli/subcommands.py:649
 msgid "Alias information"
 msgstr ""
 
-#: vmm:134
+#: VirtualMailManager/cli/subcommands.py:651
 #, python-format
 msgid "\tMail for %s will be redirected to:"
 msgstr ""
 
-#: vmm:143
+#: VirtualMailManager/cli/subcommands.py:658
 msgid "Relocated information"
 msgstr ""
 
-#: vmm:145
+#: VirtualMailManager/cli/subcommands.py:660
 #, python-format
-msgid "\tUser “%(addr)s” has moved to “%(dest)s”"
+msgid "\tUser '%(addr)s' has moved to '%(dest)s'"
 msgstr ""
 
-#: vmm:158
+#: VirtualMailManager/cli/subcommands.py:675
+msgid "Matching domains"
+msgstr ""
+
+#: VirtualMailManager/cli/subcommands.py:677
 msgid "Available domains"
 msgstr ""
 
-#: vmm:160
-msgid "Matching domains"
-msgstr ""
-
-#: vmm:174
+#: VirtualMailManager/cli/subcommands.py:692
 msgid "Alias domain information"
 msgstr ""
 
-#: vmm:180
+#: VirtualMailManager/cli/subcommands.py:697
 #, python-format
 msgid ""
 "\tThe alias domain %(alias)s belongs to:\n"
 "\t    * %(domain)s"
 msgstr ""
 
-#: vmm:191 vmm:199 vmm:207
-msgid "Missing domain name."
+#: VirtualMailManager/common.py:61
+#, python-format
+msgid "'%s' is not a file"
+msgstr ""
+
+#: VirtualMailManager/common.py:64
+#, python-format
+msgid "File is not executable: '%s'"
 msgstr ""
 
-#: vmm:210 vmm:214
-msgid "Domain"
+#: VirtualMailManager/config.py:88
+#, python-format
+msgid "Not a boolean: '%s'"
 msgstr ""
 
-#: vmm:216 vmm:225
-msgid "accounts"
+#: VirtualMailManager/config.py:126
+#, python-format
+msgid "Bad format: '%s' - expected: section.option"
+msgstr ""
+
+#: VirtualMailManager/config.py:376
+msgid "Missing options, which have no default value.\n"
+msgstr ""
+
+#: VirtualMailManager/config.py:380
+#, python-format
+msgid "* Section: %s\n"
 msgstr ""
 
-#: vmm:220 vmm:226
-msgid "aliases"
+#: VirtualMailManager/config.py:423 VirtualMailManager/handler.py:244
+#: VirtualMailManager/handler.py:315 VirtualMailManager/handler.py:320
+#: VirtualMailManager/handler.py:348
+#, python-format
+msgid "No such directory: %s"
+msgstr ""
+
+#: VirtualMailManager/config.py:435 VirtualMailManager/maillocation.py:71
+#, python-format
+msgid "Unsupported mailbox format: '%s'"
+msgstr ""
+
+#: VirtualMailManager/config.py:446
+#, python-format
+msgid "Not a valid Dovecot version: '%s'"
 msgstr ""
 
-#: vmm:222 vmm:227
-msgid "relocated users"
+#: VirtualMailManager/domain.py:72
+#, python-format
+msgid "The domain '%s' is an alias domain."
 msgstr ""
 
-#: vmm:238
-msgid "Missing domain name and new transport."
+#: VirtualMailManager/domain.py:100
+#, python-format
+msgid ""
+"There are %(account_count)u accounts, %(alias_count)u aliases and "
+"%(relocated_count)u relocated users."
 msgstr ""
 
-#: vmm:240
-msgid "Missing new transport."
+#: VirtualMailManager/domain.py:159
+#, python-format
+msgid "The domain '%s' already exists."
+msgstr ""
+
+#: VirtualMailManager/domain.py:310
+msgid "The domain name is too long"
 msgstr ""
 
-#: vmm:249 vmm:272
-msgid "Missing alias domain name and target domain name."
+#: VirtualMailManager/domain.py:312
+#, python-format
+msgid "The domain name '%s' is invalid"
+msgstr ""
+
+#: VirtualMailManager/emailaddress.py:71
+#, python-format
+msgid "Missing the '@' sign in address '%s'"
+msgstr ""
+
+#: VirtualMailManager/emailaddress.py:74
+#, python-format
+msgid "Too many '@' signs in address '%s'"
 msgstr ""
 
-#: vmm:251 vmm:274
-msgid "Missing target domain name."
+#: VirtualMailManager/emailaddress.py:77
+#, python-format
+msgid "Missing local-part in address '%s'"
 msgstr ""
 
-#: vmm:257 vmm:280
-msgid "Missing alias domain name."
+#: VirtualMailManager/emailaddress.py:80
+#, python-format
+msgid "Missing domain name in address '%s'"
 msgstr ""
 
-#: vmm:286 vmm:295 vmm:303 vmm:345 vmm:353 vmm:361
-msgid "Missing e-mail address."
+#: VirtualMailManager/emailaddress.py:93
+#, python-format
+msgid "The local-part '%s' is too long"
+msgstr ""
+
+#: VirtualMailManager/emailaddress.py:98
+#, python-format
+msgid "The local-part '%(l_part)s' contains invalid characters: %(i_chars)s"
 msgstr ""
 
-#: vmm:312
-msgid "alias addresses"
+#: VirtualMailManager/ext/postconf.py:84
+#, python-format
+msgid ""
+"The value '%s' doesn't look like a valid postfix configuration parameter "
+"name."
 msgstr ""
 
-#: vmm:329
-msgid "Missing e-mail address and user’s name."
+#: VirtualMailManager/handler.py:53
+msgid "an account"
+msgstr ""
+
+#: VirtualMailManager/handler.py:54
+msgid "an alias"
 msgstr ""
 
-#: vmm:331
-msgid "Missing user’s name."
+#: VirtualMailManager/handler.py:55
+msgid "a relocated user"
+msgstr ""
+
+#: VirtualMailManager/handler.py:80
+msgid ""
+"You are not root.\n"
+"\tGood bye!\n"
 msgstr ""
 
-#: vmm:337
-msgid "Missing e-mail address and transport."
+#: VirtualMailManager/handler.py:99
+#, python-format
+msgid "Could not find '%(cfg_file)s' in: '%(cfg_path)s'"
 msgstr ""
 
-#: vmm:339
-msgid "Missing transport."
+#: VirtualMailManager/handler.py:110
+#, python-format
+msgid ""
+"wrong permissions for '%(file)s': %(perms)s\n"
+"`chmod 0600 %(file)s` would be great."
 msgstr ""
 
-#: vmm:370
-msgid "Missing alias address and destination."
+#: VirtualMailManager/handler.py:130
+#, python-format
+msgid ""
+"'%(path)s' is not a directory.\n"
+"(%(cfg_file)s: section 'misc', option 'base_directory')"
+msgstr ""
+
+#: VirtualMailManager/handler.py:139
+#, python-format
+msgid ""
+"'%(binary)s' doesn't exist.\n"
+"(%(cfg_file)s: section 'bin', option '%(option)s')"
 msgstr ""
 
-#: vmm:372 vmm:407
-msgid "Missing destination address."
+#: VirtualMailManager/handler.py:145
+#, python-format
+msgid ""
+"'%(binary)s' is not executable.\n"
+"(%(cfg_file)s: section 'bin', option '%(option)s')"
 msgstr ""
 
-#: vmm:378 vmm:396
-msgid "Missing alias address"
+#. TP: %(a_type)s will be one of: 'an account', 'an alias' or
+#. 'a relocated user'
+#: VirtualMailManager/handler.py:205
+#, python-format
+msgid "There is already %(a_type)s with the address '%(address)s'."
+msgstr ""
+
+#: VirtualMailManager/handler.py:258
+#, python-format
+msgid "'%s' is not a directory."
 msgstr ""
 
-#: vmm:405
-msgid "Missing relocated address and destination."
+#: VirtualMailManager/handler.py:287
+msgid "Skipped mailbox folders:"
 msgstr ""
 
-#: vmm:413 vmm:431
-msgid "Missing relocated address"
+#: VirtualMailManager/handler.py:307
+#, python-format
+msgid ""
+"UID '%(uid)u' and/or GID '%(gid)u' are less than %(min_uid)u/%(min_gid)u."
+msgstr ""
+
+#: VirtualMailManager/handler.py:312 VirtualMailManager/handler.py:345
+#, python-format
+msgid "Found \"..\" in domain directory path: %s"
 msgstr ""
 
-#: vmm:437
-msgid "Missing userid"
+#: VirtualMailManager/handler.py:325
+msgid "Detected owner/group mismatch in home directory."
+msgstr ""
+
+#: VirtualMailManager/handler.py:341
+#, python-format
+msgid "GID '%(gid)u' is less than '%(min_gid)u'."
 msgstr ""
 
-#: vmm:450
-msgid "Warnings:"
+#: VirtualMailManager/handler.py:352
+#, python-format
+msgid "Detected group mismatch in domain directory: %s"
 msgstr ""
 
-#: vmm:460
-msgid "from"
+#: VirtualMailManager/handler.py:506
+#, python-format
+msgid "The pattern '%s' contains invalid characters."
+msgstr ""
+
+#: VirtualMailManager/handler.py:529
+msgid "Ignored destination addresses:"
 msgstr ""
 
-#. TP: The words 'from', 'version' and 'on' are used in the version
-#. information:
-#. vmm, version 0.5.2 (from 09/09/09)
-#. Python 2.5.4 on FreeBSD
-#: vmm:460
-msgid "version"
+#: VirtualMailManager/handler.py:534
+#, python-format
+msgid "The destination account/alias '%s' doesn't exist."
+msgstr ""
+
+#: VirtualMailManager/handler.py:556
+#, python-format
+msgid ""
+"The account has been successfully deleted from the database.\n"
+"    But an error occurred while deleting the following directory:\n"
+"    '%(directory)s'\n"
+"    Reason: %(reason)s"
 msgstr ""
 
-#: vmm:463
-msgid "on"
+#: VirtualMailManager/handler.py:626
+#, python-format
+msgid "Could not accept name: '%s'"
 msgstr ""
 
-#: vmm:464
-msgid "is free software and comes with ABSOLUTELY NO WARRANTY."
+#: VirtualMailManager/handler.py:637
+#, python-format
+msgid "Could not accept transport: '%s'"
+msgstr ""
+
+#: VirtualMailManager/handler.py:683 VirtualMailManager/relocated.py:97
+#: VirtualMailManager/relocated.py:104
+#, python-format
+msgid "The relocated user '%s' doesn't exist."
+msgstr ""
+
+#: VirtualMailManager/maillocation.py:75
+msgid "Empty directory name"
 msgstr ""
 
-#: vmm:472
+#: VirtualMailManager/maillocation.py:77
 #, python-format
-msgid "Plan A failed ... trying Plan B: %(subcommand)s %(object)s"
+msgid "Directory name is too long: '%s'"
 msgstr ""
 
-#: vmm:535
+#: VirtualMailManager/maillocation.py:123
+#, python-format
+msgid "Unknown mail_location id: %u"
+msgstr ""
+
+#: VirtualMailManager/password.py:370
 #, python-format
-msgid "Unknown subcommand: “%s”"
+msgid "Unsupported password scheme: '%s'"
+msgstr ""
+
+#: VirtualMailManager/password.py:373
+#, python-format
+msgid "The password scheme '%(scheme)s' requires Dovecot >= v%(version)s"
 msgstr ""
 
-#. TP: We have to cry, because root has killed/interrupted vmm
-#. with Ctrl+C or Ctrl+D.
-#: vmm:540
-msgid ""
-"\n"
-"Ouch!\n"
+#: VirtualMailManager/password.py:379
+msgid "Encoding suffixes for password schemes require Dovecot >= v1.1.alpha1"
+msgstr ""
+
+#: VirtualMailManager/password.py:382
+#, python-format
+msgid "Unsupported password encoding: '%s'"
 msgstr ""
 
-#: vmm:543
+#: VirtualMailManager/relocated.py:71
+msgid "Address and destination are identical."
+msgstr ""
+
+#: VirtualMailManager/relocated.py:75
 #, python-format
-msgid "Error: %s"
+msgid "The relocated user '%s' already exists."
 msgstr ""
+
+#: VirtualMailManager/transport.py:78
+msgid "Unknown tid specified."
+msgstr ""