# HG changeset patch
# User Pascal Volk <neverseen@users.sourceforge.net>
# Date 1219198963 0
# Node ID f5ca21303871ad3897ddfdb86bd6c502a74dfb4c
# Parent  927b0705d31a61eba3f3209ef05221075eb4e1fb
* Switched from pygettext to xgettext -> small adjustments to these files:
    - 'VirtualMailManager/Config.py'
    - 'VirtualMailManager/VirtualMailManager.py'

* 'VirtualMailManager/VirtualMailManager.py'
    - Renamed VirtualMailManager.__maildirdelete() to
      VirtualMailManager.__userdirdelete()

* 'po/de.po'
* 'po/vmm.pot'
    - updated

diff -r 927b0705d31a -r f5ca21303871 VirtualMailManager/Config.py
--- a/VirtualMailManager/Config.py	Tue Aug 19 04:30:34 2008 +0000
+++ b/VirtualMailManager/Config.py	Wed Aug 20 02:22:43 2008 +0000
@@ -130,8 +130,8 @@
                 print _(u'* Config section: »%s«') % s
             for opt, val in self.items(s):
                 newval = raw_input(
-                _('Enter new value for option %s [%s]: ').encode(
-                    ENCODING, 'replace') % (opt, val))
+                _('Enter new value for option %(opt)s [%(val)s]: ').encode(
+                    ENCODING, 'replace') % {'opt': opt, 'val': val})
                 if newval and newval != val:
                     self.set(s, opt, newval)
                     self.__changes = True
diff -r 927b0705d31a -r f5ca21303871 VirtualMailManager/VirtualMailManager.py
--- a/VirtualMailManager/VirtualMailManager.py	Tue Aug 19 04:30:34 2008 +0000
+++ b/VirtualMailManager/VirtualMailManager.py	Wed Aug 20 02:22:43 2008 +0000
@@ -44,8 +44,9 @@
         Throws a VMMNotRootException if your uid is greater 0.
         """
         self.__cfgFileName = '/usr/local/etc/vmm.cfg'
-        self.__permWarnMsg = _(u"fix permissions for »%s«\n`chmod 0600 %s`\
- would be great.") % (self.__cfgFileName, self.__cfgFileName)
+        self.__permWarnMsg = _(u"fix permissions for »%(cfgFileName)s«\n\
+`chmod 0600 %(cfgFileName)s` would be great.") % {'cfgFileName':
+            self.__cfgFileName}
         self.__warnings = []
         self.__Cfg = None
         self.__dbh = None
@@ -89,13 +90,13 @@
                 self.__Cfg.get('domdir', 'base'), ERR.NO_SUCH_DIRECTORY)
         for opt, val in self.__Cfg.items('bin'):
             if not os.path.exists(val):
-                raise VMMException(_(u'»%s« doesn\'t exists.\n\
-(vmm.cfg: section "bin", option "%s")') %
-                    (val, opt), ERR.NO_SUCH_BINARY)
+                raise VMMException(_(u'»%(binary)s« doesn\'t exists.\n\
+(vmm.cfg: section "bin", option "%(option)s")') %{'binary': val,'option': opt},
+                    ERR.NO_SUCH_BINARY)
             elif not os.access(val, os.X_OK):
-                raise VMMException(_(u'»%s« is not executable.\n\
-(vmm.cfg: section "bin", option "%s")') %
-                    (val, opt), ERR.NOT_EXECUTABLE)
+                raise VMMException(_(u'»%(binary)s« is not executable.\n\
+(vmm.cfg: section "bin", option "%(option)s")') %{'binary': val,'option': opt},
+                    ERR.NOT_EXECUTABLE)
 
     def __dbConnect(self):
         """Creates a pyPgSQL.PgSQL.connection instance."""
@@ -129,9 +130,9 @@
             ichrs = ''
             for c in set(ic):
                 ichrs += u"»%s« " % c
-            raise VMMException(
-                _(u"The local part »%s« contains invalid characters: %s") %
-                (localpart, ichrs), ERR.LOCALPART_INVALID)
+            raise VMMException(_(u"The local part »%(lpart)s« contains invalid\
+ characters: %(ichrs)s") % {'lpart': localpart, 'ichrs': ichrs},
+                ERR.LOCALPART_INVALID)
         return localpart
     chkLocalpart = staticmethod(chkLocalpart)
 
@@ -303,24 +304,24 @@
                 self.__makedir(folder+'/'+subdir, mode, uid, gid)
         os.chdir(oldpwd)
 
-    def __maildirdelete(self, domdir, uid, gid):
+    def __userdirdelete(self, domdir, uid, gid):
         if uid > 0 and gid > 0:
-            maildir = '%s' % uid
-            if maildir.count('..') or domdir.count('..'):
-                raise VMMException(_(u'Found ".." in maildir path.'),
+            userdir = '%s' % uid
+            if userdir.count('..') or domdir.count('..'):
+                raise VMMException(_(u'Found ".." in home directory path.'),
                     ERR.FOUND_DOTS_IN_PATH)
             if os.path.isdir(domdir):
                 os.chdir(domdir)
-                if os.path.isdir(maildir):
-                    mdstat = os.stat(maildir)
+                if os.path.isdir(userdir):
+                    mdstat = os.stat(userdir)
                     if (mdstat.st_uid, mdstat.st_gid) != (uid, gid):
                         raise VMMException(
-                          _(u'Owner/group mismatch in maildir detected.'),
-                          ERR.MAILDIR_PERM_MISMATCH)
-                    rmtree(maildir, ignore_errors=True)
+                         _(u'Owner/group mismatch in home directory detected.'),
+                         ERR.MAILDIR_PERM_MISMATCH)
+                    rmtree(userdir, ignore_errors=True)
                 else:
-                    raise VMMException(_(u"No such directory: %s/%s") %
-                        (domdir, uid), ERR.NO_SUCH_DIRECTORY)
+                    raise VMMException(_(u"No such directory: %s") %
+                        domdir+'/'+userdir, ERR.NO_SUCH_DIRECTORY)
 
     def __domdirdelete(self, domdir, gid):
         if gid > 0:
@@ -559,15 +560,15 @@
         acc.delete()
         if self.__Cfg.getboolean('maildir', 'delete'):
             try:
-                self.__maildirdelete(acc.getDir('domain'), uid, gid)
+                self.__userdirdelete(acc.getDir('domain'), uid, gid)
             except VMMException, e:
                 if e.code() in [ERR.FOUND_DOTS_IN_PATH,
                         ERR.MAILDIR_PERM_MISMATCH, ERR.NO_SUCH_DIRECTORY]:
                     warning = _(u"""\
 The account has been successfully deleted from the database.
     But an error occurred while deleting the following directory:
