--- a/VirtualMailManager/catchall.py Sun Sep 02 21:33:53 2012 +0000
+++ b/VirtualMailManager/catchall.py Mon Sep 03 19:59:49 2012 +0000
@@ -66,7 +66,7 @@
if dcount == limit or dcount + count_new > limit:
failed = True
errmsg = _(
-u"""Cannot add %(count_new)i new destination(s) to catchall alias for
+u"""Cannot add %(count_new)i new destination(s) to catch-all alias for
domain '%(domain)s'. Currently this alias expands into %(count)i/%(limit)i
recipients. %(count_new)i additional destination(s) will render this alias
unusable.
@@ -74,7 +74,7 @@
elif dcount > limit:
failed = True
errmsg = _(
-u"""Cannot add %(count_new)i new destination(s) to catchall alias for
+u"""Cannot add %(count_new)i new destination(s) to catch-all alias for
domain '%(domain)s'. This alias already exceeds its expansion limit (%(count)i/%(limit)i).
So its unusable, all messages addressed to this alias will be bounced.
Hint: Delete some destination addresses.""")
@@ -143,11 +143,11 @@
alias."""
assert isinstance(destination, EmailAddress)
if not self._dests:
- raise AErr(_(u"There are no catchall aliases defined for "
+ raise AErr(_(u"There are no catch-all aliases defined for "
u"domain '%s'.") % self._domain, NO_SUCH_ALIAS)
if not destination in self._dests:
raise AErr(_(u"The address '%(addr)s' is not a destination of "
- u"the catchall alias for domain '%(domain)s'.")
+ u"the catch-all alias for domain '%(domain)s'.")
% {'addr': destination, 'domain': self._domain},
NO_SUCH_ALIAS)
self._delete(destination)
@@ -156,14 +156,14 @@
def get_destinations(self):
"""Returns an iterator for all destinations of the catchall alias."""
if not self._dests:
- raise AErr(_(u"There are no catchall aliases defined for "
+ raise AErr(_(u"There are no catch-all aliases defined for "
u"domain '%s'.") % self._domain, NO_SUCH_ALIAS)
return iter(self._dests)
def delete(self):
"""Deletes all catchall destinations for the domain."""
if not self._dests:
- raise AErr(_(u"There are no catchall aliases defined for "
+ raise AErr(_(u"There are no catch-all aliases defined for "
u"domain '%s'.") % self._domain, NO_SUCH_ALIAS)
self._delete()
del self._dests[:]
--- a/VirtualMailManager/cli/subcommands.py Sun Sep 02 21:33:53 2012 +0000
+++ b/VirtualMailManager/cli/subcommands.py Mon Sep 03 19:59:49 2012 +0000
@@ -216,7 +216,7 @@
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:
@@ -226,7 +226,7 @@
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))
@@ -258,7 +258,7 @@
def configure(ctx):
- """start interactive configuration modus"""
+ """start interactive configuration mode"""
if ctx.argc < 3:
ctx.hdlr.configure()
else:
@@ -801,7 +801,7 @@
'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')),
@@ -816,7 +816,7 @@
'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 '
@@ -867,7 +867,7 @@
'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')),
@@ -878,7 +878,8 @@
'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',
@@ -894,7 +895,7 @@
'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')),
@@ -1020,7 +1021,7 @@
"""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
@@ -1064,13 +1065,13 @@
"""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: