po/POTFILES.skip po/pykolab.pot

Thomas Brüderli bruederli at kolabsys.com
Wed Jan 21 17:28:20 CET 2015


 po/POTFILES.skip |   63 +--
 po/pykolab.pot   | 1126 ++++++++++++++++++++++++++++++-------------------------
 2 files changed, 654 insertions(+), 535 deletions(-)

New commits:
commit 3c2d3b18cc058f6f479cd0e522c26c6c8d749633
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Jan 14 01:37:52 2015 +0100

    Updated PO files

diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 07c0620..394df28 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,31 +1,34 @@
-pykolab/auth/ldap/fds/__init__.py
-pykolab/auth/ldap/msds/__init__.py
-pykolab/auth/ldap/openldap/__init__.py
-pykolab/auth/ldap/rhds/__init__.py
-pykolab/auth/ldap/sunds/__init__.py
-pykolab/auth/sql/__init__.py
-pykolab/cli/cmd_examine_message.py
-pykolab/cli/cmd_list_contacts.py
-pykolab/cli/cmd_list_events.py
-pykolab/cli/cmd_rebalance_mailboxes.py
-pykolab/cli/cmd_role_info.py
-pykolab/cli/cmd_summarize_quota_allocation.py
-pykolab/confmgmt/augeas.py
-pykolab/conf/parser.py
+._conf.py
+pykolab/auth/.___init__.py
+pykolab/auth/ldap/._auth_cache.py
+pykolab/auth/ldap/.___init__.py
+pykolab/._base.py
+pykolab/cli/._cmd_add_alias.py
+pykolab/cli/._cmd_list_messages.py
+pykolab/conf/._defaults.py
+pykolab/conf/.___init__.py
 pykolab/constants.py
-pykolab/ical/itip.py
-pykolab/imap/dovecot.py
-pykolab/plugins/roundcube/__init__.py
-pykolab/setup/facts.py
-pykolab/setup/setup_ssl.py
-pykolab/setup/utils.py
-pykolab/ssl/__init__.py
-pykolab/xml/task.py
-wallace/future_module_bcc.py
-wallace/future_module_conversations.py
-wallace/future_module_correctsentdate.py
-wallace/future_module_dlp.py
-wallace/future_module_footer.py
-wallace/future_module_freebusy.py
-wallace/future_module_googletranslate.py
-wallace/future_module_statistics.py
+pykolab/imap/._cyrus.py
+pykolab/imap/.___init__.py
+pykolab/.___init__.py
+pykolab/itip/.___init__.py
+pykolab/._translate.py
+pykolab/._utils.py
+pykolab/xml/._event.py
+pykolab/xml/._todo.py
+pykolab/xml/._utils.py
+tests/functional/._resource_func.py
+tests/functional/._synchronize.py
+tests/functional/test_wallace/._test_005_resource_invitation.py
+tests/functional/test_wallace/._test_007_invitationpolicy.py
+tests/unit/._test-003-event.py
+tests/unit/._test-004-icalendar.py
+tests/unit/._test-011-itip.py
+tests/unit/._test-011-wallace_resources.py
+tests/unit/._test-012-wallace_invitationpolicy.py
+._test-wallace.py
+wallace/.___init__.py
+wallace/._module_invitationpolicy.py
+wallace/._module_resources.py
+wallace/._modules.py
+._wallace.py
diff --git a/po/pykolab.pot b/po/pykolab.pot
index c081230..6bd2681 100644
--- a/po/pykolab.pot
+++ b/po/pykolab.pot
@@ -8,287 +8,286 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-11 18:01+0200\n"
+"POT-Creation-Date: 2015-01-14 01:36+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../bin/kolab_smtp_access_policy.py:209
+#: ../bin/kolab_smtp_access_policy.py:210
 #, python-format
 msgid "Adding policy request to instance %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:479
+#: ../bin/kolab_smtp_access_policy.py:480
 msgid "Unauthorized access not allowed"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:508
-#: ../bin/kolab_smtp_access_policy.py:689
+#: ../bin/kolab_smtp_access_policy.py:509
+#: ../bin/kolab_smtp_access_policy.py:690
 msgid "Could not find recipient"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:527
+#: ../bin/kolab_smtp_access_policy.py:528
 #, python-format
 msgid "Could not find envelope sender user %s (511)"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:570
+#: ../bin/kolab_smtp_access_policy.py:571
 #, python-format
 msgid "Obtained authenticated user details for %r: %r"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:627
+#: ../bin/kolab_smtp_access_policy.py:628
 #, python-format
 msgid "Could not find envelope sender user %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:649
+#: ../bin/kolab_smtp_access_policy.py:650
 #, python-format
 msgid "%s is unauthorized to send on behalf of %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:659
+#: ../bin/kolab_smtp_access_policy.py:660
 #, python-format
 msgid ""
 "User %s attempted to use envelope sender address %s without authorization"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:713
-#: ../bin/kolab_smtp_access_policy.py:724
+#: ../bin/kolab_smtp_access_policy.py:714
+#: ../bin/kolab_smtp_access_policy.py:725
 #, python-format
 msgid "Found user %s to be a delegate user of %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:748
+#: ../bin/kolab_smtp_access_policy.py:749
 #, python-format
 msgid ""
-"Verifying authenticated sender '%(sender)s' with sasl_username "
-"'%(sasl_username)s' for recipient '%(recipient)s'"
+"Verifying authenticated sender '%(sender)s' with sasl_username '%"
+"(sasl_username)s' for recipient '%(recipient)s'"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:751
+#: ../bin/kolab_smtp_access_policy.py:752
 #, python-format
 msgid ""
 "Verifying unauthenticated sender '%(sender)s' for recipient '%(recipient)s'"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:767
+#: ../bin/kolab_smtp_access_policy.py:768
 #, python-format
 msgid "Reproducing verify_recipient(%s, %s) from cache"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:804
+#: ../bin/kolab_smtp_access_policy.py:805
 #, python-format
 msgid "Using authentication domain %s instead of %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:814
+#: ../bin/kolab_smtp_access_policy.py:815
 #, python-format
 msgid "Domain %s is a primary domain"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:822
+#: ../bin/kolab_smtp_access_policy.py:823
 #, python-format
 msgid ""
 "Checking the recipient for domain %s that is not ours. This is probably a "
 "configuration error."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:837
+#: ../bin/kolab_smtp_access_policy.py:838
 msgid ""
 "This recipient address is related to multiple object entries and the SMTP "
 "Access Policy can therefore not restrict message flow"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:854
+#: ../bin/kolab_smtp_access_policy.py:855
 #, python-format
 msgid ""
 "Recipient address %r not found. Allowing since the MTA was configured to "
 "accept the recipient."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:890
+#: ../bin/kolab_smtp_access_policy.py:891
 msgid "Invalid recipient"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:901
+#: ../bin/kolab_smtp_access_policy.py:902
 msgid "Could not find this user, accepting"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:974
-#: ../bin/kolab_smtp_access_policy.py:1050
+#: ../bin/kolab_smtp_access_policy.py:975
+#: ../bin/kolab_smtp_access_policy.py:1051
 #, python-format
 msgid "Sender %s is not allowed to send to recipient %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1038
+#: ../bin/kolab_smtp_access_policy.py:1039
 #, python-format
 msgid "Reproducing verify_sender(%r) from cache"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1055
+#: ../bin/kolab_smtp_access_policy.py:1056
 msgid "Unverifiable sender."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1060
+#: ../bin/kolab_smtp_access_policy.py:1061
 msgid "Sender is not using an alias"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1068
+#: ../bin/kolab_smtp_access_policy.py:1069
 msgid "Sender uses unauthorized envelope sender address"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1085
+#: ../bin/kolab_smtp_access_policy.py:1086
 msgid "Could not verify sender"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1092
+#: ../bin/kolab_smtp_access_policy.py:1093
 msgid ""
 "Verifying whether sender is allowed to send to recipient using sender policy"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1105
+#: ../bin/kolab_smtp_access_policy.py:1106
 #, python-format
 msgid "Result is %r"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1110
+#: ../bin/kolab_smtp_access_policy.py:1111
 msgid "No recipient policy restrictions exist for this sender"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1119
+#: ../bin/kolab_smtp_access_policy.py:1120
 msgid "Found a recipient policy to apply for this sender."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1134
+#: ../bin/kolab_smtp_access_policy.py:1135
 #, python-format
 msgid "Sender %s not allowed to send to recipient %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1155
+#: ../bin/kolab_smtp_access_policy.py:1156
 msgid "Cleaning up the cache"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1177
+#: ../bin/kolab_smtp_access_policy.py:1179
 msgid ""
 "The 'uri' setting in the kolab_smtp_access_policy section is soon going to "
 "be deprecated in favor of 'cache_uri'"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1193
+#: ../bin/kolab_smtp_access_policy.py:1195
 #, python-format
 msgid "Operational Error in caching: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1245
+#: ../bin/kolab_smtp_access_policy.py:1247
 #, python-format
 msgid "Caching the policy result with timestamp %d"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1319
+#: ../bin/kolab_smtp_access_policy.py:1321
 #, python-format
 msgid "Returning action DEFER_IF_PERMIT: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1324
+#: ../bin/kolab_smtp_access_policy.py:1326
 #, python-format
 msgid "Returning action DUNNO: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1329
+#: ../bin/kolab_smtp_access_policy.py:1331
 #, python-format
 msgid "Returning action HOLD: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1334
+#: ../bin/kolab_smtp_access_policy.py:1336
 #, python-format
 msgid "Returning action PERMIT: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1459
+#: ../bin/kolab_smtp_access_policy.py:1461
 #, python-format
 msgid "Returning action REJECT: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1505
+#: ../bin/kolab_smtp_access_policy.py:1507
 msgid "Starting to loop for new request"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1512
+#: ../bin/kolab_smtp_access_policy.py:1514
 msgid "Timeout for policy request reading exceeded"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1518
+#: ../bin/kolab_smtp_access_policy.py:1520
 msgid "End of current request"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1522
+#: ../bin/kolab_smtp_access_policy.py:1524
 #, python-format
 msgid "Getting line: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1526
+#: ../bin/kolab_smtp_access_policy.py:1528
 msgid "Returning request"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1555
+#: ../bin/kolab_smtp_access_policy.py:1557
 msgid "Access Policy Options"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1562
+#: ../bin/kolab_smtp_access_policy.py:1564
 msgid "SMTP Policy request timeout."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1568
+#: ../bin/kolab_smtp_access_policy.py:1570
 msgid "Verify the recipient access policy."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1574
+#: ../bin/kolab_smtp_access_policy.py:1576
 msgid "Verify the sender access policy."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1580
+#: ../bin/kolab_smtp_access_policy.py:1582
 msgid "Allow unauthenticated senders."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1594
+#: ../bin/kolab_smtp_access_policy.py:1596
 #, python-format
 msgid "Got request instance %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1603
+#: ../bin/kolab_smtp_access_policy.py:1605
 #, python-format
 msgid "Request instance %s is in state %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1611
+#: ../bin/kolab_smtp_access_policy.py:1613
 #, python-format
 msgid "Request instance %s is not yet in DATA state"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1623
+#: ../bin/kolab_smtp_access_policy.py:1625
 #, python-format
 msgid "Request instance %s reached DATA state"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1643
+#: ../bin/kolab_smtp_access_policy.py:1645
 #, python-format
 msgid "Unhandled exception caught: %r"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1647
+#: ../bin/kolab_smtp_access_policy.py:1649
 msgid "Sender access denied"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1649
+#: ../bin/kolab_smtp_access_policy.py:1651
 msgid "Recipient access denied"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1651
+#: ../bin/kolab_smtp_access_policy.py:1653
 msgid "No objections"
 msgstr ""
 
@@ -297,72 +296,70 @@ msgid "Cannot load pykolab/logger.py:"
 msgstr ""
 
 #: ../kolabd/__init__.py:49 ../saslauthd/__init__.py:51
-#: ../wallace/__init__.py:85
+#: ../wallace/__init__.py:107
 msgid "Daemon Options"
 msgstr ""
 
 #: ../kolabd/__init__.py:56 ../saslauthd/__init__.py:58
-#: ../wallace/__init__.py:92
+#: ../wallace/__init__.py:114
 msgid "Fork to the background."
 msgstr ""
 
 #: ../kolabd/__init__.py:65 ../saslauthd/__init__.py:67
-#: ../wallace/__init__.py:118
+#: ../wallace/__init__.py:148
 msgid "Path to the PID file to use."
 msgstr ""
 
 #: ../kolabd/__init__.py:74 ../saslauthd/__init__.py:85
-#: ../wallace/__init__.py:135
+#: ../wallace/__init__.py:165
 msgid "Run as user USERNAME"
 msgstr ""
 
 #: ../kolabd/__init__.py:84 ../saslauthd/__init__.py:95
-#: ../wallace/__init__.py:109
+#: ../wallace/__init__.py:131
 msgid "Run as group GROUPNAME"
 msgstr ""
 
 #: ../kolabd/__init__.py:122 ../pykolab/utils.py:234
-#: ../saslauthd/__init__.py:301 ../wallace/__init__.py:329
+#: ../saslauthd/__init__.py:301 ../wallace/__init__.py:365
 #, python-format
 msgid "Group %s does not exist"
 msgstr ""
 
 #: ../kolabd/__init__.py:131 ../saslauthd/__init__.py:310
-#: ../wallace/__init__.py:338
+#: ../wallace/__init__.py:374
 #, python-format
 msgid "Switching real and effective group id to %d"
 msgstr ""
 
 #: ../kolabd/__init__.py:153 ../pykolab/utils.py:258
-#: ../saslauthd/__init__.py:332 ../wallace/__init__.py:360
+#: ../saslauthd/__init__.py:332 ../wallace/__init__.py:396
 #, python-format
 msgid "User %s does not exist"
 msgstr ""
 
 #: ../kolabd/__init__.py:163 ../saslauthd/__init__.py:342
-#: ../wallace/__init__.py:370
+#: ../wallace/__init__.py:406
 #, python-format
 msgid "Switching real and effective user id to %d"
 msgstr ""
 
 #: ../kolabd/__init__.py:172 ../saslauthd/__init__.py:351
-#: ../wallace/__init__.py:379
+#: ../wallace/__init__.py:415
 msgid "Could not change real and effective uid and/or gid"
 msgstr ""
 
 #: ../kolabd/__init__.py:192 ../saslauthd/__init__.py:142
-#: ../wallace/__init__.py:399
+#: ../wallace/__init__.py:435
 msgid "Interrupted by user"
 msgstr ""
 
 #: ../kolabd/__init__.py:197 ../kolabd/__init__.py:208
-#: ../saslauthd/__init__.py:146 ../saslauthd/__init__.py:154
-#: ../wallace/__init__.py:403 ../wallace/__init__.py:412
-msgid "Traceback occurred, please report a bug at http://bugzilla.kolabsys.com"
+msgid "Traceback occurred, please report a "
 msgstr ""
 
 #: ../kolabd/__init__.py:203 ../saslauthd/__init__.py:150
-#: ../wallace/__init__.py:408
+#: ../wallace/__init__.py:444
 #, python-format
 msgid "Type Error: %s"
 msgstr ""
@@ -371,8 +368,8 @@ msgstr ""
 msgid "Could not connect to LDAP, is it running?"
 msgstr ""
 
-#: ../kolabd/__init__.py:233 ../pykolab/auth/ldap/__init__.py:2178
-#: ../pykolab/cli/cmd_sync.py:36
+#: ../kolabd/__init__.py:233 ../pykolab/auth/ldap/__init__.py:2242
+#: ../pykolab/cli/cmd_sync.py:67
 msgid "Listing domains..."
 msgstr ""
 
@@ -513,271 +510,260 @@ msgid ""
 "ldap search: (%r, %r, filterstr='(objectclass=*)', attrlist=[ 'dn' ] + %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:453
+#: ../pykolab/auth/ldap/__init__.py:481
 #, python-format
 msgid "Finding recipient with filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:529
+#: ../pykolab/auth/ldap/__init__.py:557
 #, python-format
 msgid "Finding resource with filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:560
+#: ../pykolab/auth/ldap/__init__.py:588
 #, python-format
 msgid "Using timestamp %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:597
+#: ../pykolab/auth/ldap/__init__.py:625
 #, python-format
-msgid "Not applying recipient policy for %s (disabled through configuration)"
+msgid "Not applying recipient policy for %s "
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:607
+#: ../pykolab/auth/ldap/__init__.py:635
 #, python-format
 msgid "Applying recipient policy to %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:624
+#: ../pykolab/auth/ldap/__init__.py:652
 #, python-format
-msgid "Using mail attributes: %r, with primary %r and secondary %r"
+msgid "Using mail attributes: %r, with primary %r and "
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:635
+#: ../pykolab/auth/ldap/__init__.py:663
 #, python-format
 msgid "key %r not in entry"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:637
+#: ../pykolab/auth/ldap/__init__.py:665
 #, python-format
 msgid "key %r is the prim. mail attr."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:639
+#: ../pykolab/auth/ldap/__init__.py:667
 msgid "prim. mail pol. is not empty"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:642
+#: ../pykolab/auth/ldap/__init__.py:670
 #, python-format
 msgid "key %r is the sec. mail attr."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:644
+#: ../pykolab/auth/ldap/__init__.py:672
 msgid "sec. mail pol. is not empty"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:648 ../pykolab/auth/ldap/__init__.py:662
+#: ../pykolab/auth/ldap/__init__.py:676 ../pykolab/auth/ldap/__init__.py:690
 #, python-format
 msgid "Attributes %r are not yet available for entry %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:701
+#: ../pykolab/auth/ldap/__init__.py:729
 #, python-format
 msgid "No results for mail address %s found"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:712
+#: ../pykolab/auth/ldap/__init__.py:740
 #, python-format
 msgid "1 result for address %s found, verifying"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:722
+#: ../pykolab/auth/ldap/__init__.py:750
 #, python-format
-msgid "Too bad, primary email address %s already in use for %s (we are %s)"
+msgid "Too bad, primary email address %s "
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:733 ../pykolab/auth/ldap/__init__.py:822
+#: ../pykolab/auth/ldap/__init__.py:761 ../pykolab/auth/ldap/__init__.py:850
 msgid "Address assigned to us"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:788
+#: ../pykolab/auth/ldap/__init__.py:816
 #, python-format
 msgid "No results for address %s found"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:799
+#: ../pykolab/auth/ldap/__init__.py:827
 #, python-format
-msgid "1 result for address %s found, verifying..."
+msgid "1 result for address %s found, "
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:810
-#, python-format
-msgid "Too bad, secondary email address %s already in use for %s (we are %s)"
+#: ../pykolab/auth/ldap/__init__.py:838
+msgid "Too bad, secondary email "
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:837
-#, python-format
-msgid ""
-"Recipient policy composed the following set of secondary email addresses: %r"
+#: ../pykolab/auth/ldap/__init__.py:865
+msgid "Recipient policy composed the following set of secondary "
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:848
+#: ../pykolab/auth/ldap/__init__.py:876
 #, python-format
 msgid "Secondary mail addresses that we want is not None: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:859
-#, python-format
-msgid ""
-"Avoiding the duplication of the primary mail address %r in the list of "
-"secondary mail addresses"
+#: ../pykolab/auth/ldap/__init__.py:887
+msgid "Avoiding the duplication of the primary mail "
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:870
+#: ../pykolab/auth/ldap/__init__.py:898
 #, python-format
 msgid "Entry is getting secondary mail addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:878
-#, python-format
-msgid "Entry did not have any secondary mail addresses in %r"
+#: ../pykolab/auth/ldap/__init__.py:906
+msgid "Entry did not have any secondary mail "
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:895 ../pykolab/auth/ldap/__init__.py:901
+#: ../pykolab/auth/ldap/__init__.py:923 ../pykolab/auth/ldap/__init__.py:929
 #, python-format
 msgid "secondary_mail_addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:896 ../pykolab/auth/ldap/__init__.py:902