-    »%s«
-    Reason: %s""") % (acc.getDir('home'), e.msg())
+    »%(directory)s«
+    Reason: %(raeson)s""") % {'directory': acc.getDir('home'),'raeson': e.msg()}
                     self.__warnings.append(warning)
                 else:
                     raise e
diff -r 927b0705d31a -r f5ca21303871 po/de.po
--- a/po/de.po	Tue Aug 19 04:30:34 2008 +0000
+++ b/po/de.po	Wed Aug 20 02:22:43 2008 +0000
@@ -5,34 +5,39 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vmm 0.5\n"
-"POT-Creation-Date: 2008-08-19 06:18+CEST\n"
-"PO-Revision-Date: 2008-08-19 06:20+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-08-20 03:31+0200\n"
+"PO-Revision-Date: 2008-08-20 04:19+0200\n"
 "Last-Translator: Pascal Volk <p.volk@veb-it.de>\n"
 "Language-Team: German\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: pygettext.py 1.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: VirtualMailManager/Account.py:40
+#, python-format
 msgid "There is already an alias with the address »%s«."
 msgstr "Es existiert bereits ein Alias mit der Adresse »%s«."
 
 #: VirtualMailManager/Account.py:72
+#, python-format
 msgid "Domain »%s« doesn't exist."
 msgstr "Die Domain »%s« existiert nicht."
 
 #: VirtualMailManager/Account.py:91
+#, python-format
 msgid "Unknown service »%s«."
 msgstr "Unbekannter Service »%s«."
 
 #: VirtualMailManager/Account.py:94 VirtualMailManager/Account.py:151
 #: VirtualMailManager/Account.py:178 VirtualMailManager/Account.py:206
