# HG changeset patch
# User Pascal Volk <user@localhost.localdomain.org>
# Date 1395607125 0
# Node ID ee3c6c826b4285d99ca932235c03a052a21c74dc
# Parent  51d834ac792349754eb6a441be28d2073a206d13# Parent  ef2b73d461d49e3c8144786afcb821b190cd1ee8
merged changes from default(ef2b73d461d4).

diff -r 51d834ac7923 -r ee3c6c826b42 VirtualMailManager/cli/subcommands.py
--- a/VirtualMailManager/cli/subcommands.py	Sun Mar 23 17:16:04 2014 +0000
+++ b/VirtualMailManager/cli/subcommands.py	Sun Mar 23 20:38:45 2014 +0000
@@ -1205,9 +1205,9 @@
             # only one type is requested, so no type indicator
             _trans = {TYPE_ACCOUNT: '', TYPE_ALIAS: '', TYPE_RELOCATED: ''}
         else:
+            _trans = {
             # TP: the letters 'u', 'a' and 'r' are abbreviations of user,
             # alias and relocated user
-            _trans = {
                 TYPE_ACCOUNT: _('u'),
                 TYPE_ALIAS: _('a'),
                 TYPE_RELOCATED: _('r'),
diff -r 51d834ac7923 -r ee3c6c826b42 po/vmm.pot
--- a/po/vmm.pot	Sun Mar 23 17:16:04 2014 +0000
+++ b/po/vmm.pot	Sun Mar 23 20:38:45 2014 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: vmm 0.6.2\n"
 "Report-Msgid-Bugs-To: user+vmm/tp@localhost.localdomain.org\n"
-"POT-Creation-Date: 2014-03-23 16:32+0000\n"
+"POT-Creation-Date: 2014-03-23 20:10+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"
@@ -1339,6 +1339,8 @@
 msgid "Invalid address type for list: '%s'"
 msgstr ""
 
+#. TP: the letters 'u', 'a' and 'r' are abbreviations of user,
+#. alias and relocated user
 #: VirtualMailManager/cli/subcommands.py:1101
 msgid "u"
 msgstr ""