+#: ../pykolab/auth/ldap/__init__.py:924 ../pykolab/auth/ldap/__init__.py:930
 #, python-format
 msgid "entry[%s]: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:913
+#: ../pykolab/auth/ldap/__init__.py:941
 #, python-format
 msgid "Entry modifications list: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:941
+#: ../pykolab/auth/ldap/__init__.py:969
 #, python-format
 msgid "Setting entry attribute %r to %r for %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:977
+#: ../pykolab/auth/ldap/__init__.py:1005
 #, python-format
 msgid ""
 "Could not update dn %r:\n"
 "%r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:990
+#: ../pykolab/auth/ldap/__init__.py:1031
 #, python-format
 msgid "Using filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1005
+#: ../pykolab/auth/ldap/__init__.py:1046
 #, python-format
 msgid "Synchronization is searching against base DN: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1051
+#: ../pykolab/auth/ldap/__init__.py:1095
 #, python-format
-msgid ""
-"About to consider the user quota for %r (used: %r, imap: %r, ldap: %r, "
-"default: %r"
+msgid "About to consider the user quota for %r (used: %r, "
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1122
+#: ../pykolab/auth/ldap/__init__.py:1166
 msgid "Invalid DN, username and/or password."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1247 ../pykolab/auth/ldap/__init__.py:1264
-#: ../pykolab/auth/ldap/__init__.py:1628 ../pykolab/auth/ldap/__init__.py:1645
+#: ../pykolab/auth/ldap/__init__.py:1291 ../pykolab/auth/ldap/__init__.py:1308
+#: ../pykolab/auth/ldap/__init__.py:1682 ../pykolab/auth/ldap/__init__.py:1699
 #, python-format
 msgid "Found a subject %r with access %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1366
+#: ../pykolab/auth/ldap/__init__.py:1410
 #, python-format
 msgid "Entry %s attribute value: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1374
+#: ../pykolab/auth/ldap/__init__.py:1418
 #, python-format
 msgid "imap.user_mailbox_server(%r) result: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1694 ../pykolab/auth/ldap/__init__.py:1894
+#: ../pykolab/auth/ldap/__init__.py:1481 ../pykolab/auth/ldap/__init__.py:2809
+#, python-format
+msgid "%s"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1748 ../pykolab/auth/ldap/__init__.py:1948
 #, python-format
 msgid "Result from recipient policy: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1949
+#: ../pykolab/auth/ldap/__init__.py:2003
 #, python-format
 msgid "Kolab user %s does not have a result attribute %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2108
+#: ../pykolab/auth/ldap/__init__.py:2162
 #, python-format
 msgid "Finding domain root dn for domain %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2205
+#: ../pykolab/auth/ldap/__init__.py:2269
 msgid "Authentication database DOWN"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2289 ../pykolab/auth/ldap/__init__.py:2337
+#: ../pykolab/auth/ldap/__init__.py:2353 ../pykolab/auth/ldap/__init__.py:2401
 #, python-format
 msgid "Entry type: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2426
+#: ../pykolab/auth/ldap/__init__.py:2490
 msgid "LDAP Search Result Data Entry:"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2442
+#: ../pykolab/auth/ldap/__init__.py:2506
 msgid "Entry Change Notification attributes:"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2447
+#: ../pykolab/auth/ldap/__init__.py:2511
 #, python-format
 msgid "Change Type: %r (%r)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2455
+#: ../pykolab/auth/ldap/__init__.py:2519
 #, python-format
 msgid "Previous DN: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2510
+#: ../pykolab/auth/ldap/__init__.py:2574
 #, python-format
 msgid "Object %s searched no longer exists"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2520
+#: ../pykolab/auth/ldap/__init__.py:2584
 #, python-format
 msgid "%d results..."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2623
+#: ../pykolab/auth/ldap/__init__.py:2687
 #, python-format
 msgid "Searching with filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2675
+#: ../pykolab/auth/ldap/__init__.py:2739
 #, python-format
 msgid "Checking for support for %s on %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2694
+#: ../pykolab/auth/ldap/__init__.py:2758
 #, python-format
 msgid "Found support for %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2739
+#: ../pykolab/auth/ldap/__init__.py:2803
 #, python-format
 msgid "An error occured using %s: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2745
-#, python-format
-msgid "%s"
-msgstr ""
-
 #: ../pykolab/auth/ldap/syncrepl.py:46
-msgid ""
-"The name of the persistent, unique attribute is very probably not compatible "
-"with the use of syncrepl."
+msgid "The name of the persistent, unique attribute "
 msgstr ""
 
 #: ../pykolab/cli/cmd_acl_cleanup.py:34
@@ -785,6 +771,7 @@ msgid "Clean up ACLs that use identifiers that no longer exist"
 msgstr ""
 
 #: ../pykolab/cli/cmd_acl_cleanup.py:56
+#: ../pykolab/cli/cmd_mailbox_cleanup.py:173
 #, python-format
 msgid "Deleting ACL %s for subject %s on folder %s"
 msgstr ""
@@ -817,8 +804,7 @@ msgid "Recipient for alias %r already exists"
 msgstr ""
 
 #: ../pykolab/cli/cmd_add_alias.py:97
-msgid ""
-"Environment is not configured for users to hold secondary mail attributes"
+msgid "Environment is not configured for "
 msgstr ""
 
 #: ../pykolab/cli/cmd_add_alias.py:105
@@ -836,9 +822,10 @@ msgstr ""
 #: ../pykolab/cli/cmd_list_mailbox_metadata.py:37
 #: ../pykolab/cli/cmd_list_messages.py:37 ../pykolab/cli/cmd_list_quota.py:36
 #: ../pykolab/cli/cmd_list_user_subscriptions.py:36
+#: ../pykolab/cli/cmd_mailbox_cleanup.py:39
 #: ../pykolab/cli/cmd_server_info.py:34
 #: ../pykolab/cli/cmd_set_mailbox_metadata.py:38
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:39
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:39 ../pykolab/cli/cmd_sync.py:45
 #: ../pykolab/cli/cmd_undelete_mailbox.py:34
 msgid "CLI Options"
 msgstr ""
@@ -853,9 +840,7 @@ msgstr ""
 
 #: ../pykolab/cli/cmd_add_domain.py:55 ../pykolab/cli/cmd_delete_domain.py:44
 #: ../pykolab/cli/cmd_find_domain.py:44
-msgid ""
-"Could not find credentials with sufficient permissionsto add a domain name "
-"space."
+msgid "Could not find credentials with sufficient permissions"
 msgstr ""
 
 #: ../pykolab/cli/cmd_add_domain.py:67 ../pykolab/cli/cmd_delete_domain.py:56
@@ -951,15 +936,20 @@ msgstr ""
 msgid "No such folder %r"
 msgstr ""
 
-#: ../pykolab/cli/cmd_delete_mailbox.py:46
+#: ../pykolab/cli/cmd_delete_mailbox.py:44
 msgid "No mailbox specified"
 msgstr ""
 
-#: ../pykolab/cli/cmd_delete_mailbox.py:56
-msgid "No such folder(s)"
+#: ../pykolab/cli/cmd_delete_mailbox.py:57
+#, python-format
+msgid "No such folder(s): %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_delete_mailbox.py:62
+msgid "No folders to delete."
 msgstr ""
 
-#: ../pykolab/cli/cmd_delete_mailbox.py:63
+#: ../pykolab/cli/cmd_delete_mailbox.py:69
 #, python-format
 msgid "Could not delete mailbox '%s'"
 msgstr ""
@@ -1046,15 +1036,71 @@ msgstr ""
 msgid "No unsubscribed folders for user %s"
 msgstr ""
 
-#: ../pykolab/cli/cmd_mailbox_cleanup.py:37
+#: ../pykolab/cli/cmd_mailbox_cleanup.py:45
+msgid ""
+"Do not actually delete mailboxes, but report what mailboxes would have been "
+"deleted."
+msgstr ""
+
+#: ../pykolab/cli/cmd_mailbox_cleanup.py:49
 msgid "Clean up mailboxes that do no longer have an owner."
 msgstr ""
 
-#: ../pykolab/cli/cmd_mailbox_cleanup.py:61
+#: ../pykolab/cli/cmd_mailbox_cleanup.py:85
+#: ../pykolab/cli/cmd_mailbox_cleanup.py:95
+#, python-format
+msgid "Would have deleted folder 'user/%s' (dryrun)"
+msgstr ""
+
+#: ../pykolab/cli/cmd_mailbox_cleanup.py:87
+#: ../pykolab/cli/cmd_mailbox_cleanup.py:97
 #, python-format
 msgid "Deleting folder 'user/%s'"
 msgstr ""
 
+#: ../pykolab/cli/cmd_mailbox_cleanup.py:101
+#, python-format
+msgid "Error deleting folder 'user/%s'"
+msgstr ""
+
+#: ../pykolab/cli/cmd_mailbox_cleanup.py:103
+#, python-format
+msgid "Valid recipient found for 'user/%s'"
+msgstr ""
+
+#: ../pykolab/cli/cmd_mailbox_cleanup.py:128
+#: ../pykolab/cli/cmd_mailbox_cleanup.py:138
+#, python-format
+msgid "Would have deleted folder '%s' (dryrun)"
+msgstr ""
+
+#: ../pykolab/cli/cmd_mailbox_cleanup.py:130
+#: ../pykolab/cli/cmd_mailbox_cleanup.py:140
+#, python-format
+msgid "Deleting folder '%s'"
+msgstr ""
+
+#: ../pykolab/cli/cmd_mailbox_cleanup.py:134
+#: ../pykolab/cli/cmd_mailbox_cleanup.py:144
+#, python-format
+msgid "Error deleting folder '%s'"
+msgstr ""
+
+#: ../pykolab/cli/cmd_mailbox_cleanup.py:153
+#, python-format
+msgid "Skipping removal of ACL %s for subject %s on folder %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_mailbox_cleanup.py:165
+#, python-format
+msgid "Would have deleted ACL %s for subject %s on folder %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_mailbox_cleanup.py:184
+#, python-format
+msgid "Error removing ACL %s for subject %s from folder %s"
+msgstr ""
+
 #: ../pykolab/cli/cmd_remove_mailaddress.py:49
 msgid "Invalid or unqualified email address."
 msgstr ""