+#, python-format
 msgid "The account »%s« doesn't exists."
 msgstr "Der Account »%s« existiert nicht."
 
 #: VirtualMailManager/Account.py:146
+#, python-format
 msgid "The account »%s« already exists."
 msgstr "Der Account »%s« existiert bereits."
 
@@ -53,6 +58,7 @@
 msgstr "Die UID muss größer als 0 sein."
 
 #: VirtualMailManager/Account.py:227
+#, python-format
 msgid "There is no account with the UID »%d«."
 msgstr "Es existiert kein Account mit der UID »%d«."
 
@@ -61,10 +67,12 @@
 msgstr "Alias- und Ziel-Adresse sind identisch."
 
 #: VirtualMailManager/Alias.py:38
+#, python-format
 msgid "There is already an account with address '%s'"
 msgstr "Es gibt bereits einen Accounts mit der Adresse '%s'"
 
 #: VirtualMailManager/Alias.py:68
+#, python-format
 msgid "Domain '%s' doesn't exist."
 msgstr "Die Domain '%s' existiert nicht."
 
@@ -81,10 +89,12 @@
 msgstr "Der Alias existiert nicht."
 
 #: VirtualMailManager/Config.py:101
+#, python-format
 msgid "missing section: %s\n"
 msgstr "Fehlender Abschnitt: %s\n"
 
 #: VirtualMailManager/Config.py:103
+#, python-format
 msgid "missing options in section %s:\n"
 msgstr "Fehlende Optionen im Abschnitt %s:\n"
 
@@ -93,18 +103,22 @@
 msgstr "Argument 'section' ist nicht vom Typ List."
 
 #: VirtualMailManager/Config.py:130
+#, python-format
 msgid "* Config section: »%s«"
 msgstr "* Konfigurations Abschnitt: »%s«"
 
 #: VirtualMailManager/Config.py:133
-msgid "Enter new value for option %s [%s]: "
-msgstr "Neuer Wert für Option %s [%s]: "
+#, python-format
+msgid "Enter new value for option %(opt)s [%(val)s]: "
+msgstr "Neuer Wert für Option %(opt)s [%(val)s]: "
 
 #: VirtualMailManager/Domain.py:75 VirtualMailManager/Domain.py:153
+#, python-format
 msgid "The domain »%s« already exists."
 msgstr "Die Domain »%s« existiert bereits."
 
 #: VirtualMailManager/Domain.py:78
+#, python-format
 msgid "The domain alias »%s« already exists."
 msgstr "Der Domain-Alias »%s« existiert bereits."
 
@@ -122,6 +136,7 @@
 
 #: VirtualMailManager/Domain.py:171 VirtualMailManager/Domain.py:195
 #: VirtualMailManager/Domain.py:213 VirtualMailManager/Domain.py:243
+#, python-format
 msgid "The domain »%s« doesn't exist yet."
 msgstr "Die Domain »%s« existiert noch nicht."
 
@@ -150,14 +165,15 @@
 msgstr "Unbekannte tid angegeben."
 
 #: VirtualMailManager/VirtualMailManager.py:47
+#, python-format
 msgid ""
-"fix permissions for »%s«\n"
-"`chmod 0600 %s` would be great."
+"fix permissions for »%(cfgFileName)s«\n"
+"`chmod 0600 %(cfgFileName)s` would be great."
 msgstr ""
-"Bitte Zugriffsrechte für »%s« anpassen\n"
-"`chmod 0600 %s` wäre großartig."
+"Bitte Zugriffsrechte für »%(cfgFileName)s« anpassen\n"
+"`chmod 0600 %(cfgFileName)s` wäre großartig."
 
-#: VirtualMailManager/VirtualMailManager.py:54
+#: VirtualMailManager/VirtualMailManager.py:55
 msgid ""
 "You are not root.\n"
 "\tGood bye!\n"
@@ -165,11 +181,13 @@
 "Sie sind nicht root.\n"
 "\tAuf Wiedersehen.\n"
 
-#: VirtualMailManager/VirtualMailManager.py:68
+#: VirtualMailManager/VirtualMailManager.py:69
+#, python-format
 msgid "The file »%s« does not exists."
 msgstr "Die Datei »%s« existiert nicht."
 
