# HG changeset patch
# User Pascal Volk <neverseen@users.sourceforge.net>
# Date 1221763254 0
# Node ID 752d3b57ebb6c99803c15bc4da6abdc6a7a061dc
# Parent  b3debcfea7bc275c120c0d7c83f4d419994d6678
small fixes/updates

diff -r b3debcfea7bc -r 752d3b57ebb6 VirtualMailManager/Alias.py
--- a/VirtualMailManager/Alias.py	Wed Sep 17 02:43:16 2008 +0000
+++ b/VirtualMailManager/Alias.py	Thu Sep 18 18:40:54 2008 +0000
@@ -75,7 +75,7 @@
         if curEx == limit:
             errmsg = _(u"""Can't add new destination to alias »%(address)s«.
 Currently this alias expands into %(count)i recipients.
-One destination more will render this alias unusable.
+One more destination will render this alias unusable.
 Hint: Increase Postfix' virtual_alias_expansion_limit
 """) % {'address': self._addr, 'count': curEx}
             raise VMMAE(errmsg, ERR.ALIAS_EXCEEDS_EXPANSION_LIMIT)
diff -r b3debcfea7bc -r 752d3b57ebb6 VirtualMailManager/ext/Postconf.py
--- a/VirtualMailManager/ext/Postconf.py	Wed Sep 17 02:43:16 2008 +0000
+++ b/VirtualMailManager/ext/Postconf.py	Thu Sep 18 18:40:54 2008 +0000
@@ -47,7 +47,7 @@
         """
         if not re.match(RE_PC_PARAMS, parameter):
             raise VMMException(_(u'The value »%s« looks not like a valid\
- postfix configuration parameter name.'), ERR.INVALID_AGUMENT)
+ postfix configuration parameter name.') % parameter, ERR.INVALID_AGUMENT)
         self.__val = self.__read(parameter)
         if expand_vars:
             self.__expandVars()
@@ -62,8 +62,8 @@
             if pvars_len > 1:
                 self.__expandMultiVars(self.__readMulti(pvars))
                 continue
-            for var in pvars:
-                self.__val = self.__val.replace(var, self.__read(var[1:]))
+            pvars = pvars.pop()
+            self.__val = self.__val.replace(pvars, self.__read(pvars[1:]))
 
     def __expandMultiVars(self, old_new):
         for old, new in old_new.items():
diff -r b3debcfea7bc -r 752d3b57ebb6 po/de.po
--- a/po/de.po	Wed Sep 17 02:43:16 2008 +0000
+++ b/po/de.po	Thu Sep 18 18:40:54 2008 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: vmm 0.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-17 04:20+0200\n"
-"PO-Revision-Date: 2008-09-17 04:32+0200\n"
+"POT-Creation-Date: 2008-09-18 00:43+0200\n"
+"PO-Revision-Date: 2008-09-18 01:12+0200\n"
 "Last-Translator: Pascal Volk <p.volk@veb-it.de>\n"
 "Language-Team: German\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@
 msgid ""
 "Can't add new destination to alias »%(address)s«.\n"
 "Currently this alias expands into %(count)i recipients.\n"
-"One destination more will render this alias unusable.\n"
+"One more destination will render this alias unusable.\n"
 "Hint: Increase Postfix' virtual_alias_expansion_limit\n"
 msgstr ""
 "Dem Alias »%(address)s« kann keine weitere Ziel-Adresse hinzugefügt werden.\n"
@@ -424,6 +424,13 @@
 msgid "Account doesn't exists"
 msgstr "Der Account existiert nicht"
 
+#: VirtualMailManager/ext/Postconf.py:49
+#, python-format
+msgid ""
+"The value »%s« looks not like a valid postfix configuration parameter name."
+msgstr ""
+"»%s« sieht nicht wie ein gültiger Postfix Konfigurationsparametername aus."
+
 #: vmm:40
 #, python-format
 msgid ""
diff -r b3debcfea7bc -r 752d3b57ebb6 po/vmm.pot
--- a/po/vmm.pot	Wed Sep 17 02:43:16 2008 +0000
+++ b/po/vmm.pot	Thu Sep 18 18:40:54 2008 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: vmm 0.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-17 04:20+0200\n"
+"POT-Creation-Date: 2008-09-18 00:43+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"
@@ -89,7 +89,7 @@
 msgid ""
 "Can't add new destination to alias »%(address)s«.\n"
 "Currently this alias expands into %(count)i recipients.\n"
-"One destination more will render this alias unusable.\n"
+"One more destination will render this alias unusable.\n"
 "Hint: Increase Postfix' virtual_alias_expansion_limit\n"
 msgstr ""
 
@@ -399,6 +399,12 @@
 msgid "Account doesn't exists"
 msgstr ""
 
+#: VirtualMailManager/ext/Postconf.py:49
+#, python-format
+msgid ""
+"The value »%s« looks not like a valid postfix configuration parameter name."
+msgstr ""
+
 #: vmm:40
 #, python-format
 msgid ""