@@ -1184,21 +1230,34 @@ msgstr ""
 msgid "Multiple recipients for '%s'!"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync.py:41
+#: ../pykolab/cli/cmd_sync.py:52
+msgid "Synchronize LDAP and IMAP"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:60
+msgid "Resync from the beginning"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:72
 #, python-format
 msgid "Found %d domains in %d seconds"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync.py:51
+#: ../pykolab/cli/cmd_sync.py:85
 #, python-format
 msgid "Running for domain %s"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync.py:58
+#: ../pykolab/cli/cmd_sync.py:92
 #, python-format
 msgid "Synchronizing users for %s took %d seconds"
 msgstr ""
 
+#: ../pykolab/cli/cmd_sync.py:109
+#, python-format
+msgid "Worker process %s handling %s"
+msgstr ""
+
 #: ../pykolab/cli/cmd_undelete_mailbox.py:39
 msgid "Do not actually execute, but state what would have been executed."
 msgstr ""
@@ -1207,10 +1266,15 @@ msgstr ""
 msgid "Recover mailboxes previously deleted."
 msgstr ""
 
-#: ../pykolab/cli/cmd_user_info.py:39
+#: ../pykolab/cli/cmd_user_info.py:41
 msgid "Email address"
 msgstr ""
 
+#: ../pykolab/cli/cmd_user_info.py:51
+#, python-format
+msgid "No such user %s"
+msgstr ""
+
 #. This is a nested command
 #. This is a nested component
 #: ../pykolab/cli/commands.py:97 ../pykolab/setup/components.py:90
@@ -1228,7 +1292,7 @@ msgid "Command '%s' already registered"
 msgstr ""
 
 #: ../pykolab/cli/commands.py:192 ../pykolab/setup/components.py:257
-#: ../wallace/modules.py:369
+#: ../wallace/modules.py:376
 #, python-format
 msgid "Alias for %s"
 msgstr ""
@@ -1353,8 +1417,7 @@ msgstr ""
 #: ../pykolab/conf/entitlement.py:98 ../pykolab/conf/entitlement.py:116
 #: ../pykolab/conf/entitlement.py:230 ../pykolab/conf/entitlement.py:246
 #: ../pykolab/conf/entitlement.py:262
-#, python-format
-msgid "Invalid entitlement verification certificate at %s"
+msgid "Invalid entitlement verification "
 msgstr ""
 
 #: ../pykolab/conf/entitlement.py:120 ../pykolab/conf/entitlement.py:123
@@ -1436,13 +1499,11 @@ msgid "Configuration file to use"
 msgstr ""
 
 #: ../pykolab/conf/__init__.py:278
-msgid ""
-"Set the debugging verbosity. Maximum is 9, tracing protocols like LDAP, SQL "
-"and IMAP."
+msgid "Set the debugging "
 msgstr ""
 
 #: ../pykolab/conf/__init__.py:286
-msgid "Set the logging level. One of info, warn, error, critical or debug"
+msgid "Set the logging level. "
 msgstr ""
 
 #: ../pykolab/conf/__init__.py:294
@@ -1584,10 +1645,7 @@ msgid "Checking actual backend server for folder %s through annotations"
 msgstr ""
 
 #: ../pykolab/imap/cyrus.py:173
-#, python-format
-msgid ""
-"Possibly reproducing the find mailfolder server answer from previously "
-"detected and stored annotation value: %r"
+msgid "Possibly reproducing the find "
 msgstr ""
 
 #: ../pykolab/imap/cyrus.py:196
@@ -1676,227 +1734,227 @@ msgstr ""
 msgid "Removing acl %r for subject %r from folder %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:145
+#: ../pykolab/imap/__init__.py:160
 msgid "No administrator password is available."
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:153
+#: ../pykolab/imap/__init__.py:168
 #, python-format
 msgid "Logging on to Cyrus IMAP server %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:162
+#: ../pykolab/imap/__init__.py:177
 #, python-format
 msgid "Logging on to Dovecot IMAP server %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:171
+#: ../pykolab/imap/__init__.py:186
 #, python-format
 msgid "Logging on to generic IMAP server %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:189
+#: ../pykolab/imap/__init__.py:204
 #, python-format
 msgid "Reusing existing IMAP server connection to %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:191
+#: ../pykolab/imap/__init__.py:206
 #, python-format
 msgid "Reconnecting to IMAP server %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:208
+#: ../pykolab/imap/__init__.py:223
 msgid "Called imap.disconnect() on a server that we had no connection to."
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:221 ../pykolab/imap/__init__.py:233
+#: ../pykolab/imap/__init__.py:236
 #, python-format
-msgid "Could not create folder %r"
+msgid "Could not create folder %r on server %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:222
+#: ../pykolab/imap/__init__.py:247
 #, python-format
-msgid " on server %r"
+msgid "Could not create folder %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:243 ../pykolab/imap/__init__.py:245
+#: ../pykolab/imap/__init__.py:257 ../pykolab/imap/__init__.py:259
 #, python-format
 msgid "%r has no attribute %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:373
+#: ../pykolab/imap/__init__.py:393
 #, python-format
 msgid "Could not set ACL for %s on folder %s: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:407 ../pykolab/imap/__init__.py:442
+#: ../pykolab/imap/__init__.py:427 ../pykolab/imap/__init__.py:462
 #, python-format
 msgid "Creating new shared folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:467 ../pykolab/imap/__init__.py:689
+#: ../pykolab/imap/__init__.py:487 ../pykolab/imap/__init__.py:740
 #, python-format
 msgid "Downcasing mailbox name %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:471
+#: ../pykolab/imap/__init__.py:491
 #, python-format
 msgid "Creating new mailbox for user %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:484
+#: ../pykolab/imap/__init__.py:506 ../pykolab/imap/__init__.py:613
 msgid "Waiting for the Cyrus IMAP Murder to settle..."
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:530
+#: ../pykolab/imap/__init__.py:559
 #, python-format
 msgid "Creating additional folders for user %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:549
+#: ../pykolab/imap/__init__.py:587
 #, python-format
 msgid "Waiting for the Cyrus murder to settle... %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:561
+#: ../pykolab/imap/__init__.py:602
 #, python-format
 msgid "Correcting additional folder name from %r to %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:567
+#: ../pykolab/imap/__init__.py:618
 #, python-format
 msgid "Mailbox already exists: %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:607
+#: ../pykolab/imap/__init__.py:658
 msgid "Subscribing user to the additional folders"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:621
+#: ../pykolab/imap/__init__.py:672
 msgid "Using the following tests for folder subscriptions:"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:623
+#: ../pykolab/imap/__init__.py:674
 #, python-format
 msgid "    %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:626
+#: ../pykolab/imap/__init__.py:677
 #, python-format
 msgid "Folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:638
+#: ../pykolab/imap/__init__.py:689
 #, python-format
 msgid "Subscribing %s to folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:642
+#: ../pykolab/imap/__init__.py:693
 #, python-format
 msgid "Subscribing %s to folder %s failed: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:672
+#: ../pykolab/imap/__init__.py:723
 #, python-format
 msgid "Could not rename %s to reside on partition %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:705
+#: ../pykolab/imap/__init__.py:756
 #, python-format
 msgid "INBOX folder to rename (%s) does not exist"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:708 ../pykolab/imap/__init__.py:784
+#: ../pykolab/imap/__init__.py:759 ../pykolab/imap/__init__.py:835
 #, python-format
 msgid "Renaming INBOX from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:712
+#: ../pykolab/imap/__init__.py:763
 #, python-format
 msgid "Could not rename INBOX folder %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:714 ../pykolab/imap/__init__.py:788
+#: ../pykolab/imap/__init__.py:765 ../pykolab/imap/__init__.py:839
 #, python-format
 msgid "Moving INBOX folder %s won't succeed as target folder %s already exists"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:718
+#: ../pykolab/imap/__init__.py:769
 #, python-format
 msgid "Server for mailbox %r is %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:726
+#: ../pykolab/imap/__init__.py:777
 #, python-format
 msgid "Looking for folder '%s', we found folders: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:749
+#: ../pykolab/imap/__init__.py:800
 #, python-format
-msgid "Setting ACL rights %s for subject %s on folder %s"
+msgid "Setting ACL rights %s for subject %s on folder "
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:760
+#: ../pykolab/imap/__init__.py:811
 #, python-format
-msgid "Removing ACL rights %s for subject %s on folder %s"
+msgid "Removing ACL rights %s for subject %s on folder "
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:781
+#: ../pykolab/imap/__init__.py:832
 #, python-format
 msgid "Found old INBOX folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:790
+#: ../pykolab/imap/__init__.py:841
 #, python-format
 msgid "Did not find old folder user/%s to rename"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:792
+#: ../pykolab/imap/__init__.py:843
 msgid "Value for user is not a dictionary"
 msgstr ""
 
 #. TODO: Go in fact correct the quota.
-#: ../pykolab/imap/__init__.py:860
+#: ../pykolab/imap/__init__.py:911
 #, python-format
 msgid "Cannot get current IMAP quota for folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:873
+#: ../pykolab/imap/__init__.py:924
 #, python-format
 msgid "Quota for %s currently is %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:879
+#: ../pykolab/imap/__init__.py:930
 #, python-format
 msgid "Adjusting authentication database quota for folder %s to %d"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:884
+#: ../pykolab/imap/__init__.py:935
 #, python-format
 msgid "Correcting quota for %s to %s (currently %s)"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:961
+#: ../pykolab/imap/__init__.py:1012
 #, python-format
 msgid "Checking folder: %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:966
+#: ../pykolab/imap/__init__.py:1017
 #, python-format
 msgid "Folder has no corresponding user (1): %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:969
+#: ../pykolab/imap/__init__.py:1020
 #, python-format
 msgid "Folder has no corresponding user (2): %s"
 msgstr ""
 
 #. We got user identifier only