-#: VirtualMailManager/VirtualMailManager.py:87
+#: VirtualMailManager/VirtualMailManager.py:88
+#, python-format
 msgid ""
 "»%s« is not a directory.\n"
 "(vmm.cfg: section \"domdir\", option \"base\")"
@@ -177,91 +195,96 @@
 "»%s« ist kein Verzeichnis.\n"
 "(vmm.cfg: Abschnitt \"domdir\", Option \"base\")"
 
-#: VirtualMailManager/VirtualMailManager.py:92
+#: VirtualMailManager/VirtualMailManager.py:93
+#, python-format
 msgid ""
-"»%s« doesn't exists.\n"
-"(vmm.cfg: section \"bin\", option \"%s\")"
+"»%(binary)s« doesn't exists.\n"
+"(vmm.cfg: section \"bin\", option \"%(option)s\")"
 msgstr ""
-"»%s« existiert nicht.\n"
-"(vmm.cfg: Abschnitt \"bin\", Option \"%s\")"
+"»%(binary)s« existiert nicht.\n"
+"(vmm.cfg: Abschnitt \"bin\", Option \"%(option)s\")"
 
-#: VirtualMailManager/VirtualMailManager.py:96
+#: VirtualMailManager/VirtualMailManager.py:97
+#, python-format
 msgid ""
-"»%s« is not executable.\n"
-"(vmm.cfg: section \"bin\", option \"%s\")"
+"»%(binary)s« is not executable.\n"
+"(vmm.cfg: section \"bin\", option \"%(option)s\")"
 msgstr ""
-"»%s« ist nicht ausführbar.\n"
-"(vmm.cfg: Abschnitt \"bin\", Option \"%s\")"
+"»%(binary)s« ist nicht ausführbar.\n"
+"(vmm.cfg: Abschnitt \"bin\", Option \"%(option)s\")"
 
-#: VirtualMailManager/VirtualMailManager.py:122
+#: VirtualMailManager/VirtualMailManager.py:123
 msgid "No localpart specified."
 msgstr "Kein local-part angegeben."
 
-#: VirtualMailManager/VirtualMailManager.py:125
+#: VirtualMailManager/VirtualMailManager.py:126
+#, python-format
 msgid "The local part »%s« is too long"
 msgstr "Der local-part »%s« ist zu lang"
 
 #: VirtualMailManager/VirtualMailManager.py:133
-msgid "The local part »%s« contains invalid characters: %s"
-msgstr "Der local-part »%s« enthält ungültige Zeichen: %s"
+#, python-format
+msgid "The local part »%(lpart)s« contains invalid characters: %(ichrs)s"
+msgstr "Der local-part »%(lpart)s« enthält ungültige Zeichen: %(ichrs)s"
 
-#: VirtualMailManager/VirtualMailManager.py:176
+#: VirtualMailManager/VirtualMailManager.py:177
 msgid "The domain name is too long."
 msgstr "Der Domain-Name ist zu lang."
 
-#: VirtualMailManager/VirtualMailManager.py:180
+#: VirtualMailManager/VirtualMailManager.py:181
 msgid "The domain name is invalid."
 msgstr "Der Domain-Name ist ungültig."
 
-#: VirtualMailManager/VirtualMailManager.py:189
+#: VirtualMailManager/VirtualMailManager.py:190
+#, python-format
 msgid "Missing '@' sign in e-mail address »%s«."
 msgstr "In der E-Mail-Adresse »%s« fehlt das '@'-Zeichen."
 
-#: VirtualMailManager/VirtualMailManager.py:192
+#: VirtualMailManager/VirtualMailManager.py:193
+#, python-format
 msgid "»%s« looks not like an e-mail address."
 msgstr "»%s« sieht nicht wie eine E-Mail-Adresse aus."
 
-#: VirtualMailManager/VirtualMailManager.py:210
+#: VirtualMailManager/VirtualMailManager.py:211
 msgid "Enter new password: "
 msgstr "Neues Passwort eingeben: "
 
-#: VirtualMailManager/VirtualMailManager.py:213
+#: VirtualMailManager/VirtualMailManager.py:214
 msgid "Sorry, empty passwords are not permitted"
 msgstr "Entschuldigung, leere Passwörter sind nicht zulässig"
 
