diff -r da80de422b3c -r 58e23bd7c97f VirtualMailManager/cli/subcommands.py --- a/VirtualMailManager/cli/subcommands.py Mon Feb 14 19:11:34 2011 +0000 +++ b/VirtualMailManager/cli/subcommands.py Fri Feb 18 01:15:03 2011 +0000 @@ -625,82 +625,87 @@ cmd = Command cmd_map = { # {{{ # Account commands - 'getuser': cmd('getuser', 'gu', get_user, 'uid', + 'getuser': cmd('getuser', 'gu', get_user, _(u'uid'), _(u'get the address of the user with the given UID')), - 'useradd': cmd('useradd', 'ua', user_add, 'address [password]', + 'useradd': cmd('useradd', 'ua', user_add, _(u'address [password]'), _(u'create a new e-mail user with the given address')), - 'userdelete': cmd('userdelete', 'ud', user_delete, 'address [force]', + 'userdelete': cmd('userdelete', 'ud', user_delete, _(u'address [force]'), _(u'delete the specified user')), 'userdisable': cmd('userdisable', 'u0', user_disable, - 'address [service ...]', + _(u'address [service ...]'), _(u'deactivate all/the given service(s) for a user')), - 'userenable': cmd('userenable', 'u1', user_enable, 'address [service ...]', + 'userenable': cmd('userenable', 'u1', user_enable, + _(u'address [service ...]'), _(u'activate all or the given service(s) for a user')), - 'userinfo': cmd('userinfo', 'ui', user_info, 'address [details]', + 'userinfo': cmd('userinfo', 'ui', user_info, _(u'address [details]'), _(u'display information about the given address')), - 'username': cmd('username', 'un', user_name, 'address name', + 'username': cmd('username', 'un', user_name, _(u'address name'), _(u'set or update the real name for an address')), 'userpassword': cmd('userpassword', 'up', user_password, - 'address [password]', + _(u'address [password]'), _(u'update the password for the given address')), 'userquota': cmd('userquota', 'uq', user_quota, - 'address storage [messages]', + _(u'address storage [messages]'), _(u'update the quota limit for the given address')), 'usertransport': cmd('usertransport', 'ut', user_transport, - 'address transport', + _(u'address transport'), _(u'update the transport of the given address')), # Alias commands - 'aliasadd': cmd('aliasadd', 'aa', alias_add, 'address destination ...', - _(u'create a new alias e-mail address')), + 'aliasadd': cmd('aliasadd', 'aa', alias_add, _(u'address destination ...'), + _(u'create a new alias e-mail address with one or more ' + u'destinations')), 'aliasdelete': cmd('aliasdelete', 'ad', alias_delete, - 'address [destination]', + _(u'address [destination]'), _(u'delete the specified alias e-mail address or one ' u'of its destinations')), - 'aliasinfo': cmd('aliasinfo', 'ai', alias_info, 'address', + 'aliasinfo': cmd('aliasinfo', 'ai', alias_info, _(u'address'), _(u'show the destination(s) of the specified alias')), # AliasDomain commands 'aliasdomainadd': cmd('aliasdomainadd', 'ada', aliasdomain_add, - 'fqdn destination', + _(u'fqdn destination'), _(u'create a new alias for an existing domain')), 'aliasdomaindelete': cmd('aliasdomaindelete', 'add', aliasdomain_delete, - 'fqdn', _(u'delete the specified alias domain')), - 'aliasdomaininfo': cmd('aliasdomaininfo', 'adi', aliasdomain_info, 'fqdn', + _(u'fqdn'), + _(u'delete the specified alias domain')), + 'aliasdomaininfo': cmd('aliasdomaininfo', 'adi', aliasdomain_info, + _(u'fqdn'), _(u'show the destination of the given alias domain')), 'aliasdomainswitch': cmd('aliasdomainswitch', 'ads', aliasdomain_switch, - 'fqdn destination', + _(u'fqdn destination'), _(u'assign the given alias domain to an other domain')), # Domain commands - 'domainadd': cmd('domainadd', 'da', domain_add, 'fqdn [transport]', + 'domainadd': cmd('domainadd', 'da', domain_add, _(u'fqdn [transport]'), _(u'create a new domain')), - 'domaindelete': cmd('domaindelete', 'dd', domain_delete, 'fqdn [force]', + 'domaindelete': cmd('domaindelete', 'dd', domain_delete, + _(u'fqdn [force]'), _(u'delete the given domain and all its alias domains')), - 'domaininfo': cmd('domaininfo', 'di', domain_info, 'fqdn [details]', + 'domaininfo': cmd('domaininfo', 'di', domain_info, _(u'fqdn [details]'), _(u'display information about the given domain')), 'domainquota': cmd('domainquota', 'dq', domain_quota, - 'fqdn storage [messages] [force]', + _(u'fqdn storage [messages] [force]'), _(u'update the quota limit of the specified domain')), 'domaintransport': cmd('domaintransport', 'dt', domain_transport, - 'fqdn transport [force]', + _(u'fqdn transport [force]'), _(u'update the transport of the specified domain')), - 'listdomains': cmd('listdomains', 'ld', list_domains, '[pattern]', + 'listdomains': cmd('listdomains', 'ld', list_domains, _(u'[pattern]'), _(u'list all domains / search domains by pattern')), # Relocated commands 'relocatedadd': cmd('relocatedadd', 'ra', relocated_add, - 'address newaddress', + _(u'address newaddress'), _(u'create a new record for a relocated user')), 'relocateddelete': cmd('relocateddelete', 'rd', relocated_delete, - 'address', + _(u'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, 'option', + 'configget': cmd('configget', 'cg', config_get, _(u'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, '[section]', + 'configure': cmd('configure', 'cf', configure, _(u'[section]'), _(u'start interactive configuration modus')), - 'help': cmd('help', 'h', help_, '[subcommand]', + 'help': cmd('help', 'h', help_, _(u'[subcommand]'), _(u'show a help overview or help for the given subcommand')), 'version': cmd('version', 'v', version, '', _(u'show version and copyright information')),