-#: ../pykolab/imap/__init__.py:984
+#: ../pykolab/imap/__init__.py:1035
 msgid "Please don't give us just a user identifier"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:987
+#: ../pykolab/imap/__init__.py:1038
 #, python-format
 msgid "Deleting folder %s"
 msgstr ""
@@ -1912,7 +1970,7 @@ msgstr ""
 
 #: ../pykolab/itip/__init__.py:51
 #, python-format
-msgid "Raw iTip payload: %s"
+msgid "Raw iTip payload (%r): %r"
 msgstr ""
 
 #: ../pykolab/itip/__init__.py:61
@@ -1943,9 +2001,9 @@ msgid "Failed to compose iTip reply message: %r: %s"
 msgstr ""
 
 #: ../pykolab/itip/__init__.py:248 ../pykolab/itip/__init__.py:292
-#: ../wallace/module_invitationpolicy.py:1063
-#: ../wallace/module_invitationpolicy.py:1121
-#: ../wallace/module_resources.py:1144
+#: ../wallace/module_invitationpolicy.py:1082
+#: ../wallace/module_invitationpolicy.py:1144
+#: ../wallace/module_resources.py:1247
 #, python-format
 msgid "SMTP sendmail error: %r"
 msgstr ""
@@ -2095,7 +2153,7 @@ msgid "user_delete: %r"
 msgstr ""
 
 #: ../pykolab/plugins/roundcubedb/__init__.py:55
-#: ../pykolab/setup/setup_roundcube.py:161
+#: ../pykolab/setup/setup_roundcube.py:167
 msgid "Roundcube installation path not found."
 msgstr ""
 
@@ -2139,10 +2197,11 @@ msgstr ""
 msgid "Could not start the cyrus-imapd and kolab-saslauthd services."
 msgstr ""
 
-#: ../pykolab/setup/setup_imap.py:173
-msgid ""
-"Could not configure to start on boot, the cyrus-imapd and kolab-saslauthd "
-"services."
+#: ../pykolab/setup/setup_imap.py:173 ../pykolab/setup/setup_kolabd.py:90
+#: ../pykolab/setup/setup_ldap.py:426 ../pykolab/setup/setup_mta.py:465
+#: ../pykolab/setup/setup_mysql.py:58 ../pykolab/setup/setup_roundcube.py:244
+#: ../pykolab/setup/setup_syncroton.py:105
+msgid "Could not configure to start on boot, the "
 msgstr ""
 
 #: ../pykolab/setup/setup_kolabd.py:44
@@ -2163,10 +2222,6 @@ msgstr ""
 msgid "Could not start the kolab server service."
 msgstr ""
 
-#: ../pykolab/setup/setup_kolabd.py:90
-msgid "Could not configure to start on boot, the kolab server service."
-msgstr ""
-
 #: ../pykolab/setup/setup_ldap.py:45
 msgid "LDAP Options"
 msgstr ""
@@ -2364,10 +2419,6 @@ msgstr ""
 msgid "Could not start the directory server service."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:426
-msgid "Could not configure to start on boot, the directory server service."
-msgstr ""
-
 #: ../pykolab/setup/setup_ldap.py:431
 msgid ""
 "\n"
@@ -2450,9 +2501,7 @@ msgid "Setting access control to %s"
 msgstr ""
 
 #: ../pykolab/setup/setup_ldap.py:679
-msgid ""
-"Could not start and configure to start on boot, the directory server admin "
-"service."
+msgid "Could not start and configure to start on boot, the "
 msgstr ""
 
 #: ../pykolab/setup/setup_mta.py:41
@@ -2480,12 +2529,6 @@ msgstr ""
 msgid "Could not start the postfix, clamav and amavisd services services."
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:465
-msgid ""
-"Could not configure to start on boot, the postfix, clamav and amavisd "
-"services."
-msgstr ""
-
 #: ../pykolab/setup/setup_mysql.py:39
 msgid "Setup MySQL."
 msgstr ""
@@ -2494,10 +2537,6 @@ msgstr ""
 msgid "Could not start the MySQL database service."
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:58
-msgid "Could not configure to start on boot, the MySQL database service."
-msgstr ""
-
 #: ../pykolab/setup/setup_mysql.py:71
 msgid "What MySQL server are we setting up?"
 msgstr ""
@@ -2513,7 +2552,7 @@ msgid ""
 msgstr ""
 
 #: ../pykolab/setup/setup_mysql.py:82 ../pykolab/setup/setup_mysql.py:99
-#: ../pykolab/setup/setup_roundcube.py:184
+#: ../pykolab/setup/setup_roundcube.py:190
 #: ../pykolab/setup/setup_syncroton.py:66
 msgid "MySQL root password"
 msgstr ""
@@ -2533,7 +2572,7 @@ msgid ""
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:139
+#: ../pykolab/setup/setup_mysql.py:143
 msgid ""
 "\n"
 "                        Please supply a password for the MySQL user "
@@ -2544,11 +2583,11 @@ msgid ""
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:147
+#: ../pykolab/setup/setup_mysql.py:151
 msgid "MySQL kolab password"
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:166
+#: ../pykolab/setup/setup_mysql.py:170
 msgid "Could not find the MySQL Kolab schema file"
 msgstr ""
 
@@ -2609,26 +2648,21 @@ msgstr ""
 msgid "MySQL roundcube password"
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:120
+#: ../pykolab/setup/setup_roundcube.py:126
 #, python-format
 msgid "Using template file %r"
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:127
+#: ../pykolab/setup/setup_roundcube.py:133
 #, python-format
 msgid "Successfully compiled template %r, writing out to %r"
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:229
+#: ../pykolab/setup/setup_roundcube.py:235
 #: ../pykolab/setup/setup_syncroton.py:96
 msgid "Could not start the webserver server service."
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:238
-#: ../pykolab/setup/setup_syncroton.py:105
-msgid "Could not configure to start on boot, the webserver server service."
-msgstr ""
-
 #: ../pykolab/setup/setup_syncroton.py:40
 msgid "Setup Syncroton."
 msgstr ""
@@ -2664,7 +2698,7 @@ msgid "Confirm %s: "
 msgstr ""
 
 #: ../pykolab/utils.py:67
-msgid "Incorrect confirmation. Please try again."
+msgid "Incorrect confirmation. "
 msgstr ""
 
 #: ../pykolab/utils.py:72 ../pykolab/utils.py:77
@@ -2694,45 +2728,45 @@ msgstr ""
 msgid "Could not change the permissions on %s"
 msgstr ""
 
-#: ../pykolab/utils.py:479
+#: ../pykolab/utils.py:488
 #, python-format
 msgid "Transliterating string %r with locale %r"
 msgstr ""
 
-#: ../pykolab/utils.py:487
+#: ../pykolab/utils.py:496
 msgid "Attempting to set locale"
 msgstr ""
 
-#: ../pykolab/utils.py:489
+#: ../pykolab/utils.py:498
 msgid "Success setting locale"
 msgstr ""
 
-#: ../pykolab/utils.py:491
+#: ../pykolab/utils.py:500
 msgid "Failure to set locale"
 msgstr ""
 
-#: ../pykolab/utils.py:499
+#: ../pykolab/utils.py:508
 #, python-format
 msgid "Executing '%s | %s'"
 msgstr ""
 
-#: ../pykolab/utils.py:510
+#: ../pykolab/utils.py:519
 #, python-format
 msgid "Could not translate %s using locale %s"
 msgstr ""
 
-#: ../pykolab/wap_client/__init__.py:396
+#: ../pykolab/wap_client/__init__.py:399
 #, python-format
 msgid "Requesting %r with params %r"
 msgstr ""
 
-#: ../pykolab/wap_client/__init__.py:404
+#: ../pykolab/wap_client/__init__.py:407
 #, python-format
 msgid "Got response: %r"
 msgstr ""
 
 #. Some data is not JSON
-#: ../pykolab/wap_client/__init__.py:410
+#: ../pykolab/wap_client/__init__.py:413
 msgid "Response data is not JSON"
 msgstr ""
 
@@ -2792,72 +2826,72 @@ msgstr ""
 msgid "Invalid role %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:149 ../pykolab/xml/event.py:784
-#: ../pykolab/xml/event.py:827
+#: ../pykolab/xml/event.py:163 ../pykolab/xml/event.py:802
+#: ../pykolab/xml/event.py:845
 msgid "Event start needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: ../pykolab/xml/event.py:294
+#: ../pykolab/xml/event.py:308
 #, python-format
 msgid "No attendee with email or name %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:302
+#: ../pykolab/xml/event.py:316
 #, python-format
 msgid "Invalid argument value attendee %r, must be basestring or Attendee"
 msgstr ""
 
-#: ../pykolab/xml/event.py:314
+#: ../pykolab/xml/event.py:328
 #, python-format
 msgid "No attendee with email %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:320
+#: ../pykolab/xml/event.py:334
 #, python-format
 msgid "No attendee with name %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:370 ../pykolab/xml/utils.py:151
+#: ../pykolab/xml/event.py:384 ../pykolab/xml/utils.py:157
 msgid "%Y-%m-%d"
 msgstr ""
 
-#: ../pykolab/xml/event.py:372 ../pykolab/xml/utils.py:152
+#: ../pykolab/xml/event.py:386 ../pykolab/xml/utils.py:158
 msgid "%H:%M (%Z)"
 msgstr ""
 
-#: ../pykolab/xml/event.py:496
+#: ../pykolab/xml/event.py:510
 msgid "Invalid participant status"
 msgstr ""
 
-#: ../pykolab/xml/event.py:618
+#: ../pykolab/xml/event.py:636
 #, python-format
 msgid "Invalid classification %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:649
+#: ../pykolab/xml/event.py:667
 msgid "Event end needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: ../pykolab/xml/event.py:659
+#: ../pykolab/xml/event.py:677
 #, python-format
 msgid "Invalid custom property name %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:837
+#: ../pykolab/xml/event.py:855
 #, python-format
 msgid "Invalid status set: %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:1074
+#: ../pykolab/xml/event.py:1094
 msgid "No sender specified"
 msgstr ""
 