-#: VirtualMailManager/VirtualMailManager.py:214
+#: VirtualMailManager/VirtualMailManager.py:215
 msgid "Retype new password: "
 msgstr "Neues Passwort wiederholen: "
 
-#: VirtualMailManager/VirtualMailManager.py:217
+#: VirtualMailManager/VirtualMailManager.py:218
 msgid "Sorry, passwords do not match"
 msgstr "Entschuldigung, die Passwörter stimmen nicht überein"
 
-#: VirtualMailManager/VirtualMailManager.py:252
+#: VirtualMailManager/VirtualMailManager.py:253
+#: VirtualMailManager/VirtualMailManager.py:323
+#, python-format
 msgid "No such directory: %s"
 msgstr "Verzeichnis nicht gefunden: %s"
 
-#: VirtualMailManager/VirtualMailManager.py:310
-msgid "Found \"..\" in maildir path."
-msgstr "\"..\" im Pfad zum Maildir entdeckt."
+#: VirtualMailManager/VirtualMailManager.py:311
+msgid "Found \"..\" in userdir path."
+msgstr "\"..\" im Pfad zum Benutzerverzeichnis entdeckt."
 
-#: VirtualMailManager/VirtualMailManager.py:318
-msgid "Owner/group mismatch in maildir detected."
-msgstr "Maildir gehört dem/der falschen Benutzer/Gruppe."
+#: VirtualMailManager/VirtualMailManager.py:319
+msgid "Owner/group mismatch in userdir detected."
+msgstr "Benutzerverzeichnis gehört dem/der falschen Benutzer/Gruppe."
 
-#: VirtualMailManager/VirtualMailManager.py:322
-msgid "No such directory: %s/%s"
-msgstr "Verzeichnis nicht gefunden: %s/%s"
-
-#: VirtualMailManager/VirtualMailManager.py:333
+#: VirtualMailManager/VirtualMailManager.py:334
 msgid "FATAL: \"..\" in domain directory path detected."
 msgstr "FATAL: \"..\" im Pfad zum Domain-Verzeichnis entdeckt."
 
-#: VirtualMailManager/VirtualMailManager.py:339
+#: VirtualMailManager/VirtualMailManager.py:340
 msgid "FATAL: group mismatch in domain directory detected"
 msgstr "FATAL: Domain-Verzeichnis gehört der falschen Gruppe"
 
-#: VirtualMailManager/VirtualMailManager.py:426
+#: VirtualMailManager/VirtualMailManager.py:427
+#, python-format
 msgid ""
 "Configurtion error: \"%s\"\n"
 "(in section \"connfig\", option \"done\") see also: vmm.cfg(5)\n"
@@ -269,40 +292,46 @@
 "Konfigurations Fehler: \"%s\"\n"
 "(im Abschnitt \"connfig\", Option \"done\") Siehe auch: vmm.cfg(5)\n"
 
-#: VirtualMailManager/VirtualMailManager.py:446
+#: VirtualMailManager/VirtualMailManager.py:447
+#, python-format
 msgid "Invalid section: '%s'"
 msgstr "Ungültiger Abschnitt: '%s'"
 
-#: VirtualMailManager/VirtualMailManager.py:456
+#: VirtualMailManager/VirtualMailManager.py:457
+#, python-format
 msgid "Invalid argument: '%s'"
 msgstr "Ungültiges Argument: '%s'"
 
-#: VirtualMailManager/VirtualMailManager.py:466
-#: VirtualMailManager/VirtualMailManager.py:496
+#: VirtualMailManager/VirtualMailManager.py:467
+#: VirtualMailManager/VirtualMailManager.py:497
+#, python-format
 msgid "Invalid argument: »%s«"
 msgstr "Ungültiges Argument: »%s«"
 
-#: VirtualMailManager/VirtualMailManager.py:534
+#: VirtualMailManager/VirtualMailManager.py:535
+#, python-format
 msgid "The pattern »%s« contains invalid characters."
 msgstr "Das Muster »%s« enthält ungültige Zeichen."
 
-#: VirtualMailManager/VirtualMailManager.py:566
+#: VirtualMailManager/VirtualMailManager.py:567
+#, python-format
 msgid ""
 "The account has been successfully deleted from the database.\n"
 "    But an error occurred while deleting the following directory:\n"
