diff -r 89bf9389d62f -r 1ebb6b88f589 VirtualMailManager/cli/subcommands.py
--- a/VirtualMailManager/cli/subcommands.py	Mon Nov 07 23:02:33 2011 +0000
+++ b/VirtualMailManager/cli/subcommands.py	Tue Nov 08 01:42:49 2011 +0000
@@ -669,93 +669,89 @@
     cmd = Command
     cmd_map.update({
     # Account commands
-    'getuser': cmd('getuser', 'gu', get_user, _(u'uid'),
+    'getuser': cmd('getuser', 'gu', get_user, 'uid',
                    _(u'get the address of the user with the given UID')),
-    'useradd': cmd('useradd', 'ua', user_add, _(u'address [password]'),
+    'useradd': cmd('useradd', 'ua', user_add, 'address [password]',
                    _(u'create a new e-mail user with the given address')),
-    'userdelete': cmd('userdelete', 'ud', user_delete,
-                      _(u'address') + ' [force]',
+    'userdelete': cmd('userdelete', 'ud', user_delete, 'address [force]',
                       _(u'delete the specified user')),
-    'userinfo': cmd('userinfo', 'ui', user_info, _(u'address [details]'),
+    'userinfo': cmd('userinfo', 'ui', user_info, 'address [details]',
                     _(u'display information about the given address')),
-    'username': cmd('username', 'un', user_name, _(u'address name'),
+    'username': cmd('username', 'un', user_name, 'address name',
                     _(u'set or update the real name for an address')),
     'userpassword': cmd('userpassword', 'up', user_password,
-                        _(u'address [password]'),
+                        'address [password]',
                         _(u'update the password for the given address')),
     'userquota': cmd('userquota', 'uq', user_quota,
-                     _(u'address storage [messages]'),
+                     'address storage [messages]',
                      _(u'update the quota limit for the given address')),
     'userservices': cmd('userservices', 'us', user_services,
-                        _(u'address [service ...]'),
+                        'address [service ...]',
                         _(u'enables the specified services and disables all '
                           u'not specified services')),
     'usertransport': cmd('usertransport', 'ut', user_transport,
-                         _(u'address transport'),
+                         'address transport',
                          _(u'update the transport of the given address')),
     # Alias commands
-    'aliasadd': cmd('aliasadd', 'aa', alias_add, _(u'address destination ...'),
+    'aliasadd': cmd('aliasadd', 'aa', alias_add, 'address destination ...',
                     _(u'create a new alias e-mail address with one or more '
                       u'destinations')),
     'aliasdelete': cmd('aliasdelete', 'ad', alias_delete,
-                       _(u'address [destination]'),
+                       'address [destination]',
                        _(u'delete the specified alias e-mail address or one '
                          u'of its destinations')),
-    'aliasinfo': cmd('aliasinfo', 'ai', alias_info, _(u'address'),
+    'aliasinfo': cmd('aliasinfo', 'ai', alias_info, 'address',
                      _(u'show the destination(s) of the specified alias')),
     # AliasDomain commands
     'aliasdomainadd': cmd('aliasdomainadd', 'ada', aliasdomain_add,
-                          _(u'fqdn destination'),
+                          'fqdn destination',
                           _(u'create a new alias for an existing domain')),
     'aliasdomaindelete': cmd('aliasdomaindelete', 'add', aliasdomain_delete,
-                             _(u'fqdn'),
-                             _(u'delete the specified alias domain')),
-    'aliasdomaininfo': cmd('aliasdomaininfo', 'adi', aliasdomain_info,
-                         _(u'fqdn'),
+                             'fqdn', _(u'delete the specified alias domain')),
+    'aliasdomaininfo': cmd('aliasdomaininfo', 'adi', aliasdomain_info, 'fqdn',
                          _(u'show the destination of the given alias domain')),
     'aliasdomainswitch': cmd('aliasdomainswitch', 'ads', aliasdomain_switch,
-                       _(u'fqdn destination'),
-                       _(u'assign the given alias domain to an other domain')),
+                             'fqdn destination', _(u'assign the given alias '
+                             'domain to an other domain')),
     # Domain commands
-    'domainadd': cmd('domainadd', 'da', domain_add, _(u'fqdn [transport]'),
+    'domainadd': cmd('domainadd', 'da', domain_add, 'fqdn [transport]',
                      _(u'create a new domain')),
-    'domaindelete': cmd('domaindelete', 'dd', domain_delete,
-                      _(u'fqdn') + ' [force]',
+    'domaindelete': cmd('domaindelete', 'dd', domain_delete, 'fqdn [force]',
                       _(u'delete the given domain and all its alias domains')),
-    'domaininfo': cmd('domaininfo', 'di', domain_info, _(u'fqdn [details]'),
+    'domaininfo': cmd('domaininfo', 'di', domain_info, 'fqdn [details]',
                       _(u'display information about the given domain')),
     'domainquota': cmd('domainquota', 'dq', domain_quota,
-                       _(u'fqdn storage [messages]') + ' [force]',
+                       'fqdn storage [messages] [force]',
                        _(u'update the quota limit of the specified domain')),
     'domainservices': cmd('domainservices', 'ds', domain_services,
-                          _(u'fqdn [service ...]') + ' [force]',
+                          'fqdn [service ...] [force]',
                           _(u'enables the specified services and disables all '
                             u'not specified services of the given domain')),
     'domaintransport': cmd('domaintransport', 'dt', domain_transport,
-                           _(u'fqdn transport') + ' [force]',
+                           'fqdn transport [force]',
                            _(u'update the transport of the specified domain')),
-    'listdomains': cmd('listdomains', 'ld', list_domains, _(u'[pattern]'),
-                       _(u'list all domains / search domains by pattern')),
+    'listdomains': cmd('listdomains', 'ld', list_domains, '[pattern]',
+                      _(u'list all domains or search for domains by pattern')),
     # Relocated commands
     'relocatedadd': cmd('relocatedadd', 'ra', relocated_add,
-                        _(u'address newaddress'),
+                        'address newaddress',
                         _(u'create a new record for a relocated user')),
     'relocateddelete': cmd('relocateddelete', 'rd', relocated_delete,
-                           _(u'address'),
+                           'address',
                            _(u'delete the record of the relocated user')),
-    'relocatedinfo': cmd('relocatedinfo', 'ri', relocated_info, _('address'),
+    'relocatedinfo': cmd('relocatedinfo', 'ri', relocated_info, 'address',
                          _(u'print information about a relocated user')),
     # cli commands
-    'configget': cmd('configget', 'cg', config_get, _(u'option'),
+    'configget': cmd('configget', 'cg', config_get, 'option',
                      _('show the actual value of the configuration option')),
-    'configset': cmd('configset', 'cs', config_set, _('option value'),
+    'configset': cmd('configset', 'cs', config_set, 'option value',
                       _('set a new value for the configuration option')),
-    'configure': cmd('configure', 'cf', configure, _(u'[section]'),
+    'configure': cmd('configure', 'cf', configure, '[section]',
                      _(u'start interactive configuration modus')),
     'listpwschemes': cmd('listpwschemes', 'lp', list_pwschemes, '',
                          _(u'lists all usable password schemes and password '
                            u'encoding suffixes')),
-    'help': cmd('help', 'h', help_, _(u'[subcommand]'),
+    'help': cmd('help', 'h', help_, '[subcommand]',
                 _(u'show a help overview or help for the given subcommand')),
     'version': cmd('version', 'v', version, '',
                    _(u'show version and copyright information')),