-#: ../pykolab/xml/event.py:1083
+#: ../pykolab/xml/event.py:1103
 #, python-format
 msgid "Invitation for %s was %s"
 msgstr ""
 
-#: ../pykolab/xml/event.py:1088
+#: ../pykolab/xml/event.py:1108
 msgid "This is an automated response to one of your event requests."
 msgstr ""
 
@@ -2900,121 +2934,121 @@ msgstr ""
 msgid "Todo due needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:120
+#: ../pykolab/xml/utils.py:126
 msgid "Name"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:121
+#: ../pykolab/xml/utils.py:127
 msgid "Summary"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:122
+#: ../pykolab/xml/utils.py:128
 msgid "Location"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:123
+#: ../pykolab/xml/utils.py:129
 msgid "Description"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:124
+#: ../pykolab/xml/utils.py:130
 msgid "URL"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:125
+#: ../pykolab/xml/utils.py:131
 msgid "Status"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:126
+#: ../pykolab/xml/utils.py:132
 msgid "Priority"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:127
+#: ../pykolab/xml/utils.py:133
 msgid "Attendee"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:128
+#: ../pykolab/xml/utils.py:134
 msgid "Start"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:129
+#: ../pykolab/xml/utils.py:135
 msgid "End"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:130
+#: ../pykolab/xml/utils.py:136
 msgid "Due"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:131
+#: ../pykolab/xml/utils.py:137
 msgid "Repeat"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:132
+#: ../pykolab/xml/utils.py:138
 msgid "Repeat Exception"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:133
+#: ../pykolab/xml/utils.py:139
 msgid "Organizer"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:134
+#: ../pykolab/xml/utils.py:140
 msgid "Attachment"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:135
+#: ../pykolab/xml/utils.py:141
 msgid "Alarm"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:136
+#: ../pykolab/xml/utils.py:142
 msgid "Classification"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:137
+#: ../pykolab/xml/utils.py:143
 msgid "Progress"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:182
+#: ../pykolab/xml/utils.py:188
 #, python-format
 msgid "for %d times"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:184
+#: ../pykolab/xml/utils.py:190
 #, python-format
 msgid "until %s"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:189
+#: ../pykolab/xml/utils.py:195
 msgid "Display message"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:190
+#: ../pykolab/xml/utils.py:196
 msgid "Send email"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:191
+#: ../pykolab/xml/utils.py:197
 msgid "Play sound"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:197
+#: ../pykolab/xml/utils.py:203
 #, python-format
 msgid "%s after"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:197
+#: ../pykolab/xml/utils.py:203
 #, python-format
 msgid "%s before"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:206
+#: ../pykolab/xml/utils.py:212
 #, python-format
 msgid "%d day(s)"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:212
+#: ../pykolab/xml/utils.py:218
 #, python-format
 msgid "%d hour(s)"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:214
+#: ../pykolab/xml/utils.py:220
 #, python-format
 msgid "%d minute(s)"
 msgstr ""
@@ -3028,9 +3062,13 @@ msgstr ""
 msgid "Could not create %r: %r"
 msgstr ""
 
+#: ../saslauthd/__init__.py:146 ../saslauthd/__init__.py:154
+#: ../wallace/__init__.py:439 ../wallace/__init__.py:448
+msgid "Traceback occurred, please report a bug at http://bugzilla.kolabsys.com"
+msgstr ""
+
 #: ../saslauthd/__init__.py:194
-#, python-format
-msgid "kolab-saslauthd could not accept connections on socket: %r"
+msgid "kolab-saslauthd could not accept "
 msgstr ""
 
 #: ../saslauthd/__init__.py:199
@@ -3038,7 +3076,7 @@ msgid "Maximum tries exceeded, exiting"
 msgstr ""
 
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:195
-#: ../wallace/module_resources.py:1054
+#: ../wallace/module_resources.py:1151
 #, python-format
 msgid "Reservation Request for %(summary)s was %(status)s"
 msgstr ""
@@ -3050,7 +3088,7 @@ msgstr ""
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:704
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:760
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:773
-#: ../wallace/module_resources.py:1134
+#: ../wallace/module_resources.py:1235
 #, python-format
 msgid "Booking for %s has been %s"
 msgstr ""
@@ -3064,13 +3102,13 @@ msgstr ""
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:732
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:749
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:803
-#: ../wallace/module_resources.py:1230
+#: ../wallace/module_resources.py:1333
 #, python-format
 msgid "Booking request for %s requires confirmation"
 msgstr ""
 
 #: ../tests/functional/test_wallace/test_007_invitationpolicy.py:240
-#: ../wallace/module_invitationpolicy.py:441
+#: ../wallace/module_invitationpolicy.py:448
 #, python-format
 msgid "\"%(summary)s\" has been %(status)s"
 msgstr ""
@@ -3080,93 +3118,102 @@ msgstr ""
 #. this triggers an additional notification
 #. this should also trigger an update notification
 #. this should trigger an update notification
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:787
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:793
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:806
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:824
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:927
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:932
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:983
-#: ../wallace/module_invitationpolicy.py:1052
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:802
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:808
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:821
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:839
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:942
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:947
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1008
+#: ../wallace/module_invitationpolicy.py:1071
 #, python-format
 msgid "\"%s\" has been updated"
 msgstr ""
 
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:798
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:810
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:813
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:825
 msgid "PENDING"
 msgstr ""
 
 #. this should trigger a notification message
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1003
-#: ../wallace/module_invitationpolicy.py:1110
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1028
+#: ../wallace/module_invitationpolicy.py:1133
 #, python-format
 msgid "\"%s\" has been cancelled"
 msgstr ""
 
-#: ../tests/unit/test-011-itip.py:408
+#: ../tests/unit/test-011-itip.py:465
 #, python-format
 msgid "Invitation for %(summary)s was %(status)s"
 msgstr ""
 
-#: ../wallace/__init__.py:57
+#: ../wallace/__init__.py:51
 #, python-format
 msgid "Wallace modules: %r"
 msgstr ""
 
-#: ../wallace/__init__.py:69
+#: ../wallace/__init__.py:67
 #, python-format
 msgid "Module %s.execute() failed on message %r with error: %s"
 msgstr ""
 
-#: ../wallace/__init__.py:78
+#: ../wallace/__init__.py:91
 #, python-format
-msgid "Worker process %s initializing"
+msgid "Module %s.heartbeat() failed with error: %s"
 msgstr ""
 
 #: ../wallace/__init__.py:100
+#, python-format
+msgid "Worker process %s initializing"
+msgstr ""
+
+#: ../wallace/__init__.py:122
 msgid "Bind address for Wallace."
 msgstr ""
 
-#: ../wallace/__init__.py:126
+#: ../wallace/__init__.py:140
+msgid "Number of threads to use."
+msgstr ""
+
+#: ../wallace/__init__.py:156
 msgid "Port that Wallace is supposed to use."
 msgstr ""
 
-#: ../wallace/__init__.py:177
+#: ../wallace/__init__.py:205
 #, python-format
-msgid "Could not bind to socket on port %d on bind address %s"
+msgid "Could not bind to socket on port %d on bind "
 msgstr ""
 
-#: ../wallace/__init__.py:189
+#: ../wallace/__init__.py:217
 msgid "Could not shut down socket"
 msgstr ""
 
-#: ../wallace/__init__.py:253
+#: ../wallace/__init__.py:286
 msgid "Accepted connection"
 msgstr ""
 
-#: ../wallace/__init__.py:428
+#: ../wallace/__init__.py:464
 #, python-format
 msgid "Could not write pid file %s"
 msgstr ""
 
 #: ../wallace/module_footer.py:60 ../wallace/module_gpgencrypt.py:60
 #: ../wallace/module_invitationpolicy.py:210 ../wallace/module_optout.py:61
-#: ../wallace/module_resources.py:125
+#: ../wallace/module_resources.py:126
 #, python-format
 msgid "Issuing callback after processing to stage %s"
 msgstr ""
 
 #: ../wallace/module_footer.py:61 ../wallace/module_gpgencrypt.py:61
 #: ../wallace/module_invitationpolicy.py:212 ../wallace/module_optout.py:62
-#: ../wallace/module_resources.py:131
+#: ../wallace/module_resources.py:132
 #, python-format
 msgid "Testing cb_action_%s()"
 msgstr ""
 
 #: ../wallace/module_footer.py:63 ../wallace/module_gpgencrypt.py:63
 #: ../wallace/module_invitationpolicy.py:214 ../wallace/module_optout.py:64
-#: ../wallace/module_resources.py:134
+#: ../wallace/module_resources.py:135
 #, python-format
 msgid "Attempting to execute cb_action_%s()"
 msgstr ""
@@ -3236,17 +3283,17 @@ msgstr ""
 msgid "Invitation policy called for %r, %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:257
+#: ../wallace/module_invitationpolicy.py:258
 #, python-format
 msgid "Failed to parse iTip objects from message: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:261
+#: ../wallace/module_invitationpolicy.py:262
 msgid ""
 "Message is not an iTip message or does not contain any (valid) iTip objects."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:265
+#: ../wallace/module_invitationpolicy.py:266
 #, python-format
 msgid ""
 "iTip objects attached to this message contain the following information: %r"
@@ -3254,261 +3301,309 @@ msgstr ""
 
 #: ../wallace/module_invitationpolicy.py:278
 #, python-format
+msgid "Recipient emails for %s: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:282
+#, python-format
 msgid "No itips, no users, pass along %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:281
+#: ../wallace/module_invitationpolicy.py:285
 #, python-format
 msgid "iTips, but no users, pass along %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:301
+#: ../wallace/module_invitationpolicy.py:306
 #, python-format
 msgid "No user attendee matching envelope recipient %s, skip message"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:305
+#: ../wallace/module_invitationpolicy.py:309
 #, python-format
 msgid "Receiving user: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:330
+#: ../wallace/module_invitationpolicy.py:337
 #, python-format
 msgid "Apply invitation policy %r for sender %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:341
+#: ../wallace/module_invitationpolicy.py:348
 #, python-format
 msgid "Ignoring '%s' iTip method"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:345
+#: ../wallace/module_invitationpolicy.py:352
 #, python-format
 msgid "iTip message %r consumed by the invitationpolicy module"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:361