-"    »%s«\n"
-"    Reason: %s"
+"    »%(directory)s«\n"
+"    Reason: %(raeson)s"
 msgstr ""
 "Der Account wurde erfolgreich aus der Datenbank gelöscht.\n"
 "    Aber es trat ein Fehler auf beim Löschen des folgenden Verzeichnisses:\n"
-"    »%s«\n"
-"    Grund: %s"
+"    »%(directory)s«\n"
+"    Grund: %(raeson)s"
 
-#: VirtualMailManager/VirtualMailManager.py:598
+#: VirtualMailManager/VirtualMailManager.py:599
 msgid "Account doesn't exists"
 msgstr "Der Account existiert nicht"
 
 #: vmm:40
+#, python-format
 msgid ""
 "Usage: %s SUBCOMMAND OBJECT ARGS*\n"
 "  short long\n"
@@ -337,6 +366,7 @@
 msgstr "Alias Informationen"
 
 #: vmm:137
+#, python-format
 msgid "\tMail for %s goes to:"
 msgstr "\tE-Mails für %s gehen an:"
 
@@ -435,3 +465,11 @@
 #: vmm:410
 msgid "Ouch"
 msgstr "Autsch"
+
+#: VirtualMailManager/VirtualMailManager.py:311
+msgid "Found \"..\" in home directory path."
+msgstr "\"..\" im Pfad zum Benutzerverzeichnis entdeckt."
+
+#: VirtualMailManager/VirtualMailManager.py:319
+msgid "Owner/group mismatch in home directory detected."
+msgstr "Benutzerverzeichnis gehört dem/der falschen Benutzer/Gruppe."
diff -r 927b0705d31a -r f5ca21303871 po/vmm.pot
--- a/po/vmm.pot	Tue Aug 19 04:30:34 2008 +0000
+++ b/po/vmm.pot	Wed Aug 20 02:22:43 2008 +0000
@@ -1,39 +1,43 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2008 VEB IT
+# This file is distributed under the same license as the vmm package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: vmm 0.5\n"
-"POT-Creation-Date: 2008-08-19 06:18+CEST\n"
+"POT-Creation-Date: 2008-08-20 03:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
-"Generated-By: pygettext.py 1.5\n"
-
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: VirtualMailManager/Account.py:40
-msgid "There is already an alias with the address \302\273%s\302\253."
+#, python-format
+msgid "There is already an alias with the address »%s«."
 msgstr ""
 
 #: VirtualMailManager/Account.py:72
-msgid "Domain \302\273%s\302\253 doesn't exist."
+#, python-format
+msgid "Domain »%s« doesn't exist."
 msgstr ""
 
 #: VirtualMailManager/Account.py:91
-msgid "Unknown service \302\273%s\302\253."
+#, python-format
+msgid "Unknown service »%s«."
 msgstr ""
 
 #: VirtualMailManager/Account.py:94 VirtualMailManager/Account.py:151
 #: VirtualMailManager/Account.py:178 VirtualMailManager/Account.py:206
-msgid "The account \302\273%s\302\253 doesn't exists."
+#, python-format
+msgid "The account »%s« doesn't exists."
 msgstr ""
 
 #: VirtualMailManager/Account.py:146
-msgid "The account \302\273%s\302\253 already exists."
+#, python-format
+msgid "The account »%s« already exists."
 msgstr ""
 
 #: VirtualMailManager/Account.py:186
@@ -53,7 +57,8 @@
 msgstr ""
 
 #: VirtualMailManager/Account.py:227
-msgid "There is no account with the UID \302\273%d\302\253."
+#, python-format
+msgid "There is no account with the UID »%d«."
 msgstr ""
 
 #: VirtualMailManager/Alias.py:25
@@ -61,10 +66,12 @@
 msgstr ""
 
 #: VirtualMailManager/Alias.py:38
+#, python-format
 msgid "There is already an account with address '%s'"
 msgstr ""
 
 #: VirtualMailManager/Alias.py:68
+#, python-format
 msgid "Domain '%s' doesn't exist."
 msgstr ""
 
@@ -81,13 +88,13 @@
 msgstr ""
 
 #: VirtualMailManager/Config.py:101
