vmm: comparison VirtualMailManager/cli/subcommands.py

equal deleted inserted replaced

-:46454ff9d441
+:0ed93eb8b364
 def catchall_delete(ctx):
 """delete the specified destination or all of the catchall destination"""
 if ctx.argc < 3:
-usage(EX_MISSING_ARGS, _(u'Missing domain.'), ctx.scmd)
+usage(EX_MISSING_ARGS, _(u'Missing domain name.'), ctx.scmd)
 elif ctx.argc < 4:
 ctx.hdlr.catchall_delete(ctx.args[2].lower())
 else:
 ctx.hdlr.catchall_delete(ctx.args[2].lower(), ctx.args[3])
 def catchall_info(ctx):
 """show the catchall destination(s) of the specified domain"""
 if ctx.argc < 3:
-usage(EX_MISSING_ARGS, _(u'Missing domain.'), ctx.scmd)
+usage(EX_MISSING_ARGS, _(u'Missing domain name.'), ctx.scmd)
 address = ctx.args[2].lower()
 _print_catchall_info(address, ctx.hdlr.catchall_info(address))
 def config_get(ctx):
 ctx.scmd)
 ctx.hdlr.cfg_set(ctx.args[2].lower(), ctx.args[3])
 def configure(ctx):
-"""start interactive configuration modus"""
+"""start interactive configuration mode"""
 if ctx.argc < 3:
 ctx.hdlr.configure()
 else:
 ctx.hdlr.configure(ctx.args[2].lower())
 'userdelete': cmd('userdelete', 'ud', user_delete, 'address [force]',
 _(u'delete the specified user')),
 'userinfo': cmd('userinfo', 'ui', user_info, 'address [details]',
 _(u'display information about the given address')),
 'username': cmd('username', 'un', user_name, 'address [name]',
-_(u'set or update the real name for an address')),
+_(u'set, update or delete the real name for an address')),
 'userpassword': cmd('userpassword', 'up', user_password,
 'address [password]',
 _(u'update the password for the given address')),
 'userquota': cmd('userquota', 'uq', user_quota,
 'address storage [messages] | address domain',
 u'not specified services')),
 'usertransport': cmd('usertransport', 'ut', user_transport,
 'address transport | address domain',
 _(u'update the transport of the given address')),
 'usernote': cmd('usernote', 'uo', user_note, 'address [note]',
-_(u'update the note of the given address')),
+_(u'set, update or delete the note of the given address')),
 # Alias commands
 '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'not specified services of the given domain')),
 'domaintransport': cmd('domaintransport', 'dt', domain_transport,
 'fqdn transport [force]',
 _(u'update the transport of the specified domain')),
 'domainnote': cmd('domainnote', 'do', domain_note, 'fqdn [note]',
-_(u'update the note of the given domain')),
+_(u'set, update or delete the note of the given domain')),
 # List commands
 'listdomains': cmd('listdomains', 'ld', list_domains, '[pattern]',
 _(u'list all domains or search for domains by pattern')),
 'listaddresses': cmd('listaddresses', 'll', list_addresses, '[pattern]',
 _(u'list all addresses or search for addresses by pattern')),
 'listusers': cmd('listusers', 'lu', list_users, '[pattern]',
 _(u'list all user accounts or search for accounts by pattern')),
 'listaliases': cmd('listaliases', 'la', list_aliases, '[pattern]',
 _(u'list all aliases or search for aliases by pattern')),
 'listrelocated': cmd('listrelocated', 'lr', list_relocated, '[pattern]',
-_(u'list all relocated entries or search for entries by pattern')),
+_(u'list all relocated users or search for relocated '
+u'users by pattern')),
 # Relocated commands
 'relocatedadd': cmd('relocatedadd', 'ra', relocated_add,
 'address newaddress',
 _(u'create a new record for a relocated user')),
 'relocateddelete': cmd('relocateddelete', 'rd', relocated_delete,
 'configget': cmd('configget', 'cg', config_get, 'option',
 _('show the actual value of the configuration option')),
 'configset': cmd('configset', 'cs', config_set, 'option value',
 _('set a new value for the configuration option')),
 'configure': cmd('configure', 'cf', configure, '[section]',
-_(u'start interactive configuration modus')),
+_(u'start interactive configuration mode')),
 'listpwschemes': cmd('listpwschemes', 'lp', list_pwschemes, '',
 _(u'lists all usable password schemes and password '
 u'encoding suffixes')),
 'help': cmd('help', 'h', help_, '[subcommand]',
 _(u'show a help overview or help for the given subcommand')),
 def _print_catchall_info(domain, destinations):
 """Print the catchall destinations of a domain"""
 title = _(u'Catch-all information')
 w_std(title, u'-' * len(title))
-w_std(_(u'\tMail to unknown localparts in domain %s will be sent to:')
+w_std(_(u'\tMail to unknown local-parts in domain %s will be sent to:')
 % domain)
 w_std(*(u'\t     * %s' % dest for dest in destinations))
 print
 def _print_address_list(which, dids, addresses, matching):
 """Print a list of (matching) addresses."""
 _trans = { TYPE_ACCOUNT                  : _('user accounts')
 , TYPE_ALIAS                    : _('aliases')
-, TYPE_RELOCATED                : _('relocated entries')
+, TYPE_RELOCATED                : _('relocated users')
 , TYPE_ACCOUNT | TYPE_ALIAS
 : _('user accounts and aliases')
 , TYPE_ACCOUNT | TYPE_RELOCATED
-: _('user accounts and relocated entries')
+: _('user accounts and relocated users')
 , TYPE_ALIAS | TYPE_RELOCATED
-: _('aliases and relocated entries')
+: _('aliases and relocated users')
 , TYPE_ACCOUNT | TYPE_ALIAS | TYPE_RELOCATED : _('addresses')
 }
 try:
 if matching:
 title = _(u'Matching %s') % _trans[which]

changeset 608	0ed93eb8b364
parent 607	46454ff9d441
child 609	56ec275911f2