+#: ../wallace/module_invitationpolicy.py:368
 msgid "Pass invitation for manual processing"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:366
+#: ../wallace/module_invitationpolicy.py:373
 #, python-format
 msgid "Receiving Attendee: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:386
+#: ../wallace/module_invitationpolicy.py:393
 #, python-format
 msgid "Existing %s: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:397
+#: ../wallace/module_invitationpolicy.py:404
 #, python-format
 msgid "Precondition for object %r fulfilled: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:415
+#: ../wallace/module_invitationpolicy.py:422
 #, python-format
 msgid ""
-"The iTip request sequence (%r) doesn't match the referred object version "
-"(%r). Ignoring."
+"The iTip request sequence (%r) doesn't match the referred object version (%"
+"r). Ignoring."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:420
+#: ../wallace/module_invitationpolicy.py:427
 #, python-format
 msgid "Auto-updating %s %r on iTip REQUEST (no re-scheduling)"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:475
+#: ../wallace/module_invitationpolicy.py:482
 msgid "Pass reply for manual processing"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:482
+#: ../wallace/module_invitationpolicy.py:489
 #, python-format
 msgid "Sender Attendee: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:494
+#: ../wallace/module_invitationpolicy.py:501
 #, python-format
 msgid ""
 "The iTip reply sequence (%r) doesn't match the referred object version (%r). "
 "Forwarding to Inbox."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:500
+#: ../wallace/module_invitationpolicy.py:507
 #, python-format
 msgid "Auto-updating %s %r on iTip REPLY"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:525
+#: ../wallace/module_invitationpolicy.py:532
 #, python-format
 msgid "Add delegatee: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:528
+#: ../wallace/module_invitationpolicy.py:535
 #, python-format
 msgid "Update existing delegatee: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:533
+#: ../wallace/module_invitationpolicy.py:540
 #, python-format
 msgid "Update delegator: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:550
-#: ../wallace/module_invitationpolicy.py:582
+#: ../wallace/module_invitationpolicy.py:557
+#: ../wallace/module_invitationpolicy.py:589
 msgid ""
 "The object referred by this reply was not found in the user's folders. "
 "Forwarding to Inbox."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:563
+#: ../wallace/module_invitationpolicy.py:570
 msgid "Pass cancellation for manual processing"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:611
+#: ../wallace/module_invitationpolicy.py:618
 #, python-format
 msgid "Checking if email address %r belongs to a local user"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:616
+#: ../wallace/module_invitationpolicy.py:623
 #, python-format
 msgid "User DN: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:618
+#: ../wallace/module_invitationpolicy.py:625
 #, python-format
 msgid "No user record(s) found for %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:674
+#: ../wallace/module_invitationpolicy.py:681
 #, python-format
 msgid "User record doesn't have the mailbox attribute %r set"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:687
+#: ../wallace/module_invitationpolicy.py:694
 #, python-format
 msgid "IMAP proxy authentication failed: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:709
+#: ../wallace/module_invitationpolicy.py:716
 #, python-format
 msgid "List %r folders for user %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:725
+#: ../wallace/module_invitationpolicy.py:732
 #, python-format
 msgid "IMAP metadata for %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:755
+#: ../wallace/module_invitationpolicy.py:767
 #, python-format
 msgid "Searching folder %r for %s %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:771
+#: ../wallace/module_invitationpolicy.py:783
 #, python-format
 msgid "Failed to parse %s from message %s/%s: %s"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:797
+#: ../wallace/module_invitationpolicy.py:809
 #, python-format
 msgid "Listing events from folder %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:810
-#: ../wallace/module_resources.py:566 ../wallace/module_resources.py:614
+#: ../wallace/module_invitationpolicy.py:822
+#: ../wallace/module_resources.py:474 ../wallace/module_resources.py:665
+#: ../wallace/module_resources.py:713
 #, python-format
 msgid "Failed to parse event from message %s/%s: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:816
+#: ../wallace/module_invitationpolicy.py:828
 #, python-format
 msgid "Existing event %r conflicts with invitation %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:823
-#: ../wallace/module_resources.py:419
+#: ../wallace/module_invitationpolicy.py:835
+#: ../wallace/module_resources.py:518
 #, python-format
 msgid "start: %r, end: %r, total: %r, messages: %d"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:849
+#: ../wallace/module_invitationpolicy.py:861
 #, python-format
 msgid "%r is locked, waiting..."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:913
+#: ../wallace/module_invitationpolicy.py:928
 #, python-format
 msgid "Failed to save %s: no target folder found for user %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:916
+#: ../wallace/module_invitationpolicy.py:931
 #, python-format
 msgid "Save %s %r to user folder %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:929
+#: ../wallace/module_invitationpolicy.py:944
 #, python-format
 msgid "Failed to save %s to user folder at %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:945
+#: ../wallace/module_invitationpolicy.py:960
 #, python-format
 msgid "Delete %s %r in %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:970
+#: ../wallace/module_invitationpolicy.py:989
 #, python-format
 msgid "Compose participation status summary for %s %r to user %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1003
+#: ../wallace/module_invitationpolicy.py:1022
 #, python-format
 msgid ""
 "Waiting for more automated replies (got %d of %d); skipping notification"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1013
+#: ../wallace/module_invitationpolicy.py:1032
 #, python-format
 msgid "Changes submitted by %s have been automatically applied."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1022
+#: ../wallace/module_invitationpolicy.py:1041
 msgid "(removed)"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1045
-#: ../wallace/module_invitationpolicy.py:1103
-#: ../wallace/module_invitationpolicy.py:1193
+#: ../wallace/module_invitationpolicy.py:1047
+#, python-format
+msgid ""
+"\n"
+"            The assignment for '%(summary)s' has been updated in your "
+"tasklist.\n"
+"            %(roundup)s\n"
+"        "
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1055
+#, python-format
+msgid ""
+"\n"
+"            The event '%(summary)s' at %(start)s has been updated in your "
+"calendar.\n"
+"            %(roundup)s\n"
+"        "
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1064
+#: ../wallace/module_invitationpolicy.py:1126
+#: ../wallace/module_invitationpolicy.py:1216
 msgid "*** This is an automated message. Please do not reply. ***"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1076
+#: ../wallace/module_invitationpolicy.py:1099
 #, python-format
 msgid "Send cancellation notification for %s %r to user %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1183
+#: ../wallace/module_invitationpolicy.py:1109
+#, python-format
+msgid ""
+"\n"
+"            The assignment for '%(summary)s' has been cancelled by %"
+"(organizer)s.\n"
+"            The copy in your tasklist as been marked as cancelled "
+"accordingly.\n"
+"        "
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1117
+#, python-format
+msgid ""
+"\n"
+"            The event '%(summary)s' at %(start)s has been cancelled by %"
+"(organizer)s.\n"
+"            The copy in your calendar as been marked as cancelled "
+"accordingly.\n"
+"        "
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1206
 #, python-format
 msgid "Updated %s's copy of %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1186
+#: ../wallace/module_invitationpolicy.py:1209
 #, python-format
 msgid "Attendee %s's copy of %r not found"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1189
+#: ../wallace/module_invitationpolicy.py:1212
 #, python-format
 msgid "Attendee %r not found in LDAP"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1196
+#: ../wallace/module_invitationpolicy.py:1219
 #, python-format
 msgid "%(name)s has %(status)s your assignment for %(summary)s."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1198
+#: ../wallace/module_invitationpolicy.py:1221
 #, python-format
 msgid "%(name)s has %(status)s your invitation for %(summary)s."
 msgstr ""
@@ -3521,8 +3616,7 @@ msgstr ""
 
 #: ../wallace/module_optout.py:96
 #, python-format
-msgid ""
-"Running opt-out consult from envelope sender '%s <%s>' to recipient %s <%s>"
+msgid "Running opt-out consult from envelope sender '%s "
 msgstr ""
 
 #: ../wallace/module_optout.py:160
@@ -3535,233 +3629,255 @@ msgstr ""
 msgid "Could not send request to optout_url %s"
 msgstr ""
 
-#: ../wallace/module_resources.py:115
+#: ../wallace/module_resources.py:116
 #, python-format
 msgid "Resource Management called for %r, %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:180
+#: ../wallace/module_resources.py:181
 #, python-format
 msgid "Failed to parse iTip events from message: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:185
-msgid "Message is not an iTip message or does not contain any (valid) iTip."
+#: ../wallace/module_resources.py:186
+msgid "Message is not an iTip message or does not contain any "
 msgstr ""
 
-#: ../wallace/module_resources.py:193
-#, python-format
-msgid ""
-"iTip events attached to this message contain the following information: %r"
+#: ../wallace/module_resources.py:194
+msgid "iTip events attached to this message contain the "
 msgstr ""
 
-#: ../wallace/module_resources.py:226
+#: ../wallace/module_resources.py:225
 msgid "Not an iTip message, but sent to resource nonetheless. Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:234
+#: ../wallace/module_resources.py:233
 #, python-format
 msgid "No itips, no resources, pass along %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:237
+#: ../wallace/module_resources.py:236
 #, python-format
 msgid "iTips, but no resources, pass along %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:246
+#: ../wallace/module_resources.py:245
 #, python-format
 msgid "No resource attendees matching envelope recipient %s, Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:256
+#: ../wallace/module_resources.py:255
 #, python-format
 msgid "Resources: %r; %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:274
+#: ../wallace/module_resources.py:273
 #, python-format
 msgid "Sender Attendee: %r => %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:281
+#: ../wallace/module_resources.py:280
 #, python-format
 msgid ""
 "The iTip reply sequence (%r) doesn't match the referred event version (%r). "
 "Ignoring."
 msgstr ""
 
-#: ../wallace/module_resources.py:306
+#: ../wallace/module_resources.py:305
 #, python-format
 msgid "Event referenced by this REPLY (%r) not found in resource calendar"
 msgstr ""
 
-#: ../wallace/module_resources.py:309
+#: ../wallace/module_resources.py:308
 msgid "No event reference found in this REPLY. Ignoring."
 msgstr ""
 