-msgid ""
-"missing section: %s\n"
+#, python-format
+msgid "missing section: %s\n"
 msgstr ""
 
 #: VirtualMailManager/Config.py:103
-msgid ""
-"missing options in section %s:\n"
+#, python-format
+msgid "missing options in section %s:\n"
 msgstr ""
 
 #: VirtualMailManager/Config.py:119
@@ -95,19 +102,23 @@
 msgstr ""
 
 #: VirtualMailManager/Config.py:130
-msgid "* Config section: \302\273%s\302\253"
+#, python-format
+msgid "* Config section: »%s«"
 msgstr ""
 
 #: VirtualMailManager/Config.py:133
-msgid "Enter new value for option %s [%s]: "
+#, python-format
+msgid "Enter new value for option %(opt)s [%(val)s]: "
 msgstr ""
 
 #: VirtualMailManager/Domain.py:75 VirtualMailManager/Domain.py:153
-msgid "The domain \302\273%s\302\253 already exists."
+#, python-format
+msgid "The domain »%s« already exists."
 msgstr ""
 
 #: VirtualMailManager/Domain.py:78
-msgid "The domain alias \302\273%s\302\253 already exists."
+#, python-format
+msgid "The domain alias »%s« already exists."
 msgstr ""
 
 #: VirtualMailManager/Domain.py:132
@@ -124,7 +135,8 @@
 
 #: VirtualMailManager/Domain.py:171 VirtualMailManager/Domain.py:195
 #: VirtualMailManager/Domain.py:213 VirtualMailManager/Domain.py:243
-msgid "The domain \302\273%s\302\253 doesn't exist yet."
+#, python-format
+msgid "The domain »%s« doesn't exist yet."
 msgstr ""
 
 #: VirtualMailManager/MailLocation.py:34
@@ -152,143 +164,157 @@
 msgstr ""
 
 #: VirtualMailManager/VirtualMailManager.py:47
+#, python-format
 msgid ""
-"fix permissions for \302\273%s\302\253\n"
-"`chmod 0600 %s` would be great."
+"fix permissions for »%(cfgFileName)s«\n"
+"`chmod 0600 %(cfgFileName)s` would be great."
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:54
+#: VirtualMailManager/VirtualMailManager.py:55
 msgid ""
 "You are not root.\n"
 "\tGood bye!\n"
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:68
-msgid "The file \302\273%s\302\253 does not exists."
+#: VirtualMailManager/VirtualMailManager.py:69
+#, python-format
+msgid "The file »%s« does not exists."
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:87
+#: VirtualMailManager/VirtualMailManager.py:88
+#, python-format
 msgid ""
-"\302\273%s\302\253 is not a directory.\n"
+"»%s« is not a directory.\n"
 "(vmm.cfg: section \"domdir\", option \"base\")"
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:92
+#: VirtualMailManager/VirtualMailManager.py:93
+#, python-format
 msgid ""
-"\302\273%s\302\253 doesn't exists.\n"
-"(vmm.cfg: section \"bin\", option \"%s\")"
+"»%(binary)s« doesn't exists.\n"
+"(vmm.cfg: section \"bin\", option \"%(option)s\")"
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:96
+#: VirtualMailManager/VirtualMailManager.py:97
+#, python-format
 msgid ""
-"\302\273%s\302\253 is not executable.\n"
-"(vmm.cfg: section \"bin\", option \"%s\")"
+"»%(binary)s« is not executable.\n"
+"(vmm.cfg: section \"bin\", option \"%(option)s\")"
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:122
+#: VirtualMailManager/VirtualMailManager.py:123
 msgid "No localpart specified."
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:125
-msgid "The local part \302\273%s\302\253 is too long"
+#: VirtualMailManager/VirtualMailManager.py:126
+#, python-format
+msgid "The local part »%s« is too long"
 msgstr ""
 
 #: VirtualMailManager/VirtualMailManager.py:133