-#: ../wallace/module_resources.py:318
+#: ../wallace/module_resources.py:317
 #, python-format
 msgid "Receiving Resource: %r; %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:326
+#: ../wallace/module_resources.py:325
 #, python-format
 msgid "Recipient %r is non-participant, ignoring message"
 msgstr ""
 
-#: ../wallace/module_resources.py:354
+#: ../wallace/module_resources.py:353
 #, python-format
 msgid "Accept invitation for individual resource %r / %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:383
+#: ../wallace/module_resources.py:382
 #, python-format
 msgid "Delegate invitation for resource collection %r to %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:415
+#: ../wallace/module_resources.py:403
+#, python-format
+msgid "module_resources.heartbeat(%d)"
+msgstr ""
+
+#: ../wallace/module_resources.py:426
+#, python-format
+msgid "Expunge resource calendar for %s (%s) failed: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:450
+#, python-format
+msgid "Expunge events in resource folder %r older than %d days"
+msgstr ""
+
+#: ../wallace/module_resources.py:463
+#, python-format
+msgid "Fetching message ID %r from folder %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:489
+#, python-format
+msgid "Flag event %s from message %s/%s as deleted (age = %d days)"
+msgstr ""
+
+#: ../wallace/module_resources.py:514
 #, python-format
 msgid "Failed to read resource calendar for %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:425
+#: ../wallace/module_resources.py:524
 #, python-format
 msgid "Polling for resource %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:428
+#: ../wallace/module_resources.py:527
 #, python-format
 msgid "Resource %r has been popped from the list"
 msgstr ""
 
-#: ../wallace/module_resources.py:432
+#: ../wallace/module_resources.py:531
 msgid "Resource is a collection"
 msgstr ""
 
-#: ../wallace/module_resources.py:443
+#: ../wallace/module_resources.py:542
 #, python-format
 msgid "Removed conflicting resources from %r: (%r) => %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:455
+#: ../wallace/module_resources.py:554
 #, python-format
 msgid "Conflicting events: %r for resource %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:474
+#: ../wallace/module_resources.py:573
 #, python-format
 msgid "Delegate to another resource collection member: %r to %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:536
+#: ../wallace/module_resources.py:635
 #, python-format
 msgid "Checking events in resource folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:555
+#: ../wallace/module_resources.py:654
 #, python-format
 msgid "Fetching message UID %r from folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:578
+#: ../wallace/module_resources.py:677
 #, python-format
 msgid "Event %r conflicts with event %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:599
+#: ../wallace/module_resources.py:698
 #, python-format
 msgid "Searching %r for event %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:605
+#: ../wallace/module_resources.py:704
 #, python-format
 msgid "Failed to access resource calendar:: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:634
+#: ../wallace/module_resources.py:733
 #, python-format
 msgid "Apply invitation policies %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:653
+#: ../wallace/module_resources.py:752
 #, python-format
 msgid "Adding event to %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:707
+#: ../wallace/module_resources.py:806
 #, python-format
 msgid "Failed to save event to resource calendar at %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:724
+#: ../wallace/module_resources.py:823
 #, python-format
 msgid "Delete resource calendar object %r in %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:767
+#: ../wallace/module_resources.py:866
 #, python-format
 msgid "Checking if email address %r belongs to a resource (collection)"
 msgstr ""
 
-#: ../wallace/module_resources.py:775 ../wallace/module_resources.py:849
-#: ../wallace/module_resources.py:883
+#: ../wallace/module_resources.py:874 ../wallace/module_resources.py:946
+#: ../wallace/module_resources.py:980
 #, python-format
 msgid "Resource record(s): %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:777 ../wallace/module_resources.py:851
-#: ../wallace/module_resources.py:886
+#: ../wallace/module_resources.py:876 ../wallace/module_resources.py:948
+#: ../wallace/module_resources.py:983
 #, python-format
 msgid "No resource (collection) records found for %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:781 ../wallace/module_resources.py:855
-#: ../wallace/module_resources.py:890
+#: ../wallace/module_resources.py:880 ../wallace/module_resources.py:952
+#: ../wallace/module_resources.py:987
 #, python-format
 msgid "Resource record: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:801
+#: ../wallace/module_resources.py:898
 #, python-format
 msgid "Raw itip_events: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:809
+#: ../wallace/module_resources.py:906
 #, python-format
 msgid "Raw set of attendees: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:817
+#: ../wallace/module_resources.py:914
 #, python-format
 msgid "Raw set of resources: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:822
+#: ../wallace/module_resources.py:919
 #, python-format
 msgid "Raw set of organizers: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:842
+#: ../wallace/module_resources.py:939
 #, python-format
 msgid "Checking if attendee %r is a resource (collection)"
 msgstr ""
 
-#: ../wallace/module_resources.py:858 ../wallace/module_resources.py:892
+#: ../wallace/module_resources.py:955 ../wallace/module_resources.py:989
 msgid "Resource reservation made but no resource records found"
 msgstr ""
 
-#: ../wallace/module_resources.py:877
+#: ../wallace/module_resources.py:974
 #, python-format
 msgid "Checking if resource %r is a resource (collection)"
 msgstr ""
 
-#: ../wallace/module_resources.py:895
-#, python-format
-msgid "The following resources are being referred to in the iTip: %r"
+#: ../wallace/module_resources.py:992
+msgid "The following resources are being referred to in the "
 msgstr ""
 
-#: ../wallace/module_resources.py:1060
+#: ../wallace/module_resources.py:1157
 #, python-format
 msgid ""
 "\n"
@@ -3772,7 +3888,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../wallace/module_resources.py:1079
+#: ../wallace/module_resources.py:1176
 #, python-format
 msgid ""
 "\n"
@@ -3782,7 +3898,7 @@ msgid ""
 "    "
 msgstr ""
 
-#: ../wallace/module_resources.py:1086
+#: ../wallace/module_resources.py:1183
 #, python-format
 msgid ""
 "\n"
@@ -3791,28 +3907,28 @@ msgid ""
 "        "
 msgstr ""
 
-#: ../wallace/module_resources.py:1117
+#: ../wallace/module_resources.py:1218
 #, python-format
 msgid "Sending booking notification for event %r to %r from %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1134
+#: ../wallace/module_resources.py:1236
 msgid "failed"
 msgstr ""
 
-#: ../wallace/module_resources.py:1153
+#: ../wallace/module_resources.py:1256
 #, python-format
 msgid ""
 "\n"
-"            The resource booking for %(resource)s by %(orgname)s <"
-"%(orgemail)s> has been %(status)s for %(date)s.\n"
+"            The resource booking for %(resource)s by %(orgname)s <%(orgemail)"
+"s> has been %(status)s for %(date)s.\n"
 "\n"
 "            *** This is an automated message, sent to you as the resource "
 "owner. ***\n"
 "        "
 msgstr ""
 
-#: ../wallace/module_resources.py:1159
+#: ../wallace/module_resources.py:1262
 #, python-format
 msgid ""
 "\n"
@@ -3826,12 +3942,12 @@ msgid ""
 "        "
 msgstr ""
 
-#: ../wallace/module_resources.py:1203
+#: ../wallace/module_resources.py:1306
 #, python-format
 msgid "Clone invitation for owner confirmation: %r from %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1209
+#: ../wallace/module_resources.py:1312
 #, python-format
 msgid ""
 "\n"
@@ -3855,7 +3971,7 @@ msgstr ""
 msgid "Module Group: %s"
 msgstr ""
 
-#: ../wallace/modules.py:108
+#: ../wallace/modules.py:108 ../wallace/modules.py:120
 #, python-format
 msgid "No such module %r in modules %r (1)."
 msgstr ""
@@ -3865,43 +3981,43 @@ msgstr ""
 msgid "No such module %r in modules %r (2)."
 msgstr ""
 
-#: ../wallace/modules.py:119
+#: ../wallace/modules.py:126
 #, python-format
 msgid "Holding message in queue for manual review (%s by %s)"
 msgstr ""
 
-#: ../wallace/modules.py:122
+#: ../wallace/modules.py:129
 #, python-format
 msgid "Deferring message in %s (by module %s)"
 msgstr ""
 
-#: ../wallace/modules.py:134
+#: ../wallace/modules.py:141
 #, python-format
 msgid "The time when the message was sent: %r"
 msgstr ""
 
-#: ../wallace/modules.py:135
+#: ../wallace/modules.py:142
 #, python-format
 msgid "The time now: %r"
 msgstr ""
 
-#: ../wallace/modules.py:136
+#: ../wallace/modules.py:143
 #, python-format
 msgid "The time delta: %r"
 msgstr ""
 
 #. TODO: Send NDR back to user
-#: ../wallace/modules.py:140
+#: ../wallace/modules.py:147
 #, python-format
 msgid "Message in file %s older then 5 days, deleting"
 msgstr ""
 
-#: ../wallace/modules.py:165
+#: ../wallace/modules.py:172
 #, python-format
 msgid "Rejecting message in %s (by module %s)"
 msgstr ""
 
-#: ../wallace/modules.py:186
+#: ../wallace/modules.py:193
 #, python-format
 msgid ""
 "This is the email system Wallace at %s.\n"
@@ -3916,29 +4032,29 @@ msgid ""
 "recipients.\n"
 msgstr ""
 
-#: ../wallace/modules.py:201
+#: ../wallace/modules.py:208
 #, python-format
 msgid ""
 "X-Wallace-Module: %s\n"
 "X-Wallace-Result: REJECT\n"
 msgstr ""
 
-#: ../wallace/modules.py:260
+#: ../wallace/modules.py:267
 #, python-format
 msgid "Accepting message in %s (by module %s)"
 msgstr ""
 
-#: ../wallace/modules.py:262
+#: ../wallace/modules.py:269
 #, python-format
 msgid "Accepting message in: %r"
 msgstr ""
 
-#: ../wallace/modules.py:269
+#: ../wallace/modules.py:276
 #, python-format
 msgid "recipients: %r"
 msgstr ""
 
-#: ../wallace/modules.py:347
+#: ../wallace/modules.py:354
 #, python-format
 msgid "Module '%s' already registered"
 msgstr ""




More information about the commits mailing list