-msgid "The local part \302\273%s\302\253 contains invalid characters: %s"
+#, python-format
+msgid "The local part »%(lpart)s« contains invalid characters: %(ichrs)s"
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:176
+#: VirtualMailManager/VirtualMailManager.py:177
 msgid "The domain name is too long."
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:180
+#: VirtualMailManager/VirtualMailManager.py:181
 msgid "The domain name is invalid."
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:189
-msgid "Missing '@' sign in e-mail address \302\273%s\302\253."
+#: VirtualMailManager/VirtualMailManager.py:190
+#, python-format
+msgid "Missing '@' sign in e-mail address »%s«."
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:192
-msgid "\302\273%s\302\253 looks not like an e-mail address."
+#: VirtualMailManager/VirtualMailManager.py:193
+#, python-format
+msgid "»%s« looks not like an e-mail address."
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:210
+#: VirtualMailManager/VirtualMailManager.py:211
 msgid "Enter new password: "
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:213
+#: VirtualMailManager/VirtualMailManager.py:214
 msgid "Sorry, empty passwords are not permitted"
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:214
+#: VirtualMailManager/VirtualMailManager.py:215
 msgid "Retype new password: "
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:217
+#: VirtualMailManager/VirtualMailManager.py:218
 msgid "Sorry, passwords do not match"
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:252
+#: VirtualMailManager/VirtualMailManager.py:253
+#: VirtualMailManager/VirtualMailManager.py:323
+#, python-format
 msgid "No such directory: %s"
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:310
-msgid "Found \"..\" in maildir path."
+#: VirtualMailManager/VirtualMailManager.py:311
+msgid "Found \"..\" in userdir path."
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:318
-msgid "Owner/group mismatch in maildir detected."
+#: VirtualMailManager/VirtualMailManager.py:319
+msgid "Owner/group mismatch in userdir detected."
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:322
-msgid "No such directory: %s/%s"
-msgstr ""
-
-#: VirtualMailManager/VirtualMailManager.py:333
+#: VirtualMailManager/VirtualMailManager.py:334
 msgid "FATAL: \"..\" in domain directory path detected."
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:339
+#: VirtualMailManager/VirtualMailManager.py:340
 msgid "FATAL: group mismatch in domain directory detected"
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:426
+#: VirtualMailManager/VirtualMailManager.py:427
+#, python-format
 msgid ""
 "Configurtion error: \"%s\"\n"
 "(in section \"connfig\", option \"done\") see also: vmm.cfg(5)\n"
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:446
+#: VirtualMailManager/VirtualMailManager.py:447
+#, python-format
 msgid "Invalid section: '%s'"
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:456
+#: VirtualMailManager/VirtualMailManager.py:457
+#, python-format
 msgid "Invalid argument: '%s'"
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:466
-#: VirtualMailManager/VirtualMailManager.py:496
-msgid "Invalid argument: \302\273%s\302\253"
+#: VirtualMailManager/VirtualMailManager.py:467
+#: VirtualMailManager/VirtualMailManager.py:497
+#, python-format
+msgid "Invalid argument: »%s«"
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:534
-msgid "The pattern \302\273%s\302\253 contains invalid characters."
+#: VirtualMailManager/VirtualMailManager.py:535
+#, python-format
+msgid "The pattern »%s« contains invalid characters."
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:566
+#: VirtualMailManager/VirtualMailManager.py:567
+#, python-format
 msgid ""
 "The account has been successfully deleted from the database.\n"
 "    But an error occurred while deleting the following directory:\n"
-"    \302\273%s\302\253\n"
-"    Reason: %s"
+"    »%(directory)s«\n"
+"    Reason: %(raeson)s"
 msgstr ""
 
-#: VirtualMailManager/VirtualMailManager.py:598
+#: VirtualMailManager/VirtualMailManager.py:599
 msgid "Account doesn't exists"
 msgstr ""
 
 #: vmm:40
+#, python-format
 msgid ""
 "Usage: %s SUBCOMMAND OBJECT ARGS*\n"
 "  short long\n"
@@ -320,6 +346,7 @@
 msgstr ""
 
 #: vmm:137
+#, python-format
 msgid "\tMail for %s goes to:"
 msgstr ""
 
@@ -419,3 +446,10 @@
 msgid "Ouch"
 msgstr ""
 
+#: VirtualMailManager/VirtualMailManager.py:311
+msgid "Found \"..\" in home directory path."
+msgstr ""
+
+#: VirtualMailManager/VirtualMailManager.py:319
+msgid "Owner/group mismatch in home directory detected."
+msgstr ""