2 commits - configure.ac po/de_DE.po po/de.po po/es.po po/fr.po po/nl.po po/POTFILES.skip po/pykolab.pot

[Jeroen van Meeuwen]

 configure.ac     |    2 
 po/POTFILES.skip |  107 -
 po/de.po         | 1147 +++++++++++++-------
 po/de_DE.po      | 1131 +++++++++++++-------
 po/es.po         | 2664 ++++++++++++++++++++++++++++++++++++++----------
 po/fr.po         | 3047 +++++++++++++++++++++++++++++++++++++++++--------------
 po/nl.po         | 2617 +++++++++++++++++++++++++++++++++++++----------
 po/pykolab.pot   |  246 ++--
 8 files changed, 8244 insertions(+), 2717 deletions(-)

New commits:
commit c43b279f1a1d6a4186c1a99763cf1343c915f1fc
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Sep 11 18:06:46 2014 +0200

    Update translations

diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 91d4f18..07c0620 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,78 +1,31 @@
-bin/._kolab_smtp_access_policy.py
-kolabd/.___init__.py
-pykolab/auth/.___init__.py
-pykolab/auth/ldap/._cache.py
-pykolab/auth/ldap/.___init__.py
-pykolab/._base.py
-pykolab/cli/._cmd_create_mailbox.py
-pykolab/cli/._cmd_delete_message.py
-pykolab/cli/._cmd_list_mailbox_metadata.py
-pykolab/cli/._cmd_list_messages.py
-pykolab/cli/._cmd_list_quota.py
-pykolab/cli/._cmd_set_language.py
-pykolab/cli/._cmd_set_mailbox_acl.py
-pykolab/cli/._cmd_set_mail.py
-pykolab/conf/._defaults.py
-pykolab/conf/.___init__.py
-pykolab/._constants.py
+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
 pykolab/constants.py
-pykolab/._constants.py.in
-pykolab/imap/._cyrus.py
-pykolab/imap/.___init__.py
-pykolab/.___init__.py
-pykolab/itip/.___init__.py
-pykolab/._logger.py
-pykolab/plugins/dynamicquota/.___init__.py
-pykolab/plugins/.___init__.py
-pykolab/plugins/roundcubedb/.___init__.py
-pykolab/setup/.___init__.py
-pykolab/setup/._setup_freebusy.py
-pykolab/setup/._setup_ldap.py
-pykolab/setup/._setup_mta.py
-pykolab/setup/._setup_roundcube.py
-pykolab/._translate.py
-pykolab/._translit.py
-pykolab/._utils.py
-pykolab/wap_client/.___init__.py
-pykolab/xml/._attendee.py
-pykolab/xml/._contact.py
-pykolab/xml/._contact_reference.py
-pykolab/xml/._event.py
-pykolab/xml/.___init__.py
-pykolab/xml/._recurrence_rule.py
-pykolab/xml/._todo.py
-pykolab/xml/._utils.py
-tests/functional/._purge_users.py
-tests/functional/._resource_func.py
-tests/functional/._synchronize.py
-tests/functional/test_auth/.___init__.py
-tests/functional/test_auth/._test_001_ldap.py
-tests/functional/test_auth/._test_002_sql.py
-tests/functional/test_auth/._test_003_pam.py
-tests/functional/test_auth/._test_004_saslauthd.py
-tests/functional/test_kolabd/._test_001_user_sync.py
-tests/functional/test_wallace/._test_001_user_add.py
-tests/functional/test_wallace/._test_002_footer.py
-tests/functional/test_wallace/._test_005_resource_add.py
-tests/functional/test_wallace/._test_005_resource_invitation.py
-tests/functional/test_wallace/._test_006_resource_performance.py
-tests/functional/test_wallace/._test_007_invitationpolicy.py
-tests/functional/test_wap_client/._test_002_user_add.py
-tests/functional/._user_add.py
-tests/unit/._test-000-imports.py
-tests/unit/._test-002-attendee.py
-tests/unit/._test-003-event.py
-tests/unit/._test-006-ldap_psearch.py
-tests/unit/._test-007-ldap_syncrepl.py
-tests/unit/._test-010-transliterate.py
-tests/unit/._test-011-itip.py
-tests/unit/._test-011-wallace_resources.py
-tests/unit/._test-012-wallace_invitationpolicy.py
-tests/unit/._test-014-conf-and-raw.py
-tests/unit/._test-015-translate.py
-tests/unit/._test-016-todo.py
-wallace/.___init__.py
-wallace/._module_gpgencrypt.py
-wallace/._module_invitationpolicy.py
-wallace/._module_resources.py
-wallace/._modules.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
diff --git a/po/de.po b/po/de.po
index 46f34fc..6fd645d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,16 +7,16 @@
 # Grote <grote at kolabsys.com>, 2012
 # balin <johannes_graumann at web.de>, 2012
 # Jo <jo at caj-augsburg.de>, 2012
-# bitnukl <robert at proemper.net>, 2014
+# bitnukl, 2014
 # Thomas Brüderli <roundcube at gmail.com>, 2014
 # Till Savekoul <till at koul.de>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-10 07:21-0400\n"
-"PO-Revision-Date: 2014-07-22 13:01+0000\n"
-"Last-Translator: Thomas Brüderli <roundcube at gmail.com>\n"
+"POT-Creation-Date: 2014-09-11 18:01+0200\n"
+"PO-Revision-Date: 2014-09-11 16:00+0000\n"
+"Last-Translator: Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -318,55 +318,58 @@ msgstr "In den Hintergrund abtauchen"
 msgid "Path to the PID file to use."
 msgstr "Pfad zur PID-Datei"
 
-#: ../kolabd/__init__.py:74 ../saslauthd/__init__.py:76
+#: ../kolabd/__init__.py:74 ../saslauthd/__init__.py:85
 #: ../wallace/__init__.py:135
 msgid "Run as user USERNAME"
 msgstr "Als Benutzer USERNAME ausführen"
 
-#: ../kolabd/__init__.py:84 ../saslauthd/__init__.py:86
+#: ../kolabd/__init__.py:84 ../saslauthd/__init__.py:95
 #: ../wallace/__init__.py:109
 msgid "Run as group GROUPNAME"
 msgstr "Als Gruppe GROUPNAME ausführen"
 
-#: ../kolabd/__init__.py:122 ../pykolab/logger.py:139 ../pykolab/utils.py:234
-#: ../saslauthd/__init__.py:292 ../wallace/__init__.py:329
+#: ../kolabd/__init__.py:122 ../pykolab/utils.py:234
+#: ../saslauthd/__init__.py:301 ../wallace/__init__.py:329
 #, python-format
 msgid "Group %s does not exist"
 msgstr "Gruppe %s exisitert nicht"
 
-#: ../kolabd/__init__.py:131 ../saslauthd/__init__.py:301
+#: ../kolabd/__init__.py:131 ../saslauthd/__init__.py:310
 #: ../wallace/__init__.py:338
 #, python-format
 msgid "Switching real and effective group id to %d"
 msgstr ""
 
-#: ../kolabd/__init__.py:153 ../pykolab/logger.py:159 ../pykolab/utils.py:258
-#: ../saslauthd/__init__.py:323 ../wallace/__init__.py:360
+#: ../kolabd/__init__.py:153 ../pykolab/utils.py:258
+#: ../saslauthd/__init__.py:332 ../wallace/__init__.py:360
 #, python-format
 msgid "User %s does not exist"
 msgstr "Benutzer %s existiert nicht"
 
-#: ../kolabd/__init__.py:163 ../saslauthd/__init__.py:333
+#: ../kolabd/__init__.py:163 ../saslauthd/__init__.py:342
 #: ../wallace/__init__.py:370
 #, python-format
 msgid "Switching real and effective user id to %d"
 msgstr ""
 
-#: ../kolabd/__init__.py:172 ../saslauthd/__init__.py:342
+#: ../kolabd/__init__.py:172 ../saslauthd/__init__.py:351
 #: ../wallace/__init__.py:379
 msgid "Could not change real and effective uid and/or gid"
 msgstr ""
 
-#: ../kolabd/__init__.py:192 ../saslauthd/__init__.py:133
+#: ../kolabd/__init__.py:192 ../saslauthd/__init__.py:142
 #: ../wallace/__init__.py:399
 msgid "Interrupted by user"
 msgstr "Vom Benutzer unterbrochen"
 
 #: ../kolabd/__init__.py:197 ../kolabd/__init__.py:208
-msgid "Traceback occurred, please report a "
-msgstr ""
+#: ../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"
+msgstr "Ein Fehler mit Traceback trat auf, bitte legen Sie einen Bericht auf  http://bugzilla.kolabsys.com an"
 
-#: ../kolabd/__init__.py:203 ../saslauthd/__init__.py:141
+#: ../kolabd/__init__.py:203 ../saslauthd/__init__.py:150
 #: ../wallace/__init__.py:408
 #, python-format
 msgid "Type Error: %s"
@@ -376,7 +379,7 @@ msgstr "Typ-Fehler: %s"
 msgid "Could not connect to LDAP, is it running?"
 msgstr ""
 
-#: ../kolabd/__init__.py:233 ../pykolab/auth/ldap/__init__.py:2137
+#: ../kolabd/__init__.py:233 ../pykolab/auth/ldap/__init__.py:2178
 #: ../pykolab/cli/cmd_sync.py:36
 msgid "Listing domains..."
 msgstr "Liste Domains auf..."
@@ -385,7 +388,7 @@ msgstr "Liste Domains auf..."
 msgid "No domains. Not syncing"
 msgstr ""
 
-#: ../kolabd/__init__.py:275
+#: ../kolabd/__init__.py:279
 #, python-format
 msgid "added domains: %r, removed domains: %r"
 msgstr ""
@@ -533,244 +536,256 @@ msgstr ""
 msgid "Using timestamp %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:595
-msgid "Applying recipient policy disabled through configuration"
+#: ../pykolab/auth/ldap/__init__.py:597
+#, python-format
+msgid "Not applying recipient policy for %s (disabled through configuration)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:600
+#: ../pykolab/auth/ldap/__init__.py:607
 #, python-format
 msgid "Applying recipient policy to %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:617
+#: ../pykolab/auth/ldap/__init__.py:624
 #, python-format
-msgid "Using mail attributes: %r, with primary %r and "
+msgid "Using mail attributes: %r, with primary %r and secondary %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:628
+#: ../pykolab/auth/ldap/__init__.py:635
 #, python-format
 msgid "key %r not in entry"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:630
+#: ../pykolab/auth/ldap/__init__.py:637
 #, python-format
 msgid "key %r is the prim. mail attr."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:632
+#: ../pykolab/auth/ldap/__init__.py:639
 msgid "prim. mail pol. is not empty"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:635
+#: ../pykolab/auth/ldap/__init__.py:642
 #, python-format
 msgid "key %r is the sec. mail attr."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:637
+#: ../pykolab/auth/ldap/__init__.py:644
 msgid "sec. mail pol. is not empty"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:641 ../pykolab/auth/ldap/__init__.py:655
+#: ../pykolab/auth/ldap/__init__.py:648 ../pykolab/auth/ldap/__init__.py:662
 #, python-format
 msgid "Attributes %r are not yet available for entry %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:694
+#: ../pykolab/auth/ldap/__init__.py:701
 #, python-format
 msgid "No results for mail address %s found"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:705
+#: ../pykolab/auth/ldap/__init__.py:712
 #, python-format
 msgid "1 result for address %s found, verifying"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:715
+#: ../pykolab/auth/ldap/__init__.py:722
 #, python-format
-msgid "Too bad, primary email address %s "
+msgid "Too bad, primary email address %s already in use for %s (we are %s)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:726 ../pykolab/auth/ldap/__init__.py:815
+#: ../pykolab/auth/ldap/__init__.py:733 ../pykolab/auth/ldap/__init__.py:822
 msgid "Address assigned to us"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:781
+#: ../pykolab/auth/ldap/__init__.py:788
 #, python-format
 msgid "No results for address %s found"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:792
+#: ../pykolab/auth/ldap/__init__.py:799
 #, python-format
-msgid "1 result for address %s found, "
+msgid "1 result for address %s found, verifying..."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:803
-msgid "Too bad, secondary email "
+#: ../pykolab/auth/ldap/__init__.py:810
+#, python-format
+msgid "Too bad, secondary email address %s already in use for %s (we are %s)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:830
-msgid "Recipient policy composed the following set of secondary "
+#: ../pykolab/auth/ldap/__init__.py:837
+#, python-format
+msgid ""
+"Recipient policy composed the following set of secondary email addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:841
+#: ../pykolab/auth/ldap/__init__.py:848
 #, python-format
 msgid "Secondary mail addresses that we want is not None: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:852
-msgid "Avoiding the duplication of the primary mail "
+#: ../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"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:863
+#: ../pykolab/auth/ldap/__init__.py:870
 #, python-format
 msgid "Entry is getting secondary mail addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:871
-msgid "Entry did not have any secondary mail "
+#: ../pykolab/auth/ldap/__init__.py:878
+#, python-format
+msgid "Entry did not have any secondary mail addresses in %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:888 ../pykolab/auth/ldap/__init__.py:894
+#: ../pykolab/auth/ldap/__init__.py:895 ../pykolab/auth/ldap/__init__.py:901
 #, python-format
 msgid "secondary_mail_addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:889 ../pykolab/auth/ldap/__init__.py:895
+#: ../pykolab/auth/ldap/__init__.py:896 ../pykolab/auth/ldap/__init__.py:902
 #, python-format
 msgid "entry[%s]: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:906
+#: ../pykolab/auth/ldap/__init__.py:913
 #, python-format
 msgid "Entry modifications list: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:934
+#: ../pykolab/auth/ldap/__init__.py:941
 #, python-format
 msgid "Setting entry attribute %r to %r for %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:970
+#: ../pykolab/auth/ldap/__init__.py:977
 #, python-format
 msgid ""
 "Could not update dn %r:\n"
 "%r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:983
+#: ../pykolab/auth/ldap/__init__.py:990
 #, python-format
 msgid "Using filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:998
+#: ../pykolab/auth/ldap/__init__.py:1005
 #, python-format
 msgid "Synchronization is searching against base DN: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1044
+#: ../pykolab/auth/ldap/__init__.py:1051
 #, python-format
-msgid "About to consider the user quota for %r (used: %r, "
+msgid ""
+"About to consider the user quota for %r (used: %r, imap: %r, ldap: %r, "
+"default: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1115
+#: ../pykolab/auth/ldap/__init__.py:1122
 msgid "Invalid DN, username and/or password."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1236 ../pykolab/auth/ldap/__init__.py:1249
-#: ../pykolab/auth/ldap/__init__.py:1614 ../pykolab/auth/ldap/__init__.py:1627
+#: ../pykolab/auth/ldap/__init__.py:1247 ../pykolab/auth/ldap/__init__.py:1264
+#: ../pykolab/auth/ldap/__init__.py:1628 ../pykolab/auth/ldap/__init__.py:1645
 #, python-format
 msgid "Found a subject %r with access %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1356
+#: ../pykolab/auth/ldap/__init__.py:1366
 #, python-format
 msgid "Entry %s attribute value: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1364
+#: ../pykolab/auth/ldap/__init__.py:1374
 #, python-format
 msgid "imap.user_mailbox_server(%r) result: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1684 ../pykolab/auth/ldap/__init__.py:1853
+#: ../pykolab/auth/ldap/__init__.py:1694 ../pykolab/auth/ldap/__init__.py:1894
 #, python-format
 msgid "Result from recipient policy: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1908
+#: ../pykolab/auth/ldap/__init__.py:1949
 #, python-format
 msgid "Kolab user %s does not have a result attribute %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2067
+#: ../pykolab/auth/ldap/__init__.py:2108
 #, python-format
 msgid "Finding domain root dn for domain %s"
 msgstr "Suche root dn für die Domain %s"
 
-#: ../pykolab/auth/ldap/__init__.py:2164
+#: ../pykolab/auth/ldap/__init__.py:2205
 msgid "Authentication database DOWN"
 msgstr "Authentisierungsdatenbank UNTEN"
 
-#: ../pykolab/auth/ldap/__init__.py:2248 ../pykolab/auth/ldap/__init__.py:2296
+#: ../pykolab/auth/ldap/__init__.py:2289 ../pykolab/auth/ldap/__init__.py:2337
 #, python-format
 msgid "Entry type: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2321
-#, python-format
-msgid "Done with _synchronize_callback() for entry %r"
-msgstr ""
-
-#: ../pykolab/auth/ldap/__init__.py:2393
+#: ../pykolab/auth/ldap/__init__.py:2426
 msgid "LDAP Search Result Data Entry:"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2409
+#: ../pykolab/auth/ldap/__init__.py:2442
 msgid "Entry Change Notification attributes:"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2414
+#: ../pykolab/auth/ldap/__init__.py:2447
 #, python-format
 msgid "Change Type: %r (%r)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2422
+#: ../pykolab/auth/ldap/__init__.py:2455
 #, python-format
 msgid "Previous DN: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2477
+#: ../pykolab/auth/ldap/__init__.py:2510
 #, python-format
 msgid "Object %s searched no longer exists"
 msgstr "Das gesuchte Objekt %s existiert nicht mehr"
 
-#: ../pykolab/auth/ldap/__init__.py:2487
+#: ../pykolab/auth/ldap/__init__.py:2520
 #, python-format
 msgid "%d results..."
 msgstr "%d Ergebnisse..."
 
-#: ../pykolab/auth/ldap/__init__.py:2590
+#: ../pykolab/auth/ldap/__init__.py:2623
 #, python-format
 msgid "Searching with filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2642
+#: ../pykolab/auth/ldap/__init__.py:2675
 #, python-format
 msgid "Checking for support for %s on %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2661
+#: ../pykolab/auth/ldap/__init__.py:2694
 #, python-format
 msgid "Found support for %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2706
+#: ../pykolab/auth/ldap/__init__.py:2739
 #, 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 "
+msgid ""
+"The name of the persistent, unique attribute is very probably not compatible"
+" with the use of syncrepl."
 msgstr ""
 
 #: ../pykolab/cli/cmd_acl_cleanup.py:34
@@ -810,7 +825,8 @@ msgid "Recipient for alias %r already exists"
 msgstr ""
 
 #: ../pykolab/cli/cmd_add_alias.py:97
-msgid "Environment is not configured for "
+msgid ""
+"Environment is not configured for users to hold secondary mail attributes"
 msgstr ""
 
 #: ../pykolab/cli/cmd_add_alias.py:105
@@ -845,7 +861,9 @@ 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 permissions"
+msgid ""
+"Could not find credentials with sufficient permissionsto add a domain name "
+"space."
 msgstr ""
 
 #: ../pykolab/cli/cmd_add_domain.py:67 ../pykolab/cli/cmd_delete_domain.py:56
@@ -949,6 +967,11 @@ msgstr "Keine Mailbox angegeben"
 msgid "No such folder(s)"
 msgstr ""
 
+#: ../pykolab/cli/cmd_delete_mailbox.py:63
+#, python-format
+msgid "Could not delete mailbox '%s'"
+msgstr ""
+
 #: ../pykolab/cli/cmd_delete_message.py:36
 msgid "Delete a message from a folder"
 msgstr ""
@@ -1199,27 +1222,27 @@ msgstr "E-Mail-Adresse"
 
 #. This is a nested command
 #. This is a nested component
-#: ../pykolab/cli/commands.py:98 ../pykolab/setup/components.py:90
+#: ../pykolab/cli/commands.py:97 ../pykolab/setup/components.py:90
 #, python-format
 msgid "Command Group: %s"
 msgstr ""
 
-#: ../pykolab/cli/commands.py:113 ../pykolab/cli/commands.py:118
+#: ../pykolab/cli/commands.py:112 ../pykolab/cli/commands.py:117
 msgid "No such command."
 msgstr "Dieses Kommando existiert nicht."
 
-#: ../pykolab/cli/commands.py:168 ../pykolab/setup/components.py:231
+#: ../pykolab/cli/commands.py:167 ../pykolab/setup/components.py:231
 #, python-format
 msgid "Command '%s' already registered"
 msgstr ""
 
-#: ../pykolab/cli/commands.py:193 ../pykolab/setup/components.py:257
+#: ../pykolab/cli/commands.py:192 ../pykolab/setup/components.py:257
 #: ../wallace/modules.py:369
 #, python-format
 msgid "Alias for %s"
 msgstr "Alias für %s"
 
-#: ../pykolab/cli/commands.py:201 ../pykolab/setup/components.py:265
+#: ../pykolab/cli/commands.py:200 ../pykolab/setup/components.py:265
 msgid "Not yet implemented"
 msgstr "Diese Funktion ist noch nicht implementiert"
 
@@ -1340,7 +1363,8 @@ 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
-msgid "Invalid entitlement verification "
+#, python-format
+msgid "Invalid entitlement verification certificate at %s"
 msgstr ""
 
 #: ../pykolab/conf/entitlement.py:120 ../pykolab/conf/entitlement.py:123
@@ -1422,12 +1446,14 @@ msgid "Configuration file to use"
 msgstr "Konfigurationsdatei, die benutzt werden soll"
 
 #: ../pykolab/conf/__init__.py:278
-msgid "Set the debugging "
-msgstr "Stelle Fehlerbehebung ein"
+msgid ""
+"Set the debugging verbosity. Maximum is 9, tracing protocols like LDAP, SQL "
+"and IMAP."
+msgstr ""
 
 #: ../pykolab/conf/__init__.py:286
-msgid "Set the logging level. "
-msgstr "Setze das Protokollniveau"
+msgid "Set the logging level. One of info, warn, error, critical or debug"
+msgstr ""
 
 #: ../pykolab/conf/__init__.py:294
 msgid "Log file to use"
@@ -1494,27 +1520,28 @@ msgid "This program has 9 levels of verbosity. Using the maximum of 9."
 msgstr "Dieses Programm hat 9 Ebenen der Detailliertheit. Benutze das Maximum 9."
 
 #: ../pykolab/conf/__init__.py:585 ../pykolab/conf/__init__.py:591
+#: ../pykolab/conf/__init__.py:595 ../pykolab/conf/__init__.py:601
 msgid "Cannot start SASL authentication daemon"
 msgstr "Konnte SASL Authentisierungsdaemon nicht starten"
 
-#: ../pykolab/conf/__init__.py:602
+#: ../pykolab/conf/__init__.py:612
 msgid "No imaplib library found."
 msgstr "Keine imaplib-Bibliothek gefunden."
 
-#: ../pykolab/conf/__init__.py:612
+#: ../pykolab/conf/__init__.py:622
 msgid "No LMTP class found in the smtplib library."
 msgstr "Keine Klasse namens LMTP in der smtplib-Bibliothek gefunden."
 
-#: ../pykolab/conf/__init__.py:622
+#: ../pykolab/conf/__init__.py:632
 msgid "No SMTP class found in the smtplib library."
 msgstr "Keine Klasse namens SMTP in der smtplib-Bibliothek gefunden."
 
-#: ../pykolab/conf/__init__.py:636
+#: ../pykolab/conf/__init__.py:646
 #, python-format
 msgid "Found you specified a specific set of items to test: %s"
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:644
+#: ../pykolab/conf/__init__.py:654
 #, python-format
 msgid "Selectively selecting: %s"
 msgstr ""
@@ -1548,84 +1575,92 @@ msgstr "OpenLDAP oder kompatibel"
 msgid "Could not connect to Cyrus IMAP server %r"
 msgstr "Verbindung zum Cyrus IMAP-Server %r nicht möglich"
 
-#: ../pykolab/imap/cyrus.py:137
+#: ../pykolab/imap/cyrus.py:138
 #, python-format
 msgid "Continuing with separator: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:142
+#: ../pykolab/imap/cyrus.py:143
 msgid "Detected we are running in a Murder topology"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:146
+#: ../pykolab/imap/cyrus.py:147
 msgid "This system is not part of a murder topology"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:167
+#: ../pykolab/imap/cyrus.py:168
 #, python-format
 msgid "Checking actual backend server for folder %s through annotations"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:172
-msgid "Possibly reproducing the find "
+#: ../pykolab/imap/cyrus.py:173
+#, python-format
+msgid ""
+"Possibly reproducing the find mailfolder server answer from previously "
+"detected and stored annotation value: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:195
+#: ../pykolab/imap/cyrus.py:196
 #, python-format
 msgid "Could not get the annotations after %s tries."
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:199
+#: ../pykolab/imap/cyrus.py:200
 #, python-format
 msgid "No annotations for %s: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:206
+#: ../pykolab/imap/cyrus.py:207
 #, python-format
 msgid "Server for INBOX folder %s is %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:226
+#: ../pykolab/imap/cyrus.py:227
 #, python-format
 msgid "Setting quota for folder %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:230
+#: ../pykolab/imap/cyrus.py:231
 #, python-format
 msgid "Could not set quota for mailfolder %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:239
+#: ../pykolab/imap/cyrus.py:241
+#, python-format
+msgid "Moving INBOX folder %s to %s on partition %s"
+msgstr ""
+
+#: ../pykolab/imap/cyrus.py:243
 #, python-format
 msgid "Moving INBOX folder %s to %s"
 msgstr "Verschiebe Eingangsordner %s nach %s"
 
-#: ../pykolab/imap/cyrus.py:254
+#: ../pykolab/imap/cyrus.py:259
 #, python-format
 msgid "Setting annotation %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:259
+#: ../pykolab/imap/cyrus.py:264
 #, python-format
 msgid "Could not set annotation %r on mail folder %r: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:263
+#: ../pykolab/imap/cyrus.py:268
 #, python-format
 msgid "Transferring folder %s from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:323
+#: ../pykolab/imap/cyrus.py:328
 #, python-format
 msgid "Undeleting %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:334
+#: ../pykolab/imap/cyrus.py:339
 #, python-format
 msgid "Would have transfered %s from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:336
+#: ../pykolab/imap/cyrus.py:341
 #, python-format
 msgid "Would have renamed %s to %s"
 msgstr ""
@@ -1684,190 +1719,195 @@ msgstr "Verbinde nochmal zum IMAP Server %s"
 msgid "Called imap.disconnect() on a server that we had no connection to."
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:222 ../pykolab/imap/__init__.py:234
+#: ../pykolab/imap/__init__.py:221 ../pykolab/imap/__init__.py:233
 #, python-format
 msgid "Could not create folder %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:223
+#: ../pykolab/imap/__init__.py:222
 #, python-format
 msgid " on server %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:244 ../pykolab/imap/__init__.py:246
+#: ../pykolab/imap/__init__.py:243 ../pykolab/imap/__init__.py:245
 #, python-format
 msgid "%r has no attribute %s"
 msgstr "%r hat kein Attribut %s"
 
-#: ../pykolab/imap/__init__.py:393 ../pykolab/imap/__init__.py:428
+#: ../pykolab/imap/__init__.py:373
+#, python-format
+msgid "Could not set ACL for %s on folder %s: %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:407 ../pykolab/imap/__init__.py:442
 #, python-format
 msgid "Creating new shared folder %s"
 msgstr "Erzeuge einen neuen geteilten Ordner %s"
 
-#: ../pykolab/imap/__init__.py:453 ../pykolab/imap/__init__.py:675
+#: ../pykolab/imap/__init__.py:467 ../pykolab/imap/__init__.py:689
 #, python-format
 msgid "Downcasing mailbox name %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:457
+#: ../pykolab/imap/__init__.py:471
 #, python-format
 msgid "Creating new mailbox for user %s"
 msgstr "Erzeuge eine neue Mailbox für Benutzer %s"
 
-#: ../pykolab/imap/__init__.py:470
+#: ../pykolab/imap/__init__.py:484
 msgid "Waiting for the Cyrus IMAP Murder to settle..."
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:516
+#: ../pykolab/imap/__init__.py:530
 #, python-format
 msgid "Creating additional folders for user %s"
 msgstr "Erzeuge weitere Order für Benutzer %s"
 
-#: ../pykolab/imap/__init__.py:535
+#: ../pykolab/imap/__init__.py:549
 #, python-format
 msgid "Waiting for the Cyrus murder to settle... %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:547
+#: ../pykolab/imap/__init__.py:561
 #, python-format
 msgid "Correcting additional folder name from %r to %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:553
+#: ../pykolab/imap/__init__.py:567
 #, python-format
 msgid "Mailbox already exists: %s"
 msgstr "Mailbox existiert bereits: %s"
 
-#: ../pykolab/imap/__init__.py:593
+#: ../pykolab/imap/__init__.py:607
 msgid "Subscribing user to the additional folders"
 msgstr "Abonniere weitere Ordner für den Benutzer"
 
-#: ../pykolab/imap/__init__.py:607
+#: ../pykolab/imap/__init__.py:621
 msgid "Using the following tests for folder subscriptions:"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:609
+#: ../pykolab/imap/__init__.py:623
 #, python-format
 msgid "    %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:612
+#: ../pykolab/imap/__init__.py:626
 #, python-format
 msgid "Folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:624
+#: ../pykolab/imap/__init__.py:638
 #, python-format
 msgid "Subscribing %s to folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:628
+#: ../pykolab/imap/__init__.py:642
 #, python-format
 msgid "Subscribing %s to folder %s failed: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:658
+#: ../pykolab/imap/__init__.py:672
 #, python-format
 msgid "Could not rename %s to reside on partition %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:691
+#: ../pykolab/imap/__init__.py:705
 #, python-format
 msgid "INBOX folder to rename (%s) does not exist"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:694 ../pykolab/imap/__init__.py:770
+#: ../pykolab/imap/__init__.py:708 ../pykolab/imap/__init__.py:784
 #, python-format
 msgid "Renaming INBOX from %s to %s"
 msgstr "Benenne INBOX Ordner von %s in %s um"
 
-#: ../pykolab/imap/__init__.py:698
+#: ../pykolab/imap/__init__.py:712
 #, python-format
 msgid "Could not rename INBOX folder %s to %s"
 msgstr "Konnte INBOX Ordner nicht von %s in %s umbenennen"
 
-#: ../pykolab/imap/__init__.py:700 ../pykolab/imap/__init__.py:774
+#: ../pykolab/imap/__init__.py:714 ../pykolab/imap/__init__.py:788
 #, python-format
 msgid ""
 "Moving INBOX folder %s won't succeed as target folder %s already exists"
 msgstr "Der INBOX-Ordner %s kann nicht verschoben werden, weil der Zielordner %s bereits existiert"
 
-#: ../pykolab/imap/__init__.py:704
+#: ../pykolab/imap/__init__.py:718
 #, python-format
 msgid "Server for mailbox %r is %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:712
+#: ../pykolab/imap/__init__.py:726
 #, python-format
 msgid "Looking for folder '%s', we found folders: %r"
 msgstr "Auf der Suche nach dem Ordner '%s' haben wir diese Ordner gefunden: %r"
 
-#: ../pykolab/imap/__init__.py:735
+#: ../pykolab/imap/__init__.py:749
 #, python-format
-msgid "Setting ACL rights %s for subject %s on folder "
-msgstr "Richte ACL Rechte %s für Subjekt %s des Ordners ein"
+msgid "Setting ACL rights %s for subject %s on folder %s"
+msgstr ""
 
-#: ../pykolab/imap/__init__.py:746
+#: ../pykolab/imap/__init__.py:760
 #, python-format
-msgid "Removing ACL rights %s for subject %s on folder "
+msgid "Removing ACL rights %s for subject %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:767
+#: ../pykolab/imap/__init__.py:781
 #, python-format
 msgid "Found old INBOX folder %s"
 msgstr "Alter INBOX-Ordner %s gefunden"
 
-#: ../pykolab/imap/__init__.py:776
+#: ../pykolab/imap/__init__.py:790
 #, python-format
 msgid "Did not find old folder user/%s to rename"
 msgstr "Konnte alten Ordner user/%s nicht zum umbenennen finden."
 
-#: ../pykolab/imap/__init__.py:778
+#: ../pykolab/imap/__init__.py:792
 msgid "Value for user is not a dictionary"
 msgstr "Der Wert für user ist kein dictionary"
 
 #. TODO: Go in fact correct the quota.
-#: ../pykolab/imap/__init__.py:846
+#: ../pykolab/imap/__init__.py:860
 #, python-format
 msgid "Cannot get current IMAP quota for folder %s"
 msgstr "Kann aktuelles IMAP Kontingent für den Ordner %s nicht bekommen"
 
-#: ../pykolab/imap/__init__.py:859
+#: ../pykolab/imap/__init__.py:873
 #, python-format
 msgid "Quota for %s currently is %s"
 msgstr "Kontingent für %s ist aktuell %s"
 
-#: ../pykolab/imap/__init__.py:865
+#: ../pykolab/imap/__init__.py:879
 #, python-format
 msgid "Adjusting authentication database quota for folder %s to %d"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:870
+#: ../pykolab/imap/__init__.py:884
 #, python-format
 msgid "Correcting quota for %s to %s (currently %s)"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:947
+#: ../pykolab/imap/__init__.py:961
 #, python-format
 msgid "Checking folder: %s"
 msgstr "Überprüfe Ordner: %s"
 
-#: ../pykolab/imap/__init__.py:952
+#: ../pykolab/imap/__init__.py:966
 #, python-format
 msgid "Folder has no corresponding user (1): %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:955
+#: ../pykolab/imap/__init__.py:969
 #, python-format
 msgid "Folder has no corresponding user (2): %s"
 msgstr ""
 
 #. We got user identifier only
-#: ../pykolab/imap/__init__.py:970
+#: ../pykolab/imap/__init__.py:984
 msgid "Please don't give us just a user identifier"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:973
+#: ../pykolab/imap/__init__.py:987
 #, python-format
 msgid "Deleting folder %s"
 msgstr "Lösche Verzeichnis %s"
@@ -1876,50 +1916,62 @@ msgstr "Lösche Verzeichnis %s"
 msgid "Returning thread local configuration"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:43
+#: ../pykolab/itip/__init__.py:45
 #, python-format
 msgid "Method %r not really interesting for us."
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:49
+#: ../pykolab/itip/__init__.py:51
 #, python-format
 msgid "Raw iTip payload: %s"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:59
+#: ../pykolab/itip/__init__.py:61
 msgid "Could not read iTip from message."
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:67
+#: ../pykolab/itip/__init__.py:69
 #, python-format
 msgid "Duplicate iTip object: %s"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:90
+#: ../pykolab/itip/__init__.py:93
 msgid "iTip event without a start"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:132
+#: ../pykolab/itip/__init__.py:138
 msgid "Message is not an iTip message (non-multipart message)"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:225
+#: ../pykolab/itip/__init__.py:221
+#, python-format
+msgid "Send iTip reply %s for %s %r"
+msgstr ""
+
+#: ../pykolab/itip/__init__.py:237
 #, python-format
-msgid "Failed to compose iTip reply message: %r"
+msgid "Failed to compose iTip reply message: %r: %s"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:236 ../wallace/module_invitationpolicy.py:936
-#: ../wallace/module_resources.py:964
+#: ../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
 #, python-format
 msgid "SMTP sendmail error: %r"
 msgstr ""
 
-#: ../pykolab/logger.py:173 ../pykolab/logger.py:179
+#: ../pykolab/itip/__init__.py:280
+#, python-format
+msgid "Failed to compose iTip request message: %r"
+msgstr ""
+
+#: ../pykolab/logger.py:168 ../pykolab/logger.py:175
 #, python-format
 msgid "Could not change permissions on %s: %r"
 msgstr ""
 
-#: ../pykolab/logger.py:196
+#: ../pykolab/logger.py:192
 #, python-format
 msgid "Cannot log to file %s: %s"
 msgstr ""
@@ -2054,7 +2106,7 @@ msgid "user_delete: %r"
 msgstr ""
 
 #: ../pykolab/plugins/roundcubedb/__init__.py:55
-#: ../pykolab/setup/setup_roundcube.py:160
+#: ../pykolab/setup/setup_roundcube.py:161
 msgid "Roundcube installation path not found."
 msgstr ""
 
@@ -2098,18 +2150,17 @@ msgstr ""
 msgid "Could not start the cyrus-imapd and kolab-saslauthd services."
 msgstr ""
 
-#: ../pykolab/setup/setup_imap.py:173 ../pykolab/setup/setup_kolabd.py:81
-#: ../pykolab/setup/setup_ldap.py:426 ../pykolab/setup/setup_mta.py:455
-#: ../pykolab/setup/setup_mysql.py:58 ../pykolab/setup/setup_roundcube.py:237
-#: ../pykolab/setup/setup_syncroton.py:102
-msgid "Could not configure to start on boot, the "
+#: ../pykolab/setup/setup_imap.py:173
+msgid ""
+"Could not configure to start on boot, the cyrus-imapd and kolab-saslauthd "
+"services."
 msgstr ""
 
-#: ../pykolab/setup/setup_kolabd.py:43
+#: ../pykolab/setup/setup_kolabd.py:44
 msgid "Setup the Kolab daemon."
 msgstr "Richte den Kolab Daemon ein."
 
-#: ../pykolab/setup/setup_kolabd.py:51
+#: ../pykolab/setup/setup_kolabd.py:52
 #, python-format
 msgid ""
 "\n"
@@ -2118,10 +2169,14 @@ msgid ""
 "                        "
 msgstr ""
 
-#: ../pykolab/setup/setup_kolabd.py:72
+#: ../pykolab/setup/setup_kolabd.py:81
 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 "LDAP Optionen"
@@ -2299,6 +2354,10 @@ 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"
@@ -2378,7 +2437,9 @@ msgid "Setting access control to %s"
 msgstr ""
 
 #: ../pykolab/setup/setup_ldap.py:679
-msgid "Could not start and configure to start on boot, the "
+msgid ""
+"Could not start and configure to start on boot, the directory server admin "
+"service."
 msgstr ""
 
 #: ../pykolab/setup/setup_mta.py:41
@@ -2394,18 +2455,24 @@ msgstr ""
 msgid "Could not write out Postfix configuration file /etc/postfix/master.cf"
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:397
+#: ../pykolab/setup/setup_mta.py:399
 msgid "Could not write out Amavis configuration file amavisd.conf"
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:405
+#: ../pykolab/setup/setup_mta.py:407
 msgid "Not writing out any configuration for Amavis."
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:437
+#: ../pykolab/setup/setup_mta.py:447
 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 "Richte MySQL ein."
@@ -2414,6 +2481,10 @@ msgstr "Richte MySQL ein."
 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 ""
@@ -2427,8 +2498,8 @@ msgid ""
 msgstr ""
 
 #: ../pykolab/setup/setup_mysql.py:82 ../pykolab/setup/setup_mysql.py:99
-#: ../pykolab/setup/setup_roundcube.py:183
-#: ../pykolab/setup/setup_syncroton.py:63
+#: ../pykolab/setup/setup_roundcube.py:184
+#: ../pykolab/setup/setup_syncroton.py:66
 msgid "MySQL root password"
 msgstr "MySQL root Password"
 
@@ -2457,7 +2528,7 @@ msgstr ""
 msgid "MySQL kolab password"
 msgstr "MySQL-kolab Password"
 
-#: ../pykolab/setup/setup_mysql.py:165
+#: ../pykolab/setup/setup_mysql.py:166
 msgid "Could not find the MySQL Kolab schema file"
 msgstr ""
 
@@ -2526,11 +2597,16 @@ msgstr ""
 msgid "Successfully compiled template %r, writing out to %r"
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:228
-#: ../pykolab/setup/setup_syncroton.py:93
+#: ../pykolab/setup/setup_roundcube.py:229
+#: ../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 "Richte Syncroton ein."
@@ -2566,8 +2642,8 @@ msgid "Confirm %s: "
 msgstr "Bestätige %s:"
 
 #: ../pykolab/utils.py:67
-msgid "Incorrect confirmation. "
-msgstr "Ungültige Bestätigung."
+msgid "Incorrect confirmation. Please try again."
+msgstr ""
 
 #: ../pykolab/utils.py:72 ../pykolab/utils.py:77
 #, python-format
@@ -2623,18 +2699,18 @@ msgstr ""
 msgid "Could not translate %s using locale %s"
 msgstr ""
 
-#: ../pykolab/wap_client/__init__.py:320
+#: ../pykolab/wap_client/__init__.py:396
 #, python-format
 msgid "Requesting %r with params %r"
 msgstr ""
 
-#: ../pykolab/wap_client/__init__.py:328
+#: ../pykolab/wap_client/__init__.py:404
 #, python-format
 msgid "Got response: %r"
 msgstr ""
 
 #. Some data is not JSON
-#: ../pykolab/wap_client/__init__.py:334
+#: ../pykolab/wap_client/__init__.py:410
 msgid "Response data is not JSON"
 msgstr ""
 
@@ -2659,138 +2735,320 @@ msgstr "Provisorisch Akzeptiert"
 msgid "Delegated"
 msgstr "Delegiert"
 
-#: ../pykolab/xml/attendee.py:14
+#: ../pykolab/xml/attendee.py:14 ../pykolab/xml/attendee.py:22
 msgid "Completed"
-msgstr ""
+msgstr "Erledigt"
 
-#: ../pykolab/xml/attendee.py:15
-msgid "In Process"
+#: ../pykolab/xml/attendee.py:15 ../pykolab/xml/attendee.py:23
+msgid "Started"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:108 ../pykolab/xml/attendee.py:130
+#: ../pykolab/xml/attendee.py:132 ../pykolab/xml/attendee.py:154
 msgid "Not a valid attendee"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:115
+#: ../pykolab/xml/attendee.py:139
 msgid "No valid delegator references found"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:135
+#: ../pykolab/xml/attendee.py:159
 msgid "No valid delegatee references found"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:180
+#: ../pykolab/xml/attendee.py:219
 #, python-format
 msgid "Invalid cutype %r"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:192
+#: ../pykolab/xml/attendee.py:231
 #, python-format
 msgid "Invalid participant status %r"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:200
+#: ../pykolab/xml/attendee.py:239
 #, python-format
 msgid "Invalid role %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:100 ../pykolab/xml/event.py:708
-#: ../pykolab/xml/event.py:751
+#: ../pykolab/xml/event.py:149 ../pykolab/xml/event.py:784
+#: ../pykolab/xml/event.py:827
 msgid "Event start needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: ../pykolab/xml/event.py:241
+#: ../pykolab/xml/event.py:294
 #, python-format
 msgid "No attendee with email or name %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:249
+#: ../pykolab/xml/event.py:302
 #, python-format
 msgid "Invalid argument value attendee %r, must be basestring or Attendee"
 msgstr ""
 
-#: ../pykolab/xml/event.py:255
+#: ../pykolab/xml/event.py:314
 #, python-format
 msgid "No attendee with email %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:261
+#: ../pykolab/xml/event.py:320
 #, python-format
 msgid "No attendee with name %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:426
-msgid "Invalid participant status"
+#: ../pykolab/xml/event.py:370 ../pykolab/xml/utils.py:151
+msgid "%Y-%m-%d"
 msgstr ""
 
-#: ../pykolab/xml/event.py:542
-#, python-format
-msgid "Invalid status %r"
+#: ../pykolab/xml/event.py:372 ../pykolab/xml/utils.py:152
+msgid "%H:%M (%Z)"
 msgstr ""
 
-#: ../pykolab/xml/event.py:550
+#: ../pykolab/xml/event.py:496
+msgid "Invalid participant status"
+msgstr ""
+
+#: ../pykolab/xml/event.py:618
 #, python-format
 msgid "Invalid classification %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:577
+#: ../pykolab/xml/event.py:649
 msgid "Event end needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: ../pykolab/xml/event.py:761
+#: ../pykolab/xml/event.py:659
+#, python-format
+msgid "Invalid custom property name %r"
+msgstr ""
+
+#: ../pykolab/xml/event.py:837
 #, python-format
 msgid "Invalid status set: %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:923
+#: ../pykolab/xml/event.py:1074
 msgid "No sender specified"
 msgstr ""
 
-#: ../pykolab/xml/event.py:932
+#: ../pykolab/xml/event.py:1083
 #, python-format
 msgid "Invitation for %s was %s"
 msgstr ""
 
-#: ../pykolab/xml/event.py:937
+#: ../pykolab/xml/event.py:1088
 msgid "This is an automated response to one of your event requests."
 msgstr ""
 
-#: ../saslauthd/__init__.py:99
+#: ../pykolab/xml/recurrence_rule.py:38
 #, python-format
-msgid "Could not create %r: %r"
+msgid "Every %d year(s)"
 msgstr ""
 
-#: ../saslauthd/__init__.py:137 ../saslauthd/__init__.py:145
-#: ../wallace/__init__.py:403 ../wallace/__init__.py:412
-msgid ""
-"Traceback occurred, please report a bug at http://bugzilla.kolabsys.com"
-msgstr "Ein Fehler mit Traceback trat auf, bitte legen Sie einen Bericht auf  http://bugzilla.kolabsys.com an"
+#: ../pykolab/xml/recurrence_rule.py:39
+#, python-format
+msgid "Every %d month(s)"
+msgstr ""
+
+#: ../pykolab/xml/recurrence_rule.py:40
+#, python-format
+msgid "Every %d week(s)"
+msgstr ""
 
-#: ../saslauthd/__init__.py:185
-msgid "kolab-saslauthd could not accept "
+#: ../pykolab/xml/recurrence_rule.py:41
+#, python-format
+msgid "Every %d day(s)"
+msgstr ""
+
+#: ../pykolab/xml/recurrence_rule.py:42
+#, python-format
+msgid "Every %d hours"
 msgstr ""
 
-#: ../saslauthd/__init__.py:190
+#: ../pykolab/xml/recurrence_rule.py:43
+#, python-format
+msgid "Every %d minutes"
+msgstr ""
+
+#: ../pykolab/xml/recurrence_rule.py:44
+#, python-format
+msgid "Every %d seconds"
+msgstr ""
+
+#: ../pykolab/xml/todo.py:110
+msgid "Todo due needs datetime.date or datetime.datetime instance"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:120
+msgid "Name"
+msgstr "Name"
+
+#: ../pykolab/xml/utils.py:121
+msgid "Summary"
+msgstr "Zusammenfassung"
+
+#: ../pykolab/xml/utils.py:122
+msgid "Location"
+msgstr "Ort"
+
+#: ../pykolab/xml/utils.py:123
+msgid "Description"
+msgstr "Beschreibung"
+
+#: ../pykolab/xml/utils.py:124
+msgid "URL"
+msgstr "URL"
+
+#: ../pykolab/xml/utils.py:125
+msgid "Status"
+msgstr "Status"
+
+#: ../pykolab/xml/utils.py:126
+msgid "Priority"
+msgstr "Priorität"
+
+#: ../pykolab/xml/utils.py:127
+msgid "Attendee"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:128
+msgid "Start"
+msgstr "Beginn"
+
+#: ../pykolab/xml/utils.py:129
+msgid "End"
+msgstr "Ende"
+
+#: ../pykolab/xml/utils.py:130
+msgid "Due"
+msgstr "Fällig"
+
+#: ../pykolab/xml/utils.py:131
+msgid "Repeat"
+msgstr "Wiederholung"
+
+#: ../pykolab/xml/utils.py:132
+msgid "Repeat Exception"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:133
+msgid "Organizer"
+msgstr "Organisator"
+
+#: ../pykolab/xml/utils.py:134
+msgid "Attachment"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:135
+msgid "Alarm"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:136
+msgid "Classification"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:137
+msgid "Progress"
+msgstr "Fortschritt"
+
+#: ../pykolab/xml/utils.py:182
+#, python-format
+msgid "for %d times"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:184
+#, python-format
+msgid "until %s"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:189
+msgid "Display message"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:190
+msgid "Send email"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:191
+msgid "Play sound"
+msgstr "Audio abspielen"
+
+#: ../pykolab/xml/utils.py:197
+#, python-format
+msgid "%s after"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:197
+#, python-format
+msgid "%s before"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:206
+#, python-format
+msgid "%d day(s)"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:212
+#, python-format
+msgid "%d hour(s)"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:214
+#, python-format
+msgid "%d minute(s)"
+msgstr ""
+
+#: ../saslauthd/__init__.py:76
+msgid "Socket file to bind to."
+msgstr ""
+
+#: ../saslauthd/__init__.py:108
+#, python-format
+msgid "Could not create %r: %r"
+msgstr ""
+
+#: ../saslauthd/__init__.py:194
+#, python-format
+msgid "kolab-saslauthd could not accept connections on socket: %r"
+msgstr ""
+
+#: ../saslauthd/__init__.py:199
 msgid "Maximum tries exceeded, exiting"
 msgstr ""
 
-#: ../tests/functional/test_wallace/test_005_resource_invitation.py:190
-#: ../wallace/module_resources.py:879
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:195
+#: ../wallace/module_resources.py:1054
 #, python-format
 msgid "Reservation Request for %(summary)s was %(status)s"
 msgstr ""
 
 #. check notification message sent to resource owner (jane)
-#: ../tests/functional/test_wallace/test_005_resource_invitation.py:605
-#: ../tests/functional/test_wallace/test_005_resource_invitation.py:621
-#: ../wallace/module_resources.py:954
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:619
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:635
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:666
+#: ../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
 #, python-format
 msgid "Booking for %s has been %s"
 msgstr "Buchung für %s wurde %s"
 
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:146
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:720
-#: ../wallace/module_invitationpolicy.py:374
+#. check confirmation message sent to resource owner (jane)
+#. check first confirmation message sent to resource owner (jane)
+#. check second confirmation message sent to resource owner (jane)
+#. check confirmation message sent to resource owner (jane)
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:656
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:694
+#: ../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
+#, python-format
+msgid "Booking request for %s requires confirmation"
+msgstr ""
+
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:240
+#: ../wallace/module_invitationpolicy.py:441
 #, python-format
 msgid "\"%(summary)s\" has been %(status)s"
 msgstr "\"%(summary)s\" wurde %(status)s"
@@ -2798,19 +3056,37 @@ msgstr "\"%(summary)s\" wurde %(status)s"
 #. check for notification message
 #. this notification should be suppressed until mark has replied, too
 #. this triggers an additional notification
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:616
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:622
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:635
-#: ../wallace/module_invitationpolicy.py:925
+#. 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
 #, python-format
 msgid "\"%s\" has been updated"
 msgstr "\"%s\" wurde aktualisiert"
 
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:627
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:639
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:798
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:810
 msgid "PENDING"
 msgstr ""
 
+#. this should trigger a notification message
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1003
+#: ../wallace/module_invitationpolicy.py:1110
+#, python-format
+msgid "\"%s\" has been cancelled"
+msgstr ""
+
+#: ../tests/unit/test-011-itip.py:408
+#, python-format
+msgid "Invitation for %(summary)s was %(status)s"
+msgstr ""
+
 #: ../wallace/__init__.py:57
 #, python-format
 msgid "Wallace modules: %r"
@@ -2836,7 +3112,7 @@ msgstr "Port, den Wallace benutzen soll."
 
 #: ../wallace/__init__.py:177
 #, python-format
-msgid "Could not bind to socket on port %d on bind "
+msgid "Could not bind to socket on port %d on bind address %s"
 msgstr ""
 
 #: ../wallace/__init__.py:189
@@ -2853,22 +3129,22 @@ msgid "Could not write pid file %s"
 msgstr ""
 
 #: ../wallace/module_footer.py:60 ../wallace/module_gpgencrypt.py:60
-#: ../wallace/module_invitationpolicy.py:168 ../wallace/module_optout.py:61
-#: ../wallace/module_resources.py:120
+#: ../wallace/module_invitationpolicy.py:210 ../wallace/module_optout.py:61
+#: ../wallace/module_resources.py:125
 #, 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:170 ../wallace/module_optout.py:62
-#: ../wallace/module_resources.py:126
+#: ../wallace/module_invitationpolicy.py:212 ../wallace/module_optout.py:62
+#: ../wallace/module_resources.py:131
 #, python-format
 msgid "Testing cb_action_%s()"
 msgstr ""
 
 #: ../wallace/module_footer.py:63 ../wallace/module_gpgencrypt.py:63
-#: ../wallace/module_invitationpolicy.py:172 ../wallace/module_optout.py:64
-#: ../wallace/module_resources.py:129
+#: ../wallace/module_invitationpolicy.py:214 ../wallace/module_optout.py:64
+#: ../wallace/module_resources.py:134
 #, python-format
 msgid "Attempting to execute cb_action_%s()"
 msgstr ""
@@ -2933,241 +3209,286 @@ msgstr ""
 msgid "An error occurred: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:154
+#: ../wallace/module_invitationpolicy.py:196
 #, python-format
 msgid "Invitation policy called for %r, %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:211
-#: ../wallace/module_resources.py:169
+#: ../wallace/module_invitationpolicy.py:257
 #, python-format
-msgid "Failed to parse iTip events from message: %r"
+msgid "Failed to parse iTip objects from message: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:215
+#: ../wallace/module_invitationpolicy.py:261
 msgid ""
-"Message is not an iTip message or does not contain any (valid) iTip events."
+"Message is not an iTip message or does not contain any (valid) iTip objects."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:219
+#: ../wallace/module_invitationpolicy.py:265
 #, python-format
 msgid ""
-"iTip events attached to this message contain the following information: %r"
+"iTip objects attached to this message contain the following information: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:232
+#: ../wallace/module_invitationpolicy.py:278
 #, python-format
 msgid "No itips, no users, pass along %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:235
+#: ../wallace/module_invitationpolicy.py:281
 #, python-format
 msgid "iTips, but no users, pass along %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:255
+#: ../wallace/module_invitationpolicy.py:301
 #, python-format
 msgid "No user attendee matching envelope recipient %s, skip message"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:259
+#: ../wallace/module_invitationpolicy.py:305
 #, python-format
 msgid "Receiving user: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:284
+#: ../wallace/module_invitationpolicy.py:330
 #, python-format
-msgid "Apply invitation policy %r for domain %r"
+msgid "Apply invitation policy %r for sender %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:295
+#: ../wallace/module_invitationpolicy.py:341
 #, python-format
 msgid "Ignoring '%s' iTip method"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:299
+#: ../wallace/module_invitationpolicy.py:345
 #, python-format
 msgid "iTip message %r consumed by the invitationpolicy module"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:315
+#: ../wallace/module_invitationpolicy.py:361
 msgid "Pass invitation for manual processing"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:320
+#: ../wallace/module_invitationpolicy.py:366
 #, python-format
 msgid "Receiving Attendee: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:339
+#: ../wallace/module_invitationpolicy.py:386
 #, python-format
-msgid "Existing event: %r"
+msgid "Existing %s: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:350
+#: ../wallace/module_invitationpolicy.py:397
 #, python-format
-msgid "Precondition for event %r fulfilled: %r"
+msgid "Precondition for object %r fulfilled: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:386
+#: ../wallace/module_invitationpolicy.py:415
+#, python-format
+msgid ""
+"The iTip request sequence (%r) doesn't match the referred object version "
+"(%r). Ignoring."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:420
 #, python-format
-msgid "No RSVP for recipient %r requested"
+msgid "Auto-updating %s %r on iTip REQUEST (no re-scheduling)"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:412
+#: ../wallace/module_invitationpolicy.py:475
 msgid "Pass reply for manual processing"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:419
+#: ../wallace/module_invitationpolicy.py:482
 #, python-format
 msgid "Sender Attendee: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:431
+#: ../wallace/module_invitationpolicy.py:494
 #, python-format
 msgid ""
-"The iTip reply sequence (%r) doesn't match the referred event version (%r). "
-"Forwarding to Inbox."
+"The iTip reply sequence (%r) doesn't match the referred object version (%r)."
+" Forwarding to Inbox."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:437
+#: ../wallace/module_invitationpolicy.py:500
 #, python-format
-msgid "Auto-updating event %r on iTip REPLY"
+msgid "Auto-updating %s %r on iTip REPLY"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:459
-#: ../wallace/module_invitationpolicy.py:488
+#: ../wallace/module_invitationpolicy.py:525
+#, python-format
+msgid "Add delegatee: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:528
+#, python-format
+msgid "Update existing delegatee: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:533
+#, python-format
+msgid "Update delegator: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:550
+#: ../wallace/module_invitationpolicy.py:582
 msgid ""
-"The event referred by this reply was not found in the user's calendars. "
+"The object referred by this reply was not found in the user's folders. "
 "Forwarding to Inbox."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:472
+#: ../wallace/module_invitationpolicy.py:563
 msgid "Pass cancellation for manual processing"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:517
+#: ../wallace/module_invitationpolicy.py:611
 #, python-format
 msgid "Checking if email address %r belongs to a local user"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:522
+#: ../wallace/module_invitationpolicy.py:616
 #, python-format
 msgid "User DN: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:524
+#: ../wallace/module_invitationpolicy.py:618
 #, python-format
 msgid "No user record(s) found for %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:577
+#: ../wallace/module_invitationpolicy.py:674
 #, python-format
 msgid "User record doesn't have the mailbox attribute %r set"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:590
+#: ../wallace/module_invitationpolicy.py:687
 #, python-format
 msgid "IMAP proxy authentication failed: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:612
+#: ../wallace/module_invitationpolicy.py:709
 #, python-format
-msgid "List calendar folders for user %r: %r"
+msgid "List %r folders for user %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:628
+#: ../wallace/module_invitationpolicy.py:725
 #, python-format
 msgid "IMAP metadata for %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:658
+#: ../wallace/module_invitationpolicy.py:755
 #, python-format
-msgid "Searching folder %r for event %r"
+msgid "Searching folder %r for %s %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:670
-#: ../wallace/module_invitationpolicy.py:709
-#: ../wallace/module_resources.py:486
+#: ../wallace/module_invitationpolicy.py:771
 #, python-format
-msgid "Failed to parse event from message %s/%s: %r"
+msgid "Failed to parse %s from message %s/%s: %s"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:696
+#: ../wallace/module_invitationpolicy.py:797
 #, python-format
 msgid "Listing events from folder %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:715
+#: ../wallace/module_invitationpolicy.py:810
+#: ../wallace/module_resources.py:566 ../wallace/module_resources.py:614
+#, python-format
+msgid "Failed to parse event from message %s/%s: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:816
 #, python-format
 msgid "Existing event %r conflicts with invitation %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:722
-#: ../wallace/module_resources.py:344
+#: ../wallace/module_invitationpolicy.py:823
+#: ../wallace/module_resources.py:419
 #, python-format
 msgid "start: %r, end: %r, total: %r, messages: %d"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:748
+#: ../wallace/module_invitationpolicy.py:849
 #, python-format
 msgid "%r is locked, waiting..."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:811
+#: ../wallace/module_invitationpolicy.py:913
 #, python-format
-msgid "Failed to save event: no calendar folder found for user %r"
+msgid "Failed to save %s: no target folder found for user %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:814
+#: ../wallace/module_invitationpolicy.py:916
 #, python-format
-msgid "Save event %r to user calendar %r"
+msgid "Save %s %r to user folder %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:827
+#: ../wallace/module_invitationpolicy.py:929
 #, python-format
-msgid "Failed to save event to user calendar at %r: %r"
+msgid "Failed to save %s to user folder at %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:843
+#: ../wallace/module_invitationpolicy.py:945
 #, python-format
-msgid "Delete event %r in %r: %r"
+msgid "Delete %s %r in %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:863
+#: ../wallace/module_invitationpolicy.py:970
 #, python-format
-msgid "Compose participation status summary for event %r to user %r"
+msgid "Compose participation status summary for %s %r to user %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:901
+#: ../wallace/module_invitationpolicy.py:1003
 #, python-format
 msgid ""
 "Waiting for more automated replies (got %d of %d); skipping notification"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:998
+#: ../wallace/module_invitationpolicy.py:1013
+#, python-format
+msgid "Changes submitted by %s have been automatically applied."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1022
+msgid "(removed)"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1045
+#: ../wallace/module_invitationpolicy.py:1103
+#: ../wallace/module_invitationpolicy.py:1193
+msgid "*** This is an automated message. Please do not reply. ***"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1076
+#, python-format
+msgid "Send cancellation notification for %s %r to user %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1183
 #, python-format
 msgid "Updated %s's copy of %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1001
+#: ../wallace/module_invitationpolicy.py:1186
 #, python-format
 msgid "Attendee %s's copy of %r not found"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1004
+#: ../wallace/module_invitationpolicy.py:1189
 #, python-format
 msgid "Attendee %r not found in LDAP"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1008
+#: ../wallace/module_invitationpolicy.py:1196
 #, python-format
-msgid ""
-"\n"
-"        %(name)s has %(status)s your invitation for %(summary)s.\n"
-"\n"
-"        *** This is an automated response sent by the Kolab Invitation system ***\n"
-"    "
+msgid "%(name)s has %(status)s your assignment for %(summary)s."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1198
+#, python-format
+msgid "%(name)s has %(status)s your invitation for %(summary)s."
 msgstr ""
 
 #. modules.next_module('optout')
@@ -3178,7 +3499,8 @@ msgstr ""
 
 #: ../wallace/module_optout.py:96
 #, python-format
-msgid "Running opt-out consult from envelope sender '%s "
+msgid ""
+"Running opt-out consult from envelope sender '%s <%s>' to recipient %s <%s>"
 msgstr ""
 
 #: ../wallace/module_optout.py:160
@@ -3191,184 +3513,233 @@ msgstr ""
 msgid "Could not send request to optout_url %s"
 msgstr ""
 
-#: ../wallace/module_resources.py:110
+#: ../wallace/module_resources.py:115
 #, python-format
 msgid "Resource Management called for %r, %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:174
-msgid "Message is not an iTip message or does not contain any "
+#: ../wallace/module_resources.py:180
+#, 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."
 msgstr ""
 
-#: ../wallace/module_resources.py:182
-msgid "iTip events attached to this message contain the "
+#: ../wallace/module_resources.py:193
+#, python-format
+msgid ""
+"iTip events attached to this message contain the following information: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:205
+#: ../wallace/module_resources.py:226
 msgid "Not an iTip message, but sent to resource nonetheless. Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:213
+#: ../wallace/module_resources.py:234
 #, python-format
 msgid "No itips, no resources, pass along %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:216
+#: ../wallace/module_resources.py:237
 #, python-format
 msgid "iTips, but no resources, pass along %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:225
+#: ../wallace/module_resources.py:246
 #, python-format
 msgid "No resource attendees matching envelope recipient %s, Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:234
+#: ../wallace/module_resources.py:256
 #, python-format
 msgid "Resources: %r; %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:244
+#: ../wallace/module_resources.py:274
+#, python-format
+msgid "Sender Attendee: %r => %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:281
+#, python-format
+msgid ""
+"The iTip reply sequence (%r) doesn't match the referred event version (%r). "
+"Ignoring."
+msgstr ""
+
+#: ../wallace/module_resources.py:306
+#, python-format
+msgid "Event referenced by this REPLY (%r) not found in resource calendar"
+msgstr ""
+
+#: ../wallace/module_resources.py:309
+msgid "No event reference found in this REPLY. Ignoring."
+msgstr ""
+
+#: ../wallace/module_resources.py:318
 #, python-format
 msgid "Receiving Resource: %r; %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:252
+#: ../wallace/module_resources.py:326
 #, python-format
 msgid "Recipient %r is non-participant, ignoring message"
 msgstr ""
 
-#: ../wallace/module_resources.py:279
+#: ../wallace/module_resources.py:354
 #, python-format
 msgid "Accept invitation for individual resource %r / %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:308
+#: ../wallace/module_resources.py:383
 #, python-format
 msgid "Delegate invitation for resource collection %r to %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:340
+#: ../wallace/module_resources.py:415
 #, python-format
 msgid "Failed to read resource calendar for %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:350
+#: ../wallace/module_resources.py:425
 #, python-format
 msgid "Polling for resource %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:353
+#: ../wallace/module_resources.py:428
 #, python-format
 msgid "Resource %r has been popped from the list"
 msgstr ""
 
-#: ../wallace/module_resources.py:357
+#: ../wallace/module_resources.py:432
 msgid "Resource is a collection"
 msgstr ""
 
-#: ../wallace/module_resources.py:368
+#: ../wallace/module_resources.py:443
 #, python-format
 msgid "Removed conflicting resources from %r: (%r) => %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:380
+#: ../wallace/module_resources.py:455
 #, python-format
 msgid "Conflicting events: %r for resource %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:397
+#: ../wallace/module_resources.py:474
 #, python-format
 msgid "Delegate to another resource collection member: %r to %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:459
+#: ../wallace/module_resources.py:536
 #, python-format
 msgid "Checking events in resource folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:475
+#: ../wallace/module_resources.py:555
 #, python-format
 msgid "Fetching message UID %r from folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:498
+#: ../wallace/module_resources.py:578
 #, python-format
 msgid "Event %r conflicts with event %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:525
+#: ../wallace/module_resources.py:599
+#, python-format
+msgid "Searching %r for event %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:605
+#, python-format
+msgid "Failed to access resource calendar:: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:634
+#, python-format
+msgid "Apply invitation policies %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:653
 #, python-format
 msgid "Adding event to %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:573
+#: ../wallace/module_resources.py:707
 #, python-format
 msgid "Failed to save event to resource calendar at %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:590
+#: ../wallace/module_resources.py:724
 #, python-format
 msgid "Delete resource calendar object %r in %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:633
+#: ../wallace/module_resources.py:767
 #, python-format
 msgid "Checking if email address %r belongs to a resource (collection)"
 msgstr ""
 
-#: ../wallace/module_resources.py:641 ../wallace/module_resources.py:709
-#: ../wallace/module_resources.py:743
+#: ../wallace/module_resources.py:775 ../wallace/module_resources.py:849
+#: ../wallace/module_resources.py:883
 #, python-format
 msgid "Resource record(s): %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:643 ../wallace/module_resources.py:711
-#: ../wallace/module_resources.py:746
+#: ../wallace/module_resources.py:777 ../wallace/module_resources.py:851
+#: ../wallace/module_resources.py:886
 #, python-format
 msgid "No resource (collection) records found for %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:647 ../wallace/module_resources.py:715
-#: ../wallace/module_resources.py:750
+#: ../wallace/module_resources.py:781 ../wallace/module_resources.py:855
+#: ../wallace/module_resources.py:890
 #, python-format
 msgid "Resource record: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:667
+#: ../wallace/module_resources.py:801
 #, python-format
 msgid "Raw itip_events: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:675
+#: ../wallace/module_resources.py:809
 #, python-format
 msgid "Raw set of attendees: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:683
+#: ../wallace/module_resources.py:817
 #, python-format
 msgid "Raw set of resources: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:702
+#: ../wallace/module_resources.py:822
+#, python-format
+msgid "Raw set of organizers: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:842
 #, python-format
 msgid "Checking if attendee %r is a resource (collection)"
 msgstr ""
 
-#: ../wallace/module_resources.py:718 ../wallace/module_resources.py:752
+#: ../wallace/module_resources.py:858 ../wallace/module_resources.py:892
 msgid "Resource reservation made but no resource records found"
 msgstr ""
 
-#: ../wallace/module_resources.py:737
+#: ../wallace/module_resources.py:877
 #, python-format
 msgid "Checking if resource %r is a resource (collection)"
 msgstr ""
 
-#: ../wallace/module_resources.py:755
-msgid "The following resources are being referred to in the "
+#: ../wallace/module_resources.py:895
+#, python-format
+msgid "The following resources are being referred to in the iTip: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:894
+#: ../wallace/module_resources.py:1060
 #, python-format
 msgid ""
 "\n"
@@ -3378,7 +3749,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../wallace/module_resources.py:905
+#: ../wallace/module_resources.py:1079
 #, python-format
 msgid ""
 "\n"
@@ -3388,7 +3759,7 @@ msgid ""
 "    "
 msgstr ""
 
-#: ../wallace/module_resources.py:912
+#: ../wallace/module_resources.py:1086
 #, python-format
 msgid ""
 "\n"
@@ -3397,16 +3768,16 @@ msgid ""
 "        "
 msgstr ""
 
-#: ../wallace/module_resources.py:941
+#: ../wallace/module_resources.py:1117
 #, python-format
 msgid "Sending booking notification for event %r to %r from %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:954
+#: ../wallace/module_resources.py:1134
 msgid "failed"
 msgstr ""
 
-#: ../wallace/module_resources.py:973
+#: ../wallace/module_resources.py:1153
 #, python-format
 msgid ""
 "\n"
@@ -3416,7 +3787,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: ../wallace/module_resources.py:979
+#: ../wallace/module_resources.py:1159
 #, python-format
 msgid ""
 "\n"
@@ -3427,6 +3798,28 @@ msgid ""
 "        "
 msgstr ""
 
+#: ../wallace/module_resources.py:1203
+#, python-format
+msgid "Clone invitation for owner confirmation: %r from %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:1209
+#, python-format
+msgid ""
+"\n"
+"        A reservation request for %(resource)s requires your approval!\n"
+"        Please either accept or decline this invitation without saving it to your calendar.\n"
+"\n"
+"        The reservation request was sent from %(orgname)s <%(orgemail)s>.\n"
+"\n"
+"        Subject: %(summary)s.\n"
+"        Date: %(date)s\n"
+"        Participants: %(attendees)s\n"
+"\n"
+"        *** This is an automated message, please don't reply by email. ***\n"
+"    "
+msgstr ""
+
 #. This is a nested module
 #: ../wallace/modules.py:97
 #, python-format
diff --git a/po/de_DE.po b/po/de_DE.po
index b8bcc6f..17c65bb 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-10 07:21-0400\n"
-"PO-Revision-Date: 2014-07-22 13:04+0000\n"
-"Last-Translator: Thomas Brüderli <roundcube at gmail.com>\n"
+"POT-Creation-Date: 2014-09-11 18:01+0200\n"
+"PO-Revision-Date: 2014-09-11 16:00+0000\n"
+"Last-Translator: Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/kolab/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -314,55 +314,58 @@ msgstr ""
 msgid "Path to the PID file to use."
 msgstr ""
 
-#: ../kolabd/__init__.py:74 ../saslauthd/__init__.py:76
+#: ../kolabd/__init__.py:74 ../saslauthd/__init__.py:85
 #: ../wallace/__init__.py:135
 msgid "Run as user USERNAME"
 msgstr ""
 
-#: ../kolabd/__init__.py:84 ../saslauthd/__init__.py:86
+#: ../kolabd/__init__.py:84 ../saslauthd/__init__.py:95
 #: ../wallace/__init__.py:109
 msgid "Run as group GROUPNAME"
 msgstr ""
 
-#: ../kolabd/__init__.py:122 ../pykolab/logger.py:139 ../pykolab/utils.py:234
-#: ../saslauthd/__init__.py:292 ../wallace/__init__.py:329
+#: ../kolabd/__init__.py:122 ../pykolab/utils.py:234
+#: ../saslauthd/__init__.py:301 ../wallace/__init__.py:329
 #, python-format
 msgid "Group %s does not exist"
 msgstr ""
 
-#: ../kolabd/__init__.py:131 ../saslauthd/__init__.py:301
+#: ../kolabd/__init__.py:131 ../saslauthd/__init__.py:310
 #: ../wallace/__init__.py:338
 #, python-format
 msgid "Switching real and effective group id to %d"
 msgstr ""
 
-#: ../kolabd/__init__.py:153 ../pykolab/logger.py:159 ../pykolab/utils.py:258
-#: ../saslauthd/__init__.py:323 ../wallace/__init__.py:360
+#: ../kolabd/__init__.py:153 ../pykolab/utils.py:258
+#: ../saslauthd/__init__.py:332 ../wallace/__init__.py:360
 #, python-format
 msgid "User %s does not exist"
 msgstr ""
 
-#: ../kolabd/__init__.py:163 ../saslauthd/__init__.py:333
+#: ../kolabd/__init__.py:163 ../saslauthd/__init__.py:342
 #: ../wallace/__init__.py:370
 #, python-format
 msgid "Switching real and effective user id to %d"
 msgstr ""
 
-#: ../kolabd/__init__.py:172 ../saslauthd/__init__.py:342
+#: ../kolabd/__init__.py:172 ../saslauthd/__init__.py:351
 #: ../wallace/__init__.py:379
 msgid "Could not change real and effective uid and/or gid"
 msgstr ""
 
-#: ../kolabd/__init__.py:192 ../saslauthd/__init__.py:133
+#: ../kolabd/__init__.py:192 ../saslauthd/__init__.py:142
 #: ../wallace/__init__.py:399
 msgid "Interrupted by user"
 msgstr ""
 
 #: ../kolabd/__init__.py:197 ../kolabd/__init__.py:208
-msgid "Traceback occurred, please report a "
+#: ../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"
 msgstr ""
 
-#: ../kolabd/__init__.py:203 ../saslauthd/__init__.py:141
+#: ../kolabd/__init__.py:203 ../saslauthd/__init__.py:150
 #: ../wallace/__init__.py:408
 #, python-format
 msgid "Type Error: %s"
@@ -372,7 +375,7 @@ msgstr ""
 msgid "Could not connect to LDAP, is it running?"
 msgstr ""
 
-#: ../kolabd/__init__.py:233 ../pykolab/auth/ldap/__init__.py:2137
+#: ../kolabd/__init__.py:233 ../pykolab/auth/ldap/__init__.py:2178
 #: ../pykolab/cli/cmd_sync.py:36
 msgid "Listing domains..."
 msgstr "Domänen werden geladen…"
@@ -381,7 +384,7 @@ msgstr "Domänen werden geladen…"
 msgid "No domains. Not syncing"
 msgstr ""
 
-#: ../kolabd/__init__.py:275
+#: ../kolabd/__init__.py:279
 #, python-format
 msgid "added domains: %r, removed domains: %r"
 msgstr ""
@@ -529,244 +532,256 @@ msgstr ""
 msgid "Using timestamp %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:595
-msgid "Applying recipient policy disabled through configuration"
+#: ../pykolab/auth/ldap/__init__.py:597
+#, python-format
+msgid "Not applying recipient policy for %s (disabled through configuration)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:600
+#: ../pykolab/auth/ldap/__init__.py:607
 #, python-format
 msgid "Applying recipient policy to %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:617
+#: ../pykolab/auth/ldap/__init__.py:624
 #, python-format
-msgid "Using mail attributes: %r, with primary %r and "
+msgid "Using mail attributes: %r, with primary %r and secondary %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:628
+#: ../pykolab/auth/ldap/__init__.py:635
 #, python-format
 msgid "key %r not in entry"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:630
+#: ../pykolab/auth/ldap/__init__.py:637
 #, python-format
 msgid "key %r is the prim. mail attr."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:632
+#: ../pykolab/auth/ldap/__init__.py:639
 msgid "prim. mail pol. is not empty"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:635
+#: ../pykolab/auth/ldap/__init__.py:642
 #, python-format
 msgid "key %r is the sec. mail attr."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:637
+#: ../pykolab/auth/ldap/__init__.py:644
 msgid "sec. mail pol. is not empty"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:641 ../pykolab/auth/ldap/__init__.py:655
+#: ../pykolab/auth/ldap/__init__.py:648 ../pykolab/auth/ldap/__init__.py:662
 #, python-format
 msgid "Attributes %r are not yet available for entry %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:694
+#: ../pykolab/auth/ldap/__init__.py:701
 #, python-format
 msgid "No results for mail address %s found"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:705
+#: ../pykolab/auth/ldap/__init__.py:712
 #, python-format
 msgid "1 result for address %s found, verifying"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:715
+#: ../pykolab/auth/ldap/__init__.py:722
 #, python-format
-msgid "Too bad, primary email address %s "
+msgid "Too bad, primary email address %s already in use for %s (we are %s)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:726 ../pykolab/auth/ldap/__init__.py:815
+#: ../pykolab/auth/ldap/__init__.py:733 ../pykolab/auth/ldap/__init__.py:822
 msgid "Address assigned to us"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:781
+#: ../pykolab/auth/ldap/__init__.py:788
 #, python-format
 msgid "No results for address %s found"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:792
+#: ../pykolab/auth/ldap/__init__.py:799
 #, python-format
-msgid "1 result for address %s found, "
+msgid "1 result for address %s found, verifying..."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:803
-msgid "Too bad, secondary email "
+#: ../pykolab/auth/ldap/__init__.py:810
+#, python-format
+msgid "Too bad, secondary email address %s already in use for %s (we are %s)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:830
-msgid "Recipient policy composed the following set of secondary "
+#: ../pykolab/auth/ldap/__init__.py:837
+#, python-format
+msgid ""
+"Recipient policy composed the following set of secondary email addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:841
+#: ../pykolab/auth/ldap/__init__.py:848
 #, python-format
 msgid "Secondary mail addresses that we want is not None: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:852
-msgid "Avoiding the duplication of the primary mail "
+#: ../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"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:863
+#: ../pykolab/auth/ldap/__init__.py:870
 #, python-format
 msgid "Entry is getting secondary mail addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:871
-msgid "Entry did not have any secondary mail "
+#: ../pykolab/auth/ldap/__init__.py:878
+#, python-format
+msgid "Entry did not have any secondary mail addresses in %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:888 ../pykolab/auth/ldap/__init__.py:894
+#: ../pykolab/auth/ldap/__init__.py:895 ../pykolab/auth/ldap/__init__.py:901
 #, python-format
 msgid "secondary_mail_addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:889 ../pykolab/auth/ldap/__init__.py:895
+#: ../pykolab/auth/ldap/__init__.py:896 ../pykolab/auth/ldap/__init__.py:902
 #, python-format
 msgid "entry[%s]: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:906
+#: ../pykolab/auth/ldap/__init__.py:913
 #, python-format
 msgid "Entry modifications list: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:934
+#: ../pykolab/auth/ldap/__init__.py:941
 #, python-format
 msgid "Setting entry attribute %r to %r for %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:970
+#: ../pykolab/auth/ldap/__init__.py:977
 #, python-format
 msgid ""
 "Could not update dn %r:\n"
 "%r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:983
+#: ../pykolab/auth/ldap/__init__.py:990
 #, python-format
 msgid "Using filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:998
+#: ../pykolab/auth/ldap/__init__.py:1005
 #, python-format
 msgid "Synchronization is searching against base DN: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1044
+#: ../pykolab/auth/ldap/__init__.py:1051
 #, python-format
-msgid "About to consider the user quota for %r (used: %r, "
+msgid ""
+"About to consider the user quota for %r (used: %r, imap: %r, ldap: %r, "
+"default: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1115
+#: ../pykolab/auth/ldap/__init__.py:1122
 msgid "Invalid DN, username and/or password."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1236 ../pykolab/auth/ldap/__init__.py:1249
-#: ../pykolab/auth/ldap/__init__.py:1614 ../pykolab/auth/ldap/__init__.py:1627
+#: ../pykolab/auth/ldap/__init__.py:1247 ../pykolab/auth/ldap/__init__.py:1264
+#: ../pykolab/auth/ldap/__init__.py:1628 ../pykolab/auth/ldap/__init__.py:1645
 #, python-format
 msgid "Found a subject %r with access %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1356
+#: ../pykolab/auth/ldap/__init__.py:1366
 #, python-format
 msgid "Entry %s attribute value: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1364
+#: ../pykolab/auth/ldap/__init__.py:1374
 #, python-format
 msgid "imap.user_mailbox_server(%r) result: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1684 ../pykolab/auth/ldap/__init__.py:1853
+#: ../pykolab/auth/ldap/__init__.py:1694 ../pykolab/auth/ldap/__init__.py:1894
 #, python-format
 msgid "Result from recipient policy: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1908
+#: ../pykolab/auth/ldap/__init__.py:1949
 #, python-format
 msgid "Kolab user %s does not have a result attribute %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2067
+#: ../pykolab/auth/ldap/__init__.py:2108
 #, python-format
 msgid "Finding domain root dn for domain %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2164
+#: ../pykolab/auth/ldap/__init__.py:2205
 msgid "Authentication database DOWN"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2248 ../pykolab/auth/ldap/__init__.py:2296
+#: ../pykolab/auth/ldap/__init__.py:2289 ../pykolab/auth/ldap/__init__.py:2337
 #, python-format
 msgid "Entry type: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2321
-#, python-format
-msgid "Done with _synchronize_callback() for entry %r"
-msgstr ""
-
-#: ../pykolab/auth/ldap/__init__.py:2393
+#: ../pykolab/auth/ldap/__init__.py:2426
 msgid "LDAP Search Result Data Entry:"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2409
+#: ../pykolab/auth/ldap/__init__.py:2442
 msgid "Entry Change Notification attributes:"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2414
+#: ../pykolab/auth/ldap/__init__.py:2447
 #, python-format
 msgid "Change Type: %r (%r)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2422
+#: ../pykolab/auth/ldap/__init__.py:2455
 #, python-format
 msgid "Previous DN: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2477
+#: ../pykolab/auth/ldap/__init__.py:2510
 #, python-format
 msgid "Object %s searched no longer exists"
 msgstr "Das gesuchte Objekt %s existiert nicht mehr"
 
-#: ../pykolab/auth/ldap/__init__.py:2487
+#: ../pykolab/auth/ldap/__init__.py:2520
 #, python-format
 msgid "%d results..."
 msgstr "%d Ergebnisse…"
 
-#: ../pykolab/auth/ldap/__init__.py:2590
+#: ../pykolab/auth/ldap/__init__.py:2623
 #, python-format
 msgid "Searching with filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2642
+#: ../pykolab/auth/ldap/__init__.py:2675
 #, python-format
 msgid "Checking for support for %s on %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2661
+#: ../pykolab/auth/ldap/__init__.py:2694
 #, python-format
 msgid "Found support for %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2706
+#: ../pykolab/auth/ldap/__init__.py:2739
 #, 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 "
+msgid ""
+"The name of the persistent, unique attribute is very probably not compatible"
+" with the use of syncrepl."
 msgstr ""
 
 #: ../pykolab/cli/cmd_acl_cleanup.py:34
@@ -806,7 +821,8 @@ msgid "Recipient for alias %r already exists"
 msgstr ""
 
 #: ../pykolab/cli/cmd_add_alias.py:97
-msgid "Environment is not configured for "
+msgid ""
+"Environment is not configured for users to hold secondary mail attributes"
 msgstr ""
 
 #: ../pykolab/cli/cmd_add_alias.py:105
@@ -841,7 +857,9 @@ 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 permissions"
+msgid ""
+"Could not find credentials with sufficient permissionsto add a domain name "
+"space."
 msgstr ""
 
 #: ../pykolab/cli/cmd_add_domain.py:67 ../pykolab/cli/cmd_delete_domain.py:56
@@ -945,6 +963,11 @@ msgstr ""
 msgid "No such folder(s)"
 msgstr ""
 
+#: ../pykolab/cli/cmd_delete_mailbox.py:63
+#, python-format
+msgid "Could not delete mailbox '%s'"
+msgstr ""
+
 #: ../pykolab/cli/cmd_delete_message.py:36
 msgid "Delete a message from a folder"
 msgstr ""
@@ -1195,27 +1218,27 @@ msgstr ""
 
 #. This is a nested command
 #. This is a nested component
-#: ../pykolab/cli/commands.py:98 ../pykolab/setup/components.py:90
+#: ../pykolab/cli/commands.py:97 ../pykolab/setup/components.py:90
 #, python-format
 msgid "Command Group: %s"
 msgstr ""
 
-#: ../pykolab/cli/commands.py:113 ../pykolab/cli/commands.py:118
+#: ../pykolab/cli/commands.py:112 ../pykolab/cli/commands.py:117
 msgid "No such command."
 msgstr ""
 
-#: ../pykolab/cli/commands.py:168 ../pykolab/setup/components.py:231
+#: ../pykolab/cli/commands.py:167 ../pykolab/setup/components.py:231
 #, python-format
 msgid "Command '%s' already registered"
 msgstr ""
 
-#: ../pykolab/cli/commands.py:193 ../pykolab/setup/components.py:257
+#: ../pykolab/cli/commands.py:192 ../pykolab/setup/components.py:257
 #: ../wallace/modules.py:369
 #, python-format
 msgid "Alias for %s"
 msgstr ""
 
-#: ../pykolab/cli/commands.py:201 ../pykolab/setup/components.py:265
+#: ../pykolab/cli/commands.py:200 ../pykolab/setup/components.py:265
 msgid "Not yet implemented"
 msgstr ""
 
@@ -1336,7 +1359,8 @@ 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
-msgid "Invalid entitlement verification "
+#, python-format
+msgid "Invalid entitlement verification certificate at %s"
 msgstr ""
 
 #: ../pykolab/conf/entitlement.py:120 ../pykolab/conf/entitlement.py:123
@@ -1418,11 +1442,13 @@ msgid "Configuration file to use"
 msgstr ""
 
 #: ../pykolab/conf/__init__.py:278
-msgid "Set the debugging "
+msgid ""
+"Set the debugging verbosity. Maximum is 9, tracing protocols like LDAP, SQL "
+"and IMAP."
 msgstr ""
 
 #: ../pykolab/conf/__init__.py:286
-msgid "Set the logging level. "
+msgid "Set the logging level. One of info, warn, error, critical or debug"
 msgstr ""
 
 #: ../pykolab/conf/__init__.py:294
@@ -1490,27 +1516,28 @@ msgid "This program has 9 levels of verbosity. Using the maximum of 9."
 msgstr ""
 
 #: ../pykolab/conf/__init__.py:585 ../pykolab/conf/__init__.py:591
+#: ../pykolab/conf/__init__.py:595 ../pykolab/conf/__init__.py:601
 msgid "Cannot start SASL authentication daemon"
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:602
+#: ../pykolab/conf/__init__.py:612
 msgid "No imaplib library found."
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:612
+#: ../pykolab/conf/__init__.py:622
 msgid "No LMTP class found in the smtplib library."
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:622
+#: ../pykolab/conf/__init__.py:632
 msgid "No SMTP class found in the smtplib library."
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:636
+#: ../pykolab/conf/__init__.py:646
 #, python-format
 msgid "Found you specified a specific set of items to test: %s"
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:644
+#: ../pykolab/conf/__init__.py:654
 #, python-format
 msgid "Selectively selecting: %s"
 msgstr ""
@@ -1544,84 +1571,92 @@ msgstr ""
 msgid "Could not connect to Cyrus IMAP server %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:137
+#: ../pykolab/imap/cyrus.py:138
 #, python-format
 msgid "Continuing with separator: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:142
+#: ../pykolab/imap/cyrus.py:143
 msgid "Detected we are running in a Murder topology"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:146
+#: ../pykolab/imap/cyrus.py:147
 msgid "This system is not part of a murder topology"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:167
+#: ../pykolab/imap/cyrus.py:168
 #, python-format
 msgid "Checking actual backend server for folder %s through annotations"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:172
-msgid "Possibly reproducing the find "
+#: ../pykolab/imap/cyrus.py:173
+#, python-format
+msgid ""
+"Possibly reproducing the find mailfolder server answer from previously "
+"detected and stored annotation value: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:195
+#: ../pykolab/imap/cyrus.py:196
 #, python-format
 msgid "Could not get the annotations after %s tries."
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:199
+#: ../pykolab/imap/cyrus.py:200
 #, python-format
 msgid "No annotations for %s: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:206
+#: ../pykolab/imap/cyrus.py:207
 #, python-format
 msgid "Server for INBOX folder %s is %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:226
+#: ../pykolab/imap/cyrus.py:227
 #, python-format
 msgid "Setting quota for folder %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:230
+#: ../pykolab/imap/cyrus.py:231
 #, python-format
 msgid "Could not set quota for mailfolder %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:239
+#: ../pykolab/imap/cyrus.py:241
+#, python-format
+msgid "Moving INBOX folder %s to %s on partition %s"
+msgstr ""
+
+#: ../pykolab/imap/cyrus.py:243
 #, python-format
 msgid "Moving INBOX folder %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:254
+#: ../pykolab/imap/cyrus.py:259
 #, python-format
 msgid "Setting annotation %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:259
+#: ../pykolab/imap/cyrus.py:264
 #, python-format
 msgid "Could not set annotation %r on mail folder %r: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:263
+#: ../pykolab/imap/cyrus.py:268
 #, python-format
 msgid "Transferring folder %s from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:323
+#: ../pykolab/imap/cyrus.py:328
 #, python-format
 msgid "Undeleting %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:334
+#: ../pykolab/imap/cyrus.py:339
 #, python-format
 msgid "Would have transfered %s from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:336
+#: ../pykolab/imap/cyrus.py:341
 #, python-format
 msgid "Would have renamed %s to %s"
 msgstr ""
@@ -1680,190 +1715,195 @@ msgstr ""
 msgid "Called imap.disconnect() on a server that we had no connection to."
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:222 ../pykolab/imap/__init__.py:234
+#: ../pykolab/imap/__init__.py:221 ../pykolab/imap/__init__.py:233
 #, python-format
 msgid "Could not create folder %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:223
+#: ../pykolab/imap/__init__.py:222
 #, python-format
 msgid " on server %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:244 ../pykolab/imap/__init__.py:246
+#: ../pykolab/imap/__init__.py:243 ../pykolab/imap/__init__.py:245
 #, python-format
 msgid "%r has no attribute %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:393 ../pykolab/imap/__init__.py:428
+#: ../pykolab/imap/__init__.py:373
+#, python-format
+msgid "Could not set ACL for %s on folder %s: %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:407 ../pykolab/imap/__init__.py:442
 #, python-format
 msgid "Creating new shared folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:453 ../pykolab/imap/__init__.py:675
+#: ../pykolab/imap/__init__.py:467 ../pykolab/imap/__init__.py:689
 #, python-format
 msgid "Downcasing mailbox name %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:457
+#: ../pykolab/imap/__init__.py:471
 #, python-format
 msgid "Creating new mailbox for user %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:470
+#: ../pykolab/imap/__init__.py:484
 msgid "Waiting for the Cyrus IMAP Murder to settle..."
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:516
+#: ../pykolab/imap/__init__.py:530
 #, python-format
 msgid "Creating additional folders for user %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:535
+#: ../pykolab/imap/__init__.py:549
 #, python-format
 msgid "Waiting for the Cyrus murder to settle... %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:547
+#: ../pykolab/imap/__init__.py:561
 #, python-format
 msgid "Correcting additional folder name from %r to %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:553
+#: ../pykolab/imap/__init__.py:567
 #, python-format
 msgid "Mailbox already exists: %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:593
+#: ../pykolab/imap/__init__.py:607
 msgid "Subscribing user to the additional folders"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:607
+#: ../pykolab/imap/__init__.py:621
 msgid "Using the following tests for folder subscriptions:"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:609
+#: ../pykolab/imap/__init__.py:623
 #, python-format
 msgid "    %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:612
+#: ../pykolab/imap/__init__.py:626
 #, python-format
 msgid "Folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:624
+#: ../pykolab/imap/__init__.py:638
 #, python-format
 msgid "Subscribing %s to folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:628
+#: ../pykolab/imap/__init__.py:642
 #, python-format
 msgid "Subscribing %s to folder %s failed: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:658
+#: ../pykolab/imap/__init__.py:672
 #, python-format
 msgid "Could not rename %s to reside on partition %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:691
+#: ../pykolab/imap/__init__.py:705
 #, python-format
 msgid "INBOX folder to rename (%s) does not exist"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:694 ../pykolab/imap/__init__.py:770
+#: ../pykolab/imap/__init__.py:708 ../pykolab/imap/__init__.py:784
 #, python-format
 msgid "Renaming INBOX from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:698
+#: ../pykolab/imap/__init__.py:712
 #, python-format
 msgid "Could not rename INBOX folder %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:700 ../pykolab/imap/__init__.py:774
+#: ../pykolab/imap/__init__.py:714 ../pykolab/imap/__init__.py:788
 #, python-format
 msgid ""
 "Moving INBOX folder %s won't succeed as target folder %s already exists"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:704
+#: ../pykolab/imap/__init__.py:718
 #, python-format
 msgid "Server for mailbox %r is %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:712
+#: ../pykolab/imap/__init__.py:726
 #, python-format
 msgid "Looking for folder '%s', we found folders: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:735
+#: ../pykolab/imap/__init__.py:749
 #, python-format
-msgid "Setting ACL rights %s for subject %s on folder "
+msgid "Setting ACL rights %s for subject %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:746
+#: ../pykolab/imap/__init__.py:760
 #, python-format
-msgid "Removing ACL rights %s for subject %s on folder "
+msgid "Removing ACL rights %s for subject %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:767
+#: ../pykolab/imap/__init__.py:781
 #, python-format
 msgid "Found old INBOX folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:776
+#: ../pykolab/imap/__init__.py:790
 #, python-format
 msgid "Did not find old folder user/%s to rename"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:778
+#: ../pykolab/imap/__init__.py:792
 msgid "Value for user is not a dictionary"
 msgstr ""
 
 #. TODO: Go in fact correct the quota.
-#: ../pykolab/imap/__init__.py:846
+#: ../pykolab/imap/__init__.py:860
 #, python-format
 msgid "Cannot get current IMAP quota for folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:859
+#: ../pykolab/imap/__init__.py:873
 #, python-format
 msgid "Quota for %s currently is %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:865
+#: ../pykolab/imap/__init__.py:879
 #, python-format
 msgid "Adjusting authentication database quota for folder %s to %d"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:870
+#: ../pykolab/imap/__init__.py:884
 #, python-format
 msgid "Correcting quota for %s to %s (currently %s)"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:947
+#: ../pykolab/imap/__init__.py:961
 #, python-format
 msgid "Checking folder: %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:952
+#: ../pykolab/imap/__init__.py:966
 #, python-format
 msgid "Folder has no corresponding user (1): %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:955
+#: ../pykolab/imap/__init__.py:969
 #, python-format
 msgid "Folder has no corresponding user (2): %s"
 msgstr ""
 
 #. We got user identifier only
-#: ../pykolab/imap/__init__.py:970
+#: ../pykolab/imap/__init__.py:984
 msgid "Please don't give us just a user identifier"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:973
+#: ../pykolab/imap/__init__.py:987
 #, python-format
 msgid "Deleting folder %s"
 msgstr ""
@@ -1872,50 +1912,62 @@ msgstr ""
 msgid "Returning thread local configuration"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:43
+#: ../pykolab/itip/__init__.py:45
 #, python-format
 msgid "Method %r not really interesting for us."
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:49
+#: ../pykolab/itip/__init__.py:51
 #, python-format
 msgid "Raw iTip payload: %s"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:59
+#: ../pykolab/itip/__init__.py:61
 msgid "Could not read iTip from message."
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:67
+#: ../pykolab/itip/__init__.py:69
 #, python-format
 msgid "Duplicate iTip object: %s"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:90
+#: ../pykolab/itip/__init__.py:93
 msgid "iTip event without a start"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:132
+#: ../pykolab/itip/__init__.py:138
 msgid "Message is not an iTip message (non-multipart message)"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:225
+#: ../pykolab/itip/__init__.py:221
 #, python-format
-msgid "Failed to compose iTip reply message: %r"
+msgid "Send iTip reply %s for %s %r"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:236 ../wallace/module_invitationpolicy.py:936
-#: ../wallace/module_resources.py:964
+#: ../pykolab/itip/__init__.py:237
+#, python-format
+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
 #, python-format
 msgid "SMTP sendmail error: %r"
 msgstr ""
 
-#: ../pykolab/logger.py:173 ../pykolab/logger.py:179
+#: ../pykolab/itip/__init__.py:280
+#, python-format
+msgid "Failed to compose iTip request message: %r"
+msgstr ""
+
+#: ../pykolab/logger.py:168 ../pykolab/logger.py:175
 #, python-format
 msgid "Could not change permissions on %s: %r"
 msgstr ""
 
-#: ../pykolab/logger.py:196
+#: ../pykolab/logger.py:192
 #, python-format
 msgid "Cannot log to file %s: %s"
 msgstr ""
@@ -2050,7 +2102,7 @@ msgid "user_delete: %r"
 msgstr ""
 
 #: ../pykolab/plugins/roundcubedb/__init__.py:55
-#: ../pykolab/setup/setup_roundcube.py:160
+#: ../pykolab/setup/setup_roundcube.py:161
 msgid "Roundcube installation path not found."
 msgstr ""
 
@@ -2094,18 +2146,17 @@ msgstr ""
 msgid "Could not start the cyrus-imapd and kolab-saslauthd services."
 msgstr ""
 
-#: ../pykolab/setup/setup_imap.py:173 ../pykolab/setup/setup_kolabd.py:81
-#: ../pykolab/setup/setup_ldap.py:426 ../pykolab/setup/setup_mta.py:455
-#: ../pykolab/setup/setup_mysql.py:58 ../pykolab/setup/setup_roundcube.py:237
-#: ../pykolab/setup/setup_syncroton.py:102
-msgid "Could not configure to start on boot, the "
+#: ../pykolab/setup/setup_imap.py:173
+msgid ""
+"Could not configure to start on boot, the cyrus-imapd and kolab-saslauthd "
+"services."
 msgstr ""
 
-#: ../pykolab/setup/setup_kolabd.py:43
+#: ../pykolab/setup/setup_kolabd.py:44
 msgid "Setup the Kolab daemon."
 msgstr ""
 
-#: ../pykolab/setup/setup_kolabd.py:51
+#: ../pykolab/setup/setup_kolabd.py:52
 #, python-format
 msgid ""
 "\n"
@@ -2114,10 +2165,14 @@ msgid ""
 "                        "
 msgstr ""
 
-#: ../pykolab/setup/setup_kolabd.py:72
+#: ../pykolab/setup/setup_kolabd.py:81
 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 ""
@@ -2295,6 +2350,10 @@ 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"
@@ -2374,7 +2433,9 @@ msgid "Setting access control to %s"
 msgstr ""
 
 #: ../pykolab/setup/setup_ldap.py:679
-msgid "Could not start and configure to start on boot, the "
+msgid ""
+"Could not start and configure to start on boot, the directory server admin "
+"service."
 msgstr ""
 
 #: ../pykolab/setup/setup_mta.py:41
@@ -2390,18 +2451,24 @@ msgstr ""
 msgid "Could not write out Postfix configuration file /etc/postfix/master.cf"
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:397
+#: ../pykolab/setup/setup_mta.py:399
 msgid "Could not write out Amavis configuration file amavisd.conf"
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:405
+#: ../pykolab/setup/setup_mta.py:407
 msgid "Not writing out any configuration for Amavis."
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:437
+#: ../pykolab/setup/setup_mta.py:447
 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 ""
@@ -2410,6 +2477,10 @@ 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 ""
@@ -2423,8 +2494,8 @@ msgid ""
 msgstr ""
 
 #: ../pykolab/setup/setup_mysql.py:82 ../pykolab/setup/setup_mysql.py:99
-#: ../pykolab/setup/setup_roundcube.py:183
-#: ../pykolab/setup/setup_syncroton.py:63
+#: ../pykolab/setup/setup_roundcube.py:184
+#: ../pykolab/setup/setup_syncroton.py:66
 msgid "MySQL root password"
 msgstr ""
 
@@ -2453,7 +2524,7 @@ msgstr ""
 msgid "MySQL kolab password"
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:165
+#: ../pykolab/setup/setup_mysql.py:166
 msgid "Could not find the MySQL Kolab schema file"
 msgstr ""
 
@@ -2522,11 +2593,16 @@ msgstr ""
 msgid "Successfully compiled template %r, writing out to %r"
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:228
-#: ../pykolab/setup/setup_syncroton.py:93
+#: ../pykolab/setup/setup_roundcube.py:229
+#: ../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 ""
@@ -2562,7 +2638,7 @@ msgid "Confirm %s: "
 msgstr ""
 
 #: ../pykolab/utils.py:67
-msgid "Incorrect confirmation. "
+msgid "Incorrect confirmation. Please try again."
 msgstr ""
 
 #: ../pykolab/utils.py:72 ../pykolab/utils.py:77
@@ -2619,18 +2695,18 @@ msgstr ""
 msgid "Could not translate %s using locale %s"
 msgstr ""
 
-#: ../pykolab/wap_client/__init__.py:320
+#: ../pykolab/wap_client/__init__.py:396
 #, python-format
 msgid "Requesting %r with params %r"
 msgstr ""
 
-#: ../pykolab/wap_client/__init__.py:328
+#: ../pykolab/wap_client/__init__.py:404
 #, python-format
 msgid "Got response: %r"
 msgstr ""
 
 #. Some data is not JSON
-#: ../pykolab/wap_client/__init__.py:334
+#: ../pykolab/wap_client/__init__.py:410
 msgid "Response data is not JSON"
 msgstr ""
 
@@ -2655,138 +2731,320 @@ msgstr "Provisorisch Akzeptiert"
 msgid "Delegated"
 msgstr "Delegiert"
 
-#: ../pykolab/xml/attendee.py:14
+#: ../pykolab/xml/attendee.py:14 ../pykolab/xml/attendee.py:22
 msgid "Completed"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:15
-msgid "In Process"
+#: ../pykolab/xml/attendee.py:15 ../pykolab/xml/attendee.py:23
+msgid "Started"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:108 ../pykolab/xml/attendee.py:130
+#: ../pykolab/xml/attendee.py:132 ../pykolab/xml/attendee.py:154
 msgid "Not a valid attendee"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:115
+#: ../pykolab/xml/attendee.py:139
 msgid "No valid delegator references found"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:135
+#: ../pykolab/xml/attendee.py:159
 msgid "No valid delegatee references found"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:180
+#: ../pykolab/xml/attendee.py:219
 #, python-format
 msgid "Invalid cutype %r"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:192
+#: ../pykolab/xml/attendee.py:231
 #, python-format
 msgid "Invalid participant status %r"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:200
+#: ../pykolab/xml/attendee.py:239
 #, python-format
 msgid "Invalid role %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:100 ../pykolab/xml/event.py:708
-#: ../pykolab/xml/event.py:751
+#: ../pykolab/xml/event.py:149 ../pykolab/xml/event.py:784
+#: ../pykolab/xml/event.py:827
 msgid "Event start needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: ../pykolab/xml/event.py:241
+#: ../pykolab/xml/event.py:294
 #, python-format
 msgid "No attendee with email or name %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:249
+#: ../pykolab/xml/event.py:302
 #, python-format
 msgid "Invalid argument value attendee %r, must be basestring or Attendee"
 msgstr ""
 
-#: ../pykolab/xml/event.py:255
+#: ../pykolab/xml/event.py:314
 #, python-format
 msgid "No attendee with email %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:261
+#: ../pykolab/xml/event.py:320
 #, python-format
 msgid "No attendee with name %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:426
-msgid "Invalid participant status"
+#: ../pykolab/xml/event.py:370 ../pykolab/xml/utils.py:151
+msgid "%Y-%m-%d"
 msgstr ""
 
-#: ../pykolab/xml/event.py:542
-#, python-format
-msgid "Invalid status %r"
+#: ../pykolab/xml/event.py:372 ../pykolab/xml/utils.py:152
+msgid "%H:%M (%Z)"
 msgstr ""
 
-#: ../pykolab/xml/event.py:550
+#: ../pykolab/xml/event.py:496
+msgid "Invalid participant status"
+msgstr ""
+
+#: ../pykolab/xml/event.py:618
 #, python-format
 msgid "Invalid classification %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:577
+#: ../pykolab/xml/event.py:649
 msgid "Event end needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: ../pykolab/xml/event.py:761
+#: ../pykolab/xml/event.py:659
+#, python-format
+msgid "Invalid custom property name %r"
+msgstr ""
+
+#: ../pykolab/xml/event.py:837
 #, python-format
 msgid "Invalid status set: %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:923
+#: ../pykolab/xml/event.py:1074
 msgid "No sender specified"
 msgstr ""
 
-#: ../pykolab/xml/event.py:932
+#: ../pykolab/xml/event.py:1083
 #, python-format
 msgid "Invitation for %s was %s"
 msgstr ""
 
-#: ../pykolab/xml/event.py:937
+#: ../pykolab/xml/event.py:1088
 msgid "This is an automated response to one of your event requests."
 msgstr ""
 
-#: ../saslauthd/__init__.py:99
+#: ../pykolab/xml/recurrence_rule.py:38
 #, python-format
-msgid "Could not create %r: %r"
+msgid "Every %d year(s)"
 msgstr ""
 
-#: ../saslauthd/__init__.py:137 ../saslauthd/__init__.py:145
-#: ../wallace/__init__.py:403 ../wallace/__init__.py:412
-msgid ""
-"Traceback occurred, please report a bug at http://bugzilla.kolabsys.com"
+#: ../pykolab/xml/recurrence_rule.py:39
+#, python-format
+msgid "Every %d month(s)"
+msgstr ""
+
+#: ../pykolab/xml/recurrence_rule.py:40
+#, python-format
+msgid "Every %d week(s)"
+msgstr ""
+
+#: ../pykolab/xml/recurrence_rule.py:41
+#, python-format
+msgid "Every %d day(s)"
+msgstr ""
+
+#: ../pykolab/xml/recurrence_rule.py:42
+#, python-format
+msgid "Every %d hours"
+msgstr ""
+
+#: ../pykolab/xml/recurrence_rule.py:43
+#, python-format
+msgid "Every %d minutes"
+msgstr ""
+
+#: ../pykolab/xml/recurrence_rule.py:44
+#, python-format
+msgid "Every %d seconds"
+msgstr ""
+
+#: ../pykolab/xml/todo.py:110
+msgid "Todo due needs datetime.date or datetime.datetime instance"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:120
+msgid "Name"
+msgstr "Name"
+
+#: ../pykolab/xml/utils.py:121
+msgid "Summary"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:122
+msgid "Location"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:123
+msgid "Description"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:124
+msgid "URL"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:125
+msgid "Status"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:126
+msgid "Priority"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:127
+msgid "Attendee"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:128
+msgid "Start"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:129
+msgid "End"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:130
+msgid "Due"
 msgstr ""
 
-#: ../saslauthd/__init__.py:185
-msgid "kolab-saslauthd could not accept "
+#: ../pykolab/xml/utils.py:131
+msgid "Repeat"
 msgstr ""
 
-#: ../saslauthd/__init__.py:190
+#: ../pykolab/xml/utils.py:132
+msgid "Repeat Exception"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:133
+msgid "Organizer"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:134
+msgid "Attachment"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:135
+msgid "Alarm"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:136
+msgid "Classification"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:137
+msgid "Progress"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:182
+#, python-format
+msgid "for %d times"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:184
+#, python-format
+msgid "until %s"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:189
+msgid "Display message"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:190
+msgid "Send email"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:191
+msgid "Play sound"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:197
+#, python-format
+msgid "%s after"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:197
+#, python-format
+msgid "%s before"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:206
+#, python-format
+msgid "%d day(s)"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:212
+#, python-format
+msgid "%d hour(s)"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:214
+#, python-format
+msgid "%d minute(s)"
+msgstr ""
+
+#: ../saslauthd/__init__.py:76
+msgid "Socket file to bind to."
+msgstr ""
+
+#: ../saslauthd/__init__.py:108
+#, python-format
+msgid "Could not create %r: %r"
+msgstr ""
+
+#: ../saslauthd/__init__.py:194
+#, python-format
+msgid "kolab-saslauthd could not accept connections on socket: %r"
+msgstr ""
+
+#: ../saslauthd/__init__.py:199
 msgid "Maximum tries exceeded, exiting"
 msgstr ""
 
-#: ../tests/functional/test_wallace/test_005_resource_invitation.py:190
-#: ../wallace/module_resources.py:879
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:195
+#: ../wallace/module_resources.py:1054
 #, python-format
 msgid "Reservation Request for %(summary)s was %(status)s"
 msgstr ""
 
 #. check notification message sent to resource owner (jane)
-#: ../tests/functional/test_wallace/test_005_resource_invitation.py:605
-#: ../tests/functional/test_wallace/test_005_resource_invitation.py:621
-#: ../wallace/module_resources.py:954
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:619
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:635
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:666
+#: ../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
 #, python-format
 msgid "Booking for %s has been %s"
 msgstr ""
 
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:146
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:720
-#: ../wallace/module_invitationpolicy.py:374
+#. check confirmation message sent to resource owner (jane)
+#. check first confirmation message sent to resource owner (jane)
+#. check second confirmation message sent to resource owner (jane)
+#. check confirmation message sent to resource owner (jane)
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:656
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:694
+#: ../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
+#, python-format
+msgid "Booking request for %s requires confirmation"
+msgstr ""
+
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:240
+#: ../wallace/module_invitationpolicy.py:441
 #, python-format
 msgid "\"%(summary)s\" has been %(status)s"
 msgstr ""
@@ -2794,19 +3052,37 @@ msgstr ""
 #. check for notification message
 #. this notification should be suppressed until mark has replied, too
 #. this triggers an additional notification
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:616
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:622
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:635
-#: ../wallace/module_invitationpolicy.py:925
+#. 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
 #, python-format
 msgid "\"%s\" has been updated"
 msgstr ""
 
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:627
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:639
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:798
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:810
 msgid "PENDING"
 msgstr ""
 
+#. this should trigger a notification message
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1003
+#: ../wallace/module_invitationpolicy.py:1110
+#, python-format
+msgid "\"%s\" has been cancelled"
+msgstr ""
+
+#: ../tests/unit/test-011-itip.py:408
+#, python-format
+msgid "Invitation for %(summary)s was %(status)s"
+msgstr ""
+
 #: ../wallace/__init__.py:57
 #, python-format
 msgid "Wallace modules: %r"
@@ -2832,7 +3108,7 @@ msgstr ""
 
 #: ../wallace/__init__.py:177
 #, python-format
-msgid "Could not bind to socket on port %d on bind "
+msgid "Could not bind to socket on port %d on bind address %s"
 msgstr ""
 
 #: ../wallace/__init__.py:189
@@ -2849,22 +3125,22 @@ msgid "Could not write pid file %s"
 msgstr ""
 
 #: ../wallace/module_footer.py:60 ../wallace/module_gpgencrypt.py:60
-#: ../wallace/module_invitationpolicy.py:168 ../wallace/module_optout.py:61
-#: ../wallace/module_resources.py:120
+#: ../wallace/module_invitationpolicy.py:210 ../wallace/module_optout.py:61
+#: ../wallace/module_resources.py:125
 #, 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:170 ../wallace/module_optout.py:62
-#: ../wallace/module_resources.py:126
+#: ../wallace/module_invitationpolicy.py:212 ../wallace/module_optout.py:62
+#: ../wallace/module_resources.py:131
 #, python-format
 msgid "Testing cb_action_%s()"
 msgstr ""
 
 #: ../wallace/module_footer.py:63 ../wallace/module_gpgencrypt.py:63
-#: ../wallace/module_invitationpolicy.py:172 ../wallace/module_optout.py:64
-#: ../wallace/module_resources.py:129
+#: ../wallace/module_invitationpolicy.py:214 ../wallace/module_optout.py:64
+#: ../wallace/module_resources.py:134
 #, python-format
 msgid "Attempting to execute cb_action_%s()"
 msgstr ""
@@ -2929,241 +3205,286 @@ msgstr ""
 msgid "An error occurred: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:154
+#: ../wallace/module_invitationpolicy.py:196
 #, python-format
 msgid "Invitation policy called for %r, %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:211
-#: ../wallace/module_resources.py:169
+#: ../wallace/module_invitationpolicy.py:257
 #, python-format
-msgid "Failed to parse iTip events from message: %r"
+msgid "Failed to parse iTip objects from message: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:215
+#: ../wallace/module_invitationpolicy.py:261
 msgid ""
-"Message is not an iTip message or does not contain any (valid) iTip events."
+"Message is not an iTip message or does not contain any (valid) iTip objects."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:219
+#: ../wallace/module_invitationpolicy.py:265
 #, python-format
 msgid ""
-"iTip events attached to this message contain the following information: %r"
+"iTip objects attached to this message contain the following information: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:232
+#: ../wallace/module_invitationpolicy.py:278
 #, python-format
 msgid "No itips, no users, pass along %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:235
+#: ../wallace/module_invitationpolicy.py:281
 #, python-format
 msgid "iTips, but no users, pass along %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:255
+#: ../wallace/module_invitationpolicy.py:301
 #, python-format
 msgid "No user attendee matching envelope recipient %s, skip message"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:259
+#: ../wallace/module_invitationpolicy.py:305
 #, python-format
 msgid "Receiving user: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:284
+#: ../wallace/module_invitationpolicy.py:330
 #, python-format
-msgid "Apply invitation policy %r for domain %r"
+msgid "Apply invitation policy %r for sender %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:295
+#: ../wallace/module_invitationpolicy.py:341
 #, python-format
 msgid "Ignoring '%s' iTip method"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:299
+#: ../wallace/module_invitationpolicy.py:345
 #, python-format
 msgid "iTip message %r consumed by the invitationpolicy module"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:315
+#: ../wallace/module_invitationpolicy.py:361
 msgid "Pass invitation for manual processing"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:320
+#: ../wallace/module_invitationpolicy.py:366
 #, python-format
 msgid "Receiving Attendee: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:339
+#: ../wallace/module_invitationpolicy.py:386
 #, python-format
-msgid "Existing event: %r"
+msgid "Existing %s: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:350
+#: ../wallace/module_invitationpolicy.py:397
 #, python-format
-msgid "Precondition for event %r fulfilled: %r"
+msgid "Precondition for object %r fulfilled: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:386
+#: ../wallace/module_invitationpolicy.py:415
+#, python-format
+msgid ""
+"The iTip request sequence (%r) doesn't match the referred object version "
+"(%r). Ignoring."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:420
 #, python-format
-msgid "No RSVP for recipient %r requested"
+msgid "Auto-updating %s %r on iTip REQUEST (no re-scheduling)"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:412
+#: ../wallace/module_invitationpolicy.py:475
 msgid "Pass reply for manual processing"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:419
+#: ../wallace/module_invitationpolicy.py:482
 #, python-format
 msgid "Sender Attendee: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:431
+#: ../wallace/module_invitationpolicy.py:494
 #, python-format
 msgid ""
-"The iTip reply sequence (%r) doesn't match the referred event version (%r). "
-"Forwarding to Inbox."
+"The iTip reply sequence (%r) doesn't match the referred object version (%r)."
+" Forwarding to Inbox."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:500
+#, python-format
+msgid "Auto-updating %s %r on iTip REPLY"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:525
+#, python-format
+msgid "Add delegatee: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:528
+#, python-format
+msgid "Update existing delegatee: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:437
+#: ../wallace/module_invitationpolicy.py:533
 #, python-format
-msgid "Auto-updating event %r on iTip REPLY"
+msgid "Update delegator: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:459
-#: ../wallace/module_invitationpolicy.py:488
+#: ../wallace/module_invitationpolicy.py:550
+#: ../wallace/module_invitationpolicy.py:582
 msgid ""
-"The event referred by this reply was not found in the user's calendars. "
+"The object referred by this reply was not found in the user's folders. "
 "Forwarding to Inbox."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:472
+#: ../wallace/module_invitationpolicy.py:563
 msgid "Pass cancellation for manual processing"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:517
+#: ../wallace/module_invitationpolicy.py:611
 #, python-format
 msgid "Checking if email address %r belongs to a local user"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:522
+#: ../wallace/module_invitationpolicy.py:616
 #, python-format
 msgid "User DN: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:524
+#: ../wallace/module_invitationpolicy.py:618
 #, python-format
 msgid "No user record(s) found for %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:577
+#: ../wallace/module_invitationpolicy.py:674
 #, python-format
 msgid "User record doesn't have the mailbox attribute %r set"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:590
+#: ../wallace/module_invitationpolicy.py:687
 #, python-format
 msgid "IMAP proxy authentication failed: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:612
+#: ../wallace/module_invitationpolicy.py:709
 #, python-format
-msgid "List calendar folders for user %r: %r"
+msgid "List %r folders for user %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:628
+#: ../wallace/module_invitationpolicy.py:725
 #, python-format
 msgid "IMAP metadata for %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:658
+#: ../wallace/module_invitationpolicy.py:755
 #, python-format
-msgid "Searching folder %r for event %r"
+msgid "Searching folder %r for %s %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:670
-#: ../wallace/module_invitationpolicy.py:709
-#: ../wallace/module_resources.py:486
+#: ../wallace/module_invitationpolicy.py:771
 #, python-format
-msgid "Failed to parse event from message %s/%s: %r"
+msgid "Failed to parse %s from message %s/%s: %s"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:696
+#: ../wallace/module_invitationpolicy.py:797
 #, python-format
 msgid "Listing events from folder %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:715
+#: ../wallace/module_invitationpolicy.py:810
+#: ../wallace/module_resources.py:566 ../wallace/module_resources.py:614
+#, python-format
+msgid "Failed to parse event from message %s/%s: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:816
 #, python-format
 msgid "Existing event %r conflicts with invitation %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:722
-#: ../wallace/module_resources.py:344
+#: ../wallace/module_invitationpolicy.py:823
+#: ../wallace/module_resources.py:419
 #, python-format
 msgid "start: %r, end: %r, total: %r, messages: %d"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:748
+#: ../wallace/module_invitationpolicy.py:849
 #, python-format
 msgid "%r is locked, waiting..."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:811
+#: ../wallace/module_invitationpolicy.py:913
 #, python-format
-msgid "Failed to save event: no calendar folder found for user %r"
+msgid "Failed to save %s: no target folder found for user %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:814
+#: ../wallace/module_invitationpolicy.py:916
 #, python-format
-msgid "Save event %r to user calendar %r"
+msgid "Save %s %r to user folder %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:827
+#: ../wallace/module_invitationpolicy.py:929
 #, python-format
-msgid "Failed to save event to user calendar at %r: %r"
+msgid "Failed to save %s to user folder at %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:843
+#: ../wallace/module_invitationpolicy.py:945
 #, python-format
-msgid "Delete event %r in %r: %r"
+msgid "Delete %s %r in %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:863
+#: ../wallace/module_invitationpolicy.py:970
 #, python-format
-msgid "Compose participation status summary for event %r to user %r"
+msgid "Compose participation status summary for %s %r to user %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:901
+#: ../wallace/module_invitationpolicy.py:1003
 #, python-format
 msgid ""
 "Waiting for more automated replies (got %d of %d); skipping notification"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:998
+#: ../wallace/module_invitationpolicy.py:1013
+#, python-format
+msgid "Changes submitted by %s have been automatically applied."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1022
+msgid "(removed)"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1045
+#: ../wallace/module_invitationpolicy.py:1103
+#: ../wallace/module_invitationpolicy.py:1193
+msgid "*** This is an automated message. Please do not reply. ***"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1076
+#, python-format
+msgid "Send cancellation notification for %s %r to user %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1183
 #, python-format
 msgid "Updated %s's copy of %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1001
+#: ../wallace/module_invitationpolicy.py:1186
 #, python-format
 msgid "Attendee %s's copy of %r not found"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1004
+#: ../wallace/module_invitationpolicy.py:1189
 #, python-format
 msgid "Attendee %r not found in LDAP"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1008
+#: ../wallace/module_invitationpolicy.py:1196
 #, python-format
-msgid ""
-"\n"
-"        %(name)s has %(status)s your invitation for %(summary)s.\n"
-"\n"
-"        *** This is an automated response sent by the Kolab Invitation system ***\n"
-"    "
+msgid "%(name)s has %(status)s your assignment for %(summary)s."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1198
+#, python-format
+msgid "%(name)s has %(status)s your invitation for %(summary)s."
 msgstr ""
 
 #. modules.next_module('optout')
@@ -3174,7 +3495,8 @@ msgstr ""
 
 #: ../wallace/module_optout.py:96
 #, python-format
-msgid "Running opt-out consult from envelope sender '%s "
+msgid ""
+"Running opt-out consult from envelope sender '%s <%s>' to recipient %s <%s>"
 msgstr ""
 
 #: ../wallace/module_optout.py:160
@@ -3187,184 +3509,233 @@ msgstr ""
 msgid "Could not send request to optout_url %s"
 msgstr ""
 
-#: ../wallace/module_resources.py:110
+#: ../wallace/module_resources.py:115
 #, python-format
 msgid "Resource Management called for %r, %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:174
-msgid "Message is not an iTip message or does not contain any "
+#: ../wallace/module_resources.py:180
+#, 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."
 msgstr ""
 
-#: ../wallace/module_resources.py:182
-msgid "iTip events attached to this message contain the "
+#: ../wallace/module_resources.py:193
+#, python-format
+msgid ""
+"iTip events attached to this message contain the following information: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:205
+#: ../wallace/module_resources.py:226
 msgid "Not an iTip message, but sent to resource nonetheless. Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:213
+#: ../wallace/module_resources.py:234
 #, python-format
 msgid "No itips, no resources, pass along %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:216
+#: ../wallace/module_resources.py:237
 #, python-format
 msgid "iTips, but no resources, pass along %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:225
+#: ../wallace/module_resources.py:246
 #, python-format
 msgid "No resource attendees matching envelope recipient %s, Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:234
+#: ../wallace/module_resources.py:256
 #, python-format
 msgid "Resources: %r; %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:244
+#: ../wallace/module_resources.py:274
+#, python-format
+msgid "Sender Attendee: %r => %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:281
+#, python-format
+msgid ""
+"The iTip reply sequence (%r) doesn't match the referred event version (%r). "
+"Ignoring."
+msgstr ""
+
+#: ../wallace/module_resources.py:306
+#, python-format
+msgid "Event referenced by this REPLY (%r) not found in resource calendar"
+msgstr ""
+
+#: ../wallace/module_resources.py:309
+msgid "No event reference found in this REPLY. Ignoring."
+msgstr ""
+
+#: ../wallace/module_resources.py:318
 #, python-format
 msgid "Receiving Resource: %r; %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:252
+#: ../wallace/module_resources.py:326
 #, python-format
 msgid "Recipient %r is non-participant, ignoring message"
 msgstr ""
 
-#: ../wallace/module_resources.py:279
+#: ../wallace/module_resources.py:354
 #, python-format
 msgid "Accept invitation for individual resource %r / %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:308
+#: ../wallace/module_resources.py:383
 #, python-format
 msgid "Delegate invitation for resource collection %r to %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:340
+#: ../wallace/module_resources.py:415
 #, python-format
 msgid "Failed to read resource calendar for %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:350
+#: ../wallace/module_resources.py:425
 #, python-format
 msgid "Polling for resource %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:353
+#: ../wallace/module_resources.py:428
 #, python-format
 msgid "Resource %r has been popped from the list"
 msgstr ""
 
-#: ../wallace/module_resources.py:357
+#: ../wallace/module_resources.py:432
 msgid "Resource is a collection"
 msgstr ""
 
-#: ../wallace/module_resources.py:368
+#: ../wallace/module_resources.py:443
 #, python-format
 msgid "Removed conflicting resources from %r: (%r) => %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:380
+#: ../wallace/module_resources.py:455
 #, python-format
 msgid "Conflicting events: %r for resource %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:397
+#: ../wallace/module_resources.py:474
 #, python-format
 msgid "Delegate to another resource collection member: %r to %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:459
+#: ../wallace/module_resources.py:536
 #, python-format
 msgid "Checking events in resource folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:475
+#: ../wallace/module_resources.py:555
 #, python-format
 msgid "Fetching message UID %r from folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:498
+#: ../wallace/module_resources.py:578
 #, python-format
 msgid "Event %r conflicts with event %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:525
+#: ../wallace/module_resources.py:599
+#, python-format
+msgid "Searching %r for event %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:605
+#, python-format
+msgid "Failed to access resource calendar:: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:634
+#, python-format
+msgid "Apply invitation policies %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:653
 #, python-format
 msgid "Adding event to %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:573
+#: ../wallace/module_resources.py:707
 #, python-format
 msgid "Failed to save event to resource calendar at %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:590
+#: ../wallace/module_resources.py:724
 #, python-format
 msgid "Delete resource calendar object %r in %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:633
+#: ../wallace/module_resources.py:767
 #, python-format
 msgid "Checking if email address %r belongs to a resource (collection)"
 msgstr ""
 
-#: ../wallace/module_resources.py:641 ../wallace/module_resources.py:709
-#: ../wallace/module_resources.py:743
+#: ../wallace/module_resources.py:775 ../wallace/module_resources.py:849
+#: ../wallace/module_resources.py:883
 #, python-format
 msgid "Resource record(s): %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:643 ../wallace/module_resources.py:711
-#: ../wallace/module_resources.py:746
+#: ../wallace/module_resources.py:777 ../wallace/module_resources.py:851
+#: ../wallace/module_resources.py:886
 #, python-format
 msgid "No resource (collection) records found for %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:647 ../wallace/module_resources.py:715
-#: ../wallace/module_resources.py:750
+#: ../wallace/module_resources.py:781 ../wallace/module_resources.py:855
+#: ../wallace/module_resources.py:890
 #, python-format
 msgid "Resource record: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:667
+#: ../wallace/module_resources.py:801
 #, python-format
 msgid "Raw itip_events: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:675
+#: ../wallace/module_resources.py:809
 #, python-format
 msgid "Raw set of attendees: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:683
+#: ../wallace/module_resources.py:817
 #, python-format
 msgid "Raw set of resources: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:702
+#: ../wallace/module_resources.py:822
+#, python-format
+msgid "Raw set of organizers: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:842
 #, python-format
 msgid "Checking if attendee %r is a resource (collection)"
 msgstr ""
 
-#: ../wallace/module_resources.py:718 ../wallace/module_resources.py:752
+#: ../wallace/module_resources.py:858 ../wallace/module_resources.py:892
 msgid "Resource reservation made but no resource records found"
 msgstr ""
 
-#: ../wallace/module_resources.py:737
+#: ../wallace/module_resources.py:877
 #, python-format
 msgid "Checking if resource %r is a resource (collection)"
 msgstr ""
 
-#: ../wallace/module_resources.py:755
-msgid "The following resources are being referred to in the "
+#: ../wallace/module_resources.py:895
+#, python-format
+msgid "The following resources are being referred to in the iTip: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:894
+#: ../wallace/module_resources.py:1060
 #, python-format
 msgid ""
 "\n"
@@ -3374,7 +3745,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../wallace/module_resources.py:905
+#: ../wallace/module_resources.py:1079
 #, python-format
 msgid ""
 "\n"
@@ -3384,7 +3755,7 @@ msgid ""
 "    "
 msgstr ""
 
-#: ../wallace/module_resources.py:912
+#: ../wallace/module_resources.py:1086
 #, python-format
 msgid ""
 "\n"
@@ -3393,16 +3764,16 @@ msgid ""
 "        "
 msgstr ""
 
-#: ../wallace/module_resources.py:941
+#: ../wallace/module_resources.py:1117
 #, python-format
 msgid "Sending booking notification for event %r to %r from %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:954
+#: ../wallace/module_resources.py:1134
 msgid "failed"
 msgstr ""
 
-#: ../wallace/module_resources.py:973
+#: ../wallace/module_resources.py:1153
 #, python-format
 msgid ""
 "\n"
@@ -3412,7 +3783,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: ../wallace/module_resources.py:979
+#: ../wallace/module_resources.py:1159
 #, python-format
 msgid ""
 "\n"
@@ -3423,6 +3794,28 @@ msgid ""
 "        "
 msgstr ""
 
+#: ../wallace/module_resources.py:1203
+#, python-format
+msgid "Clone invitation for owner confirmation: %r from %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:1209
+#, python-format
+msgid ""
+"\n"
+"        A reservation request for %(resource)s requires your approval!\n"
+"        Please either accept or decline this invitation without saving it to your calendar.\n"
+"\n"
+"        The reservation request was sent from %(orgname)s <%(orgemail)s>.\n"
+"\n"
+"        Subject: %(summary)s.\n"
+"        Date: %(date)s\n"
+"        Participants: %(attendees)s\n"
+"\n"
+"        *** This is an automated message, please don't reply by email. ***\n"
+"    "
+msgstr ""
+
 #. This is a nested module
 #: ../wallace/modules.py:97
 #, python-format
diff --git a/po/es.po b/po/es.po
index 9506a67..5e4abc7 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3,663 +3,871 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Pedro García Rodríguez <pedgarrod at gmail.com>, 2012.
+# Pedro García Rodríguez <inactive+Breaking_Pitt at transifex.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
-"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-14 12:22+0100\n"
-"PO-Revision-Date: 2012-08-14 11:13+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-11 18:01+0200\n"
+"PO-Revision-Date: 2014-09-11 16:00+0000\n"
 "Last-Translator: Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../bin/kolab_smtp_access_policy.py:206
+#: ../bin/kolab_smtp_access_policy.py:209
 #, python-format
 msgid "Adding policy request to instance %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:446
+#: ../bin/kolab_smtp_access_policy.py:479
 msgid "Unauthorized access not allowed"
 msgstr "El acceso no autorizado no está permitido"
 
-#: ../bin/kolab_smtp_access_policy.py:467
-#: ../bin/kolab_smtp_access_policy.py:657
+#: ../bin/kolab_smtp_access_policy.py:508
+#: ../bin/kolab_smtp_access_policy.py:689
 msgid "Could not find recipient"
 msgstr "No se ha podido encontrar el destinatario"
 
-#: ../bin/kolab_smtp_access_policy.py:486
-#: ../bin/kolab_smtp_access_policy.py:586
+#: ../bin/kolab_smtp_access_policy.py:527
 #, python-format
-msgid "Could not find envelope sender user %s"
+msgid "Could not find envelope sender user %s (511)"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:529
+#: ../bin/kolab_smtp_access_policy.py:570
 #, python-format
 msgid "Obtained authenticated user details for %r: %r"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:608
+#: ../bin/kolab_smtp_access_policy.py:627
+#, python-format
+msgid "Could not find envelope sender user %s"
+msgstr ""
+
+#: ../bin/kolab_smtp_access_policy.py:649
 #, python-format
 msgid "%s is unauthorized to send on behalf of %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:618
+#: ../bin/kolab_smtp_access_policy.py:659
 #, python-format
 msgid ""
 "User %s attempted to use envelope sender address %s without authorization"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:681
-#: ../bin/kolab_smtp_access_policy.py:692
+#: ../bin/kolab_smtp_access_policy.py:713
+#: ../bin/kolab_smtp_access_policy.py:724
 #, python-format
 msgid "Found user %s to be a delegate user of %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:716
+#: ../bin/kolab_smtp_access_policy.py:748
 #, python-format
 msgid ""
 "Verifying authenticated sender '%(sender)s' with sasl_username "
 "'%(sasl_username)s' for recipient '%(recipient)s'"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:719
+#: ../bin/kolab_smtp_access_policy.py:751
 #, python-format
 msgid ""
 "Verifying unauthenticated sender '%(sender)s' for recipient '%(recipient)s'"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:735
+#: ../bin/kolab_smtp_access_policy.py:767
 #, python-format
 msgid "Reproducing verify_recipient(%s, %s) from cache"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:753
+#: ../bin/kolab_smtp_access_policy.py:804
 #, python-format
 msgid "Using authentication domain %s instead of %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:763
+#: ../bin/kolab_smtp_access_policy.py:814
 #, python-format
 msgid "Domain %s is a primary domain"
 msgstr "El dominio %s es el dominio principal"
 
-#: ../bin/kolab_smtp_access_policy.py:771
+#: ../bin/kolab_smtp_access_policy.py:822
 #, 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:786
+#: ../bin/kolab_smtp_access_policy.py:837
 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:793
+#: ../bin/kolab_smtp_access_policy.py:854
 #, 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:820
+#: ../bin/kolab_smtp_access_policy.py:890
 msgid "Invalid recipient"
 msgstr "Destinatario no válido"
 
-#: ../bin/kolab_smtp_access_policy.py:831
+#: ../bin/kolab_smtp_access_policy.py:901
 msgid "Could not find this user, accepting"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:894
-#: ../bin/kolab_smtp_access_policy.py:945
+#: ../bin/kolab_smtp_access_policy.py:974
+#: ../bin/kolab_smtp_access_policy.py:1050
 #, python-format
 msgid "Sender %s is not allowed to send to recipient %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:933
+#: ../bin/kolab_smtp_access_policy.py:1038
 #, python-format
 msgid "Reproducing verify_sender(%r) from cache"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:960
+#: ../bin/kolab_smtp_access_policy.py:1055
+msgid "Unverifiable sender."
+msgstr ""
+
+#: ../bin/kolab_smtp_access_policy.py:1060
+msgid "Sender is not using an alias"
+msgstr ""
+
+#: ../bin/kolab_smtp_access_policy.py:1068
 msgid "Sender uses unauthorized envelope sender address"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:977
+#: ../bin/kolab_smtp_access_policy.py:1085
 msgid "Could not verify sender"
 msgstr "No es posible verificar el remitente"
 
-#: ../bin/kolab_smtp_access_policy.py:984
+#: ../bin/kolab_smtp_access_policy.py:1092
 msgid ""
 "Verifying whether sender is allowed to send to recipient using sender policy"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:997
+#: ../bin/kolab_smtp_access_policy.py:1105
 #, python-format
 msgid "Result is %r"
 msgstr "El resultado es %r"
 
-#: ../bin/kolab_smtp_access_policy.py:1002
+#: ../bin/kolab_smtp_access_policy.py:1110
 msgid "No recipient policy restrictions exist for this sender"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1011
+#: ../bin/kolab_smtp_access_policy.py:1119
 msgid "Found a recipient policy to apply for this sender."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1026
+#: ../bin/kolab_smtp_access_policy.py:1134
 #, python-format
 msgid "Sender %s not allowed to send to recipient %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1056
+#: ../bin/kolab_smtp_access_policy.py:1155
 msgid "Cleaning up the cache"
 msgstr "Limpiando la caché"
 
-#: ../bin/kolab_smtp_access_policy.py:1093
+#: ../bin/kolab_smtp_access_policy.py:1177
+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
 #, python-format
 msgid "Operational Error in caching: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1144
+#: ../bin/kolab_smtp_access_policy.py:1245
 #, python-format
 msgid "Caching the policy result with timestamp %d"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1221
+#: ../bin/kolab_smtp_access_policy.py:1319
 #, python-format
 msgid "Returning action DEFER_IF_PERMIT: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1226
+#: ../bin/kolab_smtp_access_policy.py:1324
 #, python-format
 msgid "Returning action DUNNO: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1231
+#: ../bin/kolab_smtp_access_policy.py:1329
 #, python-format
 msgid "Returning action HOLD: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1236
+#: ../bin/kolab_smtp_access_policy.py:1334
 #, python-format
 msgid "Returning action PERMIT: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1241
+#: ../bin/kolab_smtp_access_policy.py:1459
 #, python-format
 msgid "Returning action REJECT: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1287
+#: ../bin/kolab_smtp_access_policy.py:1505
 msgid "Starting to loop for new request"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1294
+#: ../bin/kolab_smtp_access_policy.py:1512
 msgid "Timeout for policy request reading exceeded"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1300
+#: ../bin/kolab_smtp_access_policy.py:1518
 msgid "End of current request"
 msgstr "Finalizada la petición actual"
 
-#: ../bin/kolab_smtp_access_policy.py:1304
+#: ../bin/kolab_smtp_access_policy.py:1522
 #, python-format
 msgid "Getting line: %s"
 msgstr "Obteniendo la línea: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1308
+#: ../bin/kolab_smtp_access_policy.py:1526
 msgid "Returning request"
 msgstr "Returning request"
 
-#: ../bin/kolab_smtp_access_policy.py:1334
+#: ../bin/kolab_smtp_access_policy.py:1555
 msgid "Access Policy Options"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1341
+#: ../bin/kolab_smtp_access_policy.py:1562
 msgid "SMTP Policy request timeout."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1347
+#: ../bin/kolab_smtp_access_policy.py:1568
 msgid "Verify the recipient access policy."
 msgstr "Verificar la política de acceso para los destinatarios"
 
-#: ../bin/kolab_smtp_access_policy.py:1353
+#: ../bin/kolab_smtp_access_policy.py:1574
 msgid "Verify the sender access policy."
 msgstr "Verificar la política de acceso para los remitentes"
 
-#: ../bin/kolab_smtp_access_policy.py:1359
+#: ../bin/kolab_smtp_access_policy.py:1580
 msgid "Allow unauthenticated senders."
 msgstr "Permitir remitentes no autenticados."
 
-#: ../bin/kolab_smtp_access_policy.py:1373
+#: ../bin/kolab_smtp_access_policy.py:1594
 #, python-format
 msgid "Got request instance %s"
 msgstr "Hay una solicitud de instancia %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1382
+#: ../bin/kolab_smtp_access_policy.py:1603
 #, python-format
 msgid "Request instance %s is in state %s"
 msgstr "La instancia solicitada %s, se encuentra en estado %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1390
+#: ../bin/kolab_smtp_access_policy.py:1611
 #, python-format
 msgid "Request instance %s is not yet in DATA state"
 msgstr "La instancia solicitada %s, todavía no se encuentra en estado DATA"
 
-#: ../bin/kolab_smtp_access_policy.py:1402
+#: ../bin/kolab_smtp_access_policy.py:1623
 #, python-format
 msgid "Request instance %s reached DATA state"
 msgstr "La instancia solicitada %s, alcanzó el estado DATA"
 
-#: ../bin/kolab_smtp_access_policy.py:1420
+#: ../bin/kolab_smtp_access_policy.py:1643
+#, python-format
+msgid "Unhandled exception caught: %r"
+msgstr ""
+
+#: ../bin/kolab_smtp_access_policy.py:1647
 msgid "Sender access denied"
 msgstr "Acceso denegado al destinatario"
 
-#: ../bin/kolab_smtp_access_policy.py:1422
+#: ../bin/kolab_smtp_access_policy.py:1649
 msgid "Recipient access denied"
 msgstr "Acceso denegado al destinatario"
 
-#: ../bin/kolab_smtp_access_policy.py:1424
+#: ../bin/kolab_smtp_access_policy.py:1651
 msgid "No objections"
 msgstr "No hay objeciones"
 
-#: ../conf.py:37 ../kolab.py:34 ../saslauthd.py:33
+#: ../conf.py:37 ../kolab-cli.py:34 ../saslauthd.py:33
 msgid "Cannot load pykolab/logger.py:"
 msgstr "Imposible cargar pykolab/logger.py:"
 
-#: ../kolabd/__init__.py:49 ../saslauthd/__init__.py:48
-#: ../wallace/__init__.py:65
+#: ../kolabd/__init__.py:49 ../saslauthd/__init__.py:51
+#: ../wallace/__init__.py:85
 msgid "Daemon Options"
 msgstr "Opciones del demonio"
 
-#: ../kolabd/__init__.py:56 ../saslauthd/__init__.py:55
-#: ../wallace/__init__.py:72
+#: ../kolabd/__init__.py:56 ../saslauthd/__init__.py:58
+#: ../wallace/__init__.py:92
 msgid "Fork to the background."
 msgstr ""
 
-#: ../kolabd/__init__.py:65 ../saslauthd/__init__.py:64
-#: ../wallace/__init__.py:98
+#: ../kolabd/__init__.py:65 ../saslauthd/__init__.py:67
+#: ../wallace/__init__.py:118
 msgid "Path to the PID file to use."
 msgstr "Ruta del archivo de PID a utilizar."
 
-#: ../kolabd/__init__.py:74 ../saslauthd/__init__.py:73
-#: ../wallace/__init__.py:115
+#: ../kolabd/__init__.py:74 ../saslauthd/__init__.py:85
+#: ../wallace/__init__.py:135
 msgid "Run as user USERNAME"
 msgstr "Ejecutar el usuario USERNAME"
 
-#: ../kolabd/__init__.py:84 ../saslauthd/__init__.py:83
-#: ../wallace/__init__.py:89
+#: ../kolabd/__init__.py:84 ../saslauthd/__init__.py:95
+#: ../wallace/__init__.py:109
 msgid "Run as group GROUPNAME"
 msgstr "Ejecutar el grupo GROUPNAME"
 
-#: ../kolabd/__init__.py:122 ../pykolab/utils.py:151
-#: ../wallace/__init__.py:288
+#: ../kolabd/__init__.py:122 ../pykolab/utils.py:234
+#: ../saslauthd/__init__.py:301 ../wallace/__init__.py:329
 #, python-format
 msgid "Group %s does not exist"
 msgstr "El grupo %s no existe"
 
-#: ../kolabd/__init__.py:131 ../wallace/__init__.py:297
+#: ../kolabd/__init__.py:131 ../saslauthd/__init__.py:310
+#: ../wallace/__init__.py:338
 #, python-format
 msgid "Switching real and effective group id to %d"
 msgstr "Cambio el id real y efectiva del grupo a %d"
 
-#: ../kolabd/__init__.py:153 ../pykolab/utils.py:175
-#: ../wallace/__init__.py:319
+#: ../kolabd/__init__.py:153 ../pykolab/utils.py:258
+#: ../saslauthd/__init__.py:332 ../wallace/__init__.py:360
 #, python-format
 msgid "User %s does not exist"
 msgstr " El usuario %s no existe"
 
-#: ../kolabd/__init__.py:163 ../wallace/__init__.py:329
+#: ../kolabd/__init__.py:163 ../saslauthd/__init__.py:342
+#: ../wallace/__init__.py:370
 #, python-format
 msgid "Switching real and effective user id to %d"
 msgstr ""
 
-#: ../kolabd/__init__.py:172 ../wallace/__init__.py:338
+#: ../kolabd/__init__.py:172 ../saslauthd/__init__.py:351
+#: ../wallace/__init__.py:379
 msgid "Could not change real and effective uid and/or gid"
 msgstr ""
 
-#: ../kolabd/__init__.py:192 ../saslauthd/__init__.py:122
-#: ../wallace/__init__.py:358
+#: ../kolabd/__init__.py:192 ../saslauthd/__init__.py:142
+#: ../wallace/__init__.py:399
 msgid "Interrupted by user"
 msgstr "Interrumpido por el usuario"
 
 #: ../kolabd/__init__.py:197 ../kolabd/__init__.py:208
-msgid "Traceback occurred, please report a "
+#: ../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"
 msgstr ""
 
-#: ../kolabd/__init__.py:203 ../saslauthd/__init__.py:130
-#: ../wallace/__init__.py:367
+#: ../kolabd/__init__.py:203 ../saslauthd/__init__.py:150
+#: ../wallace/__init__.py:408
 #, python-format
 msgid "Type Error: %s"
 msgstr "Tipo de error: %s"
 
-#: ../kolabd/__init__.py:223 ../pykolab/auth/ldap/__init__.py:1591
+#: ../kolabd/__init__.py:230
+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
 msgid "Listing domains..."
 msgstr "Listando dominios..."
 
-#: ../kolabd/__init__.py:256
+#: ../kolabd/__init__.py:244
+msgid "No domains. Not syncing"
+msgstr ""
+
+#: ../kolabd/__init__.py:279
 #, python-format
 msgid "added domains: %r, removed domains: %r"
 msgstr "dominios añadidos: %r, dominios eliminados: %r"
 
+#: ../kolabd/process.py:33
+#, python-format
+msgid "Process created for domain %s"
+msgstr ""
+
+#: ../kolabd/process.py:42
+#, python-format
+msgid "Synchronizing for domain %s"
+msgstr ""
+
+#: ../kolabd/process.py:59
+#, python-format
+msgid ""
+"Error in process %r, terminating:\n"
+"\t%r"
+msgstr ""
+
 #: ../kolabd.py:31 ../setup-kolab.py:36 ../wallace.py:31
 msgid "Cannot load pykolab/constants.py:"
 msgstr "No se puede cargar pykolab/constants.py:"
 
-#: ../pykolab/auth/__init__.py:94
+#: ../pykolab/auth/__init__.py:89
 #, python-format
 msgid "Called for domain %r"
 msgstr ""
 
-#: ../pykolab/auth/__init__.py:107 ../pykolab/auth/__init__.py:116
+#: ../pykolab/auth/__init__.py:106 ../pykolab/auth/__init__.py:115
 #, python-format
 msgid "Using section %s and domain %s"
-msgstr ""
+msgstr "Utilizando la sección %s y el dominio %s"
 
-#: ../pykolab/auth/__init__.py:121
+#: ../pykolab/auth/__init__.py:120
 #, python-format
 msgid "Connecting to Authentication backend for domain %s"
 msgstr ""
 
-#: ../pykolab/auth/__init__.py:132
+#: ../pykolab/auth/__init__.py:131
 #, python-format
 msgid "Section %s has no option 'auth_mechanism'"
-msgstr ""
+msgstr "La sección %s no tiene ninguna opción 'auth_mechanism'"
 
-#: ../pykolab/auth/__init__.py:139
+#: ../pykolab/auth/__init__.py:138
 #, python-format
 msgid "Section %s has auth_mechanism: %r"
 msgstr ""
 
-#: ../pykolab/auth/__init__.py:148 ../pykolab/auth/__init__.py:157
+#: ../pykolab/auth/__init__.py:147 ../pykolab/auth/__init__.py:156
 msgid "Starting LDAP..."
-msgstr ""
+msgstr "Iniciado LDAP..."
 
-#: ../pykolab/auth/ldap/cache.py:109
+#: ../pykolab/auth/ldap/cache.py:126
 #, python-format
 msgid "Inserting cache entry %r"
-msgstr ""
+msgstr "Insertando la entrada %r en la caché"
 
-#: ../pykolab/auth/ldap/cache.py:122
+#: ../pykolab/auth/ldap/cache.py:147
 #, python-format
 msgid "Updating timestamp for cache entry %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/cache.py:129
+#: ../pykolab/auth/ldap/cache.py:155
 #, python-format
 msgid "Updating result_attribute for cache entry %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:51
+#: ../pykolab/auth/ldap/__init__.py:52
 msgid "Python LDAP library does not support persistent search"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:142
+#: ../pykolab/auth/ldap/__init__.py:143
 #, python-format
 msgid "Attempting to authenticate user %s in realm %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:184
+#: ../pykolab/auth/ldap/__init__.py:175 ../pykolab/auth/ldap/__init__.py:226
+#, python-format
+msgid "Authentication cache failed: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:216 ../pykolab/auth/ldap/__init__.py:240
 #, python-format
 msgid "Binding with user_dn %s and password %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:194
+#: ../pykolab/auth/ldap/__init__.py:231 ../pykolab/auth/ldap/__init__.py:263
 #, python-format
 msgid "Failed to authenticate as user %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:211
+#: ../pykolab/auth/ldap/__init__.py:249
+#, python-format
+msgid "Error occured, there is no such object: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:254
+msgid "Authentication cache failed to clear entry"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:260
+#, python-format
+msgid "Exception occured: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:280
 msgid "Connecting to LDAP..."
 msgstr "Conectado a LDAP..."
 
-#: ../pykolab/auth/ldap/__init__.py:215
+#: ../pykolab/auth/ldap/__init__.py:284
 #, python-format
 msgid "Attempting to use LDAP URI %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:357
+#: ../pykolab/auth/ldap/__init__.py:371
+#, python-format
+msgid "Entry ID: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:373
+#, python-format
+msgid "Entry DN: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:376
+#, python-format
+msgid ""
+"ldap search: (%r, %r, filterstr='(objectclass=*)', attrlist=[ 'dn' ] + %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:453
 #, python-format
 msgid "Finding recipient with filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:425
+#: ../pykolab/auth/ldap/__init__.py:529
 #, python-format
 msgid "Finding resource with filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:448
+#: ../pykolab/auth/ldap/__init__.py:560
 #, python-format
 msgid "Using timestamp %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:480
+#: ../pykolab/auth/ldap/__init__.py:597
+#, python-format
+msgid "Not applying recipient policy for %s (disabled through configuration)"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:607
 #, python-format
 msgid "Applying recipient policy to %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:497
+#: ../pykolab/auth/ldap/__init__.py:624
 #, python-format
-msgid "Using mail attributes: %r, with primary %r and "
+msgid "Using mail attributes: %r, with primary %r and secondary %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:508
+#: ../pykolab/auth/ldap/__init__.py:635
 #, python-format
 msgid "key %r not in entry"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:510
+#: ../pykolab/auth/ldap/__init__.py:637
 #, python-format
 msgid "key %r is the prim. mail attr."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:512
+#: ../pykolab/auth/ldap/__init__.py:639
 msgid "prim. mail pol. is not empty"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:515
+#: ../pykolab/auth/ldap/__init__.py:642
 #, python-format
 msgid "key %r is the sec. mail attr."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:517
+#: ../pykolab/auth/ldap/__init__.py:644
 msgid "sec. mail pol. is not empty"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:520 ../pykolab/auth/ldap/__init__.py:533
+#: ../pykolab/auth/ldap/__init__.py:648 ../pykolab/auth/ldap/__init__.py:662
 #, python-format
 msgid "Attributes %r are not yet available for entry %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:574
+#: ../pykolab/auth/ldap/__init__.py:701
 #, python-format
 msgid "No results for mail address %s found"
-msgstr ""
+msgstr "No se han encontrado resultados para la dirección de correo %s"
 
-#: ../pykolab/auth/ldap/__init__.py:585
+#: ../pykolab/auth/ldap/__init__.py:712
 #, python-format
 msgid "1 result for address %s found, verifying"
-msgstr ""
+msgstr "Encontrado 1 resultado para la dirección %s, verificando"
 
-#: ../pykolab/auth/ldap/__init__.py:595
+#: ../pykolab/auth/ldap/__init__.py:722
 #, python-format
-msgid "Too bad, primary email address %s "
+msgid "Too bad, primary email address %s already in use for %s (we are %s)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:606 ../pykolab/auth/ldap/__init__.py:695
+#: ../pykolab/auth/ldap/__init__.py:733 ../pykolab/auth/ldap/__init__.py:822
 msgid "Address assigned to us"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:661
+#: ../pykolab/auth/ldap/__init__.py:788
 #, python-format
 msgid "No results for address %s found"
-msgstr ""
+msgstr "No se han encontrado resultados para la dirección %s"
 
-#: ../pykolab/auth/ldap/__init__.py:672
+#: ../pykolab/auth/ldap/__init__.py:799
 #, python-format
-msgid "1 result for address %s found, "
+msgid "1 result for address %s found, verifying..."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:683
-msgid "Too bad, secondary email "
+#: ../pykolab/auth/ldap/__init__.py:810
+#, python-format
+msgid "Too bad, secondary email address %s already in use for %s (we are %s)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:710
-msgid "Recipient policy composed the following set of secondary "
+#: ../pykolab/auth/ldap/__init__.py:837
+#, python-format
+msgid ""
+"Recipient policy composed the following set of secondary email addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:716
+#: ../pykolab/auth/ldap/__init__.py:848
 #, python-format
 msgid "Secondary mail addresses that we want is not None: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:727
-msgid "Avoiding the duplication of the primary mail "
+#: ../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"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:738
+#: ../pykolab/auth/ldap/__init__.py:870
 #, python-format
 msgid "Entry is getting secondary mail addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:746
-msgid "Entry did not have any secondary mail "
+#: ../pykolab/auth/ldap/__init__.py:878
+#, python-format
+msgid "Entry did not have any secondary mail addresses in %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:895 ../pykolab/auth/ldap/__init__.py:901
+#, python-format
+msgid "secondary_mail_addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:772
+#: ../pykolab/auth/ldap/__init__.py:896 ../pykolab/auth/ldap/__init__.py:902
+#, python-format
+msgid "entry[%s]: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:913
 #, python-format
 msgid "Entry modifications list: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:792
+#: ../pykolab/auth/ldap/__init__.py:941
 #, python-format
 msgid "Setting entry attribute %r to %r for %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:828
+#: ../pykolab/auth/ldap/__init__.py:977
 #, python-format
-msgid "Could not update dn %r"
+msgid ""
+"Could not update dn %r:\n"
+"%r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:841
+#: ../pykolab/auth/ldap/__init__.py:990
 #, python-format
 msgid "Using filter %r"
+msgstr "Utilizando el filtro %r"
+
+#: ../pykolab/auth/ldap/__init__.py:1005
+#, python-format
+msgid "Synchronization is searching against base DN: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:879
+#: ../pykolab/auth/ldap/__init__.py:1051
 #, python-format
-msgid "About to consider the user quota for %r (used: %r, "
+msgid ""
+"About to consider the user quota for %r (used: %r, imap: %r, ldap: %r, "
+"default: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:945
+#: ../pykolab/auth/ldap/__init__.py:1122
 msgid "Invalid DN, username and/or password."
+msgstr "DN inválido, usuario y/o contraseña"
+
+#: ../pykolab/auth/ldap/__init__.py:1247 ../pykolab/auth/ldap/__init__.py:1264
+#: ../pykolab/auth/ldap/__init__.py:1628 ../pykolab/auth/ldap/__init__.py:1645
+#, python-format
+msgid "Found a subject %r with access %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1366
+#, python-format
+msgid "Entry %s attribute value: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1229
+#: ../pykolab/auth/ldap/__init__.py:1374
 #, python-format
-msgid "Current changelog entry %s with %s"
+msgid "imap.user_mailbox_server(%r) result: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1242
+#: ../pykolab/auth/ldap/__init__.py:1694 ../pykolab/auth/ldap/__init__.py:1894
 #, python-format
 msgid "Result from recipient policy: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1385
+#: ../pykolab/auth/ldap/__init__.py:1949
 #, python-format
 msgid "Kolab user %s does not have a result attribute %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1527
+#: ../pykolab/auth/ldap/__init__.py:2108
 #, python-format
 msgid "Finding domain root dn for domain %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1615
+#: ../pykolab/auth/ldap/__init__.py:2205
 msgid "Authentication database DOWN"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1699 ../pykolab/auth/ldap/__init__.py:1734
+#: ../pykolab/auth/ldap/__init__.py:2289 ../pykolab/auth/ldap/__init__.py:2337
 #, python-format
 msgid "Entry type: %s"
-msgstr ""
+msgstr "Tipo de entrada: %s"
 
-#: ../pykolab/auth/ldap/__init__.py:1822
+#: ../pykolab/auth/ldap/__init__.py:2426
 msgid "LDAP Search Result Data Entry:"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1838
+#: ../pykolab/auth/ldap/__init__.py:2442
 msgid "Entry Change Notification attributes:"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1843
+#: ../pykolab/auth/ldap/__init__.py:2447
 #, python-format
 msgid "Change Type: %r (%r)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1851
+#: ../pykolab/auth/ldap/__init__.py:2455
 #, python-format
 msgid "Previous DN: %r"
-msgstr ""
+msgstr "DN anterior: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:1906
+#: ../pykolab/auth/ldap/__init__.py:2510
 #, python-format
 msgid "Object %s searched no longer exists"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1916
+#: ../pykolab/auth/ldap/__init__.py:2520
 #, python-format
 msgid "%d results..."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2014
+#: ../pykolab/auth/ldap/__init__.py:2623
 #, python-format
 msgid "Searching with filter %r"
-msgstr ""
+msgstr "Buscando con el filtro %r"
 
-#: ../pykolab/auth/ldap/__init__.py:2058
+#: ../pykolab/auth/ldap/__init__.py:2675
 #, python-format
 msgid "Checking for support for %s on %s"
+msgstr "Comprobando el soporte para %s en %s"
+
+#: ../pykolab/auth/ldap/__init__.py:2694
+#, python-format
+msgid "Found support for %s"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:2739
+#, 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."
+msgstr ""
+
+#: ../pykolab/cli/cmd_acl_cleanup.py:34
+msgid "Clean up ACLs that use identifiers that no longer exist"
+msgstr ""
+
+#: ../pykolab/cli/cmd_acl_cleanup.py:56
+#, python-format
+msgid "Deleting ACL %s for subject %s on folder %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_add_alias.py:42
+msgid "Specify the (new) alias address"
+msgstr ""
+
+#: ../pykolab/cli/cmd_add_alias.py:45
+msgid "Specify the existing recipient address"
+msgstr ""
+
+#: ../pykolab/cli/cmd_add_alias.py:66 ../pykolab/cli/cmd_add_alias.py:70
+#, python-format
+msgid "Domain %r is not a local domain"
+msgstr ""
+
+#: ../pykolab/cli/cmd_add_alias.py:75
+msgid "Primary and secondary domain do not have the same parent domain"
+msgstr ""
+
+#: ../pykolab/cli/cmd_add_alias.py:81
+#, python-format
+msgid "No such recipient %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_add_alias.py:87
+#, python-format
+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"
 msgstr ""
 
-#: ../pykolab/cli/cmd_add_domain.py:36 ../pykolab/cli/cmd_create_mailbox.py:36
+#: ../pykolab/cli/cmd_add_alias.py:105
+#, python-format
+msgid "Recipient %r is not the primary recipient for address %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_add_domain.py:36
+#: ../pykolab/cli/cmd_count_domain_mailboxes.py:38
+#: ../pykolab/cli/cmd_create_mailbox.py:36
 #: ../pykolab/cli/cmd_export_mailbox.py:33
-#: ../pykolab/cli/cmd_list_mailboxes.py:39
-#: ../pykolab/cli/cmd_list_user_subscriptions.py:35
+#: ../pykolab/cli/cmd_list_deleted_mailboxes.py:38
+#: ../pykolab/cli/cmd_list_domain_mailboxes.py:36
+#: ../pykolab/cli/cmd_list_mailboxes.py:40
+#: ../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_server_info.py:34
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:38
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:39
+#: ../pykolab/cli/cmd_undelete_mailbox.py:34
 msgid "CLI Options"
 msgstr ""
 
 #: ../pykolab/cli/cmd_add_domain.py:42
-msgid "Add domain as alias for DOMAIN"
+msgid "Add alias domain."
 msgstr ""
 
 #: ../pykolab/cli/cmd_add_domain.py:47
-msgid "Add a new domain or domain alias."
-msgstr ""
-
-#: ../pykolab/cli/cmd_add_domain.py:55
-msgid "Could not find credentials with sufficient permissions"
+msgid "Add a new domain."
 msgstr ""
 
-#: ../pykolab/cli/cmd_add_domain.py:80 ../pykolab/wap_client/__init__.py:113
-msgid "Invalid parent domain"
+#: ../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."
 msgstr ""
 
-#: ../pykolab/cli/cmd_add_domain.py:86
+#: ../pykolab/cli/cmd_add_domain.py:67 ../pykolab/cli/cmd_delete_domain.py:56
+#: ../pykolab/cli/cmd_find_domain.py:56
 msgid "Domain name"
 msgstr ""
 
 #: ../pykolab/cli/cmd_add_user_subscription.py:37
 msgid "Subscribe a user to a folder."
-msgstr ""
+msgstr "Subscribir un usuario a una carpeta."
 
 #: ../pykolab/cli/cmd_add_user_subscription.py:47
 #: ../pykolab/cli/cmd_add_user_subscription.py:51
@@ -669,44 +877,53 @@ msgid "Folder pattern"
 msgstr ""
 
 #: ../pykolab/cli/cmd_add_user_subscription.py:50
-#: ../pykolab/cli/cmd_list_user_subscriptions.py:56
+#: ../pykolab/cli/cmd_list_user_subscriptions.py:63
 #: ../pykolab/cli/cmd_remove_user_subscription.py:50
 msgid "User ID"
-msgstr ""
+msgstr "ID de usuario"
 
 #: ../pykolab/cli/cmd_add_user_subscription.py:72
 #: ../pykolab/cli/cmd_remove_user_subscription.py:72
 #, python-format
 msgid "Cannot subscribe user to folder %r:"
-msgstr ""
+msgstr "No ha sido posible subscribir al usuario a la carpeta %r:"
 
 #: ../pykolab/cli/cmd_add_user_subscription.py:73
+#: ../pykolab/cli/cmd_delete_message.py:61
+#: ../pykolab/cli/cmd_list_messages.py:67
 #: ../pykolab/cli/cmd_remove_user_subscription.py:73
 msgid "No such folder"
-msgstr ""
-
-#: ../pykolab/cli/cmd_add_user_subscription.py:86
-#, python-format
-msgid "Successfully subscribed user %s to the following folders:"
-msgstr ""
+msgstr "La carpeta no existe"
 
-#: ../pykolab/cli/cmd_add_user_subscription.py:92
-#, python-format
-msgid "User %s not subscribed to any folders."
+#: ../pykolab/cli/cmd_count_domain_mailboxes.py:44
+#: ../pykolab/cli/cmd_list_deleted_mailboxes.py:50
+#: ../pykolab/cli/cmd_list_domain_mailboxes.py:48
+#: ../pykolab/cli/cmd_list_mailboxes.py:52 ../pykolab/cli/cmd_list_quota.py:42
+#: ../pykolab/cli/cmd_server_info.py:40
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:57
+msgid "List mailboxes on server SERVER only."
 msgstr ""
 
-#: ../pykolab/cli/cmd_create_mailbox.py:41
+#: ../pykolab/cli/cmd_create_mailbox.py:42
 msgid "Set metadata for folder to ANNOTATION=VALUE"
 msgstr ""
 
 #: ../pykolab/cli/cmd_create_mailbox.py:50
+msgid "Create folder on PARTITION."
+msgstr ""
+
+#: ../pykolab/cli/cmd_create_mailbox.py:60
 msgid "Invalid argument"
 msgstr ""
 
-#: ../pykolab/cli/cmd_create_mailbox.py:58
+#: ../pykolab/cli/cmd_create_mailbox.py:68
 msgid "Invalid argument for metadata"
 msgstr ""
 
+#: ../pykolab/cli/cmd_delete_domain.py:36
+msgid "Delete a domain."
+msgstr ""
+
 #: ../pykolab/cli/cmd_delete_mailbox_acl.py:45
 #: ../pykolab/cli/cmd_delete_mailbox_acl.py:49
 #: ../pykolab/cli/cmd_set_mailbox_acl.py:50
@@ -715,18 +932,23 @@ msgid "ACI Subject"
 msgstr ""
 
 #: ../pykolab/cli/cmd_delete_mailbox_acl.py:48
-#: ../pykolab/cli/cmd_list_mailbox_acls.py:41
-#: ../pykolab/cli/cmd_list_mailbox_metadata.py:41
+#: ../pykolab/cli/cmd_list_mailbox_acls.py:43
+#: ../pykolab/cli/cmd_list_mailbox_metadata.py:54
 #: ../pykolab/cli/cmd_set_mailbox_acl.py:54
-#: ../pykolab/cli/cmd_set_mailbox_metadata.py:54
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:66
+#: ../pykolab/cli/cmd_set_quota.py:46 ../tests/unit/test-015-translate.py:12
+#: ../tests/unit/test-015-translate.py:16
+#: ../tests/unit/test-015-translate.py:18
+#: ../tests/unit/test-015-translate.py:20
 msgid "Folder name"
 msgstr ""
 
 #: ../pykolab/cli/cmd_delete_mailbox_acl.py:60
-#: ../pykolab/cli/cmd_list_mailbox_acls.py:52
-#: ../pykolab/cli/cmd_list_mailbox_metadata.py:52
+#: ../pykolab/cli/cmd_list_mailbox_acls.py:54
+#: ../pykolab/cli/cmd_list_mailbox_metadata.py:80
 #: ../pykolab/cli/cmd_set_mailbox_acl.py:67
-#: ../pykolab/cli/cmd_set_mailbox_metadata.py:67
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:94
+#: ../pykolab/cli/cmd_set_quota.py:58
 #, python-format
 msgid "No such folder %r"
 msgstr ""
@@ -735,6 +957,28 @@ msgstr ""
 msgid "No mailbox specified"
 msgstr ""
 
+#: ../pykolab/cli/cmd_delete_mailbox.py:56
+msgid "No such folder(s)"
+msgstr ""
+
+#: ../pykolab/cli/cmd_delete_mailbox.py:63
+#, python-format
+msgid "Could not delete mailbox '%s'"
+msgstr ""
+
+#: ../pykolab/cli/cmd_delete_message.py:36
+msgid "Delete a message from a folder"
+msgstr ""
+
+#: ../pykolab/cli/cmd_delete_message.py:49
+msgid "Specify a UID"
+msgstr ""
+
+#: ../pykolab/cli/cmd_delete_message.py:52
+#: ../pykolab/cli/cmd_list_messages.py:58
+msgid "Specify a folder"
+msgstr ""
+
 #: ../pykolab/cli/cmd_export_mailbox.py:38
 msgid "All folders this user has access to"
 msgstr ""
@@ -754,28 +998,65 @@ msgstr ""
 msgid "No directories found for user %s"
 msgstr ""
 
-#: ../pykolab/cli/cmd_list_mailboxes.py:44
+#: ../pykolab/cli/cmd_find_domain.py:36
+msgid "Find a domain."
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_deleted_mailboxes.py:43
+#: ../pykolab/cli/cmd_list_domain_mailboxes.py:41
+#: ../pykolab/cli/cmd_list_mailboxes.py:45
+#: ../pykolab/cli/cmd_list_user_subscriptions.py:41
 msgid "Display raw IMAP UTF-7 folder names"
 msgstr ""
 
-#: ../pykolab/cli/cmd_list_mailboxes.py:75
+#: ../pykolab/cli/cmd_list_domain_mailboxes.py:58
+msgid "Domain"
+msgstr "Dominio"
+
+#: ../pykolab/cli/cmd_list_mailboxes.py:87
 #, python-format
 msgid "Appending folder search for %r"
 msgstr ""
 
-#: ../pykolab/cli/cmd_list_user_subscriptions.py:40
-msgid "List unsubscribed folders"
+#: ../pykolab/cli/cmd_list_mailbox_metadata.py:44
+msgid "List annotations as user USER"
 msgstr ""
 
-#: ../pykolab/cli/cmd_list_user_subscriptions.py:43
-msgid "List the folders a user is subscribed to."
+#: ../pykolab/cli/cmd_list_messages.py:43
+msgid "Include messages flagged as \\Deleted"
 msgstr ""
 
-#: ../pykolab/cli/cmd_list_user_subscriptions.py:88
+#: ../pykolab/cli/cmd_list_messages.py:47
+msgid "List messages in a folder"
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_quota.py:73 ../pykolab/cli/cmd_list_quota.py:89
+#, python-format
+msgid "The quota for folder %s is set to literally allow 0KB of storage."
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_user_subscriptions.py:47
+msgid "List unsubscribed folders"
+msgstr "Lista de carpetas no subscritas"
+
+#: ../pykolab/cli/cmd_list_user_subscriptions.py:50
+msgid "List the folders a user is subscribed to."
+msgstr "Lista de carpetas a las que está subscrito un usuario."
+
+#: ../pykolab/cli/cmd_list_user_subscriptions.py:98
 #, python-format
 msgid "No unsubscribed folders for user %s"
 msgstr ""
 
+#: ../pykolab/cli/cmd_mailbox_cleanup.py:37
+msgid "Clean up mailboxes that do no longer have an owner."
+msgstr ""
+
+#: ../pykolab/cli/cmd_mailbox_cleanup.py:61
+#, python-format
+msgid "Deleting folder 'user/%s'"
+msgstr ""
+
 #: ../pykolab/cli/cmd_remove_mailaddress.py:49
 msgid "Invalid or unqualified email address."
 msgstr ""
@@ -810,23 +1091,23 @@ msgstr ""
 
 #: ../pykolab/cli/cmd_remove_user_subscription.py:92
 #, python-format
-msgid "User %s not be unsubscribed from any folders."
+msgid "User %s was not unsubscribed from any folders."
 msgstr ""
 
-#: ../pykolab/cli/cmd_rename_mailbox.py:48
+#: ../pykolab/cli/cmd_rename_mailbox.py:52
 msgid "No target mailbox name specified"
 msgstr ""
 
-#: ../pykolab/cli/cmd_rename_mailbox.py:50
+#: ../pykolab/cli/cmd_rename_mailbox.py:54
 msgid "No source mailbox name specified"
 msgstr ""
 
-#: ../pykolab/cli/cmd_rename_mailbox.py:62
+#: ../pykolab/cli/cmd_rename_mailbox.py:66
 #, python-format
 msgid "Source folder %r does not exist"
 msgstr ""
 
-#: ../pykolab/cli/cmd_rename_mailbox.py:66
+#: ../pykolab/cli/cmd_rename_mailbox.py:70
 #, python-format
 msgid "Target folder %r already exists"
 msgstr ""
@@ -837,17 +1118,75 @@ msgstr ""
 msgid "ACI Permissions"
 msgstr ""
 
-#: ../pykolab/cli/cmd_set_mailbox_metadata.py:47
-#: ../pykolab/cli/cmd_set_mailbox_metadata.py:51
-#: ../pykolab/cli/cmd_set_mailbox_metadata.py:56
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:45
+msgid "Set annotation as user USER"
+msgstr ""
+
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:59
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:63
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:68
 msgid "Metadata value"
 msgstr ""
 
-#: ../pykolab/cli/cmd_set_mailbox_metadata.py:50
-#: ../pykolab/cli/cmd_set_mailbox_metadata.py:55
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:62
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:67
 msgid "Metadata path"
 msgstr ""
 
+#: ../pykolab/cli/cmd_set_quota.py:43 ../pykolab/cli/cmd_set_quota.py:47
+msgid "New quota"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:44
+msgid "Delete mailboxes for recipients that do not appear to exist in LDAP."
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:50
+msgid "Display changes, do not apply them."
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:88
+#, python-format
+msgid "Domains in IMAP not in LDAP: %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:101
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:142
+#, python-format
+msgid ""
+"No recipients for '%s' (would have deleted the mailbox if not for --dry-"
+"run)!"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:106
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:147
+#, python-format
+msgid "Deleting mailbox '%s' because it has no recipients"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:110
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:151
+#, python-format
+msgid "An error occurred removing mailbox %r: %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:112
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:153
+#, python-format
+msgid "Not automatically deleting shared folder '%s'"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:114
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:155
+#, python-format
+msgid "No recipients for '%s' (use --delete to delete)!"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:136
+#, python-format
+msgid "Multiple recipients for '%s'!"
+msgstr ""
+
 #: ../pykolab/cli/cmd_sync.py:41
 #, python-format
 msgid "Found %d domains in %d seconds"
@@ -858,39 +1197,124 @@ msgstr "Encontrados %d dominios en %d segundos"
 msgid "Running for domain %s"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync.py:57
+#: ../pykolab/cli/cmd_sync.py:58
 #, python-format
 msgid "Synchronizing users for %s took %d seconds"
 msgstr ""
 
-#: ../pykolab/cli/cmd_undelete_mailbox.py:33
+#: ../pykolab/cli/cmd_undelete_mailbox.py:39
+msgid "Do not actually execute, but state what would have been executed."
+msgstr ""
+
+#: ../pykolab/cli/cmd_undelete_mailbox.py:42
 msgid "Recover mailboxes previously deleted."
 msgstr ""
 
+#: ../pykolab/cli/cmd_user_info.py:39
+msgid "Email address"
+msgstr ""
+
 #. This is a nested command
 #. This is a nested component
-#: ../pykolab/cli/commands.py:98 ../pykolab/setup/components.py:90
+#: ../pykolab/cli/commands.py:97 ../pykolab/setup/components.py:90
 #, python-format
 msgid "Command Group: %s"
 msgstr ""
 
-#: ../pykolab/cli/commands.py:109 ../pykolab/cli/commands.py:114
+#: ../pykolab/cli/commands.py:112 ../pykolab/cli/commands.py:117
 msgid "No such command."
 msgstr ""
 
-#: ../pykolab/cli/commands.py:165 ../pykolab/setup/components.py:231
+#: ../pykolab/cli/commands.py:167 ../pykolab/setup/components.py:231
 #, python-format
 msgid "Command '%s' already registered"
 msgstr ""
 
-#: ../pykolab/cli/commands.py:190 ../pykolab/setup/components.py:257
-#: ../wallace/modules.py:338
+#: ../pykolab/cli/commands.py:192 ../pykolab/setup/components.py:257
+#: ../wallace/modules.py:369
 #, python-format
 msgid "Alias for %s"
-msgstr ""
+msgstr "Alias para %s"
 
-#: ../pykolab/cli/commands.py:198 ../pykolab/setup/components.py:265
+#: ../pykolab/cli/commands.py:200 ../pykolab/setup/components.py:265
 msgid "Not yet implemented"
+msgstr "No se ha implementado"
+
+#: ../pykolab/cli/sieve/cmd_list.py:43 ../pykolab/cli/sieve/cmd_put.py:42
+#: ../pykolab/cli/sieve/cmd_refresh.py:44 ../pykolab/cli/sieve/cmd_test.py:43
+msgid "Email Address"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:99
+#: ../pykolab/plugins/sievemgmt/__init__.py:111
+#, python-format
+msgid "Found the following scripts for user %s: %s"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:100
+#: ../pykolab/plugins/sievemgmt/__init__.py:112
+#, python-format
+msgid "And the following script is active for user %s: %s"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:178
+#: ../pykolab/plugins/sievemgmt/__init__.py:190
+#, python-format
+msgid ""
+"Delivery to folder active, but no folder name attribute available for user "
+"%r"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:181
+#: ../pykolab/plugins/sievemgmt/__init__.py:193
+msgid "Delivery to folder active, but no folder name attribute configured"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:359
+#, python-format
+msgid "MANAGEMENT script for user %s contents: %r"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:364
+#: ../pykolab/plugins/sievemgmt/__init__.py:374
+#, python-format
+msgid "Uploading script MANAGEMENT failed for user %s"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:366
+#: ../pykolab/plugins/sievemgmt/__init__.py:376
+#, python-format
+msgid "Uploading script MANAGEMENT for user %s succeeded"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:377
+#: ../pykolab/plugins/sievemgmt/__init__.py:387
+#, python-format
+msgid "Including script %s in USER (for user %s)"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:386
+#: ../pykolab/plugins/sievemgmt/__init__.py:396
+#, python-format
+msgid "Uploading script USER failed for user %s"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:388
+#: ../pykolab/plugins/sievemgmt/__init__.py:398
+#, python-format
+msgid "Uploading script USER for user %s succeeded"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:416
+#: ../pykolab/plugins/sievemgmt/__init__.py:426
+#, python-format
+msgid "Uploading script MASTER failed for user %s"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:418
+#: ../pykolab/plugins/sievemgmt/__init__.py:428
+#, python-format
+msgid "Uploading script MASTER for user %s succeeded"
 msgstr ""
 
 #: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:40
@@ -904,7 +1328,7 @@ msgstr ""
 #: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:60
 #: ../pykolab/cli/telemetry/cmd_examine_session.py:65
 msgid "Invalid session identifier"
-msgstr ""
+msgstr "Identificador de sesión no válido"
 
 #: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:75
 #: ../pykolab/cli/telemetry/cmd_examine_session.py:100
@@ -914,26 +1338,27 @@ msgstr ""
 
 #: ../pykolab/cli/telemetry/cmd_examine_session.py:43
 msgid "Unspecified session identifier"
-msgstr ""
+msgstr "Identificador de sesión no especificado"
 
 #: ../pykolab/cli/telemetry/cmd_list_sessions.py:35
 msgid "List Options"
-msgstr ""
+msgstr "Opciones de la lista"
 
 #: ../pykolab/cli/telemetry/cmd_list_sessions.py:40
 msgid "Display sessions since ..."
-msgstr ""
+msgstr "Mostrar sesiones desde..."
 
 #: ../pykolab/cli/telemetry/cmd_list_sessions.py:58
 #, python-format
 msgid "Session for user %s started at %s with ID %s"
-msgstr ""
+msgstr "La sesión del usuario %s comenzó a las %s con el ID %s "
 
 #: ../pykolab/conf/entitlement.py:57 ../pykolab/conf/entitlement.py:80
 #: ../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
-msgid "Invalid entitlement verification "
+#, python-format
+msgid "Invalid entitlement verification certificate at %s"
 msgstr ""
 
 #: ../pykolab/conf/entitlement.py:120 ../pykolab/conf/entitlement.py:123
@@ -943,7 +1368,7 @@ msgstr ""
 #: ../pykolab/conf/entitlement.py:132
 #, python-format
 msgid "Parsing entitlement file %s"
-msgstr ""
+msgstr "Parsing entitlement file %s"
 
 #: ../pykolab/conf/entitlement.py:141
 #, python-format
@@ -1015,12 +1440,14 @@ msgid "Configuration file to use"
 msgstr "Configuración del archivo a utilizar"
 
 #: ../pykolab/conf/__init__.py:278
-msgid "Set the debugging "
-msgstr "Establecer el nivel de depuración"
+msgid ""
+"Set the debugging verbosity. Maximum is 9, tracing protocols like LDAP, SQL "
+"and IMAP."
+msgstr ""
 
 #: ../pykolab/conf/__init__.py:286
-msgid "Set the logging level. "
-msgstr "Establecer el nivel de registro"
+msgid "Set the logging level. One of info, warn, error, critical or debug"
+msgstr ""
 
 #: ../pykolab/conf/__init__.py:294
 msgid "Log file to use"
@@ -1038,76 +1465,77 @@ msgstr "Responde Sí a todas las preguntas."
 msgid "No command supplied"
 msgstr "No se ha proporcionado ningún comando"
 
-#: ../pykolab/conf/__init__.py:411
+#: ../pykolab/conf/__init__.py:416
 msgid "Insufficient options. Need section, key and value -in that order."
 msgstr "Opciones insuficientes. Debes proporcionar la sección, la clave y el valor en este orden."
 
-#: ../pykolab/conf/__init__.py:414
+#: ../pykolab/conf/__init__.py:419
 #, python-format
 msgid "No section '%s' exists."
 msgstr "No existe la sección '%s'."
 
-#: ../pykolab/conf/__init__.py:445
+#: ../pykolab/conf/__init__.py:461
 #, python-format
 msgid "Setting %s to %r (from the default values for CLI options)"
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:514
+#: ../pykolab/conf/__init__.py:534
 #, python-format
 msgid "Could not execute configuration function: %s"
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:522
+#: ../pykolab/conf/__init__.py:542
 #, python-format
 msgid "Option %s/%s does not exist in config file %s, pulling from defaults"
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:530 ../pykolab/conf/__init__.py:533
+#: ../pykolab/conf/__init__.py:550 ../pykolab/conf/__init__.py:553
 msgid "Option does not exist in defaults."
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:543
+#: ../pykolab/conf/__init__.py:563
 #, python-format
 msgid "Configuration file %s not readable."
 msgstr "No se puede leer el archivo de configuración %s."
 
-#: ../pykolab/conf/__init__.py:546
+#: ../pykolab/conf/__init__.py:566
 #, python-format
 msgid "Configuration file %s does not exist."
 msgstr "El archivo de configuración %s no existe."
 
-#: ../pykolab/conf/__init__.py:551
+#: ../pykolab/conf/__init__.py:571
 msgid ""
 "WARNING: A negative debug level value does not make this program be any more"
 " silent."
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:557
+#: ../pykolab/conf/__init__.py:577
 msgid "This program has 9 levels of verbosity. Using the maximum of 9."
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:565 ../pykolab/conf/__init__.py:571
+#: ../pykolab/conf/__init__.py:585 ../pykolab/conf/__init__.py:591
+#: ../pykolab/conf/__init__.py:595 ../pykolab/conf/__init__.py:601
 msgid "Cannot start SASL authentication daemon"
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:582
+#: ../pykolab/conf/__init__.py:612
 msgid "No imaplib library found."
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:592
+#: ../pykolab/conf/__init__.py:622
 msgid "No LMTP class found in the smtplib library."
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:602
+#: ../pykolab/conf/__init__.py:632
 msgid "No SMTP class found in the smtplib library."
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:616
+#: ../pykolab/conf/__init__.py:646
 #, python-format
 msgid "Found you specified a specific set of items to test: %s"
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:624
+#: ../pykolab/conf/__init__.py:654
 #, python-format
 msgid "Selectively selecting: %s"
 msgstr ""
@@ -1116,7 +1544,7 @@ msgstr ""
 msgid ""
 "PyKolab is a Kolab Systems product. For more information about Kolab or "
 "PyKolab, visit http://www.kolabsys.com"
-msgstr ""
+msgstr "PyKolab es un producto de Kolab Systems. Para obtener más información acerca de Kolab o PyKolab, puede visitar http://www.kolabsys.com"
 
 #: ../pykolab/constants.py.in:53
 msgid "WARNING"
@@ -1136,249 +1564,344 @@ msgstr ""
 msgid "OpenLDAP or compatible"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:79
+#: ../pykolab/imap/cyrus.py:80
 #, python-format
 msgid "Could not connect to Cyrus IMAP server %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:134
+#: ../pykolab/imap/cyrus.py:138
 #, python-format
 msgid "Continuing with separator: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:139
+#: ../pykolab/imap/cyrus.py:143
 msgid "Detected we are running in a Murder topology"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:143
+#: ../pykolab/imap/cyrus.py:147
 msgid "This system is not part of a murder topology"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:164
+#: ../pykolab/imap/cyrus.py:168
 #, python-format
 msgid "Checking actual backend server for folder %s through annotations"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:179
+#: ../pykolab/imap/cyrus.py:173
+#, python-format
+msgid ""
+"Possibly reproducing the find mailfolder server answer from previously "
+"detected and stored annotation value: %r"
+msgstr ""
+
+#: ../pykolab/imap/cyrus.py:196
 #, python-format
 msgid "Could not get the annotations after %s tries."
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:183
+#: ../pykolab/imap/cyrus.py:200
 #, python-format
 msgid "No annotations for %s: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:190
+#: ../pykolab/imap/cyrus.py:207
 #, python-format
 msgid "Server for INBOX folder %s is %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:202
+#: ../pykolab/imap/cyrus.py:227
 #, python-format
 msgid "Setting quota for folder %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:206
+#: ../pykolab/imap/cyrus.py:231
 #, python-format
 msgid "Could not set quota for mailfolder %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:215
+#: ../pykolab/imap/cyrus.py:241
+#, python-format
+msgid "Moving INBOX folder %s to %s on partition %s"
+msgstr ""
+
+#: ../pykolab/imap/cyrus.py:243
 #, python-format
 msgid "Moving INBOX folder %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:227
+#: ../pykolab/imap/cyrus.py:259
 #, python-format
 msgid "Setting annotation %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:234
+#: ../pykolab/imap/cyrus.py:264
 #, python-format
 msgid "Could not set annotation %r on mail folder %r: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:238
+#: ../pykolab/imap/cyrus.py:268
 #, python-format
 msgid "Transferring folder %s from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:298
+#: ../pykolab/imap/cyrus.py:328
 #, python-format
 msgid "Undeleting %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:45
+#: ../pykolab/imap/cyrus.py:339
+#, python-format
+msgid "Would have transfered %s from %s to %s"
+msgstr ""
+
+#: ../pykolab/imap/cyrus.py:341
+#, python-format
+msgid "Would have renamed %s to %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:46
 #, python-format
 msgid "Cleaning up ACL entries for %s across all folders"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:60
+#: ../pykolab/imap/__init__.py:61
 #, python-format
 msgid "Cleaning up ACL entries referring to identifier %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:69
+#: ../pykolab/imap/__init__.py:70
 #, python-format
 msgid "Iterating over %d folders"
 msgstr ""
 
 #. Set the ACL to '' (effectively deleting the ACL entry)
-#: ../pykolab/imap/__init__.py:82
+#: ../pykolab/imap/__init__.py:83
 #, python-format
 msgid "Removing acl %r for subject %r from folder %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:143
+#: ../pykolab/imap/__init__.py:145
+msgid "No administrator password is available."
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:153
 #, python-format
 msgid "Logging on to Cyrus IMAP server %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:152
+#: ../pykolab/imap/__init__.py:162
 #, python-format
 msgid "Logging on to Dovecot IMAP server %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:161
+#: ../pykolab/imap/__init__.py:171
 #, python-format
 msgid "Logging on to generic IMAP server %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:179
+#: ../pykolab/imap/__init__.py:189
 #, python-format
 msgid "Reusing existing IMAP server connection to %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:181
+#: ../pykolab/imap/__init__.py:191
 #, python-format
 msgid "Reconnecting to IMAP server %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:197
+#: ../pykolab/imap/__init__.py:208
 msgid "Called imap.disconnect() on a server that we had no connection to."
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:212
+#: ../pykolab/imap/__init__.py:221 ../pykolab/imap/__init__.py:233
+#, python-format
+msgid "Could not create folder %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:222
+#, python-format
+msgid " on server %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:243 ../pykolab/imap/__init__.py:245
 #, python-format
 msgid "%r has no attribute %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:285
-msgid "Private annotations need to be set using the appropriate user account."
+#: ../pykolab/imap/__init__.py:373
+#, python-format
+msgid "Could not set ACL for %s on folder %s: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:318 ../pykolab/imap/__init__.py:353
+#: ../pykolab/imap/__init__.py:407 ../pykolab/imap/__init__.py:442
 #, python-format
 msgid "Creating new shared folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:375
+#: ../pykolab/imap/__init__.py:467 ../pykolab/imap/__init__.py:689
+#, python-format
+msgid "Downcasing mailbox name %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:471
 #, python-format
 msgid "Creating new mailbox for user %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:404
+#: ../pykolab/imap/__init__.py:484
+msgid "Waiting for the Cyrus IMAP Murder to settle..."
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:530
 #, python-format
 msgid "Creating additional folders for user %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:428
+#: ../pykolab/imap/__init__.py:549
+#, python-format
+msgid "Waiting for the Cyrus murder to settle... %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:561
+#, python-format
+msgid "Correcting additional folder name from %r to %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:567
 #, python-format
 msgid "Mailbox already exists: %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:471
+#: ../pykolab/imap/__init__.py:607
 msgid "Subscribing user to the additional folders"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:531 ../pykolab/imap/__init__.py:605
+#: ../pykolab/imap/__init__.py:621
+msgid "Using the following tests for folder subscriptions:"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:623
+#, python-format
+msgid "    %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:626
+#, python-format
+msgid "Folder %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:638
+#, python-format
+msgid "Subscribing %s to folder %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:642
+#, python-format
+msgid "Subscribing %s to folder %s failed: %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:672
+#, python-format
+msgid "Could not rename %s to reside on partition %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:705
+#, python-format
+msgid "INBOX folder to rename (%s) does not exist"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:708 ../pykolab/imap/__init__.py:784
 #, python-format
 msgid "Renaming INBOX from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:535
+#: ../pykolab/imap/__init__.py:712
 #, python-format
 msgid "Could not rename INBOX folder %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:537 ../pykolab/imap/__init__.py:609
+#: ../pykolab/imap/__init__.py:714 ../pykolab/imap/__init__.py:788
 #, python-format
 msgid ""
 "Moving INBOX folder %s won't succeed as target folder %s already exists"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:547
+#: ../pykolab/imap/__init__.py:718
+#, python-format
+msgid "Server for mailbox %r is %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:726
 #, python-format
 msgid "Looking for folder '%s', we found folders: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:570
+#: ../pykolab/imap/__init__.py:749
 #, python-format
-msgid "Setting ACL rights %s for subject %s on folder "
+msgid "Setting ACL rights %s for subject %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:581
+#: ../pykolab/imap/__init__.py:760
 #, python-format
-msgid "Removing ACL rights %s for subject %s on folder "
+msgid "Removing ACL rights %s for subject %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:602
+#: ../pykolab/imap/__init__.py:781
 #, python-format
 msgid "Found old INBOX folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:611
+#: ../pykolab/imap/__init__.py:790
 #, python-format
 msgid "Did not find old folder user/%s to rename"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:613
+#: ../pykolab/imap/__init__.py:792
 msgid "Value for user is not a dictionary"
 msgstr ""
 
 #. TODO: Go in fact correct the quota.
-#: ../pykolab/imap/__init__.py:673
+#: ../pykolab/imap/__init__.py:860
 #, python-format
 msgid "Cannot get current IMAP quota for folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:686
+#: ../pykolab/imap/__init__.py:873
 #, python-format
 msgid "Quota for %s currently is %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:692
+#: ../pykolab/imap/__init__.py:879
 #, python-format
 msgid "Adjusting authentication database quota for folder %s to %d"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:697
+#: ../pykolab/imap/__init__.py:884
 #, python-format
 msgid "Correcting quota for %s to %s (currently %s)"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:774
+#: ../pykolab/imap/__init__.py:961
 #, python-format
 msgid "Checking folder: %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:779
+#: ../pykolab/imap/__init__.py:966
 #, python-format
 msgid "Folder has no corresponding user (1): %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:782
+#: ../pykolab/imap/__init__.py:969
 #, python-format
 msgid "Folder has no corresponding user (2): %s"
 msgstr ""
 
 #. We got user identifier only
-#: ../pykolab/imap/__init__.py:797
+#: ../pykolab/imap/__init__.py:984
 msgid "Please don't give us just a user identifier"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:800
+#: ../pykolab/imap/__init__.py:987
 #, python-format
 msgid "Deleting folder %s"
 msgstr "Borrando la carpeta %s"
@@ -1387,12 +1910,62 @@ msgstr "Borrando la carpeta %s"
 msgid "Returning thread local configuration"
 msgstr ""
 
-#: ../pykolab/logger.py:105
+#: ../pykolab/itip/__init__.py:45
+#, python-format
+msgid "Method %r not really interesting for us."
+msgstr ""
+
+#: ../pykolab/itip/__init__.py:51
+#, python-format
+msgid "Raw iTip payload: %s"
+msgstr ""
+
+#: ../pykolab/itip/__init__.py:61
+msgid "Could not read iTip from message."
+msgstr ""
+
+#: ../pykolab/itip/__init__.py:69
+#, python-format
+msgid "Duplicate iTip object: %s"
+msgstr ""
+
+#: ../pykolab/itip/__init__.py:93
+msgid "iTip event without a start"
+msgstr ""
+
+#: ../pykolab/itip/__init__.py:138
+msgid "Message is not an iTip message (non-multipart message)"
+msgstr ""
+
+#: ../pykolab/itip/__init__.py:221
+#, python-format
+msgid "Send iTip reply %s for %s %r"
+msgstr ""
+
+#: ../pykolab/itip/__init__.py:237
+#, python-format
+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
+#, python-format
+msgid "SMTP sendmail error: %r"
+msgstr ""
+
+#: ../pykolab/itip/__init__.py:280
+#, python-format
+msgid "Failed to compose iTip request message: %r"
+msgstr ""
+
+#: ../pykolab/logger.py:168 ../pykolab/logger.py:175
 #, python-format
-msgid "Could not change the ownership of log file %s"
-msgstr "Imposible cambiar el propietario del archivo de registro %s"
+msgid "Could not change permissions on %s: %r"
+msgstr ""
 
-#: ../pykolab/logger.py:121
+#: ../pykolab/logger.py:192
 #, python-format
 msgid "Cannot log to file %s: %s"
 msgstr "Imposible guardar los datos de registro en el archivo %s: %s"
@@ -1490,19 +2063,54 @@ msgstr "No se puede ejecutarel hook %s para el plugin %s: %s"
 msgid "Attribute substitution for 'mail' failed in Recipient Policy"
 msgstr ""
 
-#: ../pykolab/plugins/recipientpolicy/__init__.py:115
+#: ../pykolab/plugins/recipientpolicy/__init__.py:116
 msgid "Could not parse the alternative mail routines"
 msgstr ""
 
+#: ../pykolab/plugins/recipientpolicy/__init__.py:120
+#, python-format
+msgid "Alternative mail routines: %r"
+msgstr ""
+
 #: ../pykolab/plugins/recipientpolicy/__init__.py:127
-#: ../pykolab/plugins/recipientpolicy/__init__.py:137
+#, python-format
+msgid ""
+"An error occurred in composing the secondary mail attribute for entry %r"
+msgstr ""
+
+#: ../pykolab/plugins/recipientpolicy/__init__.py:138
+#: ../pykolab/plugins/recipientpolicy/__init__.py:153
+#, python-format
+msgid "Appending additional mail address: %s"
+msgstr ""
+
+#: ../pykolab/plugins/recipientpolicy/__init__.py:142
+#, python-format
+msgid "Policy for secondary email address failed: %r"
+msgstr ""
+
+#: ../pykolab/plugins/recipientpolicy/__init__.py:157
 msgid ""
 "Attribute substitution for 'alternative_mail' failed in Recipient Policy"
 msgstr ""
 
+#: ../pykolab/plugins/roundcubedb/__init__.py:48
+#, python-format
+msgid "user_delete: %r"
+msgstr ""
+
+#: ../pykolab/plugins/roundcubedb/__init__.py:55
+#: ../pykolab/setup/setup_roundcube.py:161
+msgid "Roundcube installation path not found."
+msgstr ""
+
+#: ../pykolab/plugins/sievemgmt/__init__.py:51
+msgid "Wrong number of arguments for sieve management plugin"
+msgstr ""
+
 #: ../pykolab/setup/components.py:58
 msgid "Display this help."
-msgstr ""
+msgstr "Mostrar esta ayuda"
 
 #: ../pykolab/setup/components.py:149
 msgid "No component selected, continuing for all components"
@@ -1520,54 +2128,33 @@ msgstr ""
 msgid "Free/Busy is not installed on this system"
 msgstr ""
 
-#: ../pykolab/setup/setup_freebusy.py:55
-msgid ""
-"\n"
-"                        Please supply the MySQL password for the 'roundcube'\n"
-"                        user. You have supplied this password earlier, and it is\n"
-"                        available from the database URI setting in\n"
-"                        /etc/roundcubemail/db.inc.php.\n"
-"                    "
-msgstr ""
-
-#: ../pykolab/setup/setup_freebusy.py:64
-#: ../pykolab/setup/setup_roundcube.py:56
-msgid "MySQL roundcube password"
-msgstr ""
-
-#: ../pykolab/setup/setup_freebusy.py:92
-#: ../pykolab/setup/setup_roundcube.py:116 ../pykolab/setup/setup_zpush.py:71
-#, python-format
-msgid "Using template file %r"
-msgstr ""
+#: ../pykolab/setup/setup_imap.py:45
+msgid "Setup IMAP."
+msgstr "Configurar IMAP."
 
-#: ../pykolab/setup/setup_freebusy.py:99
-#: ../pykolab/setup/setup_roundcube.py:123 ../pykolab/setup/setup_zpush.py:78
-#, python-format
-msgid "Successfully compiled template %r, writing out to %r"
+#: ../pykolab/setup/setup_imap.py:89
+msgid "Could not write out Cyrus IMAP configuration file /etc/imapd.conf"
 msgstr ""
 
-#: ../pykolab/setup/setup_freebusy.py:119 ../pykolab/setup/setup_imap.py:143
-#: ../pykolab/setup/setup_ldap.py:288 ../pykolab/setup/setup_ldap.py:521
-#: ../pykolab/setup/setup_mta.py:309 ../pykolab/setup/setup_mysql.py:49
-#: ../pykolab/setup/setup_roundcube.py:191
-#: ../pykolab/setup/setup_syncroton.py:66 ../pykolab/setup/setup_zpush.py:98
-msgid "Could not start and configure to start on boot, the "
+#: ../pykolab/setup/setup_imap.py:114
+msgid "Could not write out Cyrus IMAP configuration file /etc/cyrus.conf"
 msgstr ""
 
-#: ../pykolab/setup/setup_imap.py:44
-msgid "Setup IMAP."
+#: ../pykolab/setup/setup_imap.py:158
+msgid "Could not start the cyrus-imapd and kolab-saslauthd services."
 msgstr ""
 
-#: ../pykolab/setup/setup_imap.py:88 ../pykolab/setup/setup_imap.py:113
-msgid "Could not write out Cyrus IMAP configuration file /etc/imapd.conf"
+#: ../pykolab/setup/setup_imap.py:173
+msgid ""
+"Could not configure to start on boot, the cyrus-imapd and kolab-saslauthd "
+"services."
 msgstr ""
 
-#: ../pykolab/setup/setup_kolabd.py:43
+#: ../pykolab/setup/setup_kolabd.py:44
 msgid "Setup the Kolab daemon."
-msgstr ""
+msgstr "Configurar el demonio de Kolab."
 
-#: ../pykolab/setup/setup_kolabd.py:51
+#: ../pykolab/setup/setup_kolabd.py:52
 #, python-format
 msgid ""
 "\n"
@@ -1576,23 +2163,66 @@ msgid ""
 "                        "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:43
+#: ../pykolab/setup/setup_kolabd.py:81
+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 ""
 
-#: ../pykolab/setup/setup_ldap.py:50
+#: ../pykolab/setup/setup_ldap.py:52
 msgid "Specify FQDN (overriding defaults)."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:58
+#: ../pykolab/setup/setup_ldap.py:60
 msgid "Allow anonymous binds (default: no)."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:62
+#: ../pykolab/setup/setup_ldap.py:68
+msgid "Skip setting up the LDAP server."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:76
+msgid "Setup configuration for OpenLDAP compatibility."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:84
+msgid "Setup configuration for Active Directory compatibility."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:88
 msgid "Setup LDAP."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:74
+#: ../pykolab/setup/setup_ldap.py:97
+msgid "Skipping setup of LDAP, as specified"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:126
+msgid ""
+"\n"
+"                        You can not configure Kolab to run against OpenLDAP\n"
+"                        and Active Directory simultaneously.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:139
+msgid ""
+"\n"
+"                                It seems 389 Directory Server has an existing\n"
+"                                instance configured. This setup script does not\n"
+"                                intend to destroy or overwrite your data. Please\n"
+"                                make sure /etc/dirsrv/ and /var/lib/dirsrv/ are\n"
+"                                clean so that this setup does not have to worry.\n"
+"                            "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:154
 msgid ""
 "\n"
 "                        Please supply a password for the LDAP administrator user\n"
@@ -1601,11 +2231,11 @@ msgid ""
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:82
+#: ../pykolab/setup/setup_ldap.py:162
 msgid "Administrator password"
-msgstr ""
+msgstr "Contraseña de administrador"
 
-#: ../pykolab/setup/setup_ldap.py:89
+#: ../pykolab/setup/setup_ldap.py:169
 msgid ""
 "\n"
 "                        Please supply a password for the LDAP Directory Manager\n"
@@ -1615,11 +2245,11 @@ msgid ""
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:98
+#: ../pykolab/setup/setup_ldap.py:178
 msgid "Directory Manager password"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:105
+#: ../pykolab/setup/setup_ldap.py:185
 msgid ""
 "\n"
 "                        Please choose the system user and group the service\n"
@@ -1628,15 +2258,15 @@ msgid ""
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:112
+#: ../pykolab/setup/setup_ldap.py:195 ../pykolab/setup/setup_ldap.py:198
 msgid "User"
-msgstr ""
+msgstr "Usuario"
 
-#: ../pykolab/setup/setup_ldap.py:113
+#: ../pykolab/setup/setup_ldap.py:196 ../pykolab/setup/setup_ldap.py:199
 msgid "Group"
-msgstr ""
+msgstr "Grupo"
 
-#: ../pykolab/setup/setup_ldap.py:143
+#: ../pykolab/setup/setup_ldap.py:234
 msgid ""
 "\n"
 "                        This setup procedure plans to set up Kolab Groupware for\n"
@@ -1647,18 +2277,18 @@ msgid ""
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:157
+#: ../pykolab/setup/setup_ldap.py:248
 msgid "Domain name to use"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:162 ../pykolab/setup/setup_ldap.py:187
+#: ../pykolab/setup/setup_ldap.py:253 ../pykolab/setup/setup_ldap.py:278
 msgid ""
 "\n"
 "                                    Invalid input. Please try again.\n"
 "                                "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:171
+#: ../pykolab/setup/setup_ldap.py:262
 msgid ""
 "\n"
 "                        The standard root dn we composed for you follows. Please\n"
@@ -1666,11 +2296,15 @@ msgid ""
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:182
+#: ../pykolab/setup/setup_ldap.py:273
 msgid "Root DN to use"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:234
+#: ../pykolab/setup/setup_ldap.py:325
+msgid "No directory server setup tool available."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:337
 msgid ""
 "\n"
 "                    Setup is now going to set up the 389 Directory Server. This\n"
@@ -1679,24 +2313,46 @@ msgid ""
 "                "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:241
+#: ../pykolab/setup/setup_ldap.py:344
 msgid "Setting up 389 Directory Server"
 msgstr ""
 
-#. TODO: Get the return code and display output if not successful.
-#: ../pykolab/setup/setup_ldap.py:253
+#: ../pykolab/setup/setup_ldap.py:356
+msgid ""
+"\n"
+"                        An error was detected in the setup procedure for 389\n"
+"                        Directory Server. This setup will write out stderr and\n"
+"                        stdout to /var/log/kolab/setup.error.log and\n"
+"                        /var/log/kolab/setup.out.log respectively, before it\n"
+"                        exits.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:373
 msgid "Setup DS stdout:"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:256
+#: ../pykolab/setup/setup_ldap.py:376
 msgid "Setup DS stderr:"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:279 ../pykolab/setup/setup_mysql.py:129
-msgid "Could not find the Kolab schema file"
+#: ../pykolab/setup/setup_ldap.py:402
+msgid "Could not copy the LDAP extensions for Kolab"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:405
+msgid "Could not find the ldap Kolab schema file"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:417
+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:293
+#: ../pykolab/setup/setup_ldap.py:431
 msgid ""
 "\n"
 "                        Please supply a Cyrus Administrator password. This\n"
@@ -1707,11 +2363,11 @@ msgid ""
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:303
+#: ../pykolab/setup/setup_ldap.py:441
 msgid "Cyrus Administrator password"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:310
+#: ../pykolab/setup/setup_ldap.py:448
 msgid ""
 "\n"
 "                        Please supply a Kolab Service account password. This\n"
@@ -1721,136 +2377,196 @@ msgid ""
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:319
+#: ../pykolab/setup/setup_ldap.py:457
 msgid "Kolab Service password"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:329
+#: ../pykolab/setup/setup_ldap.py:467
 msgid "Writing out configuration to kolab.conf"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:343
+#: ../pykolab/setup/setup_ldap.py:481
 msgid "Inserting service users into LDAP."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:417
+#: ../pykolab/setup/setup_ldap.py:555
 msgid "Writing out cn=kolab,cn=config"
 msgstr ""
 
 #. TODO: Add kolab-admin role
 #. TODO: Assign kolab-admin admin ACLs
-#: ../pykolab/setup/setup_ldap.py:441
+#: ../pykolab/setup/setup_ldap.py:579
 #, python-format
 msgid "Adding domain %s to list of domains for this deployment"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:457
+#: ../pykolab/setup/setup_ldap.py:607
 msgid "Disabling anonymous binds"
 msgstr ""
 
 #. TODO: Ensure the uid attribute is unique
 #. TODO^2: Consider renaming the general "attribute uniqueness to "uid
 #. attribute uniqueness"
-#: ../pykolab/setup/setup_ldap.py:465
+#: ../pykolab/setup/setup_ldap.py:615
 msgid "Enabling attribute uniqueness plugin"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:471
+#: ../pykolab/setup/setup_ldap.py:621
 msgid "Enabling referential integrity plugin"
-msgstr ""
+msgstr "Habilitar el plugin de integridad referencial"
 
-#: ../pykolab/setup/setup_ldap.py:477
+#: ../pykolab/setup/setup_ldap.py:627
 msgid "Enabling and configuring account policy plugin"
 msgstr ""
 
 #. TODO: Add kolab-admin role
-#: ../pykolab/setup/setup_ldap.py:492
+#: ../pykolab/setup/setup_ldap.py:642
 msgid "Adding the kolab-admin role"
-msgstr ""
+msgstr "Añadir el rol kolab-admin"
 
 #. TODO: User writeable attributes on root_dn
-#: ../pykolab/setup/setup_ldap.py:503
+#: ../pykolab/setup/setup_ldap.py:653
 #, python-format
 msgid "Setting access control to %s"
+msgstr "Estableciendo control de acceso a %s"
+
+#: ../pykolab/setup/setup_ldap.py:679
+msgid ""
+"Could not start and configure to start on boot, the directory server admin "
+"service."
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:40
+#: ../pykolab/setup/setup_mta.py:41
 msgid "Setup MTA."
-msgstr ""
+msgstr "Configurar MTA."
 
-#: ../pykolab/setup/setup_mta.py:224 ../pykolab/setup/setup_php.py:80
+#: ../pykolab/setup/setup_mta.py:317 ../pykolab/setup/setup_php.py:106
 #, python-format
 msgid "Setting key %r to %r"
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:252
+#: ../pykolab/setup/setup_mta.py:350
 msgid "Could not write out Postfix configuration file /etc/postfix/master.cf"
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:287
+#: ../pykolab/setup/setup_mta.py:399
+msgid "Could not write out Amavis configuration file amavisd.conf"
+msgstr ""
+
+#: ../pykolab/setup/setup_mta.py:407
+msgid "Not writing out any configuration for Amavis."
+msgstr ""
+
+#: ../pykolab/setup/setup_mta.py:447
+msgid "Could not start the postfix, clamav and amavisd services services."
+msgstr ""
+
+#: ../pykolab/setup/setup_mta.py:465
 msgid ""
-"Could not write out Amavis configuration file /etc/amavisd/amavisd.conf"
+"Could not configure to start on boot, the postfix, clamav and amavisd "
+"services."
 msgstr ""
 
 #: ../pykolab/setup/setup_mysql.py:39
 msgid "Setup MySQL."
+msgstr "Configurar MySQL."
+
+#: ../pykolab/setup/setup_mysql.py:49
+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:53
+#: ../pykolab/setup/setup_mysql.py:71
+msgid "What MySQL server are we setting up?"
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:75
 msgid ""
 "\n"
-"                    Please supply a root password for MySQL. This password will\n"
-"                    be the administrative user for this MySQL server, and it\n"
-"                    should be kept a secret. After this setup process has\n"
-"                    completed, Kolab is going to discard and forget about this\n"
-"                    password, but you will need it for administrative tasks in\n"
-"                    MySQL.\n"
-"                "
+"                        Please supply the root password for MySQL, so we can set\n"
+"                        up user accounts for other components that use MySQL.\n"
+"                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:64
+#: ../pykolab/setup/setup_mysql.py:82 ../pykolab/setup/setup_mysql.py:99
+#: ../pykolab/setup/setup_roundcube.py:184
+#: ../pykolab/setup/setup_syncroton.py:66
 msgid "MySQL root password"
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:103
+#: ../pykolab/setup/setup_mysql.py:88
+msgid ""
+"\n"
+"                        Please supply a root password for MySQL. This password\n"
+"                        will be the administrative user for this MySQL server,\n"
+"                        and it should be kept a secret. After this setup process\n"
+"                        has completed, Kolab is going to discard and forget\n"
+"                        about this password, but you will need it for\n"
+"                        administrative tasks in MySQL.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:139
 msgid ""
 "\n"
 "                        Please supply a password for the MySQL user 'kolab'.\n"
 "                        This password will be used by Kolab services, such as\n"
 "                        the Web Administration Panel.\n"
 "                    "
-msgstr ""
+msgstr "\n                         Por favor proporcione una contraseña para el usuario de MySQL 'kolab'.Esta contraseña será utilizada por los servicios de Kolab, como por ejemplo el panel de administración web.\n                    "
 
-#: ../pykolab/setup/setup_mysql.py:111
+#: ../pykolab/setup/setup_mysql.py:147
 msgid "MySQL kolab password"
+msgstr "Contraseña de MySQL kolab"
+
+#: ../pykolab/setup/setup_mysql.py:166
+msgid "Could not find the MySQL Kolab schema file"
 msgstr ""
 
 #: ../pykolab/setup/setup_php.py:42
 msgid "PHP Options"
-msgstr ""
+msgstr "Opciones de PHP"
 
 #: ../pykolab/setup/setup_php.py:49
 msgid "Specify the timezone for PHP."
+msgstr "Especificar la zona horaria de PHP."
+
+#: ../pykolab/setup/setup_php.py:57
+msgid "Specify the path to the php.ini file used with the webserver."
 msgstr ""
 
-#: ../pykolab/setup/setup_php.py:53
+#: ../pykolab/setup/setup_php.py:61
 msgid "Setup PHP."
-msgstr ""
+msgstr "Configurar PHP."
 
-#: ../pykolab/setup/setup_php.py:58
+#: ../pykolab/setup/setup_php.py:66
 msgid ""
 "\n"
 "                        Please supply the timezone PHP should be using.\n"
+"                        You have to use a Continent or Country / City locality name\n"
+"                        like 'Europe/Berlin', but not just 'CEST'.\n"
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_php.py:64
+#: ../pykolab/setup/setup_php.py:74
 msgid "Timezone ID"
+msgstr "Identificador de la zona horaria"
+
+#: ../pykolab/setup/setup_php.py:80
+#, python-format
+msgid "Cannot configure PHP through %r (No such file or directory)"
+msgstr ""
+
+#: ../pykolab/setup/setup_php.py:91
+msgid "Could not find PHP configuration file php.ini"
 msgstr ""
 
 #: ../pykolab/setup/setup_roundcube.py:44
 msgid "Setup Roundcube."
-msgstr ""
+msgstr "Configurar Roundcube."
 
 #: ../pykolab/setup/setup_roundcube.py:48
 msgid ""
@@ -1861,16 +2577,32 @@ msgid ""
 "                "
 msgstr ""
 
-#: ../pykolab/setup/setup_syncroton.py:40
-msgid "Setup Syncroton."
+#: ../pykolab/setup/setup_roundcube.py:56
+msgid "MySQL roundcube password"
+msgstr "Contraseña de MySql de roundcube"
+
+#: ../pykolab/setup/setup_roundcube.py:120
+#, python-format
+msgid "Using template file %r"
 msgstr ""
 
-#: ../pykolab/setup/setup_zpush.py:41
-msgid "Setup zpush."
+#: ../pykolab/setup/setup_roundcube.py:127
+#, python-format
+msgid "Successfully compiled template %r, writing out to %r"
+msgstr ""
+
+#: ../pykolab/setup/setup_roundcube.py:229
+#: ../pykolab/setup/setup_syncroton.py:96
+msgid "Could not start the webserver server service."
 msgstr ""
 
-#: ../pykolab/setup/setup_zpush.py:45
-msgid "Z-Push is not installed on this system"
+#: ../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 ""
 
 #. start_max = (int)(time.time())
@@ -1898,174 +2630,861 @@ msgstr ""
 msgid "No database available"
 msgstr "Base de datos no disponible"
 
-#: ../pykolab/utils.py:57 ../pykolab/utils.py:59
+#: ../pykolab/utils.py:62 ../pykolab/utils.py:64
 #, python-format
 msgid "Confirm %s: "
 msgstr ""
 
-#: ../pykolab/utils.py:62
-msgid "Incorrect confirmation. "
+#: ../pykolab/utils.py:67
+msgid "Incorrect confirmation. Please try again."
 msgstr ""
 
-#: ../pykolab/utils.py:67 ../pykolab/utils.py:72
+#: ../pykolab/utils.py:72 ../pykolab/utils.py:77
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: ../pykolab/utils.py:69 ../pykolab/utils.py:74
+#: ../pykolab/utils.py:74 ../pykolab/utils.py:79
 #, python-format
 msgid "%s [%s]: "
 msgstr ""
 
-#: ../pykolab/utils.py:119
+#: ../pykolab/utils.py:124
 msgid "Please answer 'yes' or 'no'."
 msgstr ""
 
-#: ../pykolab/utils.py:185
+#: ../pykolab/utils.py:164
+msgid "Choice"
+msgstr ""
+
+#: ../pykolab/utils.py:167
+msgid "Choice (type '?' for options)"
+msgstr ""
+
+#: ../pykolab/utils.py:268
 #, python-format
 msgid "Could not change the permissions on %s"
 msgstr ""
 
-#: ../pykolab/wap_client/__init__.py:257
+#: ../pykolab/utils.py:479
+#, python-format
+msgid "Transliterating string %r with locale %r"
+msgstr ""
+
+#: ../pykolab/utils.py:487
+msgid "Attempting to set locale"
+msgstr ""
+
+#: ../pykolab/utils.py:489
+msgid "Success setting locale"
+msgstr ""
+
+#: ../pykolab/utils.py:491
+msgid "Failure to set locale"
+msgstr ""
+
+#: ../pykolab/utils.py:499
+#, python-format
+msgid "Executing '%s | %s'"
+msgstr ""
+
+#: ../pykolab/utils.py:510
+#, python-format
+msgid "Could not translate %s using locale %s"
+msgstr ""
+
+#: ../pykolab/wap_client/__init__.py:396
 #, python-format
 msgid "Requesting %r with params %r"
 msgstr ""
 
-#: ../pykolab/wap_client/__init__.py:263
+#: ../pykolab/wap_client/__init__.py:404
 #, python-format
 msgid "Got response: %r"
 msgstr ""
 
 #. Some data is not JSON
-#: ../pykolab/wap_client/__init__.py:268
+#: ../pykolab/wap_client/__init__.py:410
 msgid "Response data is not JSON"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:79 ../pykolab/xml/attendee.py:99
+#. support integer values, too
+#: ../pykolab/xml/attendee.py:9 ../pykolab/xml/attendee.py:17
+msgid "Needs Action"
+msgstr ""
+
+#: ../pykolab/xml/attendee.py:10 ../pykolab/xml/attendee.py:18
+msgid "Accepted"
+msgstr ""
+
+#: ../pykolab/xml/attendee.py:11 ../pykolab/xml/attendee.py:19
+msgid "Declined"
+msgstr ""
+
+#: ../pykolab/xml/attendee.py:12 ../pykolab/xml/attendee.py:20
+msgid "Tentatively Accepted"
+msgstr ""
+
+#: ../pykolab/xml/attendee.py:13 ../pykolab/xml/attendee.py:21
+msgid "Delegated"
+msgstr ""
+
+#: ../pykolab/xml/attendee.py:14 ../pykolab/xml/attendee.py:22
+msgid "Completed"
+msgstr ""
+
+#: ../pykolab/xml/attendee.py:15 ../pykolab/xml/attendee.py:23
+msgid "Started"
+msgstr ""
+
+#: ../pykolab/xml/attendee.py:132 ../pykolab/xml/attendee.py:154
 msgid "Not a valid attendee"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:84
+#: ../pykolab/xml/attendee.py:139
 msgid "No valid delegator references found"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:104
+#: ../pykolab/xml/attendee.py:159
 msgid "No valid delegatee references found"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:140
+#: ../pykolab/xml/attendee.py:219
 #, python-format
 msgid "Invalid cutype %r"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:151
+#: ../pykolab/xml/attendee.py:231
 #, python-format
 msgid "Invalid participant status %r"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:159
+#: ../pykolab/xml/attendee.py:239
 #, python-format
 msgid "Invalid role %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:172
+#: ../pykolab/xml/event.py:149 ../pykolab/xml/event.py:784
+#: ../pykolab/xml/event.py:827
+msgid "Event start needs datetime.date or datetime.datetime instance"
+msgstr ""
+
+#: ../pykolab/xml/event.py:294
 #, python-format
 msgid "No attendee with email or name %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:180
+#: ../pykolab/xml/event.py:302
 #, python-format
 msgid "Invalid argument value attendee %r, must be basestring or Attendee"
 msgstr ""
 
-#: ../pykolab/xml/event.py:186
+#: ../pykolab/xml/event.py:314
 #, python-format
 msgid "No attendee with email %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:192
+#: ../pykolab/xml/event.py:320
 #, python-format
 msgid "No attendee with name %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:338
-msgid "Invalid participant status"
+#: ../pykolab/xml/event.py:370 ../pykolab/xml/utils.py:151
+msgid "%Y-%m-%d"
 msgstr ""
 
-#: ../pykolab/xml/event.py:538
-msgid "Event end needs datetime.date or datetime.datetime instance"
+#: ../pykolab/xml/event.py:372 ../pykolab/xml/utils.py:152
+msgid "%H:%M (%Z)"
 msgstr ""
 
-#: ../pykolab/xml/event.py:654
+#: ../pykolab/xml/event.py:496
+msgid "Invalid participant status"
+msgstr ""
+
+#: ../pykolab/xml/event.py:618
 #, python-format
-msgid "Invalid status %r"
+msgid "Invalid classification %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:675 ../pykolab/xml/event.py:725
-msgid "Event start needs datetime.date or datetime.datetime instance"
+#: ../pykolab/xml/event.py:649
+msgid "Event end needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: ../pykolab/xml/event.py:761
+#: ../pykolab/xml/event.py:659
+#, python-format
+msgid "Invalid custom property name %r"
+msgstr ""
+
+#: ../pykolab/xml/event.py:837
 #, python-format
 msgid "Invalid status set: %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:879
+#: ../pykolab/xml/event.py:1074
 msgid "No sender specified"
 msgstr ""
 
-#: ../saslauthd/__init__.py:126 ../saslauthd/__init__.py:134
-#: ../wallace/__init__.py:362 ../wallace/__init__.py:371
-msgid ""
-"Traceback occurred, please report a bug at http://bugzilla.kolabsys.com"
+#: ../pykolab/xml/event.py:1083
+#, python-format
+msgid "Invitation for %s was %s"
+msgstr ""
+
+#: ../pykolab/xml/event.py:1088
+msgid "This is an automated response to one of your event requests."
+msgstr ""
+
+#: ../pykolab/xml/recurrence_rule.py:38
+#, python-format
+msgid "Every %d year(s)"
+msgstr ""
+
+#: ../pykolab/xml/recurrence_rule.py:39
+#, python-format
+msgid "Every %d month(s)"
+msgstr ""
+
+#: ../pykolab/xml/recurrence_rule.py:40
+#, python-format
+msgid "Every %d week(s)"
+msgstr ""
+
+#: ../pykolab/xml/recurrence_rule.py:41
+#, python-format
+msgid "Every %d day(s)"
+msgstr ""
+
+#: ../pykolab/xml/recurrence_rule.py:42
+#, python-format
+msgid "Every %d hours"
+msgstr ""
+
+#: ../pykolab/xml/recurrence_rule.py:43
+#, python-format
+msgid "Every %d minutes"
+msgstr ""
+
+#: ../pykolab/xml/recurrence_rule.py:44
+#, python-format
+msgid "Every %d seconds"
+msgstr ""
+
+#: ../pykolab/xml/todo.py:110
+msgid "Todo due needs datetime.date or datetime.datetime instance"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:120
+msgid "Name"
+msgstr "Nombre"
+
+#: ../pykolab/xml/utils.py:121
+msgid "Summary"
+msgstr "Summary"
+
+#: ../pykolab/xml/utils.py:122
+msgid "Location"
+msgstr "Location"
+
+#: ../pykolab/xml/utils.py:123
+msgid "Description"
+msgstr "Descripción"
+
+#: ../pykolab/xml/utils.py:124
+msgid "URL"
+msgstr "URL"
+
+#: ../pykolab/xml/utils.py:125
+msgid "Status"
+msgstr "Status"
+
+#: ../pykolab/xml/utils.py:126
+msgid "Priority"
+msgstr "Priority"
+
+#: ../pykolab/xml/utils.py:127
+msgid "Attendee"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:128
+msgid "Start"
+msgstr "Start"
+
+#: ../pykolab/xml/utils.py:129
+msgid "End"
+msgstr "End"
+
+#: ../pykolab/xml/utils.py:130
+msgid "Due"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:131
+msgid "Repeat"
+msgstr "Repeat"
+
+#: ../pykolab/xml/utils.py:132
+msgid "Repeat Exception"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:133
+msgid "Organizer"
+msgstr "Organizer"
+
+#: ../pykolab/xml/utils.py:134
+msgid "Attachment"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:135
+msgid "Alarm"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:136
+msgid "Classification"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:137
+msgid "Progress"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:182
+#, python-format
+msgid "for %d times"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:184
+#, python-format
+msgid "until %s"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:189
+msgid "Display message"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:190
+msgid "Send email"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:191
+msgid "Play sound"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:197
+#, python-format
+msgid "%s after"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:197
+#, python-format
+msgid "%s before"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:206
+#, python-format
+msgid "%d day(s)"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:212
+#, python-format
+msgid "%d hour(s)"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:214
+#, python-format
+msgid "%d minute(s)"
 msgstr ""
 
-#: ../wallace/__init__.py:61
+#: ../saslauthd/__init__.py:76
+msgid "Socket file to bind to."
+msgstr ""
+
+#: ../saslauthd/__init__.py:108
+#, python-format
+msgid "Could not create %r: %r"
+msgstr ""
+
+#: ../saslauthd/__init__.py:194
+#, python-format
+msgid "kolab-saslauthd could not accept connections on socket: %r"
+msgstr ""
+
+#: ../saslauthd/__init__.py:199
+msgid "Maximum tries exceeded, exiting"
+msgstr ""
+
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:195
+#: ../wallace/module_resources.py:1054
+#, python-format
+msgid "Reservation Request for %(summary)s was %(status)s"
+msgstr ""
+
+#. check notification message sent to resource owner (jane)
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:619
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:635
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:666
+#: ../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
+#, python-format
+msgid "Booking for %s has been %s"
+msgstr ""
+
+#. check confirmation message sent to resource owner (jane)
+#. check first confirmation message sent to resource owner (jane)
+#. check second confirmation message sent to resource owner (jane)
+#. check confirmation message sent to resource owner (jane)
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:656
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:694
+#: ../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
+#, python-format
+msgid "Booking request for %s requires confirmation"
+msgstr ""
+
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:240
+#: ../wallace/module_invitationpolicy.py:441
+#, python-format
+msgid "\"%(summary)s\" has been %(status)s"
+msgstr ""
+
+#. check for notification message
+#. this notification should be suppressed until mark has replied, too
+#. 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
+#, 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
+msgid "PENDING"
+msgstr ""
+
+#. this should trigger a notification message
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1003
+#: ../wallace/module_invitationpolicy.py:1110
+#, python-format
+msgid "\"%s\" has been cancelled"
+msgstr ""
+
+#: ../tests/unit/test-011-itip.py:408
+#, python-format
+msgid "Invitation for %(summary)s was %(status)s"
+msgstr ""
+
+#: ../wallace/__init__.py:57
+#, python-format
+msgid "Wallace modules: %r"
+msgstr ""
+
+#: ../wallace/__init__.py:69
+#, python-format
+msgid "Module %s.execute() failed on message %r with error: %s"
+msgstr ""
+
+#: ../wallace/__init__.py:78
 #, python-format
 msgid "Worker process %s initializing"
 msgstr ""
 
-#: ../wallace/__init__.py:80
+#: ../wallace/__init__.py:100
 msgid "Bind address for Wallace."
 msgstr ""
 
-#: ../wallace/__init__.py:106
+#: ../wallace/__init__.py:126
 msgid "Port that Wallace is supposed to use."
 msgstr ""
 
-#: ../wallace/__init__.py:157
+#: ../wallace/__init__.py:177
 #, python-format
-msgid "Could not bind to socket on port %d on bind "
+msgid "Could not bind to socket on port %d on bind address %s"
 msgstr ""
 
-#: ../wallace/__init__.py:169
+#: ../wallace/__init__.py:189
 msgid "Could not shut down socket"
 msgstr ""
 
-#: ../wallace/__init__.py:226
+#: ../wallace/__init__.py:253
 msgid "Accepted connection"
 msgstr ""
 
-#: ../wallace/__init__.py:387
+#: ../wallace/__init__.py:428
 #, python-format
 msgid "Could not write pid file %s"
 msgstr ""
 
-#: ../wallace/module_optout.py:61 ../wallace/module_resources.py:94
+#: ../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
 #, python-format
 msgid "Issuing callback after processing to stage %s"
 msgstr ""
 
-#: ../wallace/module_optout.py:62 ../wallace/module_resources.py:100
+#: ../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
 #, python-format
 msgid "Testing cb_action_%s()"
 msgstr ""
 
-#: ../wallace/module_optout.py:64 ../wallace/module_resources.py:103
+#: ../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
 #, python-format
 msgid "Attempting to execute cb_action_%s()"
 msgstr ""
 
+#: ../wallace/module_footer.py:67
+#, python-format
+msgid "Executing module footer for %r, %r"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:66
+#, python-format
+msgid "Executing module gpgencrypt for %r, %r"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:98
+msgid "Message is already encrypted (app/pgp-enc content-type)"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:102
+msgid "Message already encrypted by main content-type header"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:131
+msgid ""
+"Configured to encrypt to a key not configured, and strict policy enabled. "
+"Bailing out."
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:134
+msgid ""
+"Configured to encrypt to a key not configured, but continuing anyway (see "
+"'gpgencrypt_strict')."
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:171
+#, python-format
+msgid "Recipients: %r"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:183
+#, python-format
+msgid "Current keys: %r"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:188
+#, python-format
+msgid "Retrieving key for recipient: %r"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:192 ../wallace/module_gpgencrypt.py:208
+#, python-format
+msgid "Found matching address %r"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:200
+#, python-format
+msgid "Found matching address %r in remote keys"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:232
+#, python-format
+msgid "An error occurred: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:196
+#, python-format
+msgid "Invitation policy called for %r, %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:257
+#, python-format
+msgid "Failed to parse iTip objects from message: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:261
+msgid ""
+"Message is not an iTip message or does not contain any (valid) iTip objects."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:265
+#, python-format
+msgid ""
+"iTip objects attached to this message contain the following information: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:278
+#, python-format
+msgid "No itips, no users, pass along %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:281
+#, python-format
+msgid "iTips, but no users, pass along %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:301
+#, python-format
+msgid "No user attendee matching envelope recipient %s, skip message"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:305
+#, python-format
+msgid "Receiving user: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:330
+#, python-format
+msgid "Apply invitation policy %r for sender %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:341
+#, python-format
+msgid "Ignoring '%s' iTip method"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:345
+#, python-format
+msgid "iTip message %r consumed by the invitationpolicy module"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:361
+msgid "Pass invitation for manual processing"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:366
+#, python-format
+msgid "Receiving Attendee: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:386
+#, python-format
+msgid "Existing %s: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:397
+#, python-format
+msgid "Precondition for object %r fulfilled: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:415
+#, python-format
+msgid ""
+"The iTip request sequence (%r) doesn't match the referred object version "
+"(%r). Ignoring."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:420
+#, python-format
+msgid "Auto-updating %s %r on iTip REQUEST (no re-scheduling)"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:475
+msgid "Pass reply for manual processing"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:482
+#, python-format
+msgid "Sender Attendee: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:494
+#, 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
+#, python-format
+msgid "Auto-updating %s %r on iTip REPLY"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:525
+#, python-format
+msgid "Add delegatee: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:528
+#, python-format
+msgid "Update existing delegatee: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:533
+#, python-format
+msgid "Update delegator: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:550
+#: ../wallace/module_invitationpolicy.py:582
+msgid ""
+"The object referred by this reply was not found in the user's folders. "
+"Forwarding to Inbox."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:563
+msgid "Pass cancellation for manual processing"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:611
+#, python-format
+msgid "Checking if email address %r belongs to a local user"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:616
+#, python-format
+msgid "User DN: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:618
+#, python-format
+msgid "No user record(s) found for %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:674
+#, python-format
+msgid "User record doesn't have the mailbox attribute %r set"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:687
+#, python-format
+msgid "IMAP proxy authentication failed: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:709
+#, python-format
+msgid "List %r folders for user %r: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:725
+#, python-format
+msgid "IMAP metadata for %r: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:755
+#, python-format
+msgid "Searching folder %r for %s %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:771
+#, python-format
+msgid "Failed to parse %s from message %s/%s: %s"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:797
+#, python-format
+msgid "Listing events from folder %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:810
+#: ../wallace/module_resources.py:566 ../wallace/module_resources.py:614
+#, python-format
+msgid "Failed to parse event from message %s/%s: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:816
+#, python-format
+msgid "Existing event %r conflicts with invitation %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:823
+#: ../wallace/module_resources.py:419
+#, python-format
+msgid "start: %r, end: %r, total: %r, messages: %d"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:849
+#, python-format
+msgid "%r is locked, waiting..."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:913
+#, python-format
+msgid "Failed to save %s: no target folder found for user %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:916
+#, python-format
+msgid "Save %s %r to user folder %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:929
+#, python-format
+msgid "Failed to save %s to user folder at %r: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:945
+#, python-format
+msgid "Delete %s %r in %r: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:970
+#, python-format
+msgid "Compose participation status summary for %s %r to user %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1003
+#, python-format
+msgid ""
+"Waiting for more automated replies (got %d of %d); skipping notification"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1013
+#, python-format
+msgid "Changes submitted by %s have been automatically applied."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1022
+msgid "(removed)"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1045
+#: ../wallace/module_invitationpolicy.py:1103
+#: ../wallace/module_invitationpolicy.py:1193
+msgid "*** This is an automated message. Please do not reply. ***"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1076
+#, python-format
+msgid "Send cancellation notification for %s %r to user %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1183
+#, python-format
+msgid "Updated %s's copy of %r: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1186
+#, python-format
+msgid "Attendee %s's copy of %r not found"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1189
+#, python-format
+msgid "Attendee %r not found in LDAP"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1196
+#, python-format
+msgid "%(name)s has %(status)s your assignment for %(summary)s."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1198
+#, python-format
+msgid "%(name)s has %(status)s your invitation for %(summary)s."
+msgstr ""
+
 #. modules.next_module('optout')
 #: ../wallace/module_optout.py:70
 #, python-format
@@ -2074,7 +3493,8 @@ msgstr ""
 
 #: ../wallace/module_optout.py:96
 #, python-format
-msgid "Running opt-out consult from envelope sender '%s "
+msgid ""
+"Running opt-out consult from envelope sender '%s <%s>' to recipient %s <%s>"
 msgstr ""
 
 #: ../wallace/module_optout.py:160
@@ -2087,210 +3507,366 @@ msgstr ""
 msgid "Could not send request to optout_url %s"
 msgstr ""
 
-#: ../wallace/module_resources.py:81
+#: ../wallace/module_resources.py:115
 #, python-format
 msgid "Resource Management called for %r, %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:139
-msgid "Message is not an iTip message or does not contain any "
+#: ../wallace/module_resources.py:180
+#, 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."
 msgstr ""
 
-#: ../wallace/module_resources.py:147
-msgid "iTip events attached to this message contain the "
+#: ../wallace/module_resources.py:193
+#, python-format
+msgid ""
+"iTip events attached to this message contain the following information: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:174
+#: ../wallace/module_resources.py:226
 msgid "Not an iTip message, but sent to resource nonetheless. Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:182
-msgid "No itips, no resources, pass along"
+#: ../wallace/module_resources.py:234
+#, python-format
+msgid "No itips, no resources, pass along %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:186
-msgid "iTips, but no resources, pass along"
+#: ../wallace/module_resources.py:237
+#, python-format
+msgid "iTips, but no resources, pass along %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:218
+#: ../wallace/module_resources.py:246
 #, python-format
-msgid "Resources: %r"
+msgid "No resource attendees matching envelope recipient %s, Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:236
+#: ../wallace/module_resources.py:256
 #, python-format
-msgid "Checking events in resource folder %r"
+msgid "Resources: %r; %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:243
+#: ../wallace/module_resources.py:274
 #, python-format
-msgid "Mailbox for resource %r doesn't exist"
+msgid "Sender Attendee: %r => %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:256
+#: ../wallace/module_resources.py:281
 #, python-format
-msgid "Fetching message UID %r from folder %r"
+msgid ""
+"The iTip reply sequence (%r) doesn't match the referred event version (%r). "
+"Ignoring."
+msgstr ""
+
+#: ../wallace/module_resources.py:306
+#, python-format
+msgid "Event referenced by this REPLY (%r) not found in resource calendar"
+msgstr ""
+
+#: ../wallace/module_resources.py:309
+msgid "No event reference found in this REPLY. Ignoring."
+msgstr ""
+
+#: ../wallace/module_resources.py:318
+#, python-format
+msgid "Receiving Resource: %r; %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:326
+#, python-format
+msgid "Recipient %r is non-participant, ignoring message"
+msgstr ""
+
+#: ../wallace/module_resources.py:354
+#, python-format
+msgid "Accept invitation for individual resource %r / %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:295
+#: ../wallace/module_resources.py:383
 #, python-format
-msgid "Event %r conflicts with event "
+msgid "Delegate invitation for resource collection %r to %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:308
+#: ../wallace/module_resources.py:415
 #, python-format
-msgid "start: %r, end: %r, total: %r, messages: %r"
+msgid "Failed to read resource calendar for %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:315
+#: ../wallace/module_resources.py:425
 #, python-format
 msgid "Polling for resource %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:319
+#: ../wallace/module_resources.py:428
 #, python-format
 msgid "Resource %r has been popped from the list"
 msgstr ""
 
-#: ../wallace/module_resources.py:326
+#: ../wallace/module_resources.py:432
 msgid "Resource is a collection"
+msgstr "El recurso es una colección"
+
+#: ../wallace/module_resources.py:443
+#, python-format
+msgid "Removed conflicting resources from %r: (%r) => %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:374 ../wallace/module_resources.py:424
+#: ../wallace/module_resources.py:455
 #, python-format
-msgid "Adding event to %r"
+msgid "Conflicting events: %r for resource %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:473
+#: ../wallace/module_resources.py:474
 #, python-format
-msgid "Method %r not really interesting for us."
+msgid "Delegate to another resource collection member: %r to %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:481
+#: ../wallace/module_resources.py:536
 #, python-format
-msgid "Raw iTip payload: %s"
+msgid "Checking events in resource folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:491
-msgid "Could not read iTip from message."
+#: ../wallace/module_resources.py:555
+#, python-format
+msgid "Fetching message UID %r from folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:513
-msgid "iTip event without a start"
+#: ../wallace/module_resources.py:578
+#, python-format
+msgid "Event %r conflicts with event %r"
 msgstr ""
 
-#. end if c.name == "VEVENT"
-#. end for c in cal.walk()
-#. end if part.get_content_type() == "text/calendar"
-#. end for part in message.walk()
-#. if message.is_multipart()
-#: ../wallace/module_resources.py:543
-msgid "Message is not an iTip message (non-multipart message)"
+#: ../wallace/module_resources.py:599
+#, python-format
+msgid "Searching %r for event %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:564
+#: ../wallace/module_resources.py:605
 #, python-format
-msgid "Checking if email address %r belongs to a resource (collection)"
+msgid "Failed to access resource calendar:: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:575 ../wallace/module_resources.py:649
-#: ../wallace/module_resources.py:699
+#: ../wallace/module_resources.py:634
 #, python-format
-msgid "No resource (collection) records found for %r"
+msgid "Apply invitation policies %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:653
+#, python-format
+msgid "Adding event to %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:583 ../wallace/module_resources.py:657
 #: ../wallace/module_resources.py:707
 #, python-format
+msgid "Failed to save event to resource calendar at %r: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:724
+#, python-format
+msgid "Delete resource calendar object %r in %r: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:767
+#, 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
+#, python-format
 msgid "Resource record(s): %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:589 ../wallace/module_resources.py:664
-#: ../wallace/module_resources.py:714
+#: ../wallace/module_resources.py:777 ../wallace/module_resources.py:851
+#: ../wallace/module_resources.py:886
+#, 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
 #, python-format
 msgid "Resource record: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:608
+#: ../wallace/module_resources.py:801
 #, python-format
 msgid "Raw itip_events: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:616
+#: ../wallace/module_resources.py:809
 #, python-format
 msgid "Raw set of attendees: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:624
+#: ../wallace/module_resources.py:817
 #, python-format
 msgid "Raw set of resources: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:638
+#: ../wallace/module_resources.py:822
+#, python-format
+msgid "Raw set of organizers: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:842
 #, python-format
 msgid "Checking if attendee %r is a resource (collection)"
 msgstr ""
 
-#: ../wallace/module_resources.py:671 ../wallace/module_resources.py:717
+#: ../wallace/module_resources.py:858 ../wallace/module_resources.py:892
 msgid "Resource reservation made but no resource records found"
 msgstr ""
 
-#: ../wallace/module_resources.py:689
+#: ../wallace/module_resources.py:877
 #, python-format
 msgid "Checking if resource %r is a resource (collection)"
 msgstr ""
 
-#: ../wallace/module_resources.py:721
-msgid "The following resources are being referred to in the "
+#: ../wallace/module_resources.py:895
+#, python-format
+msgid "The following resources are being referred to in the iTip: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:1060
+#, python-format
+msgid ""
+"\n"
+"                *** This is an automated response, please do not reply! ***\n"
+"\n"
+"                Your reservation was delegated to \"%s\" which is available for the requested time.\n"
+"            "
+msgstr ""
+
+#: ../wallace/module_resources.py:1079
+#, python-format
+msgid ""
+"\n"
+"        *** This is an automated response, please do not reply! ***\n"
+"        \n"
+"        We hereby inform you that your reservation was %s.\n"
+"    "
+msgstr ""
+
+#: ../wallace/module_resources.py:1086
+#, python-format
+msgid ""
+"\n"
+"            If you have questions about this reservation, please contact\n"
+"            %s <%s> %s\n"
+"        "
+msgstr ""
+
+#: ../wallace/module_resources.py:1117
+#, python-format
+msgid "Sending booking notification for event %r to %r from %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:1134
+msgid "failed"
+msgstr ""
+
+#: ../wallace/module_resources.py:1153
+#, python-format
+msgid ""
+"\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
+#, python-format
+msgid ""
+"\n"
+"            A reservation request for %(resource)s could not be processed automatically.\n"
+"            Please contact %(orgname)s <%(orgemail)s> who requested this resource for %(date)s. Subject: %(summary)s.\n"
+"\n"
+"            *** This is an automated message, sent to you as the resource owner. ***\n"
+"        "
+msgstr ""
+
+#: ../wallace/module_resources.py:1203
+#, python-format
+msgid "Clone invitation for owner confirmation: %r from %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:1209
+#, python-format
+msgid ""
+"\n"
+"        A reservation request for %(resource)s requires your approval!\n"
+"        Please either accept or decline this invitation without saving it to your calendar.\n"
+"\n"
+"        The reservation request was sent from %(orgname)s <%(orgemail)s>.\n"
+"\n"
+"        Subject: %(summary)s.\n"
+"        Date: %(date)s\n"
+"        Participants: %(attendees)s\n"
+"\n"
+"        *** This is an automated message, please don't reply by email. ***\n"
+"    "
 msgstr ""
 
 #. This is a nested module
-#: ../wallace/modules.py:96
+#: ../wallace/modules.py:97
 #, python-format
 msgid "Module Group: %s"
 msgstr ""
 
-#: ../wallace/modules.py:107 ../wallace/modules.py:112
-msgid "No such module."
+#: ../wallace/modules.py:108
+#, python-format
+msgid "No such module %r in modules %r (1)."
 msgstr ""
 
-#: ../wallace/modules.py:118
+#: ../wallace/modules.py:113
+#, python-format
+msgid "No such module %r in modules %r (2)."
+msgstr ""
+
+#: ../wallace/modules.py:119
 #, python-format
 msgid "Holding message in queue for manual review (%s by %s)"
 msgstr ""
 
-#: ../wallace/modules.py:121
+#: ../wallace/modules.py:122
 #, python-format
 msgid "Deferring message in %s (by module %s)"
 msgstr ""
 
-#: ../wallace/modules.py:131
+#: ../wallace/modules.py:134
 #, python-format
 msgid "The time when the message was sent: %r"
 msgstr ""
 
-#: ../wallace/modules.py:132
+#: ../wallace/modules.py:135
 #, python-format
 msgid "The time now: %r"
 msgstr ""
 
-#: ../wallace/modules.py:133
+#: ../wallace/modules.py:136
 #, python-format
 msgid "The time delta: %r"
 msgstr ""
 
 #. TODO: Send NDR back to user
-#: ../wallace/modules.py:137
+#: ../wallace/modules.py:140
 #, python-format
 msgid "Message in file %s older then 5 days, deleting"
 msgstr ""
 
-#: ../wallace/modules.py:162
+#: ../wallace/modules.py:165
 #, python-format
 msgid "Rejecting message in %s (by module %s)"
 msgstr ""
 
-#: ../wallace/modules.py:180
+#: ../wallace/modules.py:186
 #, python-format
 msgid ""
 "This is the email system Wallace at %s.\n"
@@ -2305,19 +3881,29 @@ msgid ""
 "recipients.\n"
 msgstr ""
 
-#: ../wallace/modules.py:195
+#: ../wallace/modules.py:201
 #, python-format
 msgid ""
 "X-Wallace-Module: %s\n"
 "X-Wallace-Result: REJECT\n"
 msgstr ""
 
-#: ../wallace/modules.py:248
+#: ../wallace/modules.py:260
 #, python-format
 msgid "Accepting message in %s (by module %s)"
 msgstr ""
 
-#: ../wallace/modules.py:316
+#: ../wallace/modules.py:262
+#, python-format
+msgid "Accepting message in: %r"
+msgstr ""
+
+#: ../wallace/modules.py:269
+#, python-format
+msgid "recipients: %r"
+msgstr ""
+
+#: ../wallace/modules.py:347
 #, python-format
 msgid "Module '%s' already registered"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index b76db56..b84ddba 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,659 +1,869 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
+# Alain Stark <astark at medialsace.fr>, 2013
+# Hazgaard <alpinestarzzz at hotmail.com>, 2013
+# BERNARD Darius <darius.bernard at onysos.fr>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: pykolab\n"
+"Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-14 11:57+0100\n"
-"PO-Revision-Date: 2012-08-11 13:02+0000\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: fr\n"
+"POT-Creation-Date: 2014-09-11 18:01+0200\n"
+"PO-Revision-Date: 2014-09-11 16:00+0000\n"
+"Last-Translator: Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/kolab/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../bin/kolab_smtp_access_policy.py:206
+#: ../bin/kolab_smtp_access_policy.py:209
 #, python-format
 msgid "Adding policy request to instance %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:446
+#: ../bin/kolab_smtp_access_policy.py:479
 msgid "Unauthorized access not allowed"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:467
-#: ../bin/kolab_smtp_access_policy.py:657
+#: ../bin/kolab_smtp_access_policy.py:508
+#: ../bin/kolab_smtp_access_policy.py:689
 msgid "Could not find recipient"
-msgstr ""
+msgstr "Impossible de vérifier le destinataire"
 
-#: ../bin/kolab_smtp_access_policy.py:486
-#: ../bin/kolab_smtp_access_policy.py:586
+#: ../bin/kolab_smtp_access_policy.py:527
 #, python-format
-msgid "Could not find envelope sender user %s"
+msgid "Could not find envelope sender user %s (511)"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:529
+#: ../bin/kolab_smtp_access_policy.py:570
 #, python-format
 msgid "Obtained authenticated user details for %r: %r"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:608
+#: ../bin/kolab_smtp_access_policy.py:627
+#, python-format
+msgid "Could not find envelope sender user %s"
+msgstr ""
+
+#: ../bin/kolab_smtp_access_policy.py:649
 #, python-format
 msgid "%s is unauthorized to send on behalf of %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:618
+#: ../bin/kolab_smtp_access_policy.py:659
 #, python-format
 msgid ""
 "User %s attempted to use envelope sender address %s without authorization"
-msgstr ""
+msgstr "L'utilisateur %s a tenté d'utilisé l'adresse mail expéditeur %s sans autorisation"
 
-#: ../bin/kolab_smtp_access_policy.py:681
-#: ../bin/kolab_smtp_access_policy.py:692
+#: ../bin/kolab_smtp_access_policy.py:713
+#: ../bin/kolab_smtp_access_policy.py:724
 #, python-format
 msgid "Found user %s to be a delegate user of %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:716
+#: ../bin/kolab_smtp_access_policy.py:748
 #, python-format
 msgid ""
 "Verifying authenticated sender '%(sender)s' with sasl_username "
 "'%(sasl_username)s' for recipient '%(recipient)s'"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:719
+#: ../bin/kolab_smtp_access_policy.py:751
 #, python-format
 msgid ""
 "Verifying unauthenticated sender '%(sender)s' for recipient '%(recipient)s'"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:735
+#: ../bin/kolab_smtp_access_policy.py:767
 #, python-format
 msgid "Reproducing verify_recipient(%s, %s) from cache"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:753
+#: ../bin/kolab_smtp_access_policy.py:804
 #, python-format
 msgid "Using authentication domain %s instead of %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:763
+#: ../bin/kolab_smtp_access_policy.py:814
 #, python-format
 msgid "Domain %s is a primary domain"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:771
+#: ../bin/kolab_smtp_access_policy.py:822
 #, 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:786
+#: ../bin/kolab_smtp_access_policy.py:837
 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:793
+#: ../bin/kolab_smtp_access_policy.py:854
 #, 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:820
+#: ../bin/kolab_smtp_access_policy.py:890
 msgid "Invalid recipient"
-msgstr ""
+msgstr "Destinataire invalide"
 
-#: ../bin/kolab_smtp_access_policy.py:831
+#: ../bin/kolab_smtp_access_policy.py:901
 msgid "Could not find this user, accepting"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:894
-#: ../bin/kolab_smtp_access_policy.py:945
+#: ../bin/kolab_smtp_access_policy.py:974
+#: ../bin/kolab_smtp_access_policy.py:1050
 #, python-format
 msgid "Sender %s is not allowed to send to recipient %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:933
+#: ../bin/kolab_smtp_access_policy.py:1038
 #, python-format
 msgid "Reproducing verify_sender(%r) from cache"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:960
+#: ../bin/kolab_smtp_access_policy.py:1055
+msgid "Unverifiable sender."
+msgstr ""
+
+#: ../bin/kolab_smtp_access_policy.py:1060
+msgid "Sender is not using an alias"
+msgstr ""
+
+#: ../bin/kolab_smtp_access_policy.py:1068
 msgid "Sender uses unauthorized envelope sender address"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:977
+#: ../bin/kolab_smtp_access_policy.py:1085
 msgid "Could not verify sender"
-msgstr ""
+msgstr "Impossible de vérifier l'expéditeur"
 
-#: ../bin/kolab_smtp_access_policy.py:984
+#: ../bin/kolab_smtp_access_policy.py:1092
 msgid ""
 "Verifying whether sender is allowed to send to recipient using sender policy"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:997
+#: ../bin/kolab_smtp_access_policy.py:1105
 #, python-format
 msgid "Result is %r"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1002
+#: ../bin/kolab_smtp_access_policy.py:1110
 msgid "No recipient policy restrictions exist for this sender"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1011
+#: ../bin/kolab_smtp_access_policy.py:1119
 msgid "Found a recipient policy to apply for this sender."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1026
+#: ../bin/kolab_smtp_access_policy.py:1134
 #, python-format
 msgid "Sender %s not allowed to send to recipient %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1056
+#: ../bin/kolab_smtp_access_policy.py:1155
 msgid "Cleaning up the cache"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1093
+#: ../bin/kolab_smtp_access_policy.py:1177
+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
 #, python-format
 msgid "Operational Error in caching: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1144
+#: ../bin/kolab_smtp_access_policy.py:1245
 #, python-format
 msgid "Caching the policy result with timestamp %d"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1221
+#: ../bin/kolab_smtp_access_policy.py:1319
 #, python-format
 msgid "Returning action DEFER_IF_PERMIT: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1226
+#: ../bin/kolab_smtp_access_policy.py:1324
 #, python-format
 msgid "Returning action DUNNO: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1231
+#: ../bin/kolab_smtp_access_policy.py:1329
 #, python-format
 msgid "Returning action HOLD: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1236
+#: ../bin/kolab_smtp_access_policy.py:1334
 #, python-format
 msgid "Returning action PERMIT: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1241
+#: ../bin/kolab_smtp_access_policy.py:1459
 #, python-format
 msgid "Returning action REJECT: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1287
+#: ../bin/kolab_smtp_access_policy.py:1505
 msgid "Starting to loop for new request"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1294
+#: ../bin/kolab_smtp_access_policy.py:1512
 msgid "Timeout for policy request reading exceeded"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1300
+#: ../bin/kolab_smtp_access_policy.py:1518
 msgid "End of current request"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1304
+#: ../bin/kolab_smtp_access_policy.py:1522
 #, python-format
 msgid "Getting line: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1308
+#: ../bin/kolab_smtp_access_policy.py:1526
 msgid "Returning request"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1334
+#: ../bin/kolab_smtp_access_policy.py:1555
 msgid "Access Policy Options"
-msgstr ""
+msgstr "Options de la stratégie d'accès"
 
-#: ../bin/kolab_smtp_access_policy.py:1341
+#: ../bin/kolab_smtp_access_policy.py:1562
 msgid "SMTP Policy request timeout."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1347
+#: ../bin/kolab_smtp_access_policy.py:1568
 msgid "Verify the recipient access policy."
-msgstr ""
+msgstr "Vérification de la stratégie d'accès du destinataire."
 
-#: ../bin/kolab_smtp_access_policy.py:1353
+#: ../bin/kolab_smtp_access_policy.py:1574
 msgid "Verify the sender access policy."
-msgstr ""
+msgstr "Vérification de la stratégie d'accès de l'expéditeur."
 
-#: ../bin/kolab_smtp_access_policy.py:1359
+#: ../bin/kolab_smtp_access_policy.py:1580
 msgid "Allow unauthenticated senders."
-msgstr ""
+msgstr "Autorise les expéditeurs non authentifiés."
 
-#: ../bin/kolab_smtp_access_policy.py:1373
+#: ../bin/kolab_smtp_access_policy.py:1594
 #, python-format
 msgid "Got request instance %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1382
+#: ../bin/kolab_smtp_access_policy.py:1603
 #, python-format
 msgid "Request instance %s is in state %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1390
+#: ../bin/kolab_smtp_access_policy.py:1611
 #, python-format
 msgid "Request instance %s is not yet in DATA state"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1402
+#: ../bin/kolab_smtp_access_policy.py:1623
 #, python-format
 msgid "Request instance %s reached DATA state"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1420
+#: ../bin/kolab_smtp_access_policy.py:1643
+#, python-format
+msgid "Unhandled exception caught: %r"
+msgstr ""
+
+#: ../bin/kolab_smtp_access_policy.py:1647
 msgid "Sender access denied"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1422
+#: ../bin/kolab_smtp_access_policy.py:1649
 msgid "Recipient access denied"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1424
+#: ../bin/kolab_smtp_access_policy.py:1651
 msgid "No objections"
-msgstr ""
+msgstr "Pas d'objections"
 
-#: ../conf.py:37 ../kolab.py:34 ../saslauthd.py:33
+#: ../conf.py:37 ../kolab-cli.py:34 ../saslauthd.py:33
 msgid "Cannot load pykolab/logger.py:"
-msgstr ""
+msgstr "Impossible de charger pykolab/logger.py :"
 
-#: ../kolabd/__init__.py:49 ../saslauthd/__init__.py:48
-#: ../wallace/__init__.py:65
+#: ../kolabd/__init__.py:49 ../saslauthd/__init__.py:51
+#: ../wallace/__init__.py:85
 msgid "Daemon Options"
-msgstr ""
+msgstr "Options du service"
 
-#: ../kolabd/__init__.py:56 ../saslauthd/__init__.py:55
-#: ../wallace/__init__.py:72
+#: ../kolabd/__init__.py:56 ../saslauthd/__init__.py:58
+#: ../wallace/__init__.py:92
 msgid "Fork to the background."
-msgstr ""
+msgstr "Exécution en tâche de fond."
 
-#: ../kolabd/__init__.py:65 ../saslauthd/__init__.py:64
-#: ../wallace/__init__.py:98
+#: ../kolabd/__init__.py:65 ../saslauthd/__init__.py:67
+#: ../wallace/__init__.py:118
 msgid "Path to the PID file to use."
-msgstr ""
+msgstr "Chemin absolu du fichier PID Ã  utiliser."
 
-#: ../kolabd/__init__.py:74 ../saslauthd/__init__.py:73
-#: ../wallace/__init__.py:115
+#: ../kolabd/__init__.py:74 ../saslauthd/__init__.py:85
+#: ../wallace/__init__.py:135
 msgid "Run as user USERNAME"
 msgstr ""
 
-#: ../kolabd/__init__.py:84 ../saslauthd/__init__.py:83
-#: ../wallace/__init__.py:89
+#: ../kolabd/__init__.py:84 ../saslauthd/__init__.py:95
+#: ../wallace/__init__.py:109
 msgid "Run as group GROUPNAME"
 msgstr ""
 
-#: ../kolabd/__init__.py:122 ../pykolab/utils.py:151
-#: ../wallace/__init__.py:288
+#: ../kolabd/__init__.py:122 ../pykolab/utils.py:234
+#: ../saslauthd/__init__.py:301 ../wallace/__init__.py:329
 #, python-format
 msgid "Group %s does not exist"
 msgstr ""
 
-#: ../kolabd/__init__.py:131 ../wallace/__init__.py:297
+#: ../kolabd/__init__.py:131 ../saslauthd/__init__.py:310
+#: ../wallace/__init__.py:338
 #, python-format
 msgid "Switching real and effective group id to %d"
 msgstr ""
 
-#: ../kolabd/__init__.py:153 ../pykolab/utils.py:175
-#: ../wallace/__init__.py:319
+#: ../kolabd/__init__.py:153 ../pykolab/utils.py:258
+#: ../saslauthd/__init__.py:332 ../wallace/__init__.py:360
 #, python-format
 msgid "User %s does not exist"
 msgstr ""
 
-#: ../kolabd/__init__.py:163 ../wallace/__init__.py:329
+#: ../kolabd/__init__.py:163 ../saslauthd/__init__.py:342
+#: ../wallace/__init__.py:370
 #, python-format
 msgid "Switching real and effective user id to %d"
 msgstr ""
 
-#: ../kolabd/__init__.py:172 ../wallace/__init__.py:338
+#: ../kolabd/__init__.py:172 ../saslauthd/__init__.py:351
+#: ../wallace/__init__.py:379
 msgid "Could not change real and effective uid and/or gid"
 msgstr ""
 
-#: ../kolabd/__init__.py:192 ../saslauthd/__init__.py:122
-#: ../wallace/__init__.py:358
+#: ../kolabd/__init__.py:192 ../saslauthd/__init__.py:142
+#: ../wallace/__init__.py:399
 msgid "Interrupted by user"
-msgstr ""
+msgstr "Interrompu par l'utilisateur"
 
 #: ../kolabd/__init__.py:197 ../kolabd/__init__.py:208
-#: ../wallace/__init__.py:362 ../wallace/__init__.py:372
-msgid "Traceback occurred, please report a "
-msgstr ""
+#: ../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"
+msgstr "Une erreur s'est produite, vous pouvez reporter le problème sur http://bugzilla.kolabsys.com"
 
-#: ../kolabd/__init__.py:203 ../saslauthd/__init__.py:130
-#: ../wallace/__init__.py:368
+#: ../kolabd/__init__.py:203 ../saslauthd/__init__.py:150
+#: ../wallace/__init__.py:408
 #, python-format
 msgid "Type Error: %s"
+msgstr "Type d'erreur : %s"
+
+#: ../kolabd/__init__.py:230
+msgid "Could not connect to LDAP, is it running?"
 msgstr ""
 
-#: ../kolabd/__init__.py:223 ../pykolab/auth/ldap/__init__.py:1591
+#: ../kolabd/__init__.py:233 ../pykolab/auth/ldap/__init__.py:2178
 #: ../pykolab/cli/cmd_sync.py:36
 msgid "Listing domains..."
+msgstr "Liste des domaines ..."
+
+#: ../kolabd/__init__.py:244
+msgid "No domains. Not syncing"
 msgstr ""
 
-#: ../kolabd/__init__.py:256
+#: ../kolabd/__init__.py:279
 #, python-format
 msgid "added domains: %r, removed domains: %r"
+msgstr "domaines ajoutés : %r, domaines supprimés : %r"
+
+#: ../kolabd/process.py:33
+#, python-format
+msgid "Process created for domain %s"
+msgstr ""
+
+#: ../kolabd/process.py:42
+#, python-format
+msgid "Synchronizing for domain %s"
+msgstr ""
+
+#: ../kolabd/process.py:59
+#, python-format
+msgid ""
+"Error in process %r, terminating:\n"
+"\t%r"
 msgstr ""
 
 #: ../kolabd.py:31 ../setup-kolab.py:36 ../wallace.py:31
 msgid "Cannot load pykolab/constants.py:"
-msgstr ""
+msgstr "Impossible de charger pykolab/constants.py :"
 
-#: ../pykolab/auth/__init__.py:94
+#: ../pykolab/auth/__init__.py:89
 #, python-format
 msgid "Called for domain %r"
-msgstr ""
+msgstr "Appelé pour le domaine %r"
 
-#: ../pykolab/auth/__init__.py:107 ../pykolab/auth/__init__.py:116
+#: ../pykolab/auth/__init__.py:106 ../pykolab/auth/__init__.py:115
 #, python-format
 msgid "Using section %s and domain %s"
-msgstr ""
+msgstr "Utilisation de la section %s et du domaine %s"
 
-#: ../pykolab/auth/__init__.py:121
+#: ../pykolab/auth/__init__.py:120
 #, python-format
 msgid "Connecting to Authentication backend for domain %s"
-msgstr ""
+msgstr "Connexion pour authentification du sous système pour le domaine %s"
 
-#: ../pykolab/auth/__init__.py:132
+#: ../pykolab/auth/__init__.py:131
 #, python-format
 msgid "Section %s has no option 'auth_mechanism'"
-msgstr ""
+msgstr "La section %s ne contient pas l'option 'auth_mechanism'"
 
-#: ../pykolab/auth/__init__.py:139
+#: ../pykolab/auth/__init__.py:138
 #, python-format
 msgid "Section %s has auth_mechanism: %r"
-msgstr ""
+msgstr "Système d'authentification: %r pour la section %s"
 
-#: ../pykolab/auth/__init__.py:148 ../pykolab/auth/__init__.py:157
+#: ../pykolab/auth/__init__.py:147 ../pykolab/auth/__init__.py:156
 msgid "Starting LDAP..."
-msgstr ""
+msgstr "Démarrage de LDAP ..."
 
-#: ../pykolab/auth/ldap/cache.py:109
+#: ../pykolab/auth/ldap/cache.py:126
 #, python-format
 msgid "Inserting cache entry %r"
-msgstr ""
+msgstr "Insertion de l'entrée %r dans le cache"
 
-#: ../pykolab/auth/ldap/cache.py:122
+#: ../pykolab/auth/ldap/cache.py:147
 #, python-format
 msgid "Updating timestamp for cache entry %r"
-msgstr ""
+msgstr "Mise a jour de l'horodatage pour l'entrée %r dans le cache"
 
-#: ../pykolab/auth/ldap/cache.py:129
+#: ../pykolab/auth/ldap/cache.py:155
 #, python-format
 msgid "Updating result_attribute for cache entry %r"
-msgstr ""
+msgstr "Mise a jour de result_attribute pour l'entrée %r dans le cache"
 
-#: ../pykolab/auth/ldap/__init__.py:51
+#: ../pykolab/auth/ldap/__init__.py:52
 msgid "Python LDAP library does not support persistent search"
-msgstr ""
+msgstr "La librairie Python LDAP ne supporte pas de recherche persistante."
 
-#: ../pykolab/auth/ldap/__init__.py:142
+#: ../pykolab/auth/ldap/__init__.py:143
 #, python-format
 msgid "Attempting to authenticate user %s in realm %s"
+msgstr "Tentative d'authentification de l'utilisateur %s sur le royaume %s"
+
+#: ../pykolab/auth/ldap/__init__.py:175 ../pykolab/auth/ldap/__init__.py:226
+#, python-format
+msgid "Authentication cache failed: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:184
+#: ../pykolab/auth/ldap/__init__.py:216 ../pykolab/auth/ldap/__init__.py:240
 #, python-format
 msgid "Binding with user_dn %s and password %s"
-msgstr ""
+msgstr "Connexion avec le nom distinctif %s et le mot de passe %s "
 
-#: ../pykolab/auth/ldap/__init__.py:194
+#: ../pykolab/auth/ldap/__init__.py:231 ../pykolab/auth/ldap/__init__.py:263
 #, python-format
 msgid "Failed to authenticate as user %s"
+msgstr "L'authentification de l'utilisateur %s a échoué"
+
+#: ../pykolab/auth/ldap/__init__.py:249
+#, python-format
+msgid "Error occured, there is no such object: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:211
-msgid "Connecting to LDAP..."
+#: ../pykolab/auth/ldap/__init__.py:254
+msgid "Authentication cache failed to clear entry"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:260
+#, python-format
+msgid "Exception occured: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:215
+#: ../pykolab/auth/ldap/__init__.py:280
+msgid "Connecting to LDAP..."
+msgstr "Connexion à la base LDAP ..."
+
+#: ../pykolab/auth/ldap/__init__.py:284
 #, python-format
 msgid "Attempting to use LDAP URI %s"
+msgstr "Tentative d'utilisation de l'URI LDAP %s"
+
+#: ../pykolab/auth/ldap/__init__.py:371
+#, python-format
+msgid "Entry ID: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:357
+#: ../pykolab/auth/ldap/__init__.py:373
 #, python-format
-msgid "Finding recipient with filter %r"
+msgid "Entry DN: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:425
+#: ../pykolab/auth/ldap/__init__.py:376
+#, python-format
+msgid ""
+"ldap search: (%r, %r, filterstr='(objectclass=*)', attrlist=[ 'dn' ] + %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:453
+#, python-format
+msgid "Finding recipient with filter %r"
+msgstr "Recherche de destinataire à partir du filtre %r"
+
+#: ../pykolab/auth/ldap/__init__.py:529
 #, python-format
 msgid "Finding resource with filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:448
+#: ../pykolab/auth/ldap/__init__.py:560
 #, python-format
 msgid "Using timestamp %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:480
+#: ../pykolab/auth/ldap/__init__.py:597
 #, python-format
-msgid "Applying recipient policy to %r"
+msgid "Not applying recipient policy for %s (disabled through configuration)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:497
+#: ../pykolab/auth/ldap/__init__.py:607
+#, python-format
+msgid "Applying recipient policy to %r"
+msgstr "Application de la stratégie destinataire pour %r"
+
+#: ../pykolab/auth/ldap/__init__.py:624
 #, python-format
-msgid "Using mail attributes: %r, with primary %r and "
+msgid "Using mail attributes: %r, with primary %r and secondary %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:508
+#: ../pykolab/auth/ldap/__init__.py:635
 #, python-format
 msgid "key %r not in entry"
-msgstr ""
+msgstr "la clé %r n'est pas dans l'entrée"
 
-#: ../pykolab/auth/ldap/__init__.py:510
+#: ../pykolab/auth/ldap/__init__.py:637
 #, python-format
 msgid "key %r is the prim. mail attr."
-msgstr ""
+msgstr "la clé %r est l'attribut mail primaire"
 
-#: ../pykolab/auth/ldap/__init__.py:512
+#: ../pykolab/auth/ldap/__init__.py:639
 msgid "prim. mail pol. is not empty"
-msgstr ""
+msgstr "le pol. mail primaire n'est pas vide"
 
-#: ../pykolab/auth/ldap/__init__.py:515
+#: ../pykolab/auth/ldap/__init__.py:642
 #, python-format
 msgid "key %r is the sec. mail attr."
-msgstr ""
+msgstr "la clé %r est l'attribut mail secondaire"
 
-#: ../pykolab/auth/ldap/__init__.py:517
+#: ../pykolab/auth/ldap/__init__.py:644
 msgid "sec. mail pol. is not empty"
-msgstr ""
+msgstr "le pol. mail secondaire n'est pas vide"
 
-#: ../pykolab/auth/ldap/__init__.py:520 ../pykolab/auth/ldap/__init__.py:533
+#: ../pykolab/auth/ldap/__init__.py:648 ../pykolab/auth/ldap/__init__.py:662
 #, python-format
 msgid "Attributes %r are not yet available for entry %r"
-msgstr ""
+msgstr "Les attributs %r n'existent pas pour le moment dans l'entrée %r"
 
-#: ../pykolab/auth/ldap/__init__.py:574
+#: ../pykolab/auth/ldap/__init__.py:701
 #, python-format
 msgid "No results for mail address %s found"
-msgstr ""
+msgstr "Aucun résultat pour l'adresse mail %s"
 
-#: ../pykolab/auth/ldap/__init__.py:585
+#: ../pykolab/auth/ldap/__init__.py:712
 #, python-format
 msgid "1 result for address %s found, verifying"
-msgstr ""
+msgstr "1 résultat trouvé pour l'adresse %s, vérification en cours"
 
-#: ../pykolab/auth/ldap/__init__.py:595
+#: ../pykolab/auth/ldap/__init__.py:722
 #, python-format
-msgid "Too bad, primary email address %s "
+msgid "Too bad, primary email address %s already in use for %s (we are %s)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:606 ../pykolab/auth/ldap/__init__.py:695
+#: ../pykolab/auth/ldap/__init__.py:733 ../pykolab/auth/ldap/__init__.py:822
 msgid "Address assigned to us"
-msgstr ""
+msgstr "Cette adresse vous est assignée"
 
-#: ../pykolab/auth/ldap/__init__.py:661
+#: ../pykolab/auth/ldap/__init__.py:788
 #, python-format
 msgid "No results for address %s found"
-msgstr ""
+msgstr "Aucun résultat pour l'adresse %s"
 
-#: ../pykolab/auth/ldap/__init__.py:672
+#: ../pykolab/auth/ldap/__init__.py:799
 #, python-format
-msgid "1 result for address %s found, "
+msgid "1 result for address %s found, verifying..."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:683
-msgid "Too bad, secondary email "
+#: ../pykolab/auth/ldap/__init__.py:810
+#, python-format
+msgid "Too bad, secondary email address %s already in use for %s (we are %s)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:710
-msgid "Recipient policy composed the following set of secondary "
+#: ../pykolab/auth/ldap/__init__.py:837
+#, python-format
+msgid ""
+"Recipient policy composed the following set of secondary email addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:716
+#: ../pykolab/auth/ldap/__init__.py:848
 #, python-format
 msgid "Secondary mail addresses that we want is not None: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:727
-msgid "Avoiding the duplication of the primary mail "
+#: ../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"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:738
+#: ../pykolab/auth/ldap/__init__.py:870
 #, python-format
 msgid "Entry is getting secondary mail addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:746
-msgid "Entry did not have any secondary mail "
+#: ../pykolab/auth/ldap/__init__.py:878
+#, python-format
+msgid "Entry did not have any secondary mail addresses in %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:772
+#: ../pykolab/auth/ldap/__init__.py:895 ../pykolab/auth/ldap/__init__.py:901
 #, python-format
-msgid "Entry modifications list: %r"
+msgid "secondary_mail_addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:792
+#: ../pykolab/auth/ldap/__init__.py:896 ../pykolab/auth/ldap/__init__.py:902
+#, python-format
+msgid "entry[%s]: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:913
+#, python-format
+msgid "Entry modifications list: %r"
+msgstr "Entrée : liste des modifications : %r"
+
+#: ../pykolab/auth/ldap/__init__.py:941
 #, python-format
 msgid "Setting entry attribute %r to %r for %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:828
+#: ../pykolab/auth/ldap/__init__.py:977
 #, python-format
-msgid "Could not update dn %r"
+msgid ""
+"Could not update dn %r:\n"
+"%r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:841
+#: ../pykolab/auth/ldap/__init__.py:990
 #, python-format
 msgid "Using filter %r"
+msgstr "Utilisation du filtre %r"
+
+#: ../pykolab/auth/ldap/__init__.py:1005
+#, python-format
+msgid "Synchronization is searching against base DN: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:879
+#: ../pykolab/auth/ldap/__init__.py:1051
 #, python-format
-msgid "About to consider the user quota for %r (used: %r, "
+msgid ""
+"About to consider the user quota for %r (used: %r, imap: %r, ldap: %r, "
+"default: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:945
-msgid "Invalid bind credentials"
+#: ../pykolab/auth/ldap/__init__.py:1122
+msgid "Invalid DN, username and/or password."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1229
+#: ../pykolab/auth/ldap/__init__.py:1247 ../pykolab/auth/ldap/__init__.py:1264
+#: ../pykolab/auth/ldap/__init__.py:1628 ../pykolab/auth/ldap/__init__.py:1645
 #, python-format
-msgid "Current changelog entry %s with %s"
+msgid "Found a subject %r with access %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1242
+#: ../pykolab/auth/ldap/__init__.py:1366
 #, python-format
-msgid "Result from recipient policy: %r"
+msgid "Entry %s attribute value: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1385
+#: ../pykolab/auth/ldap/__init__.py:1374
+#, python-format
+msgid "imap.user_mailbox_server(%r) result: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1694 ../pykolab/auth/ldap/__init__.py:1894
+#, python-format
+msgid "Result from recipient policy: %r"
+msgstr "Résultat de la stratégie de destinataire : %r"
+
+#: ../pykolab/auth/ldap/__init__.py:1949
 #, python-format
 msgid "Kolab user %s does not have a result attribute %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1527
+#: ../pykolab/auth/ldap/__init__.py:2108
 #, python-format
 msgid "Finding domain root dn for domain %s"
-msgstr ""
+msgstr "Recherche du nom distinctif racine pour le domaine %s"
 
-#: ../pykolab/auth/ldap/__init__.py:1615
+#: ../pykolab/auth/ldap/__init__.py:2205
 msgid "Authentication database DOWN"
-msgstr ""
+msgstr "Le système d'authentification est INACTIF"
 
-#: ../pykolab/auth/ldap/__init__.py:1699 ../pykolab/auth/ldap/__init__.py:1734
+#: ../pykolab/auth/ldap/__init__.py:2289 ../pykolab/auth/ldap/__init__.py:2337
 #, python-format
 msgid "Entry type: %s"
-msgstr ""
+msgstr "Type de l'enregistrement : %s"
 
-#: ../pykolab/auth/ldap/__init__.py:1822
+#: ../pykolab/auth/ldap/__init__.py:2426
 msgid "LDAP Search Result Data Entry:"
-msgstr ""
+msgstr "Résultat de la recherche LDAP :"
 
-#: ../pykolab/auth/ldap/__init__.py:1838
+#: ../pykolab/auth/ldap/__init__.py:2442
 msgid "Entry Change Notification attributes:"
-msgstr ""
+msgstr "Notification de modification des attributs de l'enregistrement :"
 
-#: ../pykolab/auth/ldap/__init__.py:1843
+#: ../pykolab/auth/ldap/__init__.py:2447
 #, python-format
 msgid "Change Type: %r (%r)"
-msgstr ""
+msgstr "Changement de type : %r(%r)"
 
-#: ../pykolab/auth/ldap/__init__.py:1851
+#: ../pykolab/auth/ldap/__init__.py:2455
 #, python-format
 msgid "Previous DN: %r"
-msgstr ""
+msgstr "Non distinctif précédent : %r"
 
-#: ../pykolab/auth/ldap/__init__.py:1906
+#: ../pykolab/auth/ldap/__init__.py:2510
 #, python-format
 msgid "Object %s searched no longer exists"
-msgstr ""
+msgstr "L'objet %s recherché n'existe pas"
 
-#: ../pykolab/auth/ldap/__init__.py:1916
+#: ../pykolab/auth/ldap/__init__.py:2520
 #, python-format
 msgid "%d results..."
-msgstr ""
+msgstr "%d résultats ..."
 
-#: ../pykolab/auth/ldap/__init__.py:2014
+#: ../pykolab/auth/ldap/__init__.py:2623
 #, python-format
 msgid "Searching with filter %r"
-msgstr ""
+msgstr "Recherche avec le filtre %r"
 
-#: ../pykolab/auth/ldap/__init__.py:2058
+#: ../pykolab/auth/ldap/__init__.py:2675
 #, python-format
 msgid "Checking for support for %s on %s"
+msgstr "Vérification du support de %s pour %s"
+
+#: ../pykolab/auth/ldap/__init__.py:2694
+#, python-format
+msgid "Found support for %s"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:2739
+#, 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."
 msgstr ""
 
-#: ../pykolab/cli/cmd_add_domain.py:36 ../pykolab/cli/cmd_create_mailbox.py:36
+#: ../pykolab/cli/cmd_acl_cleanup.py:34
+msgid "Clean up ACLs that use identifiers that no longer exist"
+msgstr ""
+
+#: ../pykolab/cli/cmd_acl_cleanup.py:56
+#, python-format
+msgid "Deleting ACL %s for subject %s on folder %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_add_alias.py:42
+msgid "Specify the (new) alias address"
+msgstr ""
+
+#: ../pykolab/cli/cmd_add_alias.py:45
+msgid "Specify the existing recipient address"
+msgstr ""
+
+#: ../pykolab/cli/cmd_add_alias.py:66 ../pykolab/cli/cmd_add_alias.py:70
+#, python-format
+msgid "Domain %r is not a local domain"
+msgstr ""
+
+#: ../pykolab/cli/cmd_add_alias.py:75
+msgid "Primary and secondary domain do not have the same parent domain"
+msgstr ""
+
+#: ../pykolab/cli/cmd_add_alias.py:81
+#, python-format
+msgid "No such recipient %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_add_alias.py:87
+#, python-format
+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"
+msgstr ""
+
+#: ../pykolab/cli/cmd_add_alias.py:105
+#, python-format
+msgid "Recipient %r is not the primary recipient for address %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_add_domain.py:36
+#: ../pykolab/cli/cmd_count_domain_mailboxes.py:38
+#: ../pykolab/cli/cmd_create_mailbox.py:36
 #: ../pykolab/cli/cmd_export_mailbox.py:33
-#: ../pykolab/cli/cmd_list_mailboxes.py:39
-#: ../pykolab/cli/cmd_list_user_subscriptions.py:35
+#: ../pykolab/cli/cmd_list_deleted_mailboxes.py:38
+#: ../pykolab/cli/cmd_list_domain_mailboxes.py:36
+#: ../pykolab/cli/cmd_list_mailboxes.py:40
+#: ../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_server_info.py:34
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:38
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:39
+#: ../pykolab/cli/cmd_undelete_mailbox.py:34
 msgid "CLI Options"
-msgstr ""
+msgstr "Options CLI"
 
 #: ../pykolab/cli/cmd_add_domain.py:42
-msgid "Add domain as alias for DOMAIN"
+msgid "Add alias domain."
 msgstr ""
 
 #: ../pykolab/cli/cmd_add_domain.py:47
-msgid "Add a new domain or domain alias."
-msgstr ""
-
-#: ../pykolab/cli/cmd_add_domain.py:55
-msgid "Could not find credentials with sufficient permissions"
+msgid "Add a new domain."
 msgstr ""
 
-#: ../pykolab/cli/cmd_add_domain.py:80 ../pykolab/wap_client/__init__.py:113
-msgid "Invalid parent domain"
+#: ../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."
 msgstr ""
 
-#: ../pykolab/cli/cmd_add_domain.py:86
+#: ../pykolab/cli/cmd_add_domain.py:67 ../pykolab/cli/cmd_delete_domain.py:56
+#: ../pykolab/cli/cmd_find_domain.py:56
 msgid "Domain name"
 msgstr ""
 
@@ -669,7 +879,7 @@ msgid "Folder pattern"
 msgstr ""
 
 #: ../pykolab/cli/cmd_add_user_subscription.py:50
-#: ../pykolab/cli/cmd_list_user_subscriptions.py:56
+#: ../pykolab/cli/cmd_list_user_subscriptions.py:63
 #: ../pykolab/cli/cmd_remove_user_subscription.py:50
 msgid "User ID"
 msgstr ""
@@ -681,32 +891,41 @@ msgid "Cannot subscribe user to folder %r:"
 msgstr ""
 
 #: ../pykolab/cli/cmd_add_user_subscription.py:73
+#: ../pykolab/cli/cmd_delete_message.py:61
+#: ../pykolab/cli/cmd_list_messages.py:67
 #: ../pykolab/cli/cmd_remove_user_subscription.py:73
 msgid "No such folder"
 msgstr ""
 
-#: ../pykolab/cli/cmd_add_user_subscription.py:86
-#, python-format
-msgid "Successfully subscribed user %s to the following folders:"
-msgstr ""
-
-#: ../pykolab/cli/cmd_add_user_subscription.py:92
-#, python-format
-msgid "User %s not subscribed to any folders."
+#: ../pykolab/cli/cmd_count_domain_mailboxes.py:44
+#: ../pykolab/cli/cmd_list_deleted_mailboxes.py:50
+#: ../pykolab/cli/cmd_list_domain_mailboxes.py:48
+#: ../pykolab/cli/cmd_list_mailboxes.py:52 ../pykolab/cli/cmd_list_quota.py:42
+#: ../pykolab/cli/cmd_server_info.py:40
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:57
+msgid "List mailboxes on server SERVER only."
 msgstr ""
 
-#: ../pykolab/cli/cmd_create_mailbox.py:41
+#: ../pykolab/cli/cmd_create_mailbox.py:42
 msgid "Set metadata for folder to ANNOTATION=VALUE"
 msgstr ""
 
 #: ../pykolab/cli/cmd_create_mailbox.py:50
+msgid "Create folder on PARTITION."
+msgstr ""
+
+#: ../pykolab/cli/cmd_create_mailbox.py:60
 msgid "Invalid argument"
 msgstr ""
 
-#: ../pykolab/cli/cmd_create_mailbox.py:58
+#: ../pykolab/cli/cmd_create_mailbox.py:68
 msgid "Invalid argument for metadata"
 msgstr ""
 
+#: ../pykolab/cli/cmd_delete_domain.py:36
+msgid "Delete a domain."
+msgstr ""
+
 #: ../pykolab/cli/cmd_delete_mailbox_acl.py:45
 #: ../pykolab/cli/cmd_delete_mailbox_acl.py:49
 #: ../pykolab/cli/cmd_set_mailbox_acl.py:50
@@ -715,67 +934,131 @@ msgid "ACI Subject"
 msgstr ""
 
 #: ../pykolab/cli/cmd_delete_mailbox_acl.py:48
-#: ../pykolab/cli/cmd_list_mailbox_acls.py:41
-#: ../pykolab/cli/cmd_list_mailbox_metadata.py:41
+#: ../pykolab/cli/cmd_list_mailbox_acls.py:43
+#: ../pykolab/cli/cmd_list_mailbox_metadata.py:54
 #: ../pykolab/cli/cmd_set_mailbox_acl.py:54
-#: ../pykolab/cli/cmd_set_mailbox_metadata.py:54
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:66
+#: ../pykolab/cli/cmd_set_quota.py:46 ../tests/unit/test-015-translate.py:12
+#: ../tests/unit/test-015-translate.py:16
+#: ../tests/unit/test-015-translate.py:18
+#: ../tests/unit/test-015-translate.py:20
 msgid "Folder name"
-msgstr ""
+msgstr "Nom du répertoire"
 
 #: ../pykolab/cli/cmd_delete_mailbox_acl.py:60
-#: ../pykolab/cli/cmd_list_mailbox_acls.py:52
-#: ../pykolab/cli/cmd_list_mailbox_metadata.py:52
+#: ../pykolab/cli/cmd_list_mailbox_acls.py:54
+#: ../pykolab/cli/cmd_list_mailbox_metadata.py:80
 #: ../pykolab/cli/cmd_set_mailbox_acl.py:67
-#: ../pykolab/cli/cmd_set_mailbox_metadata.py:67
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:94
+#: ../pykolab/cli/cmd_set_quota.py:58
 #, python-format
 msgid "No such folder %r"
 msgstr ""
 
 #: ../pykolab/cli/cmd_delete_mailbox.py:46
 msgid "No mailbox specified"
+msgstr "Aucune boîte aux lettres spécifiée"
+
+#: ../pykolab/cli/cmd_delete_mailbox.py:56
+msgid "No such folder(s)"
+msgstr ""
+
+#: ../pykolab/cli/cmd_delete_mailbox.py:63
+#, python-format
+msgid "Could not delete mailbox '%s'"
+msgstr ""
+
+#: ../pykolab/cli/cmd_delete_message.py:36
+msgid "Delete a message from a folder"
+msgstr ""
+
+#: ../pykolab/cli/cmd_delete_message.py:49
+msgid "Specify a UID"
+msgstr ""
+
+#: ../pykolab/cli/cmd_delete_message.py:52
+#: ../pykolab/cli/cmd_list_messages.py:58
+msgid "Specify a folder"
 msgstr ""
 
 #: ../pykolab/cli/cmd_export_mailbox.py:38
 msgid "All folders this user has access to"
-msgstr ""
+msgstr "Tous les dossiers auxquels cet utilisateur a accès "
 
 #: ../pykolab/cli/cmd_export_mailbox.py:108
 #, python-format
 msgid "%s is not a directory"
-msgstr ""
+msgstr "%s n'est pas un répertoire"
 
 #: ../pykolab/cli/cmd_export_mailbox.py:118
 #, python-format
 msgid "ZIP file at %s.zip"
-msgstr ""
+msgstr "Fichier ZIP %s.zip"
 
 #: ../pykolab/cli/cmd_export_mailbox.py:120
 #, python-format
 msgid "No directories found for user %s"
+msgstr "Aucun répertoire trouvé pour l'utilisateur %s"
+
+#: ../pykolab/cli/cmd_find_domain.py:36
+msgid "Find a domain."
 msgstr ""
 
-#: ../pykolab/cli/cmd_list_mailboxes.py:44
+#: ../pykolab/cli/cmd_list_deleted_mailboxes.py:43
+#: ../pykolab/cli/cmd_list_domain_mailboxes.py:41
+#: ../pykolab/cli/cmd_list_mailboxes.py:45
+#: ../pykolab/cli/cmd_list_user_subscriptions.py:41
 msgid "Display raw IMAP UTF-7 folder names"
 msgstr ""
 
-#: ../pykolab/cli/cmd_list_mailboxes.py:75
+#: ../pykolab/cli/cmd_list_domain_mailboxes.py:58
+msgid "Domain"
+msgstr "Domaine"
+
+#: ../pykolab/cli/cmd_list_mailboxes.py:87
 #, python-format
 msgid "Appending folder search for %r"
 msgstr ""
 
-#: ../pykolab/cli/cmd_list_user_subscriptions.py:40
+#: ../pykolab/cli/cmd_list_mailbox_metadata.py:44
+msgid "List annotations as user USER"
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_messages.py:43
+msgid "Include messages flagged as \\Deleted"
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_messages.py:47
+msgid "List messages in a folder"
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_quota.py:73 ../pykolab/cli/cmd_list_quota.py:89
+#, python-format
+msgid "The quota for folder %s is set to literally allow 0KB of storage."
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_user_subscriptions.py:47
 msgid "List unsubscribed folders"
 msgstr ""
 
-#: ../pykolab/cli/cmd_list_user_subscriptions.py:43
+#: ../pykolab/cli/cmd_list_user_subscriptions.py:50
 msgid "List the folders a user is subscribed to."
 msgstr ""
 
-#: ../pykolab/cli/cmd_list_user_subscriptions.py:88
+#: ../pykolab/cli/cmd_list_user_subscriptions.py:98
 #, python-format
 msgid "No unsubscribed folders for user %s"
 msgstr ""
 
+#: ../pykolab/cli/cmd_mailbox_cleanup.py:37
+msgid "Clean up mailboxes that do no longer have an owner."
+msgstr ""
+
+#: ../pykolab/cli/cmd_mailbox_cleanup.py:61
+#, python-format
+msgid "Deleting folder 'user/%s'"
+msgstr ""
+
 #: ../pykolab/cli/cmd_remove_mailaddress.py:49
 msgid "Invalid or unqualified email address."
 msgstr ""
@@ -810,23 +1093,23 @@ msgstr ""
 
 #: ../pykolab/cli/cmd_remove_user_subscription.py:92
 #, python-format
-msgid "User %s not be unsubscribed from any folders."
+msgid "User %s was not unsubscribed from any folders."
 msgstr ""
 
-#: ../pykolab/cli/cmd_rename_mailbox.py:48
+#: ../pykolab/cli/cmd_rename_mailbox.py:52
 msgid "No target mailbox name specified"
-msgstr ""
+msgstr "Aucun nom de boîte aux lettres cible indiqué"
 
-#: ../pykolab/cli/cmd_rename_mailbox.py:50
+#: ../pykolab/cli/cmd_rename_mailbox.py:54
 msgid "No source mailbox name specified"
-msgstr ""
+msgstr "Aucun nom de boîte aux lettres source indiqué"
 
-#: ../pykolab/cli/cmd_rename_mailbox.py:62
+#: ../pykolab/cli/cmd_rename_mailbox.py:66
 #, python-format
 msgid "Source folder %r does not exist"
 msgstr ""
 
-#: ../pykolab/cli/cmd_rename_mailbox.py:66
+#: ../pykolab/cli/cmd_rename_mailbox.py:70
 #, python-format
 msgid "Target folder %r already exists"
 msgstr ""
@@ -837,103 +1120,247 @@ msgstr ""
 msgid "ACI Permissions"
 msgstr ""
 
-#: ../pykolab/cli/cmd_set_mailbox_metadata.py:47
-#: ../pykolab/cli/cmd_set_mailbox_metadata.py:51
-#: ../pykolab/cli/cmd_set_mailbox_metadata.py:56
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:45
+msgid "Set annotation as user USER"
+msgstr ""
+
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:59
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:63
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:68
 msgid "Metadata value"
 msgstr ""
 
-#: ../pykolab/cli/cmd_set_mailbox_metadata.py:50
-#: ../pykolab/cli/cmd_set_mailbox_metadata.py:55
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:62
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:67
 msgid "Metadata path"
 msgstr ""
 
+#: ../pykolab/cli/cmd_set_quota.py:43 ../pykolab/cli/cmd_set_quota.py:47
+msgid "New quota"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:44
+msgid "Delete mailboxes for recipients that do not appear to exist in LDAP."
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:50
+msgid "Display changes, do not apply them."
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:88
+#, python-format
+msgid "Domains in IMAP not in LDAP: %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:101
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:142
+#, python-format
+msgid ""
+"No recipients for '%s' (would have deleted the mailbox if not for --dry-"
+"run)!"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:106
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:147
+#, python-format
+msgid "Deleting mailbox '%s' because it has no recipients"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:110
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:151
+#, python-format
+msgid "An error occurred removing mailbox %r: %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:112
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:153
+#, python-format
+msgid "Not automatically deleting shared folder '%s'"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:114
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:155
+#, python-format
+msgid "No recipients for '%s' (use --delete to delete)!"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:136
+#, python-format
+msgid "Multiple recipients for '%s'!"
+msgstr ""
+
 #: ../pykolab/cli/cmd_sync.py:41
 #, python-format
 msgid "Found %d domains in %d seconds"
-msgstr ""
+msgstr "%d domaines trouvés en %d secondes"
 
 #: ../pykolab/cli/cmd_sync.py:51
 #, python-format
 msgid "Running for domain %s"
-msgstr ""
+msgstr "Exécution pour le domaine %s"
 
-#: ../pykolab/cli/cmd_sync.py:57
+#: ../pykolab/cli/cmd_sync.py:58
 #, python-format
 msgid "Synchronizing users for %s took %d seconds"
+msgstr "Synchronisation des utilisateurs pour %s dans %d secondes"
+
+#: ../pykolab/cli/cmd_undelete_mailbox.py:39
+msgid "Do not actually execute, but state what would have been executed."
 msgstr ""
 
-#: ../pykolab/cli/cmd_undelete_mailbox.py:33
+#: ../pykolab/cli/cmd_undelete_mailbox.py:42
 msgid "Recover mailboxes previously deleted."
-msgstr ""
+msgstr "Restaurer les boîtes aux lettres déjà effacées."
+
+#: ../pykolab/cli/cmd_user_info.py:39
+msgid "Email address"
+msgstr "Adresse mail."
 
 #. This is a nested command
 #. This is a nested component
-#: ../pykolab/cli/commands.py:98 ../pykolab/setup/components.py:90
+#: ../pykolab/cli/commands.py:97 ../pykolab/setup/components.py:90
 #, python-format
 msgid "Command Group: %s"
-msgstr ""
+msgstr "Groupe de commandes : %s"
 
-#: ../pykolab/cli/commands.py:109 ../pykolab/cli/commands.py:114
+#: ../pykolab/cli/commands.py:112 ../pykolab/cli/commands.py:117
 msgid "No such command."
-msgstr ""
+msgstr "Cette commande n'existe pas."
 
-#: ../pykolab/cli/commands.py:165 ../pykolab/setup/components.py:231
+#: ../pykolab/cli/commands.py:167 ../pykolab/setup/components.py:231
 #, python-format
 msgid "Command '%s' already registered"
-msgstr ""
+msgstr "La commande '%s' est déjà enregistrée"
 
-#: ../pykolab/cli/commands.py:190 ../pykolab/setup/components.py:257
-#: ../wallace/modules.py:338
+#: ../pykolab/cli/commands.py:192 ../pykolab/setup/components.py:257
+#: ../wallace/modules.py:369
 #, python-format
 msgid "Alias for %s"
-msgstr ""
+msgstr "Alias pour %s"
 
-#: ../pykolab/cli/commands.py:198 ../pykolab/setup/components.py:265
+#: ../pykolab/cli/commands.py:200 ../pykolab/setup/components.py:265
 msgid "Not yet implemented"
+msgstr "N'est pas implémenté pour le moment"
+
+#: ../pykolab/cli/sieve/cmd_list.py:43 ../pykolab/cli/sieve/cmd_put.py:42
+#: ../pykolab/cli/sieve/cmd_refresh.py:44 ../pykolab/cli/sieve/cmd_test.py:43
+msgid "Email Address"
+msgstr "Adresse mail"
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:99
+#: ../pykolab/plugins/sievemgmt/__init__.py:111
+#, python-format
+msgid "Found the following scripts for user %s: %s"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:100
+#: ../pykolab/plugins/sievemgmt/__init__.py:112
+#, python-format
+msgid "And the following script is active for user %s: %s"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:178
+#: ../pykolab/plugins/sievemgmt/__init__.py:190
+#, python-format
+msgid ""
+"Delivery to folder active, but no folder name attribute available for user "
+"%r"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:181
+#: ../pykolab/plugins/sievemgmt/__init__.py:193
+msgid "Delivery to folder active, but no folder name attribute configured"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:359
+#, python-format
+msgid "MANAGEMENT script for user %s contents: %r"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:364
+#: ../pykolab/plugins/sievemgmt/__init__.py:374
+#, python-format
+msgid "Uploading script MANAGEMENT failed for user %s"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:366
+#: ../pykolab/plugins/sievemgmt/__init__.py:376
+#, python-format
+msgid "Uploading script MANAGEMENT for user %s succeeded"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:377
+#: ../pykolab/plugins/sievemgmt/__init__.py:387
+#, python-format
+msgid "Including script %s in USER (for user %s)"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:386
+#: ../pykolab/plugins/sievemgmt/__init__.py:396
+#, python-format
+msgid "Uploading script USER failed for user %s"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:388
+#: ../pykolab/plugins/sievemgmt/__init__.py:398
+#, python-format
+msgid "Uploading script USER for user %s succeeded"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:416
+#: ../pykolab/plugins/sievemgmt/__init__.py:426
+#, python-format
+msgid "Uploading script MASTER failed for user %s"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:418
+#: ../pykolab/plugins/sievemgmt/__init__.py:428
+#, python-format
+msgid "Uploading script MASTER for user %s succeeded"
 msgstr ""
 
 #: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:40
 msgid "Unspecified command issue identifier"
-msgstr ""
+msgstr "Valeur de retour de la commande non spécifiée"
 
 #: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:50
 msgid "Invalid command issue identifier"
-msgstr ""
+msgstr "Valeur de retour de la commande invalide"
 
 #: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:60
 #: ../pykolab/cli/telemetry/cmd_examine_session.py:65
 msgid "Invalid session identifier"
-msgstr ""
+msgstr "Identifiant de session invalide"
 
 #: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:75
 #: ../pykolab/cli/telemetry/cmd_examine_session.py:100
 #, python-format
 msgid "Session by %s on server %s"
-msgstr ""
+msgstr "Session pour %s sur le serveur %s"
 
 #: ../pykolab/cli/telemetry/cmd_examine_session.py:43
 msgid "Unspecified session identifier"
-msgstr ""
+msgstr "Identifiant de session non spécifié"
 
 #: ../pykolab/cli/telemetry/cmd_list_sessions.py:35
 msgid "List Options"
-msgstr ""
+msgstr "Options de liste"
 
 #: ../pykolab/cli/telemetry/cmd_list_sessions.py:40
 msgid "Display sessions since ..."
-msgstr ""
+msgstr "Afficher les sessions depuis ..."
 
 #: ../pykolab/cli/telemetry/cmd_list_sessions.py:58
 #, python-format
 msgid "Session for user %s started at %s with ID %s"
-msgstr ""
+msgstr "La session pour l'utilisateur %s a débuté à %s avec l'ID %s"
 
 #: ../pykolab/conf/entitlement.py:57 ../pykolab/conf/entitlement.py:80
 #: ../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
-msgid "Invalid entitlement verification "
+#, python-format
+msgid "Invalid entitlement verification certificate at %s"
 msgstr ""
 
 #: ../pykolab/conf/entitlement.py:120 ../pykolab/conf/entitlement.py:123
@@ -948,7 +1375,7 @@ msgstr ""
 #: ../pykolab/conf/entitlement.py:141
 #, python-format
 msgid "License file %s not readable!"
-msgstr ""
+msgstr "Le fichier de licence %s n'est pas lisible !"
 
 #: ../pykolab/conf/entitlement.py:147
 msgid "No entitlement directory found"
@@ -957,160 +1384,163 @@ msgstr ""
 #: ../pykolab/conf/__init__.py:87
 #, python-format
 msgid "Setting %s to %r (from defaults)"
-msgstr ""
+msgstr "Initialisation de %s à %r (valeur par défaut)"
 
 #: ../pykolab/conf/__init__.py:106
 #, python-format
 msgid "Setting %s to %r (from CLI, verified)"
-msgstr ""
+msgstr "Initialisation de %s à %r (depuis la CLI, vérifié)"
 
 #: ../pykolab/conf/__init__.py:109
 #, python-format
 msgid "Setting %s to %r (from CLI, not checked)"
-msgstr ""
+msgstr "Initialisation de %s à %r (depuis la CLI, non vérifié)"
 
 #: ../pykolab/conf/__init__.py:150 ../pykolab/conf/__init__.py:207
 #, python-format
 msgid "Setting %s_%s to '****' (from configuration file)"
-msgstr ""
+msgstr "Initialisation de %s_%s à '****' (depuis le fichier de configuration)"
 
 #: ../pykolab/conf/__init__.py:152 ../pykolab/conf/__init__.py:209
 #, python-format
 msgid "Setting %s_%s to %r (from configuration file)"
-msgstr ""
+msgstr "Initialisation de %s_%s à %r (depuis le fichier de configuration)"
 
 #: ../pykolab/conf/__init__.py:162
 msgid "Setting options from configuration file"
-msgstr ""
+msgstr "Initialisation des options depuis le fichier de configuration"
 
 #: ../pykolab/conf/__init__.py:223
 #, python-format
 msgid "Configuration file %s not readable"
-msgstr ""
+msgstr "Le fichier de configuration %s n'existe pas"
 
 #: ../pykolab/conf/__init__.py:226
 #, python-format
 msgid "Reading configuration file %s"
-msgstr ""
+msgstr "Lecture du fichier de configuration %s"
 
 #: ../pykolab/conf/__init__.py:230
 #, python-format
 msgid "Invalid configuration file %s"
-msgstr ""
+msgstr "Le fichier de configuration %s n'est pas valide"
 
 #: ../pykolab/conf/__init__.py:233
 #, python-format
 msgid "No master configuration section [kolab] in configuration file %s"
-msgstr ""
+msgstr "Il n'y a pas de section principale [kolab] dans le fichier de configuration %s"
 
 #. #
 #. # Runtime Options
 #. #
 #: ../pykolab/conf/__init__.py:267
 msgid "Runtime Options"
-msgstr ""
+msgstr "Options d'exécution"
 
 #: ../pykolab/conf/__init__.py:272
 msgid "Configuration file to use"
-msgstr ""
+msgstr "Fichier  de configuration à utiliser"
 
 #: ../pykolab/conf/__init__.py:278
-msgid "Set the debugging "
+msgid ""
+"Set the debugging verbosity. Maximum is 9, tracing protocols like LDAP, SQL "
+"and IMAP."
 msgstr ""
 
 #: ../pykolab/conf/__init__.py:286
-msgid "Set the logging level. "
+msgid "Set the logging level. One of info, warn, error, critical or debug"
 msgstr ""
 
 #: ../pykolab/conf/__init__.py:294
 msgid "Log file to use"
-msgstr ""
+msgstr "Fichier de log à utiliser"
 
 #: ../pykolab/conf/__init__.py:300
 msgid "Be quiet."
-msgstr ""
+msgstr "Mode silencieux."
 
 #: ../pykolab/conf/__init__.py:306
 msgid "Answer yes to all questions."
-msgstr ""
+msgstr "Répondre oui à toutes les questions."
 
 #: ../pykolab/conf/__init__.py:328
 msgid "No command supplied"
-msgstr ""
+msgstr "Aucune commande fournie"
 
-#: ../pykolab/conf/__init__.py:411
+#: ../pykolab/conf/__init__.py:416
 msgid "Insufficient options. Need section, key and value -in that order."
-msgstr ""
+msgstr "Il manque des options. Il manque au moins une section, clé, valeur en respectant cet ordre."
 
-#: ../pykolab/conf/__init__.py:414
+#: ../pykolab/conf/__init__.py:419
 #, python-format
 msgid "No section '%s' exists."
-msgstr ""
+msgstr "La section '%s' n'existe pas."
 
-#: ../pykolab/conf/__init__.py:445
+#: ../pykolab/conf/__init__.py:461
 #, python-format
 msgid "Setting %s to %r (from the default values for CLI options)"
-msgstr ""
+msgstr "Initialisation de %s à %r (valeur par défaut à partir des options CLI)"
 
-#: ../pykolab/conf/__init__.py:514
+#: ../pykolab/conf/__init__.py:534
 #, python-format
 msgid "Could not execute configuration function: %s"
-msgstr ""
+msgstr "Impossible d'exécuter la fonction de configuration : %s"
 
-#: ../pykolab/conf/__init__.py:522
+#: ../pykolab/conf/__init__.py:542
 #, python-format
 msgid "Option %s/%s does not exist in config file %s, pulling from defaults"
-msgstr ""
+msgstr "L'option %s/%s n'existe pas dans le fichier de configuration %s, on prend la valeur par défaut"
 
-#: ../pykolab/conf/__init__.py:530 ../pykolab/conf/__init__.py:533
+#: ../pykolab/conf/__init__.py:550 ../pykolab/conf/__init__.py:553
 msgid "Option does not exist in defaults."
-msgstr ""
+msgstr "Cette option n'existe pas par défaut."
 
-#: ../pykolab/conf/__init__.py:543
+#: ../pykolab/conf/__init__.py:563
 #, python-format
 msgid "Configuration file %s not readable."
-msgstr ""
+msgstr "Impossible de lire le fichier de configuration : %s."
 
-#: ../pykolab/conf/__init__.py:546
+#: ../pykolab/conf/__init__.py:566
 #, python-format
 msgid "Configuration file %s does not exist."
-msgstr ""
+msgstr "Le fichier de configuration %s n'existe pas."
 
-#: ../pykolab/conf/__init__.py:551
+#: ../pykolab/conf/__init__.py:571
 msgid ""
-"WARNING: A negative debug level value does not make this program be any more "
-"silent."
-msgstr ""
+"WARNING: A negative debug level value does not make this program be any more"
+" silent."
+msgstr "ATTENTION: une valeur négative pour le niveau de verbosité ne va pas rendre ce programme silencieux."
 
-#: ../pykolab/conf/__init__.py:557
+#: ../pykolab/conf/__init__.py:577
 msgid "This program has 9 levels of verbosity. Using the maximum of 9."
-msgstr ""
+msgstr "Ce programme dispose de 9 nivaux de verbosité. Le nombre maximum est donc 9."
 
-#: ../pykolab/conf/__init__.py:565 ../pykolab/conf/__init__.py:571
+#: ../pykolab/conf/__init__.py:585 ../pykolab/conf/__init__.py:591
+#: ../pykolab/conf/__init__.py:595 ../pykolab/conf/__init__.py:601
 msgid "Cannot start SASL authentication daemon"
-msgstr ""
+msgstr "Impossible de démarrer le service d'authentification SASL"
 
-#: ../pykolab/conf/__init__.py:582
+#: ../pykolab/conf/__init__.py:612
 msgid "No imaplib library found."
-msgstr ""
+msgstr "Impossible de trouver la librairie imaplib."
 
-#: ../pykolab/conf/__init__.py:592
+#: ../pykolab/conf/__init__.py:622
 msgid "No LMTP class found in the smtplib library."
-msgstr ""
+msgstr "Impossible de trouver la classe LMTP dans la librairie smtplib."
 
-#: ../pykolab/conf/__init__.py:602
+#: ../pykolab/conf/__init__.py:632
 msgid "No SMTP class found in the smtplib library."
-msgstr ""
+msgstr "Impossible de trouver la classe SMTP dans la librairie smtplib."
 
-#: ../pykolab/conf/__init__.py:616
+#: ../pykolab/conf/__init__.py:646
 #, python-format
 msgid "Found you specified a specific set of items to test: %s"
-msgstr ""
+msgstr "Il semble que vous ayez défini un ensemble spécifique d'éléments pour tester : %s"
 
-#: ../pykolab/conf/__init__.py:624
+#: ../pykolab/conf/__init__.py:654
 #, python-format
 msgid "Selectively selecting: %s"
-msgstr ""
+msgstr "Sélection sélective : %s"
 
 #: ../pykolab/constants.py.in:40
 msgid ""
@@ -1120,7 +1550,7 @@ msgstr ""
 
 #: ../pykolab/constants.py.in:53
 msgid "WARNING"
-msgstr ""
+msgstr "ATTENTION"
 
 #: ../pykolab/constants.py.in:53
 msgid ""
@@ -1130,378 +1560,559 @@ msgstr ""
 
 #: ../pykolab/constants.py.in:72
 msgid "389 Directory Server or Red Hat Directory Server"
-msgstr ""
+msgstr "389 serveur LDAP ou serveur LDAP Red Hat"
 
 #: ../pykolab/constants.py.in:76 ../pykolab/constants.py.in:80
 msgid "OpenLDAP or compatible"
-msgstr ""
+msgstr "serveur OpenLDAP ou compatible"
 
-#: ../pykolab/imap/cyrus.py:79
+#: ../pykolab/imap/cyrus.py:80
 #, python-format
 msgid "Could not connect to Cyrus IMAP server %r"
-msgstr ""
+msgstr "Impossible de se connecter au serveur Cyrus IMAP %r"
 
-#: ../pykolab/imap/cyrus.py:134
+#: ../pykolab/imap/cyrus.py:138
 #, python-format
 msgid "Continuing with separator: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:139
+#: ../pykolab/imap/cyrus.py:143
 msgid "Detected we are running in a Murder topology"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:143
+#: ../pykolab/imap/cyrus.py:147
 msgid "This system is not part of a murder topology"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:164
+#: ../pykolab/imap/cyrus.py:168
 #, python-format
 msgid "Checking actual backend server for folder %s through annotations"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:179
+#: ../pykolab/imap/cyrus.py:173
+#, python-format
+msgid ""
+"Possibly reproducing the find mailfolder server answer from previously "
+"detected and stored annotation value: %r"
+msgstr ""
+
+#: ../pykolab/imap/cyrus.py:196
 #, python-format
 msgid "Could not get the annotations after %s tries."
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:183
+#: ../pykolab/imap/cyrus.py:200
 #, python-format
 msgid "No annotations for %s: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:190
+#: ../pykolab/imap/cyrus.py:207
 #, python-format
 msgid "Server for INBOX folder %s is %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:202
+#: ../pykolab/imap/cyrus.py:227
 #, python-format
 msgid "Setting quota for folder %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:206
+#: ../pykolab/imap/cyrus.py:231
 #, python-format
 msgid "Could not set quota for mailfolder %s"
+msgstr "Impossible d'attribuer un quota pour le dossier de messagerie %s"
+
+#: ../pykolab/imap/cyrus.py:241
+#, python-format
+msgid "Moving INBOX folder %s to %s on partition %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:215
+#: ../pykolab/imap/cyrus.py:243
 #, python-format
 msgid "Moving INBOX folder %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:227
+#: ../pykolab/imap/cyrus.py:259
 #, python-format
 msgid "Setting annotation %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:234
+#: ../pykolab/imap/cyrus.py:264
 #, python-format
 msgid "Could not set annotation %r on mail folder %r: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:238
+#: ../pykolab/imap/cyrus.py:268
 #, python-format
 msgid "Transferring folder %s from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:298
+#: ../pykolab/imap/cyrus.py:328
 #, python-format
 msgid "Undeleting %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:45
+#: ../pykolab/imap/cyrus.py:339
+#, python-format
+msgid "Would have transfered %s from %s to %s"
+msgstr ""
+
+#: ../pykolab/imap/cyrus.py:341
+#, python-format
+msgid "Would have renamed %s to %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:46
 #, python-format
 msgid "Cleaning up ACL entries for %s across all folders"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:60
+#: ../pykolab/imap/__init__.py:61
 #, python-format
 msgid "Cleaning up ACL entries referring to identifier %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:69
+#: ../pykolab/imap/__init__.py:70
 #, python-format
 msgid "Iterating over %d folders"
 msgstr ""
 
 #. Set the ACL to '' (effectively deleting the ACL entry)
-#: ../pykolab/imap/__init__.py:82
+#: ../pykolab/imap/__init__.py:83
 #, python-format
 msgid "Removing acl %r for subject %r from folder %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:143
+#: ../pykolab/imap/__init__.py:145
+msgid "No administrator password is available."
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:153
 #, python-format
 msgid "Logging on to Cyrus IMAP server %s"
-msgstr ""
+msgstr "Connexion au serveur Cyrus IMAP %s"
 
-#: ../pykolab/imap/__init__.py:152
+#: ../pykolab/imap/__init__.py:162
 #, python-format
 msgid "Logging on to Dovecot IMAP server %s"
-msgstr ""
+msgstr "Connexion au serveur Dovecot IMAP %s"
 
-#: ../pykolab/imap/__init__.py:161
+#: ../pykolab/imap/__init__.py:171
 #, python-format
 msgid "Logging on to generic IMAP server %s"
-msgstr ""
+msgstr "Connexion au serveur  IMAP générique %s"
 
-#: ../pykolab/imap/__init__.py:179
+#: ../pykolab/imap/__init__.py:189
 #, python-format
 msgid "Reusing existing IMAP server connection to %s"
-msgstr ""
+msgstr "Réutilisation d'une connexion IMAP existante pour %s"
 
-#: ../pykolab/imap/__init__.py:181
+#: ../pykolab/imap/__init__.py:191
 #, python-format
 msgid "Reconnecting to IMAP server %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:197
-msgid "Called imap.disconnect() on a server that "
+#: ../pykolab/imap/__init__.py:208
+msgid "Called imap.disconnect() on a server that we had no connection to."
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:213
+#: ../pykolab/imap/__init__.py:221 ../pykolab/imap/__init__.py:233
 #, python-format
-msgid "%r has no attribute %s"
+msgid "Could not create folder %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:222
+#, python-format
+msgid " on server %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:286
-msgid "Private annotations need to be set using the appropriate user account."
+#: ../pykolab/imap/__init__.py:243 ../pykolab/imap/__init__.py:245
+#, python-format
+msgid "%r has no attribute %s"
+msgstr "%r n'a pas d'attribut %s"
+
+#: ../pykolab/imap/__init__.py:373
+#, python-format
+msgid "Could not set ACL for %s on folder %s: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:319 ../pykolab/imap/__init__.py:354
+#: ../pykolab/imap/__init__.py:407 ../pykolab/imap/__init__.py:442
 #, python-format
 msgid "Creating new shared folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:376
+#: ../pykolab/imap/__init__.py:467 ../pykolab/imap/__init__.py:689
+#, python-format
+msgid "Downcasing mailbox name %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:471
 #, python-format
 msgid "Creating new mailbox for user %s"
+msgstr "Création d'une nouvelle boîte aux lettres pour l'utilisateur %s"
+
+#: ../pykolab/imap/__init__.py:484
+msgid "Waiting for the Cyrus IMAP Murder to settle..."
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:405
+#: ../pykolab/imap/__init__.py:530
 #, python-format
 msgid "Creating additional folders for user %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:429
+#: ../pykolab/imap/__init__.py:549
 #, python-format
-msgid "Mailbox already exists: %s"
+msgid "Waiting for the Cyrus murder to settle... %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:472
+#: ../pykolab/imap/__init__.py:561
+#, python-format
+msgid "Correcting additional folder name from %r to %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:567
+#, python-format
+msgid "Mailbox already exists: %s"
+msgstr "La boîte aux lettres existe déjà : %s "
+
+#: ../pykolab/imap/__init__.py:607
 msgid "Subscribing user to the additional folders"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:532 ../pykolab/imap/__init__.py:606
+#: ../pykolab/imap/__init__.py:621
+msgid "Using the following tests for folder subscriptions:"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:623
+#, python-format
+msgid "    %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:626
+#, python-format
+msgid "Folder %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:638
+#, python-format
+msgid "Subscribing %s to folder %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:642
+#, python-format
+msgid "Subscribing %s to folder %s failed: %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:672
+#, python-format
+msgid "Could not rename %s to reside on partition %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:705
+#, python-format
+msgid "INBOX folder to rename (%s) does not exist"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:708 ../pykolab/imap/__init__.py:784
 #, python-format
 msgid "Renaming INBOX from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:536
+#: ../pykolab/imap/__init__.py:712
 #, python-format
 msgid "Could not rename INBOX folder %s to %s"
-msgstr ""
+msgstr "Impossible de renommer le dossier INBOX %s en %s"
+
+#: ../pykolab/imap/__init__.py:714 ../pykolab/imap/__init__.py:788
+#, python-format
+msgid ""
+"Moving INBOX folder %s won't succeed as target folder %s already exists"
+msgstr "Impossible de déplacer la boite de réception %s, le répertoire de destination %s existe déjà "
 
-#: ../pykolab/imap/__init__.py:538 ../pykolab/imap/__init__.py:610
+#: ../pykolab/imap/__init__.py:718
 #, python-format
-msgid "Moving INBOX folder %s won't succeed as target folder %s already exists"
+msgid "Server for mailbox %r is %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:548
+#: ../pykolab/imap/__init__.py:726
 #, python-format
 msgid "Looking for folder '%s', we found folders: %r"
-msgstr ""
+msgstr "Recherche du répertoire '%s', les répertoires trouvés sont : %r"
 
-#: ../pykolab/imap/__init__.py:571
+#: ../pykolab/imap/__init__.py:749
 #, python-format
-msgid "Setting ACL rights %s for subject %s on folder "
+msgid "Setting ACL rights %s for subject %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:582
+#: ../pykolab/imap/__init__.py:760
 #, python-format
-msgid "Removing ACL rights %s for subject %s on folder "
+msgid "Removing ACL rights %s for subject %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:603
+#: ../pykolab/imap/__init__.py:781
 #, python-format
 msgid "Found old INBOX folder %s"
-msgstr ""
+msgstr "Ancienne boite de réception %s trouvée"
 
-#: ../pykolab/imap/__init__.py:612
+#: ../pykolab/imap/__init__.py:790
 #, python-format
 msgid "Did not find old folder user/%s to rename"
-msgstr ""
+msgstr "Impossible de trouver l'ancien répertoire user/%s pour le renommer"
 
-#: ../pykolab/imap/__init__.py:614
+#: ../pykolab/imap/__init__.py:792
 msgid "Value for user is not a dictionary"
-msgstr ""
+msgstr "La valeur pour l'utilisateur n'est pas un dictionnaire"
 
 #. TODO: Go in fact correct the quota.
-#: ../pykolab/imap/__init__.py:674
+#: ../pykolab/imap/__init__.py:860
 #, python-format
 msgid "Cannot get current IMAP quota for folder %s"
-msgstr ""
+msgstr "Impossible de récupérer le quota IMAP du répertoire %s"
 
-#: ../pykolab/imap/__init__.py:687
+#: ../pykolab/imap/__init__.py:873
 #, python-format
 msgid "Quota for %s currently is %s"
-msgstr ""
+msgstr "Le quota pour %s est actuellement %s"
 
-#: ../pykolab/imap/__init__.py:693
+#: ../pykolab/imap/__init__.py:879
 #, python-format
 msgid "Adjusting authentication database quota for folder %s to %d"
-msgstr ""
+msgstr "Ajustement du quota de la base d'authentification pour le répertoire %s à %d"
 
-#: ../pykolab/imap/__init__.py:698
+#: ../pykolab/imap/__init__.py:884
 #, python-format
 msgid "Correcting quota for %s to %s (currently %s)"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:775
+#: ../pykolab/imap/__init__.py:961
 #, python-format
 msgid "Checking folder: %s"
-msgstr ""
+msgstr "Vérification du répertoire : %s"
 
-#: ../pykolab/imap/__init__.py:780
+#: ../pykolab/imap/__init__.py:966
 #, python-format
 msgid "Folder has no corresponding user (1): %s"
-msgstr ""
+msgstr "Le répertoire ne dispose pas d'utilisateur (1) correspondant : %s"
 
-#: ../pykolab/imap/__init__.py:783
+#: ../pykolab/imap/__init__.py:969
 #, python-format
 msgid "Folder has no corresponding user (2): %s"
-msgstr ""
+msgstr "Le répertoire ne dispose pas d'utilisateur (2) correspondant : %s"
 
 #. We got user identifier only
-#: ../pykolab/imap/__init__.py:798
+#: ../pykolab/imap/__init__.py:984
 msgid "Please don't give us just a user identifier"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:801
+#: ../pykolab/imap/__init__.py:987
 #, python-format
 msgid "Deleting folder %s"
 msgstr ""
 
 #: ../pykolab/__init__.py:50
 msgid "Returning thread local configuration"
+msgstr "retourne le fil d’exécution : configuration locale "
+
+#: ../pykolab/itip/__init__.py:45
+#, python-format
+msgid "Method %r not really interesting for us."
 msgstr ""
 
-#: ../pykolab/logger.py:105
+#: ../pykolab/itip/__init__.py:51
 #, python-format
-msgid "Could not change the ownership of log file %s"
+msgid "Raw iTip payload: %s"
+msgstr ""
+
+#: ../pykolab/itip/__init__.py:61
+msgid "Could not read iTip from message."
 msgstr ""
 
-#: ../pykolab/logger.py:121
+#: ../pykolab/itip/__init__.py:69
 #, python-format
-msgid "Cannot log to file %s: %s"
+msgid "Duplicate iTip object: %s"
+msgstr ""
+
+#: ../pykolab/itip/__init__.py:93
+msgid "iTip event without a start"
+msgstr ""
+
+#: ../pykolab/itip/__init__.py:138
+msgid "Message is not an iTip message (non-multipart message)"
+msgstr ""
+
+#: ../pykolab/itip/__init__.py:221
+#, python-format
+msgid "Send iTip reply %s for %s %r"
+msgstr ""
+
+#: ../pykolab/itip/__init__.py:237
+#, python-format
+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
+#, python-format
+msgid "SMTP sendmail error: %r"
+msgstr ""
+
+#: ../pykolab/itip/__init__.py:280
+#, python-format
+msgid "Failed to compose iTip request message: %r"
+msgstr ""
+
+#: ../pykolab/logger.py:168 ../pykolab/logger.py:175
+#, python-format
+msgid "Could not change permissions on %s: %r"
+msgstr ""
+
+#: ../pykolab/logger.py:192
+#, python-format
+msgid "Cannot log to file %s: %s"
+msgstr "Impossible d'écrire dans le fichier de log %s: %s"
+
 #: ../pykolab/plugins/defaultfolders/__init__.py:47
 #, python-format
 msgid "Plugin %s called without required keyword %s."
-msgstr ""
+msgstr "Le plugin %s a été appelé sans l'argument obligatoire %s."
 
 #: ../pykolab/plugins/defaultfolders/__init__.py:53
 msgid "Could not parse additional_folders"
-msgstr ""
+msgstr "Impossible de traiter additional_folders"
 
 #: ../pykolab/plugins/dynamicquota/__init__.py:58
 #, python-format
 msgid "No keyword %s passed to set_user_folder_quota"
-msgstr ""
+msgstr "Le mot clé %s n'a pas été envoyé à set_user_folder_quota"
 
 #: ../pykolab/plugins/dynamicquota/__init__.py:70
 #, python-format
 msgid "Quota '%s' not an integer!"
-msgstr ""
+msgstr "La valeur du quota '%s' n'est pas un nombre entier !"
 
 #: ../pykolab/plugins/__init__.py:70
 #, python-format
 msgid "ImportError for plugin %s: %s"
-msgstr ""
+msgstr "Erreur d'importation pour le plugin %s: %s"
 
 #: ../pykolab/plugins/__init__.py:74
 #, python-format
 msgid "RuntimeError for plugin %s: %s"
-msgstr ""
+msgstr "Erreur d'exécution pour le plugin %s: %s"
 
 #: ../pykolab/plugins/__init__.py:78
 #, python-format
 msgid "Plugin %s failed to load (%s: %s)"
-msgstr ""
+msgstr "Le plugin %s n'a pas pu être chargé (%s: %s)"
 
 #: ../pykolab/plugins/__init__.py:116 ../pykolab/plugins/__init__.py:118
 #, python-format
 msgid "Cannot set defaults for plugin %s: %s"
-msgstr ""
+msgstr "Impossible de fixer les valeurs par défaut pour le plugin %s: %s"
 
 #: ../pykolab/plugins/__init__.py:120
 #, python-format
 msgid "Cannot set defaults for plugin %s: Unknown Error"
-msgstr ""
+msgstr "Impossible de fixer les valeurs par défaut pour le plugin %s: Erreur inconnu"
 
 #: ../pykolab/plugins/__init__.py:123
 #, python-format
 msgid "Not setting defaults for plugin %s: No function 'set_defaults()'"
-msgstr ""
+msgstr "Impossible de fixer les valeurs par défaut pour le plugin %s: La fonction 'set_defaults()' n'existe pas"
 
 #: ../pykolab/plugins/__init__.py:142
 #, python-format
 msgid "Cannot set runtime for plugin %s: %s"
-msgstr ""
+msgstr "Impossible de fixer l'exécution du plugin %s: %s"
 
 #: ../pykolab/plugins/__init__.py:144
 #, python-format
 msgid "Not setting runtime for plugin %s: No function 'set_runtime()'"
-msgstr ""
+msgstr "Impossible de fixer l'exécution du plugin %s: La fonction 'set_runtime()' n'existe pas"
 
 #: ../pykolab/plugins/__init__.py:163 ../pykolab/plugins/__init__.py:165
 #, python-format
 msgid "Cannot add options for plugin %s: %s"
-msgstr ""
+msgstr "Impossible d'ajouter des options au plugin %s: %s"
 
 #: ../pykolab/plugins/__init__.py:167
 #, python-format
 msgid "Not adding options for plugin %s: No function 'add_options()'"
-msgstr ""
+msgstr "Impossible d'ajouter des options au plugin %s: La fonction 'add_options()' n'existe pas"
 
 #: ../pykolab/plugins/__init__.py:187
 #, python-format
 msgid "Cannot check options for plugin %s: %s"
-msgstr ""
+msgstr "Impossible de vérifier les options du plugin %s: %s"
 
 #: ../pykolab/plugins/__init__.py:189
 #, python-format
 msgid "Not checking options for plugin %s: No function 'check_options()'"
-msgstr ""
+msgstr "Impossible de vérifier les options du plugin %s: La fonction 'check_otions()' n'existe pas"
 
 #: ../pykolab/plugins/__init__.py:227
 #, python-format
 msgid "Executing hook %s for plugin %s"
-msgstr ""
+msgstr "Exécution du hook %s pour le plugin %s"
 
 #: ../pykolab/plugins/__init__.py:231 ../pykolab/plugins/__init__.py:233
 #, python-format
 msgid "Cannot execute hook %s for plugin %s: %s"
-msgstr ""
+msgstr "Impossible d’exécuter le code de substitution %s du plugin %s: %s "
 
 #: ../pykolab/plugins/recipientpolicy/__init__.py:79
 msgid "Attribute substitution for 'mail' failed in Recipient Policy"
-msgstr ""
+msgstr "L'attribut de substitution pour 'mail' ne convient pas à la stratégie de réception"
 
-#: ../pykolab/plugins/recipientpolicy/__init__.py:115
+#: ../pykolab/plugins/recipientpolicy/__init__.py:116
 msgid "Could not parse the alternative mail routines"
 msgstr ""
 
+#: ../pykolab/plugins/recipientpolicy/__init__.py:120
+#, python-format
+msgid "Alternative mail routines: %r"
+msgstr ""
+
 #: ../pykolab/plugins/recipientpolicy/__init__.py:127
-#: ../pykolab/plugins/recipientpolicy/__init__.py:137
+#, python-format
+msgid ""
+"An error occurred in composing the secondary mail attribute for entry %r"
+msgstr ""
+
+#: ../pykolab/plugins/recipientpolicy/__init__.py:138
+#: ../pykolab/plugins/recipientpolicy/__init__.py:153
+#, python-format
+msgid "Appending additional mail address: %s"
+msgstr ""
+
+#: ../pykolab/plugins/recipientpolicy/__init__.py:142
+#, python-format
+msgid "Policy for secondary email address failed: %r"
+msgstr ""
+
+#: ../pykolab/plugins/recipientpolicy/__init__.py:157
 msgid ""
 "Attribute substitution for 'alternative_mail' failed in Recipient Policy"
 msgstr ""
 
+#: ../pykolab/plugins/roundcubedb/__init__.py:48
+#, python-format
+msgid "user_delete: %r"
+msgstr ""
+
+#: ../pykolab/plugins/roundcubedb/__init__.py:55
+#: ../pykolab/setup/setup_roundcube.py:161
+msgid "Roundcube installation path not found."
+msgstr ""
+
+#: ../pykolab/plugins/sievemgmt/__init__.py:51
+msgid "Wrong number of arguments for sieve management plugin"
+msgstr ""
+
 #: ../pykolab/setup/components.py:58
 msgid "Display this help."
-msgstr ""
+msgstr "Afficher cette aide."
 
 #: ../pykolab/setup/components.py:149
 msgid "No component selected, continuing for all components"
@@ -1513,340 +2124,410 @@ msgstr ""
 
 #: ../pykolab/setup/setup_freebusy.py:46
 msgid "Setup Free/Busy."
-msgstr ""
+msgstr "Configurer Free/Busy."
 
 #: ../pykolab/setup/setup_freebusy.py:50
 msgid "Free/Busy is not installed on this system"
-msgstr ""
-
-#: ../pykolab/setup/setup_freebusy.py:55
-msgid ""
-"\n"
-"                        Please supply the MySQL password for the "
-"'roundcube'\n"
-"                        user. You have supplied this password earlier, and "
-"it is\n"
-"                        available from the database URI setting in\n"
-"                        /etc/roundcubemail/db.inc.php.\n"
-"                    "
-msgstr ""
+msgstr "Free/Busy n'est pas installé sur ce système"
 
-#: ../pykolab/setup/setup_freebusy.py:64
-#: ../pykolab/setup/setup_roundcube.py:56
-msgid "MySQL roundcube password"
-msgstr ""
-
-#: ../pykolab/setup/setup_freebusy.py:92
-#: ../pykolab/setup/setup_roundcube.py:116 ../pykolab/setup/setup_zpush.py:71
-#, python-format
-msgid "Using template file %r"
-msgstr ""
+#: ../pykolab/setup/setup_imap.py:45
+msgid "Setup IMAP."
+msgstr "Configurer IMAP"
 
-#: ../pykolab/setup/setup_freebusy.py:99
-#: ../pykolab/setup/setup_roundcube.py:123 ../pykolab/setup/setup_zpush.py:78
-#, python-format
-msgid "Successfully compiled template %r, writing out to %r"
-msgstr ""
+#: ../pykolab/setup/setup_imap.py:89
+msgid "Could not write out Cyrus IMAP configuration file /etc/imapd.conf"
+msgstr "Impossible d'écrire le fichier de configuration de Cyrus IMAP /etc/imapd.cf"
 
-#: ../pykolab/setup/setup_freebusy.py:119 ../pykolab/setup/setup_imap.py:143
-#: ../pykolab/setup/setup_ldap.py:288 ../pykolab/setup/setup_ldap.py:521
-#: ../pykolab/setup/setup_mta.py:309 ../pykolab/setup/setup_mysql.py:49
-#: ../pykolab/setup/setup_roundcube.py:191
-#: ../pykolab/setup/setup_syncroton.py:66 ../pykolab/setup/setup_zpush.py:98
-msgid "Could not start and configure to start on boot, the "
+#: ../pykolab/setup/setup_imap.py:114
+msgid "Could not write out Cyrus IMAP configuration file /etc/cyrus.conf"
 msgstr ""
 
-#: ../pykolab/setup/setup_imap.py:44
-msgid "Setup IMAP."
+#: ../pykolab/setup/setup_imap.py:158
+msgid "Could not start the cyrus-imapd and kolab-saslauthd services."
 msgstr ""
 
-#: ../pykolab/setup/setup_imap.py:88 ../pykolab/setup/setup_imap.py:113
-msgid "Could not write out Cyrus IMAP configuration file /etc/imapd.conf"
+#: ../pykolab/setup/setup_imap.py:173
+msgid ""
+"Could not configure to start on boot, the cyrus-imapd and kolab-saslauthd "
+"services."
 msgstr ""
 
-#: ../pykolab/setup/setup_kolabd.py:43
+#: ../pykolab/setup/setup_kolabd.py:44
 msgid "Setup the Kolab daemon."
-msgstr ""
+msgstr "Configurer le service Kolab."
 
-#: ../pykolab/setup/setup_kolabd.py:51
+#: ../pykolab/setup/setup_kolabd.py:52
 #, python-format
 msgid ""
 "\n"
-"                            Copying the configuration section for 'example."
-"org' over to\n"
+"                            Copying the configuration section for 'example.org' over to\n"
 "                            a section applicable to your domain '%s'.\n"
 "                        "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:43
-msgid "LDAP Options"
+#: ../pykolab/setup/setup_kolabd.py:81
+msgid "Could not start the kolab server service."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:50
-msgid "Specify FQDN (overriding defaults)."
+#: ../pykolab/setup/setup_kolabd.py:90
+msgid "Could not configure to start on boot, the kolab server service."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:58
+#: ../pykolab/setup/setup_ldap.py:45
+msgid "LDAP Options"
+msgstr "Options LDAP"
+
+#: ../pykolab/setup/setup_ldap.py:52
+msgid "Specify FQDN (overriding defaults)."
+msgstr "Spécifiez un nom de domaine complètement qualifié (prioritaire sur la valeur par défaut)."
+
+#: ../pykolab/setup/setup_ldap.py:60
 msgid "Allow anonymous binds (default: no)."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:62
+#: ../pykolab/setup/setup_ldap.py:68
+msgid "Skip setting up the LDAP server."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:76
+msgid "Setup configuration for OpenLDAP compatibility."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:84
+msgid "Setup configuration for Active Directory compatibility."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:88
 msgid "Setup LDAP."
+msgstr "Configurer LDAP."
+
+#: ../pykolab/setup/setup_ldap.py:97
+msgid "Skipping setup of LDAP, as specified"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:126
+msgid ""
+"\n"
+"                        You can not configure Kolab to run against OpenLDAP\n"
+"                        and Active Directory simultaneously.\n"
+"                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:74
+#: ../pykolab/setup/setup_ldap.py:139
 msgid ""
 "\n"
-"                        Please supply a password for the LDAP administrator "
-"user\n"
-"                        'admin', used to login to the graphical console of "
-"389\n"
+"                                It seems 389 Directory Server has an existing\n"
+"                                instance configured. This setup script does not\n"
+"                                intend to destroy or overwrite your data. Please\n"
+"                                make sure /etc/dirsrv/ and /var/lib/dirsrv/ are\n"
+"                                clean so that this setup does not have to worry.\n"
+"                            "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:154
+msgid ""
+"\n"
+"                        Please supply a password for the LDAP administrator user\n"
+"                        'admin', used to login to the graphical console of 389\n"
 "                        Directory server.\n"
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:82
+#: ../pykolab/setup/setup_ldap.py:162
 msgid "Administrator password"
-msgstr ""
+msgstr "Mot de passe administrateur"
 
-#: ../pykolab/setup/setup_ldap.py:89
+#: ../pykolab/setup/setup_ldap.py:169
 msgid ""
 "\n"
-"                        Please supply a password for the LDAP Directory "
-"Manager\n"
-"                        user, which is the administrator user you will be "
-"using\n"
-"                        to at least initially log in to the Web Admin, and "
-"that\n"
+"                        Please supply a password for the LDAP Directory Manager\n"
+"                        user, which is the administrator user you will be using\n"
+"                        to at least initially log in to the Web Admin, and that\n"
 "                        Kolab uses to perform administrative tasks.\n"
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:98
+#: ../pykolab/setup/setup_ldap.py:178
 msgid "Directory Manager password"
-msgstr ""
+msgstr "Mot de passe du Directory Manager"
 
-#: ../pykolab/setup/setup_ldap.py:105
+#: ../pykolab/setup/setup_ldap.py:185
 msgid ""
 "\n"
 "                        Please choose the system user and group the service\n"
 "                        should use to run under. These should be existing,\n"
-"                        unprivileged, local system POSIX accounts with no "
-"shell.\n"
+"                        unprivileged, local system POSIX accounts with no shell.\n"
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:112
+#: ../pykolab/setup/setup_ldap.py:195 ../pykolab/setup/setup_ldap.py:198
 msgid "User"
-msgstr ""
+msgstr "Utilisateur"
 
-#: ../pykolab/setup/setup_ldap.py:113
+#: ../pykolab/setup/setup_ldap.py:196 ../pykolab/setup/setup_ldap.py:199
 msgid "Group"
-msgstr ""
+msgstr "Groupe"
 
-#: ../pykolab/setup/setup_ldap.py:143
+#: ../pykolab/setup/setup_ldap.py:234
 msgid ""
 "\n"
-"                        This setup procedure plans to set up Kolab Groupware "
-"for\n"
-"                        the following domain name space. This domain name "
-"is\n"
+"                        This setup procedure plans to set up Kolab Groupware for\n"
+"                        the following domain name space. This domain name is\n"
 "                        obtained from the reverse DNS entry on your network\n"
-"                        interface. Please confirm this is the appropriate "
-"domain\n"
+"                        interface. Please confirm this is the appropriate domain\n"
 "                        name space.\n"
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:157
+#: ../pykolab/setup/setup_ldap.py:248
 msgid "Domain name to use"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:162 ../pykolab/setup/setup_ldap.py:187
+#: ../pykolab/setup/setup_ldap.py:253 ../pykolab/setup/setup_ldap.py:278
 msgid ""
 "\n"
 "                                    Invalid input. Please try again.\n"
 "                                "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:171
+#: ../pykolab/setup/setup_ldap.py:262
 msgid ""
 "\n"
-"                        The standard root dn we composed for you follows. "
-"Please\n"
+"                        The standard root dn we composed for you follows. Please\n"
 "                        confirm this is the root dn you wish to use.\n"
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:182
+#: ../pykolab/setup/setup_ldap.py:273
 msgid "Root DN to use"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:234
+#: ../pykolab/setup/setup_ldap.py:325
+msgid "No directory server setup tool available."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:337
 msgid ""
 "\n"
-"                    Setup is now going to set up the 389 Directory Server. "
-"This\n"
-"                    may take a little while (during which period there is "
-"no\n"
+"                    Setup is now going to set up the 389 Directory Server. This\n"
+"                    may take a little while (during which period there is no\n"
 "                    output and no progress indication).\n"
 "                "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:241
+#: ../pykolab/setup/setup_ldap.py:344
 msgid "Setting up 389 Directory Server"
+msgstr "Configuration de 389 Directory Server"
+
+#: ../pykolab/setup/setup_ldap.py:356
+msgid ""
+"\n"
+"                        An error was detected in the setup procedure for 389\n"
+"                        Directory Server. This setup will write out stderr and\n"
+"                        stdout to /var/log/kolab/setup.error.log and\n"
+"                        /var/log/kolab/setup.out.log respectively, before it\n"
+"                        exits.\n"
+"                    "
 msgstr ""
 
-#. TODO: Get the return code and display output if not successful.
-#: ../pykolab/setup/setup_ldap.py:253
+#: ../pykolab/setup/setup_ldap.py:373
 msgid "Setup DS stdout:"
-msgstr ""
+msgstr "Configuration DS sortie standard:"
 
-#: ../pykolab/setup/setup_ldap.py:256
+#: ../pykolab/setup/setup_ldap.py:376
 msgid "Setup DS stderr:"
+msgstr "Configuration DS sortie d'erreur :"
+
+#: ../pykolab/setup/setup_ldap.py:402
+msgid "Could not copy the LDAP extensions for Kolab"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:405
+msgid "Could not find the ldap Kolab schema file"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:417
+msgid "Could not start the directory server service."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:279 ../pykolab/setup/setup_mysql.py:129
-msgid "Could not find the Kolab schema file"
+#: ../pykolab/setup/setup_ldap.py:426
+msgid "Could not configure to start on boot, the directory server service."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:293
+#: ../pykolab/setup/setup_ldap.py:431
 msgid ""
 "\n"
 "                        Please supply a Cyrus Administrator password. This\n"
 "                        password is used by Kolab to execute administrative\n"
 "                        tasks in Cyrus IMAP. You may also need the password\n"
 "                        yourself to troubleshoot Cyrus IMAP and/or perform\n"
-"                        other administrative tasks against Cyrus IMAP "
-"directly.\n"
+"                        other administrative tasks against Cyrus IMAP directly.\n"
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:303
+#: ../pykolab/setup/setup_ldap.py:441
 msgid "Cyrus Administrator password"
-msgstr ""
+msgstr "Mot de passe pour l'administrateur Cyrus"
 
-#: ../pykolab/setup/setup_ldap.py:310
+#: ../pykolab/setup/setup_ldap.py:448
 msgid ""
 "\n"
-"                        Please supply a Kolab Service account password. "
-"This\n"
-"                        account is used by various services such as "
-"Postfix,\n"
-"                        and Roundcube, as anonymous binds to the LDAP "
-"server\n"
+"                        Please supply a Kolab Service account password. This\n"
+"                        account is used by various services such as Postfix,\n"
+"                        and Roundcube, as anonymous binds to the LDAP server\n"
 "                        will not be allowed.\n"
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:319
+#: ../pykolab/setup/setup_ldap.py:457
 msgid "Kolab Service password"
-msgstr ""
+msgstr "Mot de passe pour le service Kolab"
 
-#: ../pykolab/setup/setup_ldap.py:329
+#: ../pykolab/setup/setup_ldap.py:467
 msgid "Writing out configuration to kolab.conf"
-msgstr ""
+msgstr "Ecriture de la configuration dans kolab.conf"
 
-#: ../pykolab/setup/setup_ldap.py:343
+#: ../pykolab/setup/setup_ldap.py:481
 msgid "Inserting service users into LDAP."
-msgstr ""
+msgstr "Insertion du service des utilisateurs dans la base LDAP."
 
-#: ../pykolab/setup/setup_ldap.py:417
+#: ../pykolab/setup/setup_ldap.py:555
 msgid "Writing out cn=kolab,cn=config"
-msgstr ""
+msgstr "Affichage cn=kolab,cn=config"
 
 #. TODO: Add kolab-admin role
 #. TODO: Assign kolab-admin admin ACLs
-#: ../pykolab/setup/setup_ldap.py:441
+#: ../pykolab/setup/setup_ldap.py:579
 #, python-format
 msgid "Adding domain %s to list of domains for this deployment"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:457
+#: ../pykolab/setup/setup_ldap.py:607
 msgid "Disabling anonymous binds"
 msgstr ""
 
 #. TODO: Ensure the uid attribute is unique
-#. TODO^2: Consider renaming the general "attribute uniqueness to "uid attribute uniqueness"
-#: ../pykolab/setup/setup_ldap.py:465
+#. TODO^2: Consider renaming the general "attribute uniqueness to "uid
+#. attribute uniqueness"
+#: ../pykolab/setup/setup_ldap.py:615
 msgid "Enabling attribute uniqueness plugin"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:471
+#: ../pykolab/setup/setup_ldap.py:621
 msgid "Enabling referential integrity plugin"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:477
+#: ../pykolab/setup/setup_ldap.py:627
 msgid "Enabling and configuring account policy plugin"
 msgstr ""
 
 #. TODO: Add kolab-admin role
-#: ../pykolab/setup/setup_ldap.py:492
+#: ../pykolab/setup/setup_ldap.py:642
 msgid "Adding the kolab-admin role"
 msgstr ""
 
 #. TODO: User writeable attributes on root_dn
-#: ../pykolab/setup/setup_ldap.py:503
+#: ../pykolab/setup/setup_ldap.py:653
 #, python-format
 msgid "Setting access control to %s"
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:40
-msgid "Setup MTA."
+#: ../pykolab/setup/setup_ldap.py:679
+msgid ""
+"Could not start and configure to start on boot, the directory server admin "
+"service."
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:224 ../pykolab/setup/setup_php.py:80
+#: ../pykolab/setup/setup_mta.py:41
+msgid "Setup MTA."
+msgstr "Configurer le MTA."
+
+#: ../pykolab/setup/setup_mta.py:317 ../pykolab/setup/setup_php.py:106
 #, python-format
 msgid "Setting key %r to %r"
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:252
+#: ../pykolab/setup/setup_mta.py:350
 msgid "Could not write out Postfix configuration file /etc/postfix/master.cf"
+msgstr "Impossible d'écrire le fichier de configuration de Postfix /etc/postfix/master.cf"
+
+#: ../pykolab/setup/setup_mta.py:399
+msgid "Could not write out Amavis configuration file amavisd.conf"
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:287
-msgid "Could not write out Amavis configuration file /etc/amavisd/amavisd.conf"
+#: ../pykolab/setup/setup_mta.py:407
+msgid "Not writing out any configuration for Amavis."
+msgstr ""
+
+#: ../pykolab/setup/setup_mta.py:447
+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 "Configurer MySQL."
+
+#: ../pykolab/setup/setup_mysql.py:49
+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 ""
 
-#: ../pykolab/setup/setup_mysql.py:53
+#: ../pykolab/setup/setup_mysql.py:75
 msgid ""
 "\n"
-"                    Please supply a root password for MySQL. This password "
-"will\n"
-"                    be the administrative user for this MySQL server, and "
-"it\n"
-"                    should be kept a secret. After this setup process has\n"
-"                    completed, Kolab is going to discard and forget about "
-"this\n"
-"                    password, but you will need it for administrative tasks "
-"in\n"
-"                    MySQL.\n"
-"                "
+"                        Please supply the root password for MySQL, so we can set\n"
+"                        up user accounts for other components that use MySQL.\n"
+"                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:64
+#: ../pykolab/setup/setup_mysql.py:82 ../pykolab/setup/setup_mysql.py:99
+#: ../pykolab/setup/setup_roundcube.py:184
+#: ../pykolab/setup/setup_syncroton.py:66
 msgid "MySQL root password"
+msgstr "Mot de passe de root pour MySQL"
+
+#: ../pykolab/setup/setup_mysql.py:88
+msgid ""
+"\n"
+"                        Please supply a root password for MySQL. This password\n"
+"                        will be the administrative user for this MySQL server,\n"
+"                        and it should be kept a secret. After this setup process\n"
+"                        has completed, Kolab is going to discard and forget\n"
+"                        about this password, but you will need it for\n"
+"                        administrative tasks in MySQL.\n"
+"                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:103
+#: ../pykolab/setup/setup_mysql.py:139
 msgid ""
 "\n"
-"                        Please supply a password for the MySQL user "
-"'kolab'.\n"
-"                        This password will be used by Kolab services, such "
-"as\n"
+"                        Please supply a password for the MySQL user 'kolab'.\n"
+"                        This password will be used by Kolab services, such as\n"
 "                        the Web Administration Panel.\n"
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:111
+#: ../pykolab/setup/setup_mysql.py:147
 msgid "MySQL kolab password"
 msgstr ""
 
+#: ../pykolab/setup/setup_mysql.py:166
+msgid "Could not find the MySQL Kolab schema file"
+msgstr ""
+
 #: ../pykolab/setup/setup_php.py:42
 msgid "PHP Options"
 msgstr ""
@@ -1855,45 +2536,75 @@ msgstr ""
 msgid "Specify the timezone for PHP."
 msgstr ""
 
-#: ../pykolab/setup/setup_php.py:53
+#: ../pykolab/setup/setup_php.py:57
+msgid "Specify the path to the php.ini file used with the webserver."
+msgstr ""
+
+#: ../pykolab/setup/setup_php.py:61
 msgid "Setup PHP."
 msgstr ""
 
-#: ../pykolab/setup/setup_php.py:58
+#: ../pykolab/setup/setup_php.py:66
 msgid ""
 "\n"
 "                        Please supply the timezone PHP should be using.\n"
+"                        You have to use a Continent or Country / City locality name\n"
+"                        like 'Europe/Berlin', but not just 'CEST'.\n"
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_php.py:64
+#: ../pykolab/setup/setup_php.py:74
 msgid "Timezone ID"
 msgstr ""
 
+#: ../pykolab/setup/setup_php.py:80
+#, python-format
+msgid "Cannot configure PHP through %r (No such file or directory)"
+msgstr ""
+
+#: ../pykolab/setup/setup_php.py:91
+msgid "Could not find PHP configuration file php.ini"
+msgstr ""
+
 #: ../pykolab/setup/setup_roundcube.py:44
 msgid "Setup Roundcube."
-msgstr ""
+msgstr "Configurer Roundcube."
 
 #: ../pykolab/setup/setup_roundcube.py:48
 msgid ""
 "\n"
-"                    Please supply a password for the MySQL user "
-"'roundcube'.\n"
+"                    Please supply a password for the MySQL user 'roundcube'.\n"
 "                    This password will be used by the Roundcube webmail\n"
 "                    interface.\n"
 "                "
 msgstr ""
 
-#: ../pykolab/setup/setup_syncroton.py:40
-msgid "Setup Syncroton."
+#: ../pykolab/setup/setup_roundcube.py:56
+msgid "MySQL roundcube password"
+msgstr "Mot de passe pour la base MySQL de Roundcube"
+
+#: ../pykolab/setup/setup_roundcube.py:120
+#, python-format
+msgid "Using template file %r"
+msgstr "Utilisation du fichier modèle %r "
+
+#: ../pykolab/setup/setup_roundcube.py:127
+#, python-format
+msgid "Successfully compiled template %r, writing out to %r"
+msgstr "Le fichier modèle %r a bien été compilé, et écrit dans %r"
+
+#: ../pykolab/setup/setup_roundcube.py:229
+#: ../pykolab/setup/setup_syncroton.py:96
+msgid "Could not start the webserver server service."
 msgstr ""
 
-#: ../pykolab/setup/setup_zpush.py:41
-msgid "Setup zpush."
+#: ../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_zpush.py:45
-msgid "Z-Push is not installed on this system"
+#: ../pykolab/setup/setup_syncroton.py:40
+msgid "Setup Syncroton."
 msgstr ""
 
 #. start_max = (int)(time.time())
@@ -1919,399 +2630,1245 @@ msgstr ""
 
 #: ../pykolab/telemetry.py:652
 msgid "No database available"
-msgstr ""
+msgstr "La base de données n'existe pas"
 
-#: ../pykolab/utils.py:57 ../pykolab/utils.py:59
+#: ../pykolab/utils.py:62 ../pykolab/utils.py:64
 #, python-format
 msgid "Confirm %s: "
 msgstr ""
 
-#: ../pykolab/utils.py:62
-msgid "Incorrect confirmation. "
+#: ../pykolab/utils.py:67
+msgid "Incorrect confirmation. Please try again."
 msgstr ""
 
-#: ../pykolab/utils.py:67 ../pykolab/utils.py:72
+#: ../pykolab/utils.py:72 ../pykolab/utils.py:77
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: ../pykolab/utils.py:69 ../pykolab/utils.py:74
+#: ../pykolab/utils.py:74 ../pykolab/utils.py:79
 #, python-format
 msgid "%s [%s]: "
 msgstr ""
 
-#: ../pykolab/utils.py:119
+#: ../pykolab/utils.py:124
 msgid "Please answer 'yes' or 'no'."
+msgstr "Vous devez répondre par 'oui' ou 'non'."
+
+#: ../pykolab/utils.py:164
+msgid "Choice"
 msgstr ""
 
-#: ../pykolab/utils.py:185
+#: ../pykolab/utils.py:167
+msgid "Choice (type '?' for options)"
+msgstr ""
+
+#: ../pykolab/utils.py:268
 #, python-format
 msgid "Could not change the permissions on %s"
+msgstr "Impossible de modifier les permissions sur %s"
+
+#: ../pykolab/utils.py:479
+#, python-format
+msgid "Transliterating string %r with locale %r"
+msgstr ""
+
+#: ../pykolab/utils.py:487
+msgid "Attempting to set locale"
 msgstr ""
 
-#: ../pykolab/wap_client/__init__.py:257
+#: ../pykolab/utils.py:489
+msgid "Success setting locale"
+msgstr ""
+
+#: ../pykolab/utils.py:491
+msgid "Failure to set locale"
+msgstr ""
+
+#: ../pykolab/utils.py:499
+#, python-format
+msgid "Executing '%s | %s'"
+msgstr ""
+
+#: ../pykolab/utils.py:510
+#, python-format
+msgid "Could not translate %s using locale %s"
+msgstr ""
+
+#: ../pykolab/wap_client/__init__.py:396
 #, python-format
 msgid "Requesting %r with params %r"
 msgstr ""
 
-#: ../pykolab/wap_client/__init__.py:263
+#: ../pykolab/wap_client/__init__.py:404
 #, python-format
 msgid "Got response: %r"
 msgstr ""
 
 #. Some data is not JSON
-#: ../pykolab/wap_client/__init__.py:268
+#: ../pykolab/wap_client/__init__.py:410
 msgid "Response data is not JSON"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:79 ../pykolab/xml/attendee.py:99
+#. support integer values, too
+#: ../pykolab/xml/attendee.py:9 ../pykolab/xml/attendee.py:17
+msgid "Needs Action"
+msgstr ""
+
+#: ../pykolab/xml/attendee.py:10 ../pykolab/xml/attendee.py:18
+msgid "Accepted"
+msgstr ""
+
+#: ../pykolab/xml/attendee.py:11 ../pykolab/xml/attendee.py:19
+msgid "Declined"
+msgstr ""
+
+#: ../pykolab/xml/attendee.py:12 ../pykolab/xml/attendee.py:20
+msgid "Tentatively Accepted"
+msgstr ""
+
+#: ../pykolab/xml/attendee.py:13 ../pykolab/xml/attendee.py:21
+msgid "Delegated"
+msgstr ""
+
+#: ../pykolab/xml/attendee.py:14 ../pykolab/xml/attendee.py:22
+msgid "Completed"
+msgstr "terminé"
+
+#: ../pykolab/xml/attendee.py:15 ../pykolab/xml/attendee.py:23
+msgid "Started"
+msgstr ""
+
+#: ../pykolab/xml/attendee.py:132 ../pykolab/xml/attendee.py:154
 msgid "Not a valid attendee"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:84
+#: ../pykolab/xml/attendee.py:139
 msgid "No valid delegator references found"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:104
+#: ../pykolab/xml/attendee.py:159
 msgid "No valid delegatee references found"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:140
+#: ../pykolab/xml/attendee.py:219
 #, python-format
 msgid "Invalid cutype %r"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:151
+#: ../pykolab/xml/attendee.py:231
 #, python-format
 msgid "Invalid participant status %r"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:159
+#: ../pykolab/xml/attendee.py:239
 #, python-format
 msgid "Invalid role %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:172
+#: ../pykolab/xml/event.py:149 ../pykolab/xml/event.py:784
+#: ../pykolab/xml/event.py:827
+msgid "Event start needs datetime.date or datetime.datetime instance"
+msgstr ""
+
+#: ../pykolab/xml/event.py:294
 #, python-format
 msgid "No attendee with email or name %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:180
+#: ../pykolab/xml/event.py:302
 #, python-format
 msgid "Invalid argument value attendee %r, must be basestring or Attendee"
 msgstr ""
 
-#: ../pykolab/xml/event.py:186
+#: ../pykolab/xml/event.py:314
 #, python-format
 msgid "No attendee with email %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:192
+#: ../pykolab/xml/event.py:320
 #, python-format
 msgid "No attendee with name %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:338
-msgid "Invalid participant status"
+#: ../pykolab/xml/event.py:370 ../pykolab/xml/utils.py:151
+msgid "%Y-%m-%d"
 msgstr ""
 
-#: ../pykolab/xml/event.py:538
-msgid "Event end needs datetime.date or datetime.datetime instance"
+#: ../pykolab/xml/event.py:372 ../pykolab/xml/utils.py:152
+msgid "%H:%M (%Z)"
 msgstr ""
 
-#: ../pykolab/xml/event.py:654
+#: ../pykolab/xml/event.py:496
+msgid "Invalid participant status"
+msgstr ""
+
+#: ../pykolab/xml/event.py:618
 #, python-format
-msgid "Invalid status %r"
+msgid "Invalid classification %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:675 ../pykolab/xml/event.py:725
-msgid "Event start needs datetime.date or datetime.datetime instance"
+#: ../pykolab/xml/event.py:649
+msgid "Event end needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: ../pykolab/xml/event.py:761
+#: ../pykolab/xml/event.py:659
+#, python-format
+msgid "Invalid custom property name %r"
+msgstr ""
+
+#: ../pykolab/xml/event.py:837
 #, python-format
 msgid "Invalid status set: %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:879
+#: ../pykolab/xml/event.py:1074
 msgid "No sender specified"
 msgstr ""
 
-#: ../saslauthd/__init__.py:126 ../saslauthd/__init__.py:134
-msgid "Traceback occurred, please report a bug at http://bugzilla.kolabsys.com"
+#: ../pykolab/xml/event.py:1083
+#, python-format
+msgid "Invitation for %s was %s"
+msgstr ""
+
+#: ../pykolab/xml/event.py:1088
+msgid "This is an automated response to one of your event requests."
+msgstr ""
+
+#: ../pykolab/xml/recurrence_rule.py:38
+#, python-format
+msgid "Every %d year(s)"
 msgstr ""
 
-#: ../wallace/__init__.py:61
+#: ../pykolab/xml/recurrence_rule.py:39
+#, python-format
+msgid "Every %d month(s)"
+msgstr ""
+
+#: ../pykolab/xml/recurrence_rule.py:40
+#, python-format
+msgid "Every %d week(s)"
+msgstr ""
+
+#: ../pykolab/xml/recurrence_rule.py:41
+#, python-format
+msgid "Every %d day(s)"
+msgstr ""
+
+#: ../pykolab/xml/recurrence_rule.py:42
+#, python-format
+msgid "Every %d hours"
+msgstr ""
+
+#: ../pykolab/xml/recurrence_rule.py:43
+#, python-format
+msgid "Every %d minutes"
+msgstr ""
+
+#: ../pykolab/xml/recurrence_rule.py:44
+#, python-format
+msgid "Every %d seconds"
+msgstr ""
+
+#: ../pykolab/xml/todo.py:110
+msgid "Todo due needs datetime.date or datetime.datetime instance"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:120
+msgid "Name"
+msgstr "Nom"
+
+#: ../pykolab/xml/utils.py:121
+msgid "Summary"
+msgstr "Résumé"
+
+#: ../pykolab/xml/utils.py:122
+msgid "Location"
+msgstr "Lieu"
+
+#: ../pykolab/xml/utils.py:123
+msgid "Description"
+msgstr "Description"
+
+#: ../pykolab/xml/utils.py:124
+msgid "URL"
+msgstr "URL"
+
+#: ../pykolab/xml/utils.py:125
+msgid "Status"
+msgstr "Statut"
+
+#: ../pykolab/xml/utils.py:126
+msgid "Priority"
+msgstr "Priorité"
+
+#: ../pykolab/xml/utils.py:127
+msgid "Attendee"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:128
+msgid "Start"
+msgstr "Début"
+
+#: ../pykolab/xml/utils.py:129
+msgid "End"
+msgstr "Fin"
+
+#: ../pykolab/xml/utils.py:130
+msgid "Due"
+msgstr "Fin"
+
+#: ../pykolab/xml/utils.py:131
+msgid "Repeat"
+msgstr "Répéter"
+
+#: ../pykolab/xml/utils.py:132
+msgid "Repeat Exception"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:133
+msgid "Organizer"
+msgstr "Organisateur"
+
+#: ../pykolab/xml/utils.py:134
+msgid "Attachment"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:135
+msgid "Alarm"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:136
+msgid "Classification"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:137
+msgid "Progress"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:182
+#, python-format
+msgid "for %d times"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:184
+#, python-format
+msgid "until %s"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:189
+msgid "Display message"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:190
+msgid "Send email"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:191
+msgid "Play sound"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:197
+#, python-format
+msgid "%s after"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:197
+#, python-format
+msgid "%s before"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:206
+#, python-format
+msgid "%d day(s)"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:212
+#, python-format
+msgid "%d hour(s)"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:214
+#, python-format
+msgid "%d minute(s)"
+msgstr ""
+
+#: ../saslauthd/__init__.py:76
+msgid "Socket file to bind to."
+msgstr ""
+
+#: ../saslauthd/__init__.py:108
+#, python-format
+msgid "Could not create %r: %r"
+msgstr ""
+
+#: ../saslauthd/__init__.py:194
+#, python-format
+msgid "kolab-saslauthd could not accept connections on socket: %r"
+msgstr ""
+
+#: ../saslauthd/__init__.py:199
+msgid "Maximum tries exceeded, exiting"
+msgstr ""
+
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:195
+#: ../wallace/module_resources.py:1054
+#, python-format
+msgid "Reservation Request for %(summary)s was %(status)s"
+msgstr ""
+
+#. check notification message sent to resource owner (jane)
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:619
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:635
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:666
+#: ../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
+#, python-format
+msgid "Booking for %s has been %s"
+msgstr ""
+
+#. check confirmation message sent to resource owner (jane)
+#. check first confirmation message sent to resource owner (jane)
+#. check second confirmation message sent to resource owner (jane)
+#. check confirmation message sent to resource owner (jane)
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:656
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:694
+#: ../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
+#, python-format
+msgid "Booking request for %s requires confirmation"
+msgstr ""
+
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:240
+#: ../wallace/module_invitationpolicy.py:441
+#, python-format
+msgid "\"%(summary)s\" has been %(status)s"
+msgstr ""
+
+#. check for notification message
+#. this notification should be suppressed until mark has replied, too
+#. 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
+#, 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
+msgid "PENDING"
+msgstr ""
+
+#. this should trigger a notification message
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1003
+#: ../wallace/module_invitationpolicy.py:1110
+#, python-format
+msgid "\"%s\" has been cancelled"
+msgstr ""
+
+#: ../tests/unit/test-011-itip.py:408
+#, python-format
+msgid "Invitation for %(summary)s was %(status)s"
+msgstr ""
+
+#: ../wallace/__init__.py:57
+#, python-format
+msgid "Wallace modules: %r"
+msgstr ""
+
+#: ../wallace/__init__.py:69
+#, python-format
+msgid "Module %s.execute() failed on message %r with error: %s"
+msgstr ""
+
+#: ../wallace/__init__.py:78
 #, python-format
 msgid "Worker process %s initializing"
 msgstr ""
 
-#: ../wallace/__init__.py:80
+#: ../wallace/__init__.py:100
 msgid "Bind address for Wallace."
-msgstr ""
+msgstr "Adresse de connexion pour Wallace."
 
-#: ../wallace/__init__.py:106
+#: ../wallace/__init__.py:126
 msgid "Port that Wallace is supposed to use."
-msgstr ""
+msgstr "Numéro de port que le service Wallace est supposé utilisé."
 
-#: ../wallace/__init__.py:157
+#: ../wallace/__init__.py:177
 #, python-format
-msgid "Could not bind to socket on port %d on bind "
+msgid "Could not bind to socket on port %d on bind address %s"
 msgstr ""
 
-#: ../wallace/__init__.py:169
+#: ../wallace/__init__.py:189
 msgid "Could not shut down socket"
-msgstr ""
+msgstr "Impossible de supprimer la socket"
 
-#: ../wallace/__init__.py:226
+#: ../wallace/__init__.py:253
 msgid "Accepted connection"
-msgstr ""
+msgstr "La connexion est acceptée"
 
-#: ../wallace/__init__.py:389
+#: ../wallace/__init__.py:428
 #, python-format
 msgid "Could not write pid file %s"
 msgstr ""
 
-#: ../wallace/module_optout.py:61 ../wallace/module_resources.py:94
+#: ../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
 #, python-format
 msgid "Issuing callback after processing to stage %s"
-msgstr ""
+msgstr "Appel de la fonction callback après traitement de la procédure %s"
 
-#: ../wallace/module_optout.py:62 ../wallace/module_resources.py:100
+#: ../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
 #, python-format
 msgid "Testing cb_action_%s()"
-msgstr ""
+msgstr "Test de cb_action_%s()"
 
-#: ../wallace/module_optout.py:64 ../wallace/module_resources.py:103
+#: ../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
 #, python-format
 msgid "Attempting to execute cb_action_%s()"
+msgstr "Tentative d'exécution de cb_action_%s()"
+
+#: ../wallace/module_footer.py:67
+#, python-format
+msgid "Executing module footer for %r, %r"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:66
+#, python-format
+msgid "Executing module gpgencrypt for %r, %r"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:98
+msgid "Message is already encrypted (app/pgp-enc content-type)"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:102
+msgid "Message already encrypted by main content-type header"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:131
+msgid ""
+"Configured to encrypt to a key not configured, and strict policy enabled. "
+"Bailing out."
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:134
+msgid ""
+"Configured to encrypt to a key not configured, but continuing anyway (see "
+"'gpgencrypt_strict')."
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:171
+#, python-format
+msgid "Recipients: %r"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:183
+#, python-format
+msgid "Current keys: %r"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:188
+#, python-format
+msgid "Retrieving key for recipient: %r"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:192 ../wallace/module_gpgencrypt.py:208
+#, python-format
+msgid "Found matching address %r"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:200
+#, python-format
+msgid "Found matching address %r in remote keys"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:232
+#, python-format
+msgid "An error occurred: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:196
+#, python-format
+msgid "Invitation policy called for %r, %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:257
+#, python-format
+msgid "Failed to parse iTip objects from message: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:261
+msgid ""
+"Message is not an iTip message or does not contain any (valid) iTip objects."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:265
+#, python-format
+msgid ""
+"iTip objects attached to this message contain the following information: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:278
+#, python-format
+msgid "No itips, no users, pass along %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:281
+#, python-format
+msgid "iTips, but no users, pass along %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:301
+#, python-format
+msgid "No user attendee matching envelope recipient %s, skip message"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:305
+#, python-format
+msgid "Receiving user: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:330
+#, python-format
+msgid "Apply invitation policy %r for sender %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:341
+#, python-format
+msgid "Ignoring '%s' iTip method"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:345
+#, python-format
+msgid "iTip message %r consumed by the invitationpolicy module"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:361
+msgid "Pass invitation for manual processing"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:366
+#, python-format
+msgid "Receiving Attendee: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:386
+#, python-format
+msgid "Existing %s: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:397
+#, python-format
+msgid "Precondition for object %r fulfilled: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:415
+#, python-format
+msgid ""
+"The iTip request sequence (%r) doesn't match the referred object version "
+"(%r). Ignoring."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:420
+#, python-format
+msgid "Auto-updating %s %r on iTip REQUEST (no re-scheduling)"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:475
+msgid "Pass reply for manual processing"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:482
+#, python-format
+msgid "Sender Attendee: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:494
+#, 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
+#, python-format
+msgid "Auto-updating %s %r on iTip REPLY"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:525
+#, python-format
+msgid "Add delegatee: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:528
+#, python-format
+msgid "Update existing delegatee: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:533
+#, python-format
+msgid "Update delegator: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:550
+#: ../wallace/module_invitationpolicy.py:582
+msgid ""
+"The object referred by this reply was not found in the user's folders. "
+"Forwarding to Inbox."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:563
+msgid "Pass cancellation for manual processing"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:611
+#, python-format
+msgid "Checking if email address %r belongs to a local user"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:616
+#, python-format
+msgid "User DN: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:618
+#, python-format
+msgid "No user record(s) found for %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:674
+#, python-format
+msgid "User record doesn't have the mailbox attribute %r set"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:687
+#, python-format
+msgid "IMAP proxy authentication failed: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:709
+#, python-format
+msgid "List %r folders for user %r: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:725
+#, python-format
+msgid "IMAP metadata for %r: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:755
+#, python-format
+msgid "Searching folder %r for %s %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:771
+#, python-format
+msgid "Failed to parse %s from message %s/%s: %s"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:797
+#, python-format
+msgid "Listing events from folder %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:810
+#: ../wallace/module_resources.py:566 ../wallace/module_resources.py:614
+#, python-format
+msgid "Failed to parse event from message %s/%s: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:816
+#, python-format
+msgid "Existing event %r conflicts with invitation %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:823
+#: ../wallace/module_resources.py:419
+#, python-format
+msgid "start: %r, end: %r, total: %r, messages: %d"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:849
+#, python-format
+msgid "%r is locked, waiting..."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:913
+#, python-format
+msgid "Failed to save %s: no target folder found for user %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:916
+#, python-format
+msgid "Save %s %r to user folder %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:929
+#, python-format
+msgid "Failed to save %s to user folder at %r: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:945
+#, python-format
+msgid "Delete %s %r in %r: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:970
+#, python-format
+msgid "Compose participation status summary for %s %r to user %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1003
+#, python-format
+msgid ""
+"Waiting for more automated replies (got %d of %d); skipping notification"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1013
+#, python-format
+msgid "Changes submitted by %s have been automatically applied."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1022
+msgid "(removed)"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1045
+#: ../wallace/module_invitationpolicy.py:1103
+#: ../wallace/module_invitationpolicy.py:1193
+msgid "*** This is an automated message. Please do not reply. ***"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1076
+#, python-format
+msgid "Send cancellation notification for %s %r to user %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1183
+#, python-format
+msgid "Updated %s's copy of %r: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1186
+#, python-format
+msgid "Attendee %s's copy of %r not found"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1189
+#, python-format
+msgid "Attendee %r not found in LDAP"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1196
+#, python-format
+msgid "%(name)s has %(status)s your assignment for %(summary)s."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1198
+#, python-format
+msgid "%(name)s has %(status)s your invitation for %(summary)s."
 msgstr ""
 
 #. modules.next_module('optout')
 #: ../wallace/module_optout.py:70
 #, python-format
 msgid "Consulting opt-out service for %r, %r"
-msgstr ""
+msgstr "Service Consulting opt-out pour %r,%r"
 
 #: ../wallace/module_optout.py:96
 #, python-format
-msgid "Running opt-out consult from envelope sender '%s "
+msgid ""
+"Running opt-out consult from envelope sender '%s <%s>' to recipient %s <%s>"
 msgstr ""
 
 #: ../wallace/module_optout.py:160
 #, python-format
 msgid "Attempting to execute cb_action_%s(%r, %r)"
-msgstr ""
+msgstr "Tentative d'exécution de cb_action_%s(%r, %r)"
 
 #: ../wallace/module_optout.py:181
 #, python-format
 msgid "Could not send request to optout_url %s"
-msgstr ""
+msgstr "Impossible d'envoyer la requête opt-out via l'URL %s"
 
-#: ../wallace/module_resources.py:81
+#: ../wallace/module_resources.py:115
 #, python-format
 msgid "Resource Management called for %r, %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:139
-msgid "Message is not an iTip message or does not contain any "
+#: ../wallace/module_resources.py:180
+#, 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."
 msgstr ""
 
-#: ../wallace/module_resources.py:147
-msgid "iTip events attached to this message contain the "
+#: ../wallace/module_resources.py:193
+#, python-format
+msgid ""
+"iTip events attached to this message contain the following information: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:174
+#: ../wallace/module_resources.py:226
 msgid "Not an iTip message, but sent to resource nonetheless. Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:182
-msgid "No itips, no resources, pass along"
+#: ../wallace/module_resources.py:234
+#, python-format
+msgid "No itips, no resources, pass along %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:237
+#, python-format
+msgid "iTips, but no resources, pass along %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:186
-msgid "iTips, but no resources, pass along"
+#: ../wallace/module_resources.py:246
+#, python-format
+msgid "No resource attendees matching envelope recipient %s, Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:218
+#: ../wallace/module_resources.py:256
 #, python-format
-msgid "Resources: %r"
+msgid "Resources: %r; %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:236
+#: ../wallace/module_resources.py:274
 #, python-format
-msgid "Checking events in resource folder %r"
+msgid "Sender Attendee: %r => %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:243
+#: ../wallace/module_resources.py:281
 #, python-format
-msgid "Mailbox for resource %r doesn't exist"
+msgid ""
+"The iTip reply sequence (%r) doesn't match the referred event version (%r). "
+"Ignoring."
 msgstr ""
 
-#: ../wallace/module_resources.py:256
+#: ../wallace/module_resources.py:306
 #, python-format
-msgid "Fetching message UID %r from folder %r"
+msgid "Event referenced by this REPLY (%r) not found in resource calendar"
+msgstr ""
+
+#: ../wallace/module_resources.py:309
+msgid "No event reference found in this REPLY. Ignoring."
+msgstr ""
+
+#: ../wallace/module_resources.py:318
+#, python-format
+msgid "Receiving Resource: %r; %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:326
+#, python-format
+msgid "Recipient %r is non-participant, ignoring message"
 msgstr ""
 
-#: ../wallace/module_resources.py:295
+#: ../wallace/module_resources.py:354
 #, python-format
-msgid "Event %r conflicts with event "
+msgid "Accept invitation for individual resource %r / %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:308
+#: ../wallace/module_resources.py:383
 #, python-format
-msgid "start: %r, end: %r, total: %r, messages: %r"
+msgid "Delegate invitation for resource collection %r to %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:315
+#: ../wallace/module_resources.py:415
+#, python-format
+msgid "Failed to read resource calendar for %r: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:425
 #, python-format
 msgid "Polling for resource %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:319
+#: ../wallace/module_resources.py:428
 #, python-format
 msgid "Resource %r has been popped from the list"
 msgstr ""
 
-#: ../wallace/module_resources.py:326
+#: ../wallace/module_resources.py:432
 msgid "Resource is a collection"
 msgstr ""
 
-#: ../wallace/module_resources.py:374 ../wallace/module_resources.py:424
+#: ../wallace/module_resources.py:443
 #, python-format
-msgid "Adding event to %r"
+msgid "Removed conflicting resources from %r: (%r) => %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:473
+#: ../wallace/module_resources.py:455
 #, python-format
-msgid "Method %r not really interesting for us."
+msgid "Conflicting events: %r for resource %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:481
+#: ../wallace/module_resources.py:474
 #, python-format
-msgid "Raw iTip payload: %s"
+msgid "Delegate to another resource collection member: %r to %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:491
-msgid "Could not read iTip from message."
+#: ../wallace/module_resources.py:536
+#, python-format
+msgid "Checking events in resource folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:513
-msgid "iTip event without a start"
+#: ../wallace/module_resources.py:555
+#, python-format
+msgid "Fetching message UID %r from folder %r"
 msgstr ""
 
-#. end if c.name == "VEVENT"
-#. end for c in cal.walk()
-#. end if part.get_content_type() == "text/calendar"
-#. end for part in message.walk()
-#. if message.is_multipart()
-#: ../wallace/module_resources.py:543
-msgid "Message is not an iTip message (non-multipart message)"
+#: ../wallace/module_resources.py:578
+#, python-format
+msgid "Event %r conflicts with event %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:564
+#: ../wallace/module_resources.py:599
 #, python-format
-msgid "Checking if email address %r belongs to a resource (collection)"
+msgid "Searching %r for event %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:575 ../wallace/module_resources.py:649
-#: ../wallace/module_resources.py:699
+#: ../wallace/module_resources.py:605
 #, python-format
-msgid "No resource (collection) records found for %r"
+msgid "Failed to access resource calendar:: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:634
+#, python-format
+msgid "Apply invitation policies %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:653
+#, python-format
+msgid "Adding event to %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:583 ../wallace/module_resources.py:657
 #: ../wallace/module_resources.py:707
 #, python-format
+msgid "Failed to save event to resource calendar at %r: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:724
+#, python-format
+msgid "Delete resource calendar object %r in %r: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:767
+#, 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
+#, python-format
 msgid "Resource record(s): %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:589 ../wallace/module_resources.py:664
-#: ../wallace/module_resources.py:714
+#: ../wallace/module_resources.py:777 ../wallace/module_resources.py:851
+#: ../wallace/module_resources.py:886
+#, 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
 #, python-format
 msgid "Resource record: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:608
+#: ../wallace/module_resources.py:801
 #, python-format
 msgid "Raw itip_events: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:616
+#: ../wallace/module_resources.py:809
 #, python-format
 msgid "Raw set of attendees: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:624
+#: ../wallace/module_resources.py:817
 #, python-format
 msgid "Raw set of resources: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:638
+#: ../wallace/module_resources.py:822
+#, python-format
+msgid "Raw set of organizers: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:842
 #, python-format
 msgid "Checking if attendee %r is a resource (collection)"
 msgstr ""
 
-#: ../wallace/module_resources.py:671 ../wallace/module_resources.py:717
+#: ../wallace/module_resources.py:858 ../wallace/module_resources.py:892
 msgid "Resource reservation made but no resource records found"
 msgstr ""
 
-#: ../wallace/module_resources.py:689
+#: ../wallace/module_resources.py:877
 #, python-format
 msgid "Checking if resource %r is a resource (collection)"
 msgstr ""
 
-#: ../wallace/module_resources.py:721
-msgid "The following resources are being referred to in the "
+#: ../wallace/module_resources.py:895
+#, python-format
+msgid "The following resources are being referred to in the iTip: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:1060
+#, python-format
+msgid ""
+"\n"
+"                *** This is an automated response, please do not reply! ***\n"
+"\n"
+"                Your reservation was delegated to \"%s\" which is available for the requested time.\n"
+"            "
+msgstr ""
+
+#: ../wallace/module_resources.py:1079
+#, python-format
+msgid ""
+"\n"
+"        *** This is an automated response, please do not reply! ***\n"
+"        \n"
+"        We hereby inform you that your reservation was %s.\n"
+"    "
+msgstr ""
+
+#: ../wallace/module_resources.py:1086
+#, python-format
+msgid ""
+"\n"
+"            If you have questions about this reservation, please contact\n"
+"            %s <%s> %s\n"
+"        "
+msgstr ""
+
+#: ../wallace/module_resources.py:1117
+#, python-format
+msgid "Sending booking notification for event %r to %r from %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:1134
+msgid "failed"
+msgstr ""
+
+#: ../wallace/module_resources.py:1153
+#, python-format
+msgid ""
+"\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
+#, python-format
+msgid ""
+"\n"
+"            A reservation request for %(resource)s could not be processed automatically.\n"
+"            Please contact %(orgname)s <%(orgemail)s> who requested this resource for %(date)s. Subject: %(summary)s.\n"
+"\n"
+"            *** This is an automated message, sent to you as the resource owner. ***\n"
+"        "
+msgstr ""
+
+#: ../wallace/module_resources.py:1203
+#, python-format
+msgid "Clone invitation for owner confirmation: %r from %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:1209
+#, python-format
+msgid ""
+"\n"
+"        A reservation request for %(resource)s requires your approval!\n"
+"        Please either accept or decline this invitation without saving it to your calendar.\n"
+"\n"
+"        The reservation request was sent from %(orgname)s <%(orgemail)s>.\n"
+"\n"
+"        Subject: %(summary)s.\n"
+"        Date: %(date)s\n"
+"        Participants: %(attendees)s\n"
+"\n"
+"        *** This is an automated message, please don't reply by email. ***\n"
+"    "
 msgstr ""
 
 #. This is a nested module
-#: ../wallace/modules.py:96
+#: ../wallace/modules.py:97
 #, python-format
 msgid "Module Group: %s"
+msgstr "Groupe de modules : %s"
+
+#: ../wallace/modules.py:108
+#, python-format
+msgid "No such module %r in modules %r (1)."
 msgstr ""
 
-#: ../wallace/modules.py:107 ../wallace/modules.py:112
-msgid "No such module."
+#: ../wallace/modules.py:113
+#, python-format
+msgid "No such module %r in modules %r (2)."
 msgstr ""
 
-#: ../wallace/modules.py:118
+#: ../wallace/modules.py:119
 #, python-format
 msgid "Holding message in queue for manual review (%s by %s)"
-msgstr ""
+msgstr "Conservation du message dans la file d'attente pour consultation manuelle (%s par %s)"
 
-#: ../wallace/modules.py:121
+#: ../wallace/modules.py:122
 #, python-format
 msgid "Deferring message in %s (by module %s)"
-msgstr ""
+msgstr "Différer le message dans %s (par le module %s)"
 
-#: ../wallace/modules.py:131
+#: ../wallace/modules.py:134
 #, python-format
 msgid "The time when the message was sent: %r"
-msgstr ""
+msgstr "Le message a été envoyé le : %r"
 
-#: ../wallace/modules.py:132
+#: ../wallace/modules.py:135
 #, python-format
 msgid "The time now: %r"
-msgstr ""
+msgstr "Le temps actuel : %r"
 
-#: ../wallace/modules.py:133
+#: ../wallace/modules.py:136
 #, python-format
 msgid "The time delta: %r"
-msgstr ""
+msgstr "L'écart de temps : %r"
 
 #. TODO: Send NDR back to user
-#: ../wallace/modules.py:137
+#: ../wallace/modules.py:140
 #, python-format
 msgid "Message in file %s older then 5 days, deleting"
-msgstr ""
+msgstr "Le message dans le file d'attente %s a plus de 5 jours, on le supprime"
 
-#: ../wallace/modules.py:162
+#: ../wallace/modules.py:165
 #, python-format
 msgid "Rejecting message in %s (by module %s)"
-msgstr ""
+msgstr "Rejet du message dans %s (par le module %s)"
 
-#: ../wallace/modules.py:180
+#: ../wallace/modules.py:186
 #, python-format
 msgid ""
 "This is the email system Wallace at %s.\n"
@@ -2324,21 +3881,31 @@ msgid ""
 "Your message is being delivered to any other recipients you may have\n"
 "sent your message to. There is no need to resend the message to those\n"
 "recipients.\n"
-msgstr ""
+msgstr "Ce mail a été généré par le sous système de messagerie Wallace depuis %s.⏎ ⏎ Nous vous informons que nous ne pouvons pas délivrer le message que vous trouverez en attachement vers les destinataires ci-dessous :⏎ ⏎ - %s⏎ ⏎Votre message a été délivré a tous les autres destinataires. ⏎Il n'est donc pas nécessaire de leurs renvoyer ce message.⏎\n"
 
-#: ../wallace/modules.py:195
+#: ../wallace/modules.py:201
 #, python-format
 msgid ""
 "X-Wallace-Module: %s\n"
 "X-Wallace-Result: REJECT\n"
 msgstr ""
 
-#: ../wallace/modules.py:248
+#: ../wallace/modules.py:260
 #, python-format
 msgid "Accepting message in %s (by module %s)"
+msgstr "Le message est accepté dans %s (par le module %s)"
+
+#: ../wallace/modules.py:262
+#, python-format
+msgid "Accepting message in: %r"
 msgstr ""
 
-#: ../wallace/modules.py:316
+#: ../wallace/modules.py:269
 #, python-format
-msgid "Module '%s' already registered"
+msgid "recipients: %r"
 msgstr ""
+
+#: ../wallace/modules.py:347
+#, python-format
+msgid "Module '%s' already registered"
+msgstr "Le module '%s' est déjà enregistré"
diff --git a/po/nl.po b/po/nl.po
index 2cc7753..c3001a2 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -3,657 +3,866 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>, 2012.
+# Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>, 2012
+# Lazlo <transifex at lazlo.me>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
-"Report-Msgid-Bugs-To: https://isues.kolab.org/\n"
-"POT-Creation-Date: 2012-08-14 12:22+0100\n"
-"PO-Revision-Date: 2012-08-14 11:19+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-11 18:01+0200\n"
+"PO-Revision-Date: 2014-09-11 16:00+0000\n"
 "Last-Translator: Jeroen van Meeuwen <vanmeeuwen at kolabsys.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/kolab/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../bin/kolab_smtp_access_policy.py:206
+#: ../bin/kolab_smtp_access_policy.py:209
 #, python-format
 msgid "Adding policy request to instance %s"
 msgstr "Bezig policy verzoek toe te voegen aan %s"
 
-#: ../bin/kolab_smtp_access_policy.py:446
+#: ../bin/kolab_smtp_access_policy.py:479
 msgid "Unauthorized access not allowed"
 msgstr "Niet geautoriseerde toegang niet toegestaan"
 
-#: ../bin/kolab_smtp_access_policy.py:467
-#: ../bin/kolab_smtp_access_policy.py:657
+#: ../bin/kolab_smtp_access_policy.py:508
+#: ../bin/kolab_smtp_access_policy.py:689
 msgid "Could not find recipient"
 msgstr "Kan ontvanger niet vinden"
 
-#: ../bin/kolab_smtp_access_policy.py:486
-#: ../bin/kolab_smtp_access_policy.py:586
+#: ../bin/kolab_smtp_access_policy.py:527
 #, python-format
-msgid "Could not find envelope sender user %s"
-msgstr "Kan envelope zender gebruiker %s niet vinden"
+msgid "Could not find envelope sender user %s (511)"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:529
+#: ../bin/kolab_smtp_access_policy.py:570
 #, python-format
 msgid "Obtained authenticated user details for %r: %r"
 msgstr "Gebruikers details voor geauthentificeerde gebruiker %r verkregen: %r"
 
-#: ../bin/kolab_smtp_access_policy.py:608
+#: ../bin/kolab_smtp_access_policy.py:627
+#, python-format
+msgid "Could not find envelope sender user %s"
+msgstr "Kan envelope zender gebruiker %s niet vinden"
+
+#: ../bin/kolab_smtp_access_policy.py:649
 #, python-format
 msgid "%s is unauthorized to send on behalf of %s"
 msgstr "Het is %s niet toegestaan te versturen namens %s"
 
-#: ../bin/kolab_smtp_access_policy.py:618
+#: ../bin/kolab_smtp_access_policy.py:659
 #, python-format
 msgid ""
 "User %s attempted to use envelope sender address %s without authorization"
 msgstr "Gebruiker %s heeft geprobeerd envelop afzender adres %s te gebruiken zonder autorisatie"
 
-#: ../bin/kolab_smtp_access_policy.py:681
-#: ../bin/kolab_smtp_access_policy.py:692
+#: ../bin/kolab_smtp_access_policy.py:713
+#: ../bin/kolab_smtp_access_policy.py:724
 #, python-format
 msgid "Found user %s to be a delegate user of %s"
 msgstr "Gebruiker %s als delegatie gebruiker van %s gevonden"
 
-#: ../bin/kolab_smtp_access_policy.py:716
+#: ../bin/kolab_smtp_access_policy.py:748
 #, python-format
 msgid ""
 "Verifying authenticated sender '%(sender)s' with sasl_username "
 "'%(sasl_username)s' for recipient '%(recipient)s'"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:719
+#: ../bin/kolab_smtp_access_policy.py:751
 #, python-format
 msgid ""
 "Verifying unauthenticated sender '%(sender)s' for recipient '%(recipient)s'"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:735
+#: ../bin/kolab_smtp_access_policy.py:767
 #, python-format
 msgid "Reproducing verify_recipient(%s, %s) from cache"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:753
+#: ../bin/kolab_smtp_access_policy.py:804
 #, python-format
 msgid "Using authentication domain %s instead of %s"
 msgstr "Gebruik authenticatie domein %s in plaats van %s"
 
-#: ../bin/kolab_smtp_access_policy.py:763
+#: ../bin/kolab_smtp_access_policy.py:814
 #, python-format
 msgid "Domain %s is a primary domain"
 msgstr "Domein %s is een primair domein"
 
-#: ../bin/kolab_smtp_access_policy.py:771
+#: ../bin/kolab_smtp_access_policy.py:822
 #, 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:786
+#: ../bin/kolab_smtp_access_policy.py:837
 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:793
+#: ../bin/kolab_smtp_access_policy.py:854
 #, 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:820
+#: ../bin/kolab_smtp_access_policy.py:890
 msgid "Invalid recipient"
 msgstr "Ongeldige ontvanger"
 
-#: ../bin/kolab_smtp_access_policy.py:831
+#: ../bin/kolab_smtp_access_policy.py:901
 msgid "Could not find this user, accepting"
 msgstr "Kan deze gebruiker niet vinden, accepteren"
 
-#: ../bin/kolab_smtp_access_policy.py:894
-#: ../bin/kolab_smtp_access_policy.py:945
+#: ../bin/kolab_smtp_access_policy.py:974
+#: ../bin/kolab_smtp_access_policy.py:1050
 #, python-format
 msgid "Sender %s is not allowed to send to recipient %s"
 msgstr "Het is afzender %s niet toegestaan te versturen naar ontvanger %s"
 
-#: ../bin/kolab_smtp_access_policy.py:933
+#: ../bin/kolab_smtp_access_policy.py:1038
 #, python-format
 msgid "Reproducing verify_sender(%r) from cache"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:960
+#: ../bin/kolab_smtp_access_policy.py:1055
+msgid "Unverifiable sender."
+msgstr ""
+
+#: ../bin/kolab_smtp_access_policy.py:1060
+msgid "Sender is not using an alias"
+msgstr ""
+
+#: ../bin/kolab_smtp_access_policy.py:1068
 msgid "Sender uses unauthorized envelope sender address"
 msgstr "Verstuurder gebruikt een niet geauthorizeerd envelope zender adres"
 
-#: ../bin/kolab_smtp_access_policy.py:977
+#: ../bin/kolab_smtp_access_policy.py:1085
 msgid "Could not verify sender"
 msgstr "Kan de verstuurder niet verifieren"
 
-#: ../bin/kolab_smtp_access_policy.py:984
+#: ../bin/kolab_smtp_access_policy.py:1092
 msgid ""
 "Verifying whether sender is allowed to send to recipient using sender policy"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:997
+#: ../bin/kolab_smtp_access_policy.py:1105
 #, python-format
 msgid "Result is %r"
 msgstr "Het resultaat is %r"
 
-#: ../bin/kolab_smtp_access_policy.py:1002
+#: ../bin/kolab_smtp_access_policy.py:1110
 msgid "No recipient policy restrictions exist for this sender"
 msgstr "Er zijn geen ontvanger restricties voor deze afzender"
 
-#: ../bin/kolab_smtp_access_policy.py:1011
+#: ../bin/kolab_smtp_access_policy.py:1119
 msgid "Found a recipient policy to apply for this sender."
 msgstr "Ontvanger-beleid gevonden voor deze afzender"
 
-#: ../bin/kolab_smtp_access_policy.py:1026
+#: ../bin/kolab_smtp_access_policy.py:1134
 #, python-format
 msgid "Sender %s not allowed to send to recipient %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1056
+#: ../bin/kolab_smtp_access_policy.py:1155
 msgid "Cleaning up the cache"
 msgstr "Cache aan het schoonmaken"
 
-#: ../bin/kolab_smtp_access_policy.py:1093
+#: ../bin/kolab_smtp_access_policy.py:1177
+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
 #, python-format
 msgid "Operational Error in caching: %s"
 msgstr "Operationele fout in caching: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1144
+#: ../bin/kolab_smtp_access_policy.py:1245
 #, python-format
 msgid "Caching the policy result with timestamp %d"
 msgstr "Policy resultaat aan het cachen met tijd %d"
 
-#: ../bin/kolab_smtp_access_policy.py:1221
+#: ../bin/kolab_smtp_access_policy.py:1319
 #, python-format
 msgid "Returning action DEFER_IF_PERMIT: %s"
 msgstr "Actie DEFER_IF_PERMIT retourneren: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1226
+#: ../bin/kolab_smtp_access_policy.py:1324
 #, python-format
 msgid "Returning action DUNNO: %s"
 msgstr "Actie DUNNO retourneren: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1231
+#: ../bin/kolab_smtp_access_policy.py:1329
 #, python-format
 msgid "Returning action HOLD: %s"
 msgstr "Actie HOLD retourneren: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1236
+#: ../bin/kolab_smtp_access_policy.py:1334
 #, python-format
 msgid "Returning action PERMIT: %s"
 msgstr "Actie PERMIT retourneren: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1241
+#: ../bin/kolab_smtp_access_policy.py:1459
 #, python-format
 msgid "Returning action REJECT: %s"
 msgstr "Actie REJECT retourneren: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1287
+#: ../bin/kolab_smtp_access_policy.py:1505
 msgid "Starting to loop for new request"
 msgstr "Loop aan het starten in afwachting van nieuw verzoek"
 
-#: ../bin/kolab_smtp_access_policy.py:1294
+#: ../bin/kolab_smtp_access_policy.py:1512
 msgid "Timeout for policy request reading exceeded"
 msgstr "Maximale tijd voor het lezen van een policy verzoek verstreken"
 
-#: ../bin/kolab_smtp_access_policy.py:1300
+#: ../bin/kolab_smtp_access_policy.py:1518
 msgid "End of current request"
 msgstr "Einde van huidige verzoek"
 
-#: ../bin/kolab_smtp_access_policy.py:1304
+#: ../bin/kolab_smtp_access_policy.py:1522
 #, python-format
 msgid "Getting line: %s"
 msgstr "Gegeven regel: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1308
+#: ../bin/kolab_smtp_access_policy.py:1526
 msgid "Returning request"
 msgstr "Verzoek aan het retourneren"
 
-#: ../bin/kolab_smtp_access_policy.py:1334
+#: ../bin/kolab_smtp_access_policy.py:1555
 msgid "Access Policy Options"
 msgstr "Opties voor Toegangs-beleid"
 
-#: ../bin/kolab_smtp_access_policy.py:1341
+#: ../bin/kolab_smtp_access_policy.py:1562
 msgid "SMTP Policy request timeout."
 msgstr "Maximale tijd voor SMTP Toegangs-beleid verzoek verstreken"
 
-#: ../bin/kolab_smtp_access_policy.py:1347
+#: ../bin/kolab_smtp_access_policy.py:1568
 msgid "Verify the recipient access policy."
 msgstr "Verifieer het toegangs-beleid voor de ontvanger."
 
-#: ../bin/kolab_smtp_access_policy.py:1353
+#: ../bin/kolab_smtp_access_policy.py:1574
 msgid "Verify the sender access policy."
 msgstr "Verifieer het toegangs-beleid voor de afzender."
 
-#: ../bin/kolab_smtp_access_policy.py:1359
+#: ../bin/kolab_smtp_access_policy.py:1580
 msgid "Allow unauthenticated senders."
 msgstr "Sta niet geauthentificeerde afzenders toe."
 
-#: ../bin/kolab_smtp_access_policy.py:1373
+#: ../bin/kolab_smtp_access_policy.py:1594
 #, python-format
 msgid "Got request instance %s"
 msgstr "Verzoek %s verkregen"
 
-#: ../bin/kolab_smtp_access_policy.py:1382
+#: ../bin/kolab_smtp_access_policy.py:1603
 #, python-format
 msgid "Request instance %s is in state %s"
 msgstr "Verzoek %s is in staat %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1390
+#: ../bin/kolab_smtp_access_policy.py:1611
 #, python-format
 msgid "Request instance %s is not yet in DATA state"
 msgstr "Verzoek %s is nog niet in DATA staat"
 
-#: ../bin/kolab_smtp_access_policy.py:1402
+#: ../bin/kolab_smtp_access_policy.py:1623
 #, python-format
 msgid "Request instance %s reached DATA state"
 msgstr "Verzoek %s heeft DATA staat bereikt"
 
-#: ../bin/kolab_smtp_access_policy.py:1420
+#: ../bin/kolab_smtp_access_policy.py:1643
+#, python-format
+msgid "Unhandled exception caught: %r"
+msgstr ""
+
+#: ../bin/kolab_smtp_access_policy.py:1647
 msgid "Sender access denied"
 msgstr "Toegang voor afzender geweigerd"
 
-#: ../bin/kolab_smtp_access_policy.py:1422
+#: ../bin/kolab_smtp_access_policy.py:1649
 msgid "Recipient access denied"
 msgstr "Toegang voor ontvanger geweigerd"
 
-#: ../bin/kolab_smtp_access_policy.py:1424
+#: ../bin/kolab_smtp_access_policy.py:1651
 msgid "No objections"
 msgstr "Geen bezwaren"
 
-#: ../conf.py:37 ../kolab.py:34 ../saslauthd.py:33
+#: ../conf.py:37 ../kolab-cli.py:34 ../saslauthd.py:33
 msgid "Cannot load pykolab/logger.py:"
 msgstr "Kan pykolab/logger.py niet laden:"
 
-#: ../kolabd/__init__.py:49 ../saslauthd/__init__.py:48
-#: ../wallace/__init__.py:65
+#: ../kolabd/__init__.py:49 ../saslauthd/__init__.py:51
+#: ../wallace/__init__.py:85
 msgid "Daemon Options"
 msgstr "Opties voor Daemon"
 
-#: ../kolabd/__init__.py:56 ../saslauthd/__init__.py:55
-#: ../wallace/__init__.py:72
+#: ../kolabd/__init__.py:56 ../saslauthd/__init__.py:58
+#: ../wallace/__init__.py:92
 msgid "Fork to the background."
 msgstr "Draai op de achtergrond"
 
-#: ../kolabd/__init__.py:65 ../saslauthd/__init__.py:64
-#: ../wallace/__init__.py:98
+#: ../kolabd/__init__.py:65 ../saslauthd/__init__.py:67
+#: ../wallace/__init__.py:118
 msgid "Path to the PID file to use."
 msgstr "Te gebruiken locatie voor PID bestand"
 
-#: ../kolabd/__init__.py:74 ../saslauthd/__init__.py:73
-#: ../wallace/__init__.py:115
+#: ../kolabd/__init__.py:74 ../saslauthd/__init__.py:85
+#: ../wallace/__init__.py:135
 msgid "Run as user USERNAME"
 msgstr "Draai proces als gebruiker USERNAME"
 
-#: ../kolabd/__init__.py:84 ../saslauthd/__init__.py:83
-#: ../wallace/__init__.py:89
+#: ../kolabd/__init__.py:84 ../saslauthd/__init__.py:95
+#: ../wallace/__init__.py:109
 msgid "Run as group GROUPNAME"
 msgstr "Draai proces als group GROUPNAME"
 
-#: ../kolabd/__init__.py:122 ../pykolab/utils.py:151
-#: ../wallace/__init__.py:288
+#: ../kolabd/__init__.py:122 ../pykolab/utils.py:234
+#: ../saslauthd/__init__.py:301 ../wallace/__init__.py:329
 #, python-format
 msgid "Group %s does not exist"
 msgstr "Groep %s bestaat niet"
 
-#: ../kolabd/__init__.py:131 ../wallace/__init__.py:297
+#: ../kolabd/__init__.py:131 ../saslauthd/__init__.py:310
+#: ../wallace/__init__.py:338
 #, python-format
 msgid "Switching real and effective group id to %d"
 msgstr ""
 
-#: ../kolabd/__init__.py:153 ../pykolab/utils.py:175
-#: ../wallace/__init__.py:319
+#: ../kolabd/__init__.py:153 ../pykolab/utils.py:258
+#: ../saslauthd/__init__.py:332 ../wallace/__init__.py:360
 #, python-format
 msgid "User %s does not exist"
 msgstr "Gebruiker %s bestaat niet"
 
-#: ../kolabd/__init__.py:163 ../wallace/__init__.py:329
+#: ../kolabd/__init__.py:163 ../saslauthd/__init__.py:342
+#: ../wallace/__init__.py:370
 #, python-format
 msgid "Switching real and effective user id to %d"
 msgstr ""
 
-#: ../kolabd/__init__.py:172 ../wallace/__init__.py:338
+#: ../kolabd/__init__.py:172 ../saslauthd/__init__.py:351
+#: ../wallace/__init__.py:379
 msgid "Could not change real and effective uid and/or gid"
 msgstr ""
 
-#: ../kolabd/__init__.py:192 ../saslauthd/__init__.py:122
-#: ../wallace/__init__.py:358
+#: ../kolabd/__init__.py:192 ../saslauthd/__init__.py:142
+#: ../wallace/__init__.py:399
 msgid "Interrupted by user"
 msgstr "Onderbroken door gebruiker"
 
 #: ../kolabd/__init__.py:197 ../kolabd/__init__.py:208
-msgid "Traceback occurred, please report a "
-msgstr ""
+#: ../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"
+msgstr "Traceback voorgekomen, rapporteer alstublieft een bug op http://bugzilla.kolabsys.com"
 
-#: ../kolabd/__init__.py:203 ../saslauthd/__init__.py:130
-#: ../wallace/__init__.py:367
+#: ../kolabd/__init__.py:203 ../saslauthd/__init__.py:150
+#: ../wallace/__init__.py:408
 #, python-format
 msgid "Type Error: %s"
 msgstr "Type Fout: %s"
 
-#: ../kolabd/__init__.py:223 ../pykolab/auth/ldap/__init__.py:1591
+#: ../kolabd/__init__.py:230
+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
 msgid "Listing domains..."
 msgstr "Lijst van domeinen verkrijgen..."
 
-#: ../kolabd/__init__.py:256
+#: ../kolabd/__init__.py:244
+msgid "No domains. Not syncing"
+msgstr ""
+
+#: ../kolabd/__init__.py:279
 #, python-format
 msgid "added domains: %r, removed domains: %r"
 msgstr "Domeinen toegevoegd: %r, domeinen verwijderd: %r"
 
+#: ../kolabd/process.py:33
+#, python-format
+msgid "Process created for domain %s"
+msgstr ""
+
+#: ../kolabd/process.py:42
+#, python-format
+msgid "Synchronizing for domain %s"
+msgstr ""
+
+#: ../kolabd/process.py:59
+#, python-format
+msgid ""
+"Error in process %r, terminating:\n"
+"\t%r"
+msgstr ""
+
 #: ../kolabd.py:31 ../setup-kolab.py:36 ../wallace.py:31
 msgid "Cannot load pykolab/constants.py:"
 msgstr "Kan pykolab/constants.py niet laden:"
 
-#: ../pykolab/auth/__init__.py:94
+#: ../pykolab/auth/__init__.py:89
 #, python-format
 msgid "Called for domain %r"
 msgstr "Aangeroepen voor domein %r"
 
-#: ../pykolab/auth/__init__.py:107 ../pykolab/auth/__init__.py:116
+#: ../pykolab/auth/__init__.py:106 ../pykolab/auth/__init__.py:115
 #, python-format
 msgid "Using section %s and domain %s"
 msgstr ""
 
-#: ../pykolab/auth/__init__.py:121
+#: ../pykolab/auth/__init__.py:120
 #, python-format
 msgid "Connecting to Authentication backend for domain %s"
 msgstr "Verbinding met authenticatie backend voor domein %s aan het maken"
 
-#: ../pykolab/auth/__init__.py:132
+#: ../pykolab/auth/__init__.py:131
 #, python-format
 msgid "Section %s has no option 'auth_mechanism'"
 msgstr ""
 
-#: ../pykolab/auth/__init__.py:139
+#: ../pykolab/auth/__init__.py:138
 #, python-format
 msgid "Section %s has auth_mechanism: %r"
 msgstr ""
 
-#: ../pykolab/auth/__init__.py:148 ../pykolab/auth/__init__.py:157
+#: ../pykolab/auth/__init__.py:147 ../pykolab/auth/__init__.py:156
 msgid "Starting LDAP..."
-msgstr ""
+msgstr "LDAP starten..."
 
-#: ../pykolab/auth/ldap/cache.py:109
+#: ../pykolab/auth/ldap/cache.py:126
 #, python-format
 msgid "Inserting cache entry %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/cache.py:122
+#: ../pykolab/auth/ldap/cache.py:147
 #, python-format
 msgid "Updating timestamp for cache entry %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/cache.py:129
+#: ../pykolab/auth/ldap/cache.py:155
 #, python-format
 msgid "Updating result_attribute for cache entry %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:51
+#: ../pykolab/auth/ldap/__init__.py:52
 msgid "Python LDAP library does not support persistent search"
 msgstr "Python LDAP library ondersteund geen persistent search"
 
-#: ../pykolab/auth/ldap/__init__.py:142
+#: ../pykolab/auth/ldap/__init__.py:143
 #, python-format
 msgid "Attempting to authenticate user %s in realm %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:184
+#: ../pykolab/auth/ldap/__init__.py:175 ../pykolab/auth/ldap/__init__.py:226
+#, python-format
+msgid "Authentication cache failed: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:216 ../pykolab/auth/ldap/__init__.py:240
 #, python-format
 msgid "Binding with user_dn %s and password %s"
 msgstr "Bezig met binden als user dn %s en wachtwoord %s"
 
-#: ../pykolab/auth/ldap/__init__.py:194
+#: ../pykolab/auth/ldap/__init__.py:231 ../pykolab/auth/ldap/__init__.py:263
 #, python-format
 msgid "Failed to authenticate as user %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:211
+#: ../pykolab/auth/ldap/__init__.py:249
+#, python-format
+msgid "Error occured, there is no such object: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:254
+msgid "Authentication cache failed to clear entry"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:260
+#, python-format
+msgid "Exception occured: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:280
 msgid "Connecting to LDAP..."
 msgstr "Bezig verbinding te maken met LDAP..."
 
-#: ../pykolab/auth/ldap/__init__.py:215
+#: ../pykolab/auth/ldap/__init__.py:284
 #, python-format
 msgid "Attempting to use LDAP URI %s"
 msgstr "Bezig LDAP URI %s te gebruiken..."
 
-#: ../pykolab/auth/ldap/__init__.py:357
+#: ../pykolab/auth/ldap/__init__.py:371
+#, python-format
+msgid "Entry ID: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:373
+#, python-format
+msgid "Entry DN: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:376
+#, python-format
+msgid ""
+"ldap search: (%r, %r, filterstr='(objectclass=*)', attrlist=[ 'dn' ] + %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:453
 #, python-format
 msgid "Finding recipient with filter %r"
 msgstr "Ontvanger vinden met filter %r"
 
-#: ../pykolab/auth/ldap/__init__.py:425
+#: ../pykolab/auth/ldap/__init__.py:529
 #, python-format
 msgid "Finding resource with filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:448
+#: ../pykolab/auth/ldap/__init__.py:560
 #, python-format
 msgid "Using timestamp %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:480
+#: ../pykolab/auth/ldap/__init__.py:597
+#, python-format
+msgid "Not applying recipient policy for %s (disabled through configuration)"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:607
 #, python-format
 msgid "Applying recipient policy to %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:497
+#: ../pykolab/auth/ldap/__init__.py:624
 #, python-format
-msgid "Using mail attributes: %r, with primary %r and "
+msgid "Using mail attributes: %r, with primary %r and secondary %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:508
+#: ../pykolab/auth/ldap/__init__.py:635
 #, python-format
 msgid "key %r not in entry"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:510
+#: ../pykolab/auth/ldap/__init__.py:637
 #, python-format
 msgid "key %r is the prim. mail attr."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:512
+#: ../pykolab/auth/ldap/__init__.py:639
 msgid "prim. mail pol. is not empty"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:515
+#: ../pykolab/auth/ldap/__init__.py:642
 #, python-format
 msgid "key %r is the sec. mail attr."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:517
+#: ../pykolab/auth/ldap/__init__.py:644
 msgid "sec. mail pol. is not empty"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:520 ../pykolab/auth/ldap/__init__.py:533
+#: ../pykolab/auth/ldap/__init__.py:648 ../pykolab/auth/ldap/__init__.py:662
 #, python-format
 msgid "Attributes %r are not yet available for entry %r"
 msgstr "Attributen %r zijn nog niet beschikbaar voor entry %r"
 
-#: ../pykolab/auth/ldap/__init__.py:574
+#: ../pykolab/auth/ldap/__init__.py:701
 #, python-format
 msgid "No results for mail address %s found"
 msgstr "Geen resultaten voor email adres %s gevonden"
 
-#: ../pykolab/auth/ldap/__init__.py:585
+#: ../pykolab/auth/ldap/__init__.py:712
 #, python-format
 msgid "1 result for address %s found, verifying"
 msgstr "1 resultaat voor adres %s gevonden, aan het verifieren"
 
-#: ../pykolab/auth/ldap/__init__.py:595
+#: ../pykolab/auth/ldap/__init__.py:722
 #, python-format
-msgid "Too bad, primary email address %s "
+msgid "Too bad, primary email address %s already in use for %s (we are %s)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:606 ../pykolab/auth/ldap/__init__.py:695
+#: ../pykolab/auth/ldap/__init__.py:733 ../pykolab/auth/ldap/__init__.py:822
 msgid "Address assigned to us"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:661
+#: ../pykolab/auth/ldap/__init__.py:788
 #, python-format
 msgid "No results for address %s found"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:672
+#: ../pykolab/auth/ldap/__init__.py:799
 #, python-format
-msgid "1 result for address %s found, "
-msgstr "1 resultaat voor adres %s gevonden"
+msgid "1 result for address %s found, verifying..."
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:683
-msgid "Too bad, secondary email "
+#: ../pykolab/auth/ldap/__init__.py:810
+#, python-format
+msgid "Too bad, secondary email address %s already in use for %s (we are %s)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:710
-msgid "Recipient policy composed the following set of secondary "
+#: ../pykolab/auth/ldap/__init__.py:837
+#, python-format
+msgid ""
+"Recipient policy composed the following set of secondary email addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:716
+#: ../pykolab/auth/ldap/__init__.py:848
 #, python-format
 msgid "Secondary mail addresses that we want is not None: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:727
-msgid "Avoiding the duplication of the primary mail "
-msgstr "Duplicaat van primair email adres aan het voorkomen"
+#: ../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"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:738
+#: ../pykolab/auth/ldap/__init__.py:870
 #, python-format
 msgid "Entry is getting secondary mail addresses: %r"
 msgstr "Entry verkrijgt secundaire email adressen: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:746
-msgid "Entry did not have any secondary mail "
-msgstr "Entry had niet reeds enige secundaire email adressen"
+#: ../pykolab/auth/ldap/__init__.py:878
+#, python-format
+msgid "Entry did not have any secondary mail addresses in %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:895 ../pykolab/auth/ldap/__init__.py:901
+#, python-format
+msgid "secondary_mail_addresses: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:896 ../pykolab/auth/ldap/__init__.py:902
+#, python-format
+msgid "entry[%s]: %r"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:772
+#: ../pykolab/auth/ldap/__init__.py:913
 #, python-format
 msgid "Entry modifications list: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:792
+#: ../pykolab/auth/ldap/__init__.py:941
 #, python-format
 msgid "Setting entry attribute %r to %r for %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:828
+#: ../pykolab/auth/ldap/__init__.py:977
 #, python-format
-msgid "Could not update dn %r"
+msgid ""
+"Could not update dn %r:\n"
+"%r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:841
+#: ../pykolab/auth/ldap/__init__.py:990
 #, python-format
 msgid "Using filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:879
+#: ../pykolab/auth/ldap/__init__.py:1005
+#, python-format
+msgid "Synchronization is searching against base DN: %s"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1051
 #, python-format
-msgid "About to consider the user quota for %r (used: %r, "
+msgid ""
+"About to consider the user quota for %r (used: %r, imap: %r, ldap: %r, "
+"default: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:945
+#: ../pykolab/auth/ldap/__init__.py:1122
 msgid "Invalid DN, username and/or password."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1229
+#: ../pykolab/auth/ldap/__init__.py:1247 ../pykolab/auth/ldap/__init__.py:1264
+#: ../pykolab/auth/ldap/__init__.py:1628 ../pykolab/auth/ldap/__init__.py:1645
 #, python-format
-msgid "Current changelog entry %s with %s"
+msgid "Found a subject %r with access %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1242
+#: ../pykolab/auth/ldap/__init__.py:1366
+#, python-format
+msgid "Entry %s attribute value: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1374
+#, python-format
+msgid "imap.user_mailbox_server(%r) result: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1694 ../pykolab/auth/ldap/__init__.py:1894
 #, python-format
 msgid "Result from recipient policy: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1385
+#: ../pykolab/auth/ldap/__init__.py:1949
 #, python-format
 msgid "Kolab user %s does not have a result attribute %r"
 msgstr "Kolab gebruiker %s heeft geen resultaat attribuut %r"
 
-#: ../pykolab/auth/ldap/__init__.py:1527
+#: ../pykolab/auth/ldap/__init__.py:2108
 #, python-format
 msgid "Finding domain root dn for domain %s"
 msgstr "Root DN voor domein %s aan het vinden"
 
-#: ../pykolab/auth/ldap/__init__.py:1615
+#: ../pykolab/auth/ldap/__init__.py:2205
 msgid "Authentication database DOWN"
 msgstr "Authenticatie database NIET beschikbaar"
 
-#: ../pykolab/auth/ldap/__init__.py:1699 ../pykolab/auth/ldap/__init__.py:1734
+#: ../pykolab/auth/ldap/__init__.py:2289 ../pykolab/auth/ldap/__init__.py:2337
 #, python-format
 msgid "Entry type: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1822
+#: ../pykolab/auth/ldap/__init__.py:2426
 msgid "LDAP Search Result Data Entry:"
 msgstr "LDAP Zoek Resultaat:"
 
-#: ../pykolab/auth/ldap/__init__.py:1838
+#: ../pykolab/auth/ldap/__init__.py:2442
 msgid "Entry Change Notification attributes:"
 msgstr "Wijzigingsnotificatie attributen:"
 
-#: ../pykolab/auth/ldap/__init__.py:1843
+#: ../pykolab/auth/ldap/__init__.py:2447
 #, python-format
 msgid "Change Type: %r (%r)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1851
+#: ../pykolab/auth/ldap/__init__.py:2455
 #, python-format
 msgid "Previous DN: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1906
+#: ../pykolab/auth/ldap/__init__.py:2510
 #, python-format
 msgid "Object %s searched no longer exists"
 msgstr "Gezocht object %s bestaat niet meer"
 
-#: ../pykolab/auth/ldap/__init__.py:1916
+#: ../pykolab/auth/ldap/__init__.py:2520
 #, python-format
 msgid "%d results..."
 msgstr "%d resultaten..."
 
-#: ../pykolab/auth/ldap/__init__.py:2014
+#: ../pykolab/auth/ldap/__init__.py:2623
 #, python-format
 msgid "Searching with filter %r"
 msgstr "Zoeken met filter %r"
 
-#: ../pykolab/auth/ldap/__init__.py:2058
+#: ../pykolab/auth/ldap/__init__.py:2675
 #, python-format
 msgid "Checking for support for %s on %s"
 msgstr ""
 
-#: ../pykolab/cli/cmd_add_domain.py:36 ../pykolab/cli/cmd_create_mailbox.py:36
+#: ../pykolab/auth/ldap/__init__.py:2694
+#, python-format
+msgid "Found support for %s"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:2739
+#, 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."
+msgstr ""
+
+#: ../pykolab/cli/cmd_acl_cleanup.py:34
+msgid "Clean up ACLs that use identifiers that no longer exist"
+msgstr ""
+
+#: ../pykolab/cli/cmd_acl_cleanup.py:56
+#, python-format
+msgid "Deleting ACL %s for subject %s on folder %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_add_alias.py:42
+msgid "Specify the (new) alias address"
+msgstr ""
+
+#: ../pykolab/cli/cmd_add_alias.py:45
+msgid "Specify the existing recipient address"
+msgstr ""
+
+#: ../pykolab/cli/cmd_add_alias.py:66 ../pykolab/cli/cmd_add_alias.py:70
+#, python-format
+msgid "Domain %r is not a local domain"
+msgstr ""
+
+#: ../pykolab/cli/cmd_add_alias.py:75
+msgid "Primary and secondary domain do not have the same parent domain"
+msgstr ""
+
+#: ../pykolab/cli/cmd_add_alias.py:81
+#, python-format
+msgid "No such recipient %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_add_alias.py:87
+#, python-format
+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"
+msgstr ""
+
+#: ../pykolab/cli/cmd_add_alias.py:105
+#, python-format
+msgid "Recipient %r is not the primary recipient for address %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_add_domain.py:36
+#: ../pykolab/cli/cmd_count_domain_mailboxes.py:38
+#: ../pykolab/cli/cmd_create_mailbox.py:36
 #: ../pykolab/cli/cmd_export_mailbox.py:33
-#: ../pykolab/cli/cmd_list_mailboxes.py:39
-#: ../pykolab/cli/cmd_list_user_subscriptions.py:35
+#: ../pykolab/cli/cmd_list_deleted_mailboxes.py:38
+#: ../pykolab/cli/cmd_list_domain_mailboxes.py:36
+#: ../pykolab/cli/cmd_list_mailboxes.py:40
+#: ../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_server_info.py:34
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:38
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:39
+#: ../pykolab/cli/cmd_undelete_mailbox.py:34
 msgid "CLI Options"
 msgstr "Opties voor de CLI"
 
 #: ../pykolab/cli/cmd_add_domain.py:42
-msgid "Add domain as alias for DOMAIN"
-msgstr "Voeg DOMAIN toe als alias voor domein"
+msgid "Add alias domain."
+msgstr ""
 
 #: ../pykolab/cli/cmd_add_domain.py:47
-msgid "Add a new domain or domain alias."
-msgstr "Voeg een nieuw domein, of een alias voor een bestaand domein toe"
-
-#: ../pykolab/cli/cmd_add_domain.py:55
-msgid "Could not find credentials with sufficient permissions"
+msgid "Add a new domain."
 msgstr ""
 
-#: ../pykolab/cli/cmd_add_domain.py:80 ../pykolab/wap_client/__init__.py:113
-msgid "Invalid parent domain"
-msgstr "Ongeldig domein"
+#: ../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."
+msgstr ""
 
-#: ../pykolab/cli/cmd_add_domain.py:86
+#: ../pykolab/cli/cmd_add_domain.py:67 ../pykolab/cli/cmd_delete_domain.py:56
+#: ../pykolab/cli/cmd_find_domain.py:56
 msgid "Domain name"
 msgstr "Domein naam"
 
@@ -669,10 +878,10 @@ msgid "Folder pattern"
 msgstr ""
 
 #: ../pykolab/cli/cmd_add_user_subscription.py:50
-#: ../pykolab/cli/cmd_list_user_subscriptions.py:56
+#: ../pykolab/cli/cmd_list_user_subscriptions.py:63
 #: ../pykolab/cli/cmd_remove_user_subscription.py:50
 msgid "User ID"
-msgstr ""
+msgstr "Gebruiker ID"
 
 #: ../pykolab/cli/cmd_add_user_subscription.py:72
 #: ../pykolab/cli/cmd_remove_user_subscription.py:72
@@ -681,32 +890,41 @@ msgid "Cannot subscribe user to folder %r:"
 msgstr ""
 
 #: ../pykolab/cli/cmd_add_user_subscription.py:73
+#: ../pykolab/cli/cmd_delete_message.py:61
+#: ../pykolab/cli/cmd_list_messages.py:67
 #: ../pykolab/cli/cmd_remove_user_subscription.py:73
 msgid "No such folder"
 msgstr ""
 
-#: ../pykolab/cli/cmd_add_user_subscription.py:86
-#, python-format
-msgid "Successfully subscribed user %s to the following folders:"
-msgstr ""
-
-#: ../pykolab/cli/cmd_add_user_subscription.py:92
-#, python-format
-msgid "User %s not subscribed to any folders."
+#: ../pykolab/cli/cmd_count_domain_mailboxes.py:44
+#: ../pykolab/cli/cmd_list_deleted_mailboxes.py:50
+#: ../pykolab/cli/cmd_list_domain_mailboxes.py:48
+#: ../pykolab/cli/cmd_list_mailboxes.py:52 ../pykolab/cli/cmd_list_quota.py:42
+#: ../pykolab/cli/cmd_server_info.py:40
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:57
+msgid "List mailboxes on server SERVER only."
 msgstr ""
 
-#: ../pykolab/cli/cmd_create_mailbox.py:41
+#: ../pykolab/cli/cmd_create_mailbox.py:42
 msgid "Set metadata for folder to ANNOTATION=VALUE"
 msgstr ""
 
 #: ../pykolab/cli/cmd_create_mailbox.py:50
+msgid "Create folder on PARTITION."
+msgstr ""
+
+#: ../pykolab/cli/cmd_create_mailbox.py:60
 msgid "Invalid argument"
 msgstr "Ongeldig argument"
 
-#: ../pykolab/cli/cmd_create_mailbox.py:58
+#: ../pykolab/cli/cmd_create_mailbox.py:68
 msgid "Invalid argument for metadata"
 msgstr "Ongeldig argument voor metadata"
 
+#: ../pykolab/cli/cmd_delete_domain.py:36
+msgid "Delete a domain."
+msgstr ""
+
 #: ../pykolab/cli/cmd_delete_mailbox_acl.py:45
 #: ../pykolab/cli/cmd_delete_mailbox_acl.py:49
 #: ../pykolab/cli/cmd_set_mailbox_acl.py:50
@@ -715,18 +933,23 @@ msgid "ACI Subject"
 msgstr ""
 
 #: ../pykolab/cli/cmd_delete_mailbox_acl.py:48
-#: ../pykolab/cli/cmd_list_mailbox_acls.py:41
-#: ../pykolab/cli/cmd_list_mailbox_metadata.py:41
+#: ../pykolab/cli/cmd_list_mailbox_acls.py:43
+#: ../pykolab/cli/cmd_list_mailbox_metadata.py:54
 #: ../pykolab/cli/cmd_set_mailbox_acl.py:54
-#: ../pykolab/cli/cmd_set_mailbox_metadata.py:54
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:66
+#: ../pykolab/cli/cmd_set_quota.py:46 ../tests/unit/test-015-translate.py:12
+#: ../tests/unit/test-015-translate.py:16
+#: ../tests/unit/test-015-translate.py:18
+#: ../tests/unit/test-015-translate.py:20
 msgid "Folder name"
 msgstr "Folder naam"
 
 #: ../pykolab/cli/cmd_delete_mailbox_acl.py:60
-#: ../pykolab/cli/cmd_list_mailbox_acls.py:52
-#: ../pykolab/cli/cmd_list_mailbox_metadata.py:52
+#: ../pykolab/cli/cmd_list_mailbox_acls.py:54
+#: ../pykolab/cli/cmd_list_mailbox_metadata.py:80
 #: ../pykolab/cli/cmd_set_mailbox_acl.py:67
-#: ../pykolab/cli/cmd_set_mailbox_metadata.py:67
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:94
+#: ../pykolab/cli/cmd_set_quota.py:58
 #, python-format
 msgid "No such folder %r"
 msgstr "Folder %r bestaat niet"
@@ -735,6 +958,28 @@ msgstr "Folder %r bestaat niet"
 msgid "No mailbox specified"
 msgstr "Geen mailbox gespecificeerd"
 
+#: ../pykolab/cli/cmd_delete_mailbox.py:56
+msgid "No such folder(s)"
+msgstr ""
+
+#: ../pykolab/cli/cmd_delete_mailbox.py:63
+#, python-format
+msgid "Could not delete mailbox '%s'"
+msgstr ""
+
+#: ../pykolab/cli/cmd_delete_message.py:36
+msgid "Delete a message from a folder"
+msgstr ""
+
+#: ../pykolab/cli/cmd_delete_message.py:49
+msgid "Specify a UID"
+msgstr ""
+
+#: ../pykolab/cli/cmd_delete_message.py:52
+#: ../pykolab/cli/cmd_list_messages.py:58
+msgid "Specify a folder"
+msgstr ""
+
 #: ../pykolab/cli/cmd_export_mailbox.py:38
 msgid "All folders this user has access to"
 msgstr ""
@@ -754,28 +999,65 @@ msgstr ""
 msgid "No directories found for user %s"
 msgstr "Geen mappen gevonden voor gebruiker %s"
 
-#: ../pykolab/cli/cmd_list_mailboxes.py:44
+#: ../pykolab/cli/cmd_find_domain.py:36
+msgid "Find a domain."
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_deleted_mailboxes.py:43
+#: ../pykolab/cli/cmd_list_domain_mailboxes.py:41
+#: ../pykolab/cli/cmd_list_mailboxes.py:45
+#: ../pykolab/cli/cmd_list_user_subscriptions.py:41
 msgid "Display raw IMAP UTF-7 folder names"
 msgstr ""
 
-#: ../pykolab/cli/cmd_list_mailboxes.py:75
+#: ../pykolab/cli/cmd_list_domain_mailboxes.py:58
+msgid "Domain"
+msgstr "Domein"
+
+#: ../pykolab/cli/cmd_list_mailboxes.py:87
 #, python-format
 msgid "Appending folder search for %r"
 msgstr ""
 
-#: ../pykolab/cli/cmd_list_user_subscriptions.py:40
+#: ../pykolab/cli/cmd_list_mailbox_metadata.py:44
+msgid "List annotations as user USER"
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_messages.py:43
+msgid "Include messages flagged as \\Deleted"
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_messages.py:47
+msgid "List messages in a folder"
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_quota.py:73 ../pykolab/cli/cmd_list_quota.py:89
+#, python-format
+msgid "The quota for folder %s is set to literally allow 0KB of storage."
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_user_subscriptions.py:47
 msgid "List unsubscribed folders"
 msgstr ""
 
-#: ../pykolab/cli/cmd_list_user_subscriptions.py:43
+#: ../pykolab/cli/cmd_list_user_subscriptions.py:50
 msgid "List the folders a user is subscribed to."
 msgstr ""
 
-#: ../pykolab/cli/cmd_list_user_subscriptions.py:88
+#: ../pykolab/cli/cmd_list_user_subscriptions.py:98
 #, python-format
 msgid "No unsubscribed folders for user %s"
 msgstr ""
 
+#: ../pykolab/cli/cmd_mailbox_cleanup.py:37
+msgid "Clean up mailboxes that do no longer have an owner."
+msgstr ""
+
+#: ../pykolab/cli/cmd_mailbox_cleanup.py:61
+#, python-format
+msgid "Deleting folder 'user/%s'"
+msgstr ""
+
 #: ../pykolab/cli/cmd_remove_mailaddress.py:49
 msgid "Invalid or unqualified email address."
 msgstr "Ongeldig of onvoldoende gequalificeerd email adres."
@@ -810,23 +1092,23 @@ msgstr ""
 
 #: ../pykolab/cli/cmd_remove_user_subscription.py:92
 #, python-format
-msgid "User %s not be unsubscribed from any folders."
+msgid "User %s was not unsubscribed from any folders."
 msgstr ""
 
-#: ../pykolab/cli/cmd_rename_mailbox.py:48
+#: ../pykolab/cli/cmd_rename_mailbox.py:52
 msgid "No target mailbox name specified"
 msgstr "Geen doel mailbox naam gespecificeerd"
 
-#: ../pykolab/cli/cmd_rename_mailbox.py:50
+#: ../pykolab/cli/cmd_rename_mailbox.py:54
 msgid "No source mailbox name specified"
 msgstr "Geen bron mailbox naam gespecificeerd"
 
-#: ../pykolab/cli/cmd_rename_mailbox.py:62
+#: ../pykolab/cli/cmd_rename_mailbox.py:66
 #, python-format
 msgid "Source folder %r does not exist"
 msgstr "Bron map %r bestaat niet"
 
-#: ../pykolab/cli/cmd_rename_mailbox.py:66
+#: ../pykolab/cli/cmd_rename_mailbox.py:70
 #, python-format
 msgid "Target folder %r already exists"
 msgstr "Doel map %r bestaat reeds"
@@ -837,17 +1119,75 @@ msgstr "Doel map %r bestaat reeds"
 msgid "ACI Permissions"
 msgstr "ACI Rechten"
 
-#: ../pykolab/cli/cmd_set_mailbox_metadata.py:47
-#: ../pykolab/cli/cmd_set_mailbox_metadata.py:51
-#: ../pykolab/cli/cmd_set_mailbox_metadata.py:56
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:45
+msgid "Set annotation as user USER"
+msgstr ""
+
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:59
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:63
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:68
 msgid "Metadata value"
 msgstr "Metadata waarde"
 
-#: ../pykolab/cli/cmd_set_mailbox_metadata.py:50
-#: ../pykolab/cli/cmd_set_mailbox_metadata.py:55
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:62
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:67
 msgid "Metadata path"
 msgstr "Metadata pad"
 
+#: ../pykolab/cli/cmd_set_quota.py:43 ../pykolab/cli/cmd_set_quota.py:47
+msgid "New quota"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:44
+msgid "Delete mailboxes for recipients that do not appear to exist in LDAP."
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:50
+msgid "Display changes, do not apply them."
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:88
+#, python-format
+msgid "Domains in IMAP not in LDAP: %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:101
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:142
+#, python-format
+msgid ""
+"No recipients for '%s' (would have deleted the mailbox if not for --dry-"
+"run)!"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:106
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:147
+#, python-format
+msgid "Deleting mailbox '%s' because it has no recipients"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:110
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:151
+#, python-format
+msgid "An error occurred removing mailbox %r: %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:112
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:153
+#, python-format
+msgid "Not automatically deleting shared folder '%s'"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:114
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:155
+#, python-format
+msgid "No recipients for '%s' (use --delete to delete)!"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:136
+#, python-format
+msgid "Multiple recipients for '%s'!"
+msgstr ""
+
 #: ../pykolab/cli/cmd_sync.py:41
 #, python-format
 msgid "Found %d domains in %d seconds"
@@ -858,41 +1198,126 @@ msgstr "%d domeinen gevonden in %d seconden"
 msgid "Running for domain %s"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync.py:57
+#: ../pykolab/cli/cmd_sync.py:58
 #, python-format
 msgid "Synchronizing users for %s took %d seconds"
 msgstr "Synchronizeren van gebruikers voor %s duurde %d seconden"
 
-#: ../pykolab/cli/cmd_undelete_mailbox.py:33
+#: ../pykolab/cli/cmd_undelete_mailbox.py:39
+msgid "Do not actually execute, but state what would have been executed."
+msgstr ""
+
+#: ../pykolab/cli/cmd_undelete_mailbox.py:42
 msgid "Recover mailboxes previously deleted."
 msgstr ""
 
+#: ../pykolab/cli/cmd_user_info.py:39
+msgid "Email address"
+msgstr ""
+
 #. This is a nested command
 #. This is a nested component
-#: ../pykolab/cli/commands.py:98 ../pykolab/setup/components.py:90
+#: ../pykolab/cli/commands.py:97 ../pykolab/setup/components.py:90
 #, python-format
 msgid "Command Group: %s"
 msgstr "Commando Groep: %s"
 
-#: ../pykolab/cli/commands.py:109 ../pykolab/cli/commands.py:114
+#: ../pykolab/cli/commands.py:112 ../pykolab/cli/commands.py:117
 msgid "No such command."
 msgstr "Commando bestaat niet."
 
-#: ../pykolab/cli/commands.py:165 ../pykolab/setup/components.py:231
+#: ../pykolab/cli/commands.py:167 ../pykolab/setup/components.py:231
 #, python-format
 msgid "Command '%s' already registered"
 msgstr "Commando '%s' is reeds geregistreerd"
 
-#: ../pykolab/cli/commands.py:190 ../pykolab/setup/components.py:257
-#: ../wallace/modules.py:338
+#: ../pykolab/cli/commands.py:192 ../pykolab/setup/components.py:257
+#: ../wallace/modules.py:369
 #, python-format
 msgid "Alias for %s"
 msgstr "Alias voor %s"
 
-#: ../pykolab/cli/commands.py:198 ../pykolab/setup/components.py:265
+#: ../pykolab/cli/commands.py:200 ../pykolab/setup/components.py:265
 msgid "Not yet implemented"
 msgstr "Nog niet geimplementeerd"
 
+#: ../pykolab/cli/sieve/cmd_list.py:43 ../pykolab/cli/sieve/cmd_put.py:42
+#: ../pykolab/cli/sieve/cmd_refresh.py:44 ../pykolab/cli/sieve/cmd_test.py:43
+msgid "Email Address"
+msgstr "E-mail adres"
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:99
+#: ../pykolab/plugins/sievemgmt/__init__.py:111
+#, python-format
+msgid "Found the following scripts for user %s: %s"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:100
+#: ../pykolab/plugins/sievemgmt/__init__.py:112
+#, python-format
+msgid "And the following script is active for user %s: %s"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:178
+#: ../pykolab/plugins/sievemgmt/__init__.py:190
+#, python-format
+msgid ""
+"Delivery to folder active, but no folder name attribute available for user "
+"%r"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:181
+#: ../pykolab/plugins/sievemgmt/__init__.py:193
+msgid "Delivery to folder active, but no folder name attribute configured"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:359
+#, python-format
+msgid "MANAGEMENT script for user %s contents: %r"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:364
+#: ../pykolab/plugins/sievemgmt/__init__.py:374
+#, python-format
+msgid "Uploading script MANAGEMENT failed for user %s"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:366
+#: ../pykolab/plugins/sievemgmt/__init__.py:376
+#, python-format
+msgid "Uploading script MANAGEMENT for user %s succeeded"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:377
+#: ../pykolab/plugins/sievemgmt/__init__.py:387
+#, python-format
+msgid "Including script %s in USER (for user %s)"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:386
+#: ../pykolab/plugins/sievemgmt/__init__.py:396
+#, python-format
+msgid "Uploading script USER failed for user %s"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:388
+#: ../pykolab/plugins/sievemgmt/__init__.py:398
+#, python-format
+msgid "Uploading script USER for user %s succeeded"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:416
+#: ../pykolab/plugins/sievemgmt/__init__.py:426
+#, python-format
+msgid "Uploading script MASTER failed for user %s"
+msgstr ""
+
+#: ../pykolab/cli/sieve/cmd_refresh.py:418
+#: ../pykolab/plugins/sievemgmt/__init__.py:428
+#, python-format
+msgid "Uploading script MASTER for user %s succeeded"
+msgstr ""
+
 #: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:40
 msgid "Unspecified command issue identifier"
 msgstr ""
@@ -933,7 +1358,8 @@ 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
-msgid "Invalid entitlement verification "
+#, python-format
+msgid "Invalid entitlement verification certificate at %s"
 msgstr ""
 
 #: ../pykolab/conf/entitlement.py:120 ../pykolab/conf/entitlement.py:123
@@ -1015,12 +1441,14 @@ msgid "Configuration file to use"
 msgstr "Te gebruiken configuratie bestand"
 
 #: ../pykolab/conf/__init__.py:278
-msgid "Set the debugging "
-msgstr "Zet het debug niveau"
+msgid ""
+"Set the debugging verbosity. Maximum is 9, tracing protocols like LDAP, SQL "
+"and IMAP."
+msgstr ""
 
 #: ../pykolab/conf/__init__.py:286
-msgid "Set the logging level. "
-msgstr "Zet het log niveau"
+msgid "Set the logging level. One of info, warn, error, critical or debug"
+msgstr ""
 
 #: ../pykolab/conf/__init__.py:294
 msgid "Log file to use"
@@ -1038,76 +1466,77 @@ msgstr "Beantwoord alle vragen met ja."
 msgid "No command supplied"
 msgstr "Geen commando gegeven"
 
-#: ../pykolab/conf/__init__.py:411
+#: ../pykolab/conf/__init__.py:416
 msgid "Insufficient options. Need section, key and value -in that order."
 msgstr "Onvoldoende opties. Nodig: sectie, sleutel en waarde -in die volgorde"
 
-#: ../pykolab/conf/__init__.py:414
+#: ../pykolab/conf/__init__.py:419
 #, python-format
 msgid "No section '%s' exists."
 msgstr "Sectie '%s' bestaat niet"
 
-#: ../pykolab/conf/__init__.py:445
+#: ../pykolab/conf/__init__.py:461
 #, python-format
 msgid "Setting %s to %r (from the default values for CLI options)"
 msgstr "Zet %s op %r (van standaard waarden voor command-line opties)"
 
-#: ../pykolab/conf/__init__.py:514
+#: ../pykolab/conf/__init__.py:534
 #, python-format
 msgid "Could not execute configuration function: %s"
 msgstr "Heb configuratie functie niet uit kunnen voeren: %s"
 
-#: ../pykolab/conf/__init__.py:522
+#: ../pykolab/conf/__init__.py:542
 #, python-format
 msgid "Option %s/%s does not exist in config file %s, pulling from defaults"
 msgstr "Optie %s/%s bestaat niet in configuratie bestand %s, maak gebruik van standaard configuratie waarde"
 
-#: ../pykolab/conf/__init__.py:530 ../pykolab/conf/__init__.py:533
+#: ../pykolab/conf/__init__.py:550 ../pykolab/conf/__init__.py:553
 msgid "Option does not exist in defaults."
 msgstr "Optie bestaat niet in standaard configuratie waarden."
 
-#: ../pykolab/conf/__init__.py:543
+#: ../pykolab/conf/__init__.py:563
 #, python-format
 msgid "Configuration file %s not readable."
 msgstr "Kan configuratie bestand %s niet lezen."
 
-#: ../pykolab/conf/__init__.py:546
+#: ../pykolab/conf/__init__.py:566
 #, python-format
 msgid "Configuration file %s does not exist."
 msgstr "Configuratie bestand %s bestaat niet."
 
-#: ../pykolab/conf/__init__.py:551
+#: ../pykolab/conf/__init__.py:571
 msgid ""
 "WARNING: A negative debug level value does not make this program be any more"
 " silent."
 msgstr "Waarschuwing: Een negatief debug niveau maakt dit programma niet stiller."
 
-#: ../pykolab/conf/__init__.py:557
+#: ../pykolab/conf/__init__.py:577
 msgid "This program has 9 levels of verbosity. Using the maximum of 9."
 msgstr "Dit programma heeft een maximaal debug niveau van 9. Maak gebruik van het maximum van 9."
 
-#: ../pykolab/conf/__init__.py:565 ../pykolab/conf/__init__.py:571
+#: ../pykolab/conf/__init__.py:585 ../pykolab/conf/__init__.py:591
+#: ../pykolab/conf/__init__.py:595 ../pykolab/conf/__init__.py:601
 msgid "Cannot start SASL authentication daemon"
 msgstr "Kan de SASL authenticatie daemon niet starten"
 
-#: ../pykolab/conf/__init__.py:582
+#: ../pykolab/conf/__init__.py:612
 msgid "No imaplib library found."
 msgstr "Geen imaplib module gevonden"
 
-#: ../pykolab/conf/__init__.py:592
+#: ../pykolab/conf/__init__.py:622
 msgid "No LMTP class found in the smtplib library."
 msgstr "Geen LMTP klasse gevonden in de smtplib module."
 
-#: ../pykolab/conf/__init__.py:602
+#: ../pykolab/conf/__init__.py:632
 msgid "No SMTP class found in the smtplib library."
 msgstr "Geen SMTP klasse gevonden in de smtplib module."
 
-#: ../pykolab/conf/__init__.py:616
+#: ../pykolab/conf/__init__.py:646
 #, python-format
 msgid "Found you specified a specific set of items to test: %s"
 msgstr "Een specifieke set van items om te testen is gespecificeerd: %s"
 
-#: ../pykolab/conf/__init__.py:624
+#: ../pykolab/conf/__init__.py:654
 #, python-format
 msgid "Selectively selecting: %s"
 msgstr "Bezig selectief te selecteren: %s"
@@ -1136,249 +1565,344 @@ msgstr "389 Directory Server of Red Hat Directory Server"
 msgid "OpenLDAP or compatible"
 msgstr "OpenLDAP of compatible"
 
-#: ../pykolab/imap/cyrus.py:79
+#: ../pykolab/imap/cyrus.py:80
 #, python-format
 msgid "Could not connect to Cyrus IMAP server %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:134
+#: ../pykolab/imap/cyrus.py:138
 #, python-format
 msgid "Continuing with separator: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:139
+#: ../pykolab/imap/cyrus.py:143
 msgid "Detected we are running in a Murder topology"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:143
+#: ../pykolab/imap/cyrus.py:147
 msgid "This system is not part of a murder topology"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:164
+#: ../pykolab/imap/cyrus.py:168
 #, python-format
 msgid "Checking actual backend server for folder %s through annotations"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:179
+#: ../pykolab/imap/cyrus.py:173
+#, python-format
+msgid ""
+"Possibly reproducing the find mailfolder server answer from previously "
+"detected and stored annotation value: %r"
+msgstr ""
+
+#: ../pykolab/imap/cyrus.py:196
 #, python-format
 msgid "Could not get the annotations after %s tries."
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:183
+#: ../pykolab/imap/cyrus.py:200
 #, python-format
 msgid "No annotations for %s: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:190
+#: ../pykolab/imap/cyrus.py:207
 #, python-format
 msgid "Server for INBOX folder %s is %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:202
+#: ../pykolab/imap/cyrus.py:227
 #, python-format
 msgid "Setting quota for folder %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:206
+#: ../pykolab/imap/cyrus.py:231
 #, python-format
 msgid "Could not set quota for mailfolder %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:215
+#: ../pykolab/imap/cyrus.py:241
+#, python-format
+msgid "Moving INBOX folder %s to %s on partition %s"
+msgstr ""
+
+#: ../pykolab/imap/cyrus.py:243
 #, python-format
 msgid "Moving INBOX folder %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:227
+#: ../pykolab/imap/cyrus.py:259
 #, python-format
 msgid "Setting annotation %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:234
+#: ../pykolab/imap/cyrus.py:264
 #, python-format
 msgid "Could not set annotation %r on mail folder %r: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:238
+#: ../pykolab/imap/cyrus.py:268
 #, python-format
 msgid "Transferring folder %s from %s to %s"
 msgstr "Map %s van %s naar %s aan het verhuizen"
 
-#: ../pykolab/imap/cyrus.py:298
+#: ../pykolab/imap/cyrus.py:328
 #, python-format
 msgid "Undeleting %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:45
+#: ../pykolab/imap/cyrus.py:339
+#, python-format
+msgid "Would have transfered %s from %s to %s"
+msgstr ""
+
+#: ../pykolab/imap/cyrus.py:341
+#, python-format
+msgid "Would have renamed %s to %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:46
 #, python-format
 msgid "Cleaning up ACL entries for %s across all folders"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:60
+#: ../pykolab/imap/__init__.py:61
 #, python-format
 msgid "Cleaning up ACL entries referring to identifier %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:69
+#: ../pykolab/imap/__init__.py:70
 #, python-format
 msgid "Iterating over %d folders"
 msgstr ""
 
 #. Set the ACL to '' (effectively deleting the ACL entry)
-#: ../pykolab/imap/__init__.py:82
+#: ../pykolab/imap/__init__.py:83
 #, python-format
 msgid "Removing acl %r for subject %r from folder %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:143
+#: ../pykolab/imap/__init__.py:145
+msgid "No administrator password is available."
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:153
 #, python-format
 msgid "Logging on to Cyrus IMAP server %s"
 msgstr "Bezig met inloggen op Cyrus IMAP server %s"
 
-#: ../pykolab/imap/__init__.py:152
+#: ../pykolab/imap/__init__.py:162
 #, python-format
 msgid "Logging on to Dovecot IMAP server %s"
 msgstr "Bezig met inloggen op Dovecit IMAP server %s"
 
-#: ../pykolab/imap/__init__.py:161
+#: ../pykolab/imap/__init__.py:171
 #, python-format
 msgid "Logging on to generic IMAP server %s"
 msgstr "Bezig met inloggen op generieke IMAP server %s"
 
-#: ../pykolab/imap/__init__.py:179
+#: ../pykolab/imap/__init__.py:189
 #, python-format
 msgid "Reusing existing IMAP server connection to %s"
 msgstr "Recycle bestaande connectie naar IMAP server %s"
 
-#: ../pykolab/imap/__init__.py:181
+#: ../pykolab/imap/__init__.py:191
 #, python-format
 msgid "Reconnecting to IMAP server %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:197
+#: ../pykolab/imap/__init__.py:208
 msgid "Called imap.disconnect() on a server that we had no connection to."
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:212
+#: ../pykolab/imap/__init__.py:221 ../pykolab/imap/__init__.py:233
+#, python-format
+msgid "Could not create folder %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:222
+#, python-format
+msgid " on server %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:243 ../pykolab/imap/__init__.py:245
 #, python-format
 msgid "%r has no attribute %s"
 msgstr "%r heeft geen attribuut %s"
 
-#: ../pykolab/imap/__init__.py:285
-msgid "Private annotations need to be set using the appropriate user account."
+#: ../pykolab/imap/__init__.py:373
+#, python-format
+msgid "Could not set ACL for %s on folder %s: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:318 ../pykolab/imap/__init__.py:353
+#: ../pykolab/imap/__init__.py:407 ../pykolab/imap/__init__.py:442
 #, python-format
 msgid "Creating new shared folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:375
+#: ../pykolab/imap/__init__.py:467 ../pykolab/imap/__init__.py:689
+#, python-format
+msgid "Downcasing mailbox name %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:471
 #, python-format
 msgid "Creating new mailbox for user %s"
 msgstr "Nieuwe mailbox voor gebruiker %s aan het creeren"
 
-#: ../pykolab/imap/__init__.py:404
+#: ../pykolab/imap/__init__.py:484
+msgid "Waiting for the Cyrus IMAP Murder to settle..."
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:530
 #, python-format
 msgid "Creating additional folders for user %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:428
+#: ../pykolab/imap/__init__.py:549
+#, python-format
+msgid "Waiting for the Cyrus murder to settle... %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:561
+#, python-format
+msgid "Correcting additional folder name from %r to %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:567
 #, python-format
 msgid "Mailbox already exists: %s"
 msgstr "Mailbox bestaat reeds: %s"
 
-#: ../pykolab/imap/__init__.py:471
+#: ../pykolab/imap/__init__.py:607
 msgid "Subscribing user to the additional folders"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:531 ../pykolab/imap/__init__.py:605
+#: ../pykolab/imap/__init__.py:621
+msgid "Using the following tests for folder subscriptions:"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:623
+#, python-format
+msgid "    %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:626
+#, python-format
+msgid "Folder %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:638
+#, python-format
+msgid "Subscribing %s to folder %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:642
+#, python-format
+msgid "Subscribing %s to folder %s failed: %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:672
+#, python-format
+msgid "Could not rename %s to reside on partition %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:705
+#, python-format
+msgid "INBOX folder to rename (%s) does not exist"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:708 ../pykolab/imap/__init__.py:784
 #, python-format
 msgid "Renaming INBOX from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:535
+#: ../pykolab/imap/__init__.py:712
 #, python-format
 msgid "Could not rename INBOX folder %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:537 ../pykolab/imap/__init__.py:609
+#: ../pykolab/imap/__init__.py:714 ../pykolab/imap/__init__.py:788
 #, python-format
 msgid ""
 "Moving INBOX folder %s won't succeed as target folder %s already exists"
 msgstr "Het verplaatsen van INBOX map %s zal niet slagen sinds doel map %s reeds bestaat"
 
-#: ../pykolab/imap/__init__.py:547
+#: ../pykolab/imap/__init__.py:718
+#, python-format
+msgid "Server for mailbox %r is %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:726
 #, python-format
 msgid "Looking for folder '%s', we found folders: %r"
 msgstr "Zoekende naar map '%s' zijn de volgende mappen gevonden: %r"
 
-#: ../pykolab/imap/__init__.py:570
+#: ../pykolab/imap/__init__.py:749
 #, python-format
-msgid "Setting ACL rights %s for subject %s on folder "
+msgid "Setting ACL rights %s for subject %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:581
+#: ../pykolab/imap/__init__.py:760
 #, python-format
-msgid "Removing ACL rights %s for subject %s on folder "
+msgid "Removing ACL rights %s for subject %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:602
+#: ../pykolab/imap/__init__.py:781
 #, python-format
 msgid "Found old INBOX folder %s"
 msgstr "Oude INBOX map %s gevonden"
 
-#: ../pykolab/imap/__init__.py:611
+#: ../pykolab/imap/__init__.py:790
 #, python-format
 msgid "Did not find old folder user/%s to rename"
 msgstr "Oude te hernoemen map user/%s niet gevonden"
 
-#: ../pykolab/imap/__init__.py:613
+#: ../pykolab/imap/__init__.py:792
 msgid "Value for user is not a dictionary"
 msgstr "Waarde voor gebruiker is niet een associatieve array"
 
 #. TODO: Go in fact correct the quota.
-#: ../pykolab/imap/__init__.py:673
+#: ../pykolab/imap/__init__.py:860
 #, python-format
 msgid "Cannot get current IMAP quota for folder %s"
 msgstr "Kan huidig IMAP quota voor map %s niet verkrijgen"
 
-#: ../pykolab/imap/__init__.py:686
+#: ../pykolab/imap/__init__.py:873
 #, python-format
 msgid "Quota for %s currently is %s"
 msgstr "Quota voor %s is op dit moment %s"
 
-#: ../pykolab/imap/__init__.py:692
+#: ../pykolab/imap/__init__.py:879
 #, python-format
 msgid "Adjusting authentication database quota for folder %s to %d"
 msgstr "Bijwerken van authenticatie database quota voor map %s to %d"
 
-#: ../pykolab/imap/__init__.py:697
+#: ../pykolab/imap/__init__.py:884
 #, python-format
 msgid "Correcting quota for %s to %s (currently %s)"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:774
+#: ../pykolab/imap/__init__.py:961
 #, python-format
 msgid "Checking folder: %s"
 msgstr "Bezig met controleren van map: %s"
 
-#: ../pykolab/imap/__init__.py:779
+#: ../pykolab/imap/__init__.py:966
 #, python-format
 msgid "Folder has no corresponding user (1): %s"
 msgstr "Map heeft geen corresponderende gebruiker (1): %s"
 
-#: ../pykolab/imap/__init__.py:782
+#: ../pykolab/imap/__init__.py:969
 #, python-format
 msgid "Folder has no corresponding user (2): %s"
 msgstr "Map heeft geen corresponderende gebruiker (2): %s"
 
 #. We got user identifier only
-#: ../pykolab/imap/__init__.py:797
+#: ../pykolab/imap/__init__.py:984
 msgid "Please don't give us just a user identifier"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:800
+#: ../pykolab/imap/__init__.py:987
 #, python-format
 msgid "Deleting folder %s"
 msgstr "Map %s aan het verwijderen"
@@ -1387,12 +1911,62 @@ msgstr "Map %s aan het verwijderen"
 msgid "Returning thread local configuration"
 msgstr ""
 
-#: ../pykolab/logger.py:105
+#: ../pykolab/itip/__init__.py:45
+#, python-format
+msgid "Method %r not really interesting for us."
+msgstr ""
+
+#: ../pykolab/itip/__init__.py:51
+#, python-format
+msgid "Raw iTip payload: %s"
+msgstr ""
+
+#: ../pykolab/itip/__init__.py:61
+msgid "Could not read iTip from message."
+msgstr ""
+
+#: ../pykolab/itip/__init__.py:69
+#, python-format
+msgid "Duplicate iTip object: %s"
+msgstr ""
+
+#: ../pykolab/itip/__init__.py:93
+msgid "iTip event without a start"
+msgstr ""
+
+#: ../pykolab/itip/__init__.py:138
+msgid "Message is not an iTip message (non-multipart message)"
+msgstr ""
+
+#: ../pykolab/itip/__init__.py:221
+#, python-format
+msgid "Send iTip reply %s for %s %r"
+msgstr ""
+
+#: ../pykolab/itip/__init__.py:237
+#, python-format
+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
+#, python-format
+msgid "SMTP sendmail error: %r"
+msgstr ""
+
+#: ../pykolab/itip/__init__.py:280
 #, python-format
-msgid "Could not change the ownership of log file %s"
+msgid "Failed to compose iTip request message: %r"
 msgstr ""
 
-#: ../pykolab/logger.py:121
+#: ../pykolab/logger.py:168 ../pykolab/logger.py:175
+#, python-format
+msgid "Could not change permissions on %s: %r"
+msgstr ""
+
+#: ../pykolab/logger.py:192
 #, python-format
 msgid "Cannot log to file %s: %s"
 msgstr "Kan niet loggen naar bestand %s: %s"
@@ -1490,16 +2064,51 @@ msgstr "Kan hook %s voor plugin %s niet uitvoeren: %s"
 msgid "Attribute substitution for 'mail' failed in Recipient Policy"
 msgstr ""
 
-#: ../pykolab/plugins/recipientpolicy/__init__.py:115
+#: ../pykolab/plugins/recipientpolicy/__init__.py:116
 msgid "Could not parse the alternative mail routines"
 msgstr ""
 
+#: ../pykolab/plugins/recipientpolicy/__init__.py:120
+#, python-format
+msgid "Alternative mail routines: %r"
+msgstr ""
+
 #: ../pykolab/plugins/recipientpolicy/__init__.py:127
-#: ../pykolab/plugins/recipientpolicy/__init__.py:137
+#, python-format
+msgid ""
+"An error occurred in composing the secondary mail attribute for entry %r"
+msgstr ""
+
+#: ../pykolab/plugins/recipientpolicy/__init__.py:138
+#: ../pykolab/plugins/recipientpolicy/__init__.py:153
+#, python-format
+msgid "Appending additional mail address: %s"
+msgstr ""
+
+#: ../pykolab/plugins/recipientpolicy/__init__.py:142
+#, python-format
+msgid "Policy for secondary email address failed: %r"
+msgstr ""
+
+#: ../pykolab/plugins/recipientpolicy/__init__.py:157
 msgid ""
 "Attribute substitution for 'alternative_mail' failed in Recipient Policy"
 msgstr ""
 
+#: ../pykolab/plugins/roundcubedb/__init__.py:48
+#, python-format
+msgid "user_delete: %r"
+msgstr ""
+
+#: ../pykolab/plugins/roundcubedb/__init__.py:55
+#: ../pykolab/setup/setup_roundcube.py:161
+msgid "Roundcube installation path not found."
+msgstr ""
+
+#: ../pykolab/plugins/sievemgmt/__init__.py:51
+msgid "Wrong number of arguments for sieve management plugin"
+msgstr ""
+
 #: ../pykolab/setup/components.py:58
 msgid "Display this help."
 msgstr "Geef deze help weer."
@@ -1520,54 +2129,33 @@ msgstr ""
 msgid "Free/Busy is not installed on this system"
 msgstr ""
 
-#: ../pykolab/setup/setup_freebusy.py:55
-msgid ""
-"\n"
-"                        Please supply the MySQL password for the 'roundcube'\n"
-"                        user. You have supplied this password earlier, and it is\n"
-"                        available from the database URI setting in\n"
-"                        /etc/roundcubemail/db.inc.php.\n"
-"                    "
-msgstr ""
-
-#: ../pykolab/setup/setup_freebusy.py:64
-#: ../pykolab/setup/setup_roundcube.py:56
-msgid "MySQL roundcube password"
-msgstr ""
-
-#: ../pykolab/setup/setup_freebusy.py:92
-#: ../pykolab/setup/setup_roundcube.py:116 ../pykolab/setup/setup_zpush.py:71
-#, python-format
-msgid "Using template file %r"
+#: ../pykolab/setup/setup_imap.py:45
+msgid "Setup IMAP."
 msgstr ""
 
-#: ../pykolab/setup/setup_freebusy.py:99
-#: ../pykolab/setup/setup_roundcube.py:123 ../pykolab/setup/setup_zpush.py:78
-#, python-format
-msgid "Successfully compiled template %r, writing out to %r"
+#: ../pykolab/setup/setup_imap.py:89
+msgid "Could not write out Cyrus IMAP configuration file /etc/imapd.conf"
 msgstr ""
 
-#: ../pykolab/setup/setup_freebusy.py:119 ../pykolab/setup/setup_imap.py:143
-#: ../pykolab/setup/setup_ldap.py:288 ../pykolab/setup/setup_ldap.py:521
-#: ../pykolab/setup/setup_mta.py:309 ../pykolab/setup/setup_mysql.py:49
-#: ../pykolab/setup/setup_roundcube.py:191
-#: ../pykolab/setup/setup_syncroton.py:66 ../pykolab/setup/setup_zpush.py:98
-msgid "Could not start and configure to start on boot, the "
+#: ../pykolab/setup/setup_imap.py:114
+msgid "Could not write out Cyrus IMAP configuration file /etc/cyrus.conf"
 msgstr ""
 
-#: ../pykolab/setup/setup_imap.py:44
-msgid "Setup IMAP."
+#: ../pykolab/setup/setup_imap.py:158
+msgid "Could not start the cyrus-imapd and kolab-saslauthd services."
 msgstr ""
 
-#: ../pykolab/setup/setup_imap.py:88 ../pykolab/setup/setup_imap.py:113
-msgid "Could not write out Cyrus IMAP configuration file /etc/imapd.conf"
+#: ../pykolab/setup/setup_imap.py:173
+msgid ""
+"Could not configure to start on boot, the cyrus-imapd and kolab-saslauthd "
+"services."
 msgstr ""
 
-#: ../pykolab/setup/setup_kolabd.py:43
+#: ../pykolab/setup/setup_kolabd.py:44
 msgid "Setup the Kolab daemon."
 msgstr ""
 
-#: ../pykolab/setup/setup_kolabd.py:51
+#: ../pykolab/setup/setup_kolabd.py:52
 #, python-format
 msgid ""
 "\n"
@@ -1576,23 +2164,66 @@ msgid ""
 "                        "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:43
+#: ../pykolab/setup/setup_kolabd.py:81
+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 "Opties voor LDAP"
 
-#: ../pykolab/setup/setup_ldap.py:50
+#: ../pykolab/setup/setup_ldap.py:52
 msgid "Specify FQDN (overriding defaults)."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:58
+#: ../pykolab/setup/setup_ldap.py:60
 msgid "Allow anonymous binds (default: no)."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:62
+#: ../pykolab/setup/setup_ldap.py:68
+msgid "Skip setting up the LDAP server."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:76
+msgid "Setup configuration for OpenLDAP compatibility."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:84
+msgid "Setup configuration for Active Directory compatibility."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:88
 msgid "Setup LDAP."
 msgstr "Zet LDAP op."
 
-#: ../pykolab/setup/setup_ldap.py:74
+#: ../pykolab/setup/setup_ldap.py:97
+msgid "Skipping setup of LDAP, as specified"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:126
+msgid ""
+"\n"
+"                        You can not configure Kolab to run against OpenLDAP\n"
+"                        and Active Directory simultaneously.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:139
+msgid ""
+"\n"
+"                                It seems 389 Directory Server has an existing\n"
+"                                instance configured. This setup script does not\n"
+"                                intend to destroy or overwrite your data. Please\n"
+"                                make sure /etc/dirsrv/ and /var/lib/dirsrv/ are\n"
+"                                clean so that this setup does not have to worry.\n"
+"                            "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:154
 msgid ""
 "\n"
 "                        Please supply a password for the LDAP administrator user\n"
@@ -1601,11 +2232,11 @@ msgid ""
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:82
+#: ../pykolab/setup/setup_ldap.py:162
 msgid "Administrator password"
 msgstr "Wachtwoord voor administrator"
 
-#: ../pykolab/setup/setup_ldap.py:89
+#: ../pykolab/setup/setup_ldap.py:169
 msgid ""
 "\n"
 "                        Please supply a password for the LDAP Directory Manager\n"
@@ -1615,11 +2246,11 @@ msgid ""
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:98
+#: ../pykolab/setup/setup_ldap.py:178
 msgid "Directory Manager password"
 msgstr "Wachtwoord voor Directory Manager"
 
-#: ../pykolab/setup/setup_ldap.py:105
+#: ../pykolab/setup/setup_ldap.py:185
 msgid ""
 "\n"
 "                        Please choose the system user and group the service\n"
@@ -1628,15 +2259,15 @@ msgid ""
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:112
+#: ../pykolab/setup/setup_ldap.py:195 ../pykolab/setup/setup_ldap.py:198
 msgid "User"
 msgstr "Gebruiker"
 
-#: ../pykolab/setup/setup_ldap.py:113
+#: ../pykolab/setup/setup_ldap.py:196 ../pykolab/setup/setup_ldap.py:199
 msgid "Group"
 msgstr "Groep"
 
-#: ../pykolab/setup/setup_ldap.py:143
+#: ../pykolab/setup/setup_ldap.py:234
 msgid ""
 "\n"
 "                        This setup procedure plans to set up Kolab Groupware for\n"
@@ -1647,18 +2278,18 @@ msgid ""
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:157
+#: ../pykolab/setup/setup_ldap.py:248
 msgid "Domain name to use"
 msgstr "Domein naam te gebruiken"
 
-#: ../pykolab/setup/setup_ldap.py:162 ../pykolab/setup/setup_ldap.py:187
+#: ../pykolab/setup/setup_ldap.py:253 ../pykolab/setup/setup_ldap.py:278
 msgid ""
 "\n"
 "                                    Invalid input. Please try again.\n"
 "                                "
 msgstr "\nOngeldig antwoord. Probeer opnieuw alstublieft."
 
-#: ../pykolab/setup/setup_ldap.py:171
+#: ../pykolab/setup/setup_ldap.py:262
 msgid ""
 "\n"
 "                        The standard root dn we composed for you follows. Please\n"
@@ -1666,11 +2297,15 @@ msgid ""
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:182
+#: ../pykolab/setup/setup_ldap.py:273
 msgid "Root DN to use"
 msgstr "Te gebruiken Root DN"
 
-#: ../pykolab/setup/setup_ldap.py:234
+#: ../pykolab/setup/setup_ldap.py:325
+msgid "No directory server setup tool available."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:337
 msgid ""
 "\n"
 "                    Setup is now going to set up the 389 Directory Server. This\n"
@@ -1679,24 +2314,46 @@ msgid ""
 "                "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:241
+#: ../pykolab/setup/setup_ldap.py:344
 msgid "Setting up 389 Directory Server"
 msgstr ""
 
-#. TODO: Get the return code and display output if not successful.
-#: ../pykolab/setup/setup_ldap.py:253
+#: ../pykolab/setup/setup_ldap.py:356
+msgid ""
+"\n"
+"                        An error was detected in the setup procedure for 389\n"
+"                        Directory Server. This setup will write out stderr and\n"
+"                        stdout to /var/log/kolab/setup.error.log and\n"
+"                        /var/log/kolab/setup.out.log respectively, before it\n"
+"                        exits.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:373
 msgid "Setup DS stdout:"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:256
+#: ../pykolab/setup/setup_ldap.py:376
 msgid "Setup DS stderr:"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:279 ../pykolab/setup/setup_mysql.py:129
-msgid "Could not find the Kolab schema file"
+#: ../pykolab/setup/setup_ldap.py:402
+msgid "Could not copy the LDAP extensions for Kolab"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:293
+#: ../pykolab/setup/setup_ldap.py:405
+msgid "Could not find the ldap Kolab schema file"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:417
+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"
 "                        Please supply a Cyrus Administrator password. This\n"
@@ -1707,11 +2364,11 @@ msgid ""
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:303
+#: ../pykolab/setup/setup_ldap.py:441
 msgid "Cyrus Administrator password"
 msgstr "Wachtwoord voor Cyrus administrator"
 
-#: ../pykolab/setup/setup_ldap.py:310
+#: ../pykolab/setup/setup_ldap.py:448
 msgid ""
 "\n"
 "                        Please supply a Kolab Service account password. This\n"
@@ -1721,98 +2378,139 @@ msgid ""
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:319
+#: ../pykolab/setup/setup_ldap.py:457
 msgid "Kolab Service password"
 msgstr "Wachtwoord voor Kolab service"
 
-#: ../pykolab/setup/setup_ldap.py:329
+#: ../pykolab/setup/setup_ldap.py:467
 msgid "Writing out configuration to kolab.conf"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:343
+#: ../pykolab/setup/setup_ldap.py:481
 msgid "Inserting service users into LDAP."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:417
+#: ../pykolab/setup/setup_ldap.py:555
 msgid "Writing out cn=kolab,cn=config"
 msgstr ""
 
 #. TODO: Add kolab-admin role
 #. TODO: Assign kolab-admin admin ACLs
-#: ../pykolab/setup/setup_ldap.py:441
+#: ../pykolab/setup/setup_ldap.py:579
 #, python-format
 msgid "Adding domain %s to list of domains for this deployment"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:457
+#: ../pykolab/setup/setup_ldap.py:607
 msgid "Disabling anonymous binds"
 msgstr ""
 
 #. TODO: Ensure the uid attribute is unique
 #. TODO^2: Consider renaming the general "attribute uniqueness to "uid
 #. attribute uniqueness"
-#: ../pykolab/setup/setup_ldap.py:465
+#: ../pykolab/setup/setup_ldap.py:615
 msgid "Enabling attribute uniqueness plugin"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:471
+#: ../pykolab/setup/setup_ldap.py:621
 msgid "Enabling referential integrity plugin"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:477
+#: ../pykolab/setup/setup_ldap.py:627
 msgid "Enabling and configuring account policy plugin"
 msgstr ""
 
 #. TODO: Add kolab-admin role
-#: ../pykolab/setup/setup_ldap.py:492
+#: ../pykolab/setup/setup_ldap.py:642
 msgid "Adding the kolab-admin role"
 msgstr ""
 
 #. TODO: User writeable attributes on root_dn
-#: ../pykolab/setup/setup_ldap.py:503
+#: ../pykolab/setup/setup_ldap.py:653
 #, python-format
 msgid "Setting access control to %s"
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:40
+#: ../pykolab/setup/setup_ldap.py:679
+msgid ""
+"Could not start and configure to start on boot, the directory server admin "
+"service."
+msgstr ""
+
+#: ../pykolab/setup/setup_mta.py:41
 msgid "Setup MTA."
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:224 ../pykolab/setup/setup_php.py:80
+#: ../pykolab/setup/setup_mta.py:317 ../pykolab/setup/setup_php.py:106
 #, python-format
 msgid "Setting key %r to %r"
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:252
+#: ../pykolab/setup/setup_mta.py:350
 msgid "Could not write out Postfix configuration file /etc/postfix/master.cf"
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:287
+#: ../pykolab/setup/setup_mta.py:399
+msgid "Could not write out Amavis configuration file amavisd.conf"
+msgstr ""
+
+#: ../pykolab/setup/setup_mta.py:407
+msgid "Not writing out any configuration for Amavis."
+msgstr ""
+
+#: ../pykolab/setup/setup_mta.py:447
+msgid "Could not start the postfix, clamav and amavisd services services."
+msgstr ""
+
+#: ../pykolab/setup/setup_mta.py:465
 msgid ""
-"Could not write out Amavis configuration file /etc/amavisd/amavisd.conf"
+"Could not configure to start on boot, the postfix, clamav and amavisd "
+"services."
 msgstr ""
 
 #: ../pykolab/setup/setup_mysql.py:39
 msgid "Setup MySQL."
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:53
+#: ../pykolab/setup/setup_mysql.py:49
+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 ""
+
+#: ../pykolab/setup/setup_mysql.py:75
 msgid ""
 "\n"
-"                    Please supply a root password for MySQL. This password will\n"
-"                    be the administrative user for this MySQL server, and it\n"
-"                    should be kept a secret. After this setup process has\n"
-"                    completed, Kolab is going to discard and forget about this\n"
-"                    password, but you will need it for administrative tasks in\n"
-"                    MySQL.\n"
-"                "
+"                        Please supply the root password for MySQL, so we can set\n"
+"                        up user accounts for other components that use MySQL.\n"
+"                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:64
+#: ../pykolab/setup/setup_mysql.py:82 ../pykolab/setup/setup_mysql.py:99
+#: ../pykolab/setup/setup_roundcube.py:184
+#: ../pykolab/setup/setup_syncroton.py:66
 msgid "MySQL root password"
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:103
+#: ../pykolab/setup/setup_mysql.py:88
+msgid ""
+"\n"
+"                        Please supply a root password for MySQL. This password\n"
+"                        will be the administrative user for this MySQL server,\n"
+"                        and it should be kept a secret. After this setup process\n"
+"                        has completed, Kolab is going to discard and forget\n"
+"                        about this password, but you will need it for\n"
+"                        administrative tasks in MySQL.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:139
 msgid ""
 "\n"
 "                        Please supply a password for the MySQL user 'kolab'.\n"
@@ -1821,10 +2519,14 @@ msgid ""
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:111
+#: ../pykolab/setup/setup_mysql.py:147
 msgid "MySQL kolab password"
 msgstr ""
 
+#: ../pykolab/setup/setup_mysql.py:166
+msgid "Could not find the MySQL Kolab schema file"
+msgstr ""
+
 #: ../pykolab/setup/setup_php.py:42
 msgid "PHP Options"
 msgstr "Opties voor PHP"
@@ -1833,21 +2535,36 @@ msgstr "Opties voor PHP"
 msgid "Specify the timezone for PHP."
 msgstr "Specificeer de tijdzone voor PHP"
 
-#: ../pykolab/setup/setup_php.py:53
+#: ../pykolab/setup/setup_php.py:57
+msgid "Specify the path to the php.ini file used with the webserver."
+msgstr ""
+
+#: ../pykolab/setup/setup_php.py:61
 msgid "Setup PHP."
 msgstr ""
 
-#: ../pykolab/setup/setup_php.py:58
+#: ../pykolab/setup/setup_php.py:66
 msgid ""
 "\n"
 "                        Please supply the timezone PHP should be using.\n"
+"                        You have to use a Continent or Country / City locality name\n"
+"                        like 'Europe/Berlin', but not just 'CEST'.\n"
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_php.py:64
+#: ../pykolab/setup/setup_php.py:74
 msgid "Timezone ID"
 msgstr ""
 
+#: ../pykolab/setup/setup_php.py:80
+#, python-format
+msgid "Cannot configure PHP through %r (No such file or directory)"
+msgstr ""
+
+#: ../pykolab/setup/setup_php.py:91
+msgid "Could not find PHP configuration file php.ini"
+msgstr ""
+
 #: ../pykolab/setup/setup_roundcube.py:44
 msgid "Setup Roundcube."
 msgstr ""
@@ -1861,16 +2578,32 @@ msgid ""
 "                "
 msgstr ""
 
-#: ../pykolab/setup/setup_syncroton.py:40
-msgid "Setup Syncroton."
+#: ../pykolab/setup/setup_roundcube.py:56
+msgid "MySQL roundcube password"
 msgstr ""
 
-#: ../pykolab/setup/setup_zpush.py:41
-msgid "Setup zpush."
+#: ../pykolab/setup/setup_roundcube.py:120
+#, python-format
+msgid "Using template file %r"
 msgstr ""
 
-#: ../pykolab/setup/setup_zpush.py:45
-msgid "Z-Push is not installed on this system"
+#: ../pykolab/setup/setup_roundcube.py:127
+#, python-format
+msgid "Successfully compiled template %r, writing out to %r"
+msgstr ""
+
+#: ../pykolab/setup/setup_roundcube.py:229
+#: ../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 ""
 
 #. start_max = (int)(time.time())
@@ -1896,176 +2629,863 @@ msgstr ""
 
 #: ../pykolab/telemetry.py:652
 msgid "No database available"
-msgstr ""
+msgstr "Geen database beschikbaar"
 
-#: ../pykolab/utils.py:57 ../pykolab/utils.py:59
+#: ../pykolab/utils.py:62 ../pykolab/utils.py:64
 #, python-format
 msgid "Confirm %s: "
 msgstr "Bevestig %s:"
 
-#: ../pykolab/utils.py:62
-msgid "Incorrect confirmation. "
-msgstr "Incorrecte bevestiging."
+#: ../pykolab/utils.py:67
+msgid "Incorrect confirmation. Please try again."
+msgstr ""
 
-#: ../pykolab/utils.py:67 ../pykolab/utils.py:72
+#: ../pykolab/utils.py:72 ../pykolab/utils.py:77
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: ../pykolab/utils.py:69 ../pykolab/utils.py:74
+#: ../pykolab/utils.py:74 ../pykolab/utils.py:79
 #, python-format
 msgid "%s [%s]: "
 msgstr ""
 
-#: ../pykolab/utils.py:119
+#: ../pykolab/utils.py:124
 msgid "Please answer 'yes' or 'no'."
 msgstr "Antwoordt aub. 'yes' (ja) of 'no' (nee)."
 
-#: ../pykolab/utils.py:185
+#: ../pykolab/utils.py:164
+msgid "Choice"
+msgstr ""
+
+#: ../pykolab/utils.py:167
+msgid "Choice (type '?' for options)"
+msgstr ""
+
+#: ../pykolab/utils.py:268
 #, python-format
 msgid "Could not change the permissions on %s"
 msgstr ""
 
-#: ../pykolab/wap_client/__init__.py:257
+#: ../pykolab/utils.py:479
+#, python-format
+msgid "Transliterating string %r with locale %r"
+msgstr ""
+
+#: ../pykolab/utils.py:487
+msgid "Attempting to set locale"
+msgstr ""
+
+#: ../pykolab/utils.py:489
+msgid "Success setting locale"
+msgstr ""
+
+#: ../pykolab/utils.py:491
+msgid "Failure to set locale"
+msgstr ""
+
+#: ../pykolab/utils.py:499
+#, python-format
+msgid "Executing '%s | %s'"
+msgstr ""
+
+#: ../pykolab/utils.py:510
+#, python-format
+msgid "Could not translate %s using locale %s"
+msgstr ""
+
+#: ../pykolab/wap_client/__init__.py:396
 #, python-format
 msgid "Requesting %r with params %r"
 msgstr ""
 
-#: ../pykolab/wap_client/__init__.py:263
+#: ../pykolab/wap_client/__init__.py:404
 #, python-format
 msgid "Got response: %r"
 msgstr "Antwoord ontvangen: %r"
 
 #. Some data is not JSON
-#: ../pykolab/wap_client/__init__.py:268
+#: ../pykolab/wap_client/__init__.py:410
 msgid "Response data is not JSON"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:79 ../pykolab/xml/attendee.py:99
+#. support integer values, too
+#: ../pykolab/xml/attendee.py:9 ../pykolab/xml/attendee.py:17
+msgid "Needs Action"
+msgstr ""
+
+#: ../pykolab/xml/attendee.py:10 ../pykolab/xml/attendee.py:18
+msgid "Accepted"
+msgstr ""
+
+#: ../pykolab/xml/attendee.py:11 ../pykolab/xml/attendee.py:19
+msgid "Declined"
+msgstr ""
+
+#: ../pykolab/xml/attendee.py:12 ../pykolab/xml/attendee.py:20
+msgid "Tentatively Accepted"
+msgstr ""
+
+#: ../pykolab/xml/attendee.py:13 ../pykolab/xml/attendee.py:21
+msgid "Delegated"
+msgstr ""
+
+#: ../pykolab/xml/attendee.py:14 ../pykolab/xml/attendee.py:22
+msgid "Completed"
+msgstr ""
+
+#: ../pykolab/xml/attendee.py:15 ../pykolab/xml/attendee.py:23
+msgid "Started"
+msgstr ""
+
+#: ../pykolab/xml/attendee.py:132 ../pykolab/xml/attendee.py:154
 msgid "Not a valid attendee"
 msgstr "Ongeldige deelnemer"
 
-#: ../pykolab/xml/attendee.py:84
+#: ../pykolab/xml/attendee.py:139
 msgid "No valid delegator references found"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:104
+#: ../pykolab/xml/attendee.py:159
 msgid "No valid delegatee references found"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:140
+#: ../pykolab/xml/attendee.py:219
 #, python-format
 msgid "Invalid cutype %r"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:151
+#: ../pykolab/xml/attendee.py:231
 #, python-format
 msgid "Invalid participant status %r"
 msgstr "Ongeldige deelnemer status %r"
 
-#: ../pykolab/xml/attendee.py:159
+#: ../pykolab/xml/attendee.py:239
 #, python-format
 msgid "Invalid role %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:172
+#: ../pykolab/xml/event.py:149 ../pykolab/xml/event.py:784
+#: ../pykolab/xml/event.py:827
+msgid "Event start needs datetime.date or datetime.datetime instance"
+msgstr ""
+
+#: ../pykolab/xml/event.py:294
 #, python-format
 msgid "No attendee with email or name %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:180
+#: ../pykolab/xml/event.py:302
 #, python-format
 msgid "Invalid argument value attendee %r, must be basestring or Attendee"
 msgstr ""
 
-#: ../pykolab/xml/event.py:186
+#: ../pykolab/xml/event.py:314
 #, python-format
 msgid "No attendee with email %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:192
+#: ../pykolab/xml/event.py:320
 #, python-format
 msgid "No attendee with name %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:338
+#: ../pykolab/xml/event.py:370 ../pykolab/xml/utils.py:151
+msgid "%Y-%m-%d"
+msgstr ""
+
+#: ../pykolab/xml/event.py:372 ../pykolab/xml/utils.py:152
+msgid "%H:%M (%Z)"
+msgstr ""
+
+#: ../pykolab/xml/event.py:496
 msgid "Invalid participant status"
 msgstr "Ongeldige deelnemer status"
 
-#: ../pykolab/xml/event.py:538
-msgid "Event end needs datetime.date or datetime.datetime instance"
+#: ../pykolab/xml/event.py:618
+#, python-format
+msgid "Invalid classification %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:654
-#, python-format
-msgid "Invalid status %r"
+#: ../pykolab/xml/event.py:649
+msgid "Event end needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: ../pykolab/xml/event.py:675 ../pykolab/xml/event.py:725
-msgid "Event start needs datetime.date or datetime.datetime instance"
+#: ../pykolab/xml/event.py:659
+#, python-format
+msgid "Invalid custom property name %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:761
+#: ../pykolab/xml/event.py:837
 #, python-format
 msgid "Invalid status set: %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:879
+#: ../pykolab/xml/event.py:1074
 msgid "No sender specified"
 msgstr "Geen afzender gespecificeerd"
 
-#: ../saslauthd/__init__.py:126 ../saslauthd/__init__.py:134
-#: ../wallace/__init__.py:362 ../wallace/__init__.py:371
-msgid ""
-"Traceback occurred, please report a bug at http://bugzilla.kolabsys.com"
-msgstr "Traceback voorgekomen, rapporteer alstublieft een bug op http://bugzilla.kolabsys.com"
+#: ../pykolab/xml/event.py:1083
+#, python-format
+msgid "Invitation for %s was %s"
+msgstr ""
+
+#: ../pykolab/xml/event.py:1088
+msgid "This is an automated response to one of your event requests."
+msgstr ""
+
+#: ../pykolab/xml/recurrence_rule.py:38
+#, python-format
+msgid "Every %d year(s)"
+msgstr ""
+
+#: ../pykolab/xml/recurrence_rule.py:39
+#, python-format
+msgid "Every %d month(s)"
+msgstr ""
+
+#: ../pykolab/xml/recurrence_rule.py:40
+#, python-format
+msgid "Every %d week(s)"
+msgstr ""
+
+#: ../pykolab/xml/recurrence_rule.py:41
+#, python-format
+msgid "Every %d day(s)"
+msgstr ""
+
+#: ../pykolab/xml/recurrence_rule.py:42
+#, python-format
+msgid "Every %d hours"
+msgstr ""
+
+#: ../pykolab/xml/recurrence_rule.py:43
+#, python-format
+msgid "Every %d minutes"
+msgstr ""
+
+#: ../pykolab/xml/recurrence_rule.py:44
+#, python-format
+msgid "Every %d seconds"
+msgstr ""
+
+#: ../pykolab/xml/todo.py:110
+msgid "Todo due needs datetime.date or datetime.datetime instance"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:120
+msgid "Name"
+msgstr "Naam"
+
+#: ../pykolab/xml/utils.py:121
+msgid "Summary"
+msgstr "Samenvatting"
+
+#: ../pykolab/xml/utils.py:122
+msgid "Location"
+msgstr "Locatie"
+
+#: ../pykolab/xml/utils.py:123
+msgid "Description"
+msgstr "Omschrijving"
+
+#: ../pykolab/xml/utils.py:124
+msgid "URL"
+msgstr "URL"
+
+#: ../pykolab/xml/utils.py:125
+msgid "Status"
+msgstr "Status"
+
+#: ../pykolab/xml/utils.py:126
+msgid "Priority"
+msgstr "Prioriteit"
+
+#: ../pykolab/xml/utils.py:127
+msgid "Attendee"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:128
+msgid "Start"
+msgstr "Begin"
+
+#: ../pykolab/xml/utils.py:129
+msgid "End"
+msgstr "Eind"
+
+#: ../pykolab/xml/utils.py:130
+msgid "Due"
+msgstr "Vóór"
+
+#: ../pykolab/xml/utils.py:131
+msgid "Repeat"
+msgstr "Herhaal"
+
+#: ../pykolab/xml/utils.py:132
+msgid "Repeat Exception"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:133
+msgid "Organizer"
+msgstr "Organisatie"
+
+#: ../pykolab/xml/utils.py:134
+msgid "Attachment"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:135
+msgid "Alarm"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:136
+msgid "Classification"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:137
+msgid "Progress"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:182
+#, python-format
+msgid "for %d times"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:184
+#, python-format
+msgid "until %s"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:189
+msgid "Display message"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:190
+msgid "Send email"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:191
+msgid "Play sound"
+msgstr ""
 
-#: ../wallace/__init__.py:61
+#: ../pykolab/xml/utils.py:197
+#, python-format
+msgid "%s after"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:197
+#, python-format
+msgid "%s before"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:206
+#, python-format
+msgid "%d day(s)"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:212
+#, python-format
+msgid "%d hour(s)"
+msgstr ""
+
+#: ../pykolab/xml/utils.py:214
+#, python-format
+msgid "%d minute(s)"
+msgstr ""
+
+#: ../saslauthd/__init__.py:76
+msgid "Socket file to bind to."
+msgstr ""
+
+#: ../saslauthd/__init__.py:108
+#, python-format
+msgid "Could not create %r: %r"
+msgstr ""
+
+#: ../saslauthd/__init__.py:194
+#, python-format
+msgid "kolab-saslauthd could not accept connections on socket: %r"
+msgstr ""
+
+#: ../saslauthd/__init__.py:199
+msgid "Maximum tries exceeded, exiting"
+msgstr ""
+
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:195
+#: ../wallace/module_resources.py:1054
+#, python-format
+msgid "Reservation Request for %(summary)s was %(status)s"
+msgstr ""
+
+#. check notification message sent to resource owner (jane)
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:619
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:635
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:666
+#: ../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
+#, python-format
+msgid "Booking for %s has been %s"
+msgstr ""
+
+#. check confirmation message sent to resource owner (jane)
+#. check first confirmation message sent to resource owner (jane)
+#. check second confirmation message sent to resource owner (jane)
+#. check confirmation message sent to resource owner (jane)
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:656
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:694
+#: ../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
+#, python-format
+msgid "Booking request for %s requires confirmation"
+msgstr ""
+
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:240
+#: ../wallace/module_invitationpolicy.py:441
+#, python-format
+msgid "\"%(summary)s\" has been %(status)s"
+msgstr ""
+
+#. check for notification message
+#. this notification should be suppressed until mark has replied, too
+#. 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
+#, 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
+msgid "PENDING"
+msgstr ""
+
+#. this should trigger a notification message
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1003
+#: ../wallace/module_invitationpolicy.py:1110
+#, python-format
+msgid "\"%s\" has been cancelled"
+msgstr ""
+
+#: ../tests/unit/test-011-itip.py:408
+#, python-format
+msgid "Invitation for %(summary)s was %(status)s"
+msgstr ""
+
+#: ../wallace/__init__.py:57
+#, python-format
+msgid "Wallace modules: %r"
+msgstr ""
+
+#: ../wallace/__init__.py:69
+#, python-format
+msgid "Module %s.execute() failed on message %r with error: %s"
+msgstr ""
+
+#: ../wallace/__init__.py:78
 #, python-format
 msgid "Worker process %s initializing"
 msgstr ""
 
-#: ../wallace/__init__.py:80
+#: ../wallace/__init__.py:100
 msgid "Bind address for Wallace."
 msgstr "IP adres voor Wallace."
 
-#: ../wallace/__init__.py:106
+#: ../wallace/__init__.py:126
 msgid "Port that Wallace is supposed to use."
 msgstr "Poort voor Wallace."
 
-#: ../wallace/__init__.py:157
+#: ../wallace/__init__.py:177
 #, python-format
-msgid "Could not bind to socket on port %d on bind "
+msgid "Could not bind to socket on port %d on bind address %s"
 msgstr ""
 
-#: ../wallace/__init__.py:169
+#: ../wallace/__init__.py:189
 msgid "Could not shut down socket"
 msgstr "Kan de socket niet afsluiten"
 
-#: ../wallace/__init__.py:226
+#: ../wallace/__init__.py:253
 msgid "Accepted connection"
 msgstr "Connectie geaccepteerd"
 
-#: ../wallace/__init__.py:387
+#: ../wallace/__init__.py:428
 #, python-format
 msgid "Could not write pid file %s"
 msgstr ""
 
-#: ../wallace/module_optout.py:61 ../wallace/module_resources.py:94
+#: ../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
 #, python-format
 msgid "Issuing callback after processing to stage %s"
 msgstr ""
 
-#: ../wallace/module_optout.py:62 ../wallace/module_resources.py:100
+#: ../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
 #, python-format
 msgid "Testing cb_action_%s()"
 msgstr ""
 
-#: ../wallace/module_optout.py:64 ../wallace/module_resources.py:103
+#: ../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
 #, python-format
 msgid "Attempting to execute cb_action_%s()"
 msgstr ""
 
+#: ../wallace/module_footer.py:67
+#, python-format
+msgid "Executing module footer for %r, %r"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:66
+#, python-format
+msgid "Executing module gpgencrypt for %r, %r"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:98
+msgid "Message is already encrypted (app/pgp-enc content-type)"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:102
+msgid "Message already encrypted by main content-type header"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:131
+msgid ""
+"Configured to encrypt to a key not configured, and strict policy enabled. "
+"Bailing out."
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:134
+msgid ""
+"Configured to encrypt to a key not configured, but continuing anyway (see "
+"'gpgencrypt_strict')."
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:171
+#, python-format
+msgid "Recipients: %r"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:183
+#, python-format
+msgid "Current keys: %r"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:188
+#, python-format
+msgid "Retrieving key for recipient: %r"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:192 ../wallace/module_gpgencrypt.py:208
+#, python-format
+msgid "Found matching address %r"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:200
+#, python-format
+msgid "Found matching address %r in remote keys"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:232
+#, python-format
+msgid "An error occurred: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:196
+#, python-format
+msgid "Invitation policy called for %r, %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:257
+#, python-format
+msgid "Failed to parse iTip objects from message: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:261
+msgid ""
+"Message is not an iTip message or does not contain any (valid) iTip objects."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:265
+#, python-format
+msgid ""
+"iTip objects attached to this message contain the following information: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:278
+#, python-format
+msgid "No itips, no users, pass along %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:281
+#, python-format
+msgid "iTips, but no users, pass along %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:301
+#, python-format
+msgid "No user attendee matching envelope recipient %s, skip message"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:305
+#, python-format
+msgid "Receiving user: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:330
+#, python-format
+msgid "Apply invitation policy %r for sender %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:341
+#, python-format
+msgid "Ignoring '%s' iTip method"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:345
+#, python-format
+msgid "iTip message %r consumed by the invitationpolicy module"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:361
+msgid "Pass invitation for manual processing"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:366
+#, python-format
+msgid "Receiving Attendee: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:386
+#, python-format
+msgid "Existing %s: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:397
+#, python-format
+msgid "Precondition for object %r fulfilled: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:415
+#, python-format
+msgid ""
+"The iTip request sequence (%r) doesn't match the referred object version "
+"(%r). Ignoring."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:420
+#, python-format
+msgid "Auto-updating %s %r on iTip REQUEST (no re-scheduling)"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:475
+msgid "Pass reply for manual processing"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:482
+#, python-format
+msgid "Sender Attendee: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:494
+#, 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
+#, python-format
+msgid "Auto-updating %s %r on iTip REPLY"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:525
+#, python-format
+msgid "Add delegatee: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:528
+#, python-format
+msgid "Update existing delegatee: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:533
+#, python-format
+msgid "Update delegator: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:550
+#: ../wallace/module_invitationpolicy.py:582
+msgid ""
+"The object referred by this reply was not found in the user's folders. "
+"Forwarding to Inbox."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:563
+msgid "Pass cancellation for manual processing"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:611
+#, python-format
+msgid "Checking if email address %r belongs to a local user"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:616
+#, python-format
+msgid "User DN: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:618
+#, python-format
+msgid "No user record(s) found for %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:674
+#, python-format
+msgid "User record doesn't have the mailbox attribute %r set"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:687
+#, python-format
+msgid "IMAP proxy authentication failed: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:709
+#, python-format
+msgid "List %r folders for user %r: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:725
+#, python-format
+msgid "IMAP metadata for %r: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:755
+#, python-format
+msgid "Searching folder %r for %s %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:771
+#, python-format
+msgid "Failed to parse %s from message %s/%s: %s"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:797
+#, python-format
+msgid "Listing events from folder %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:810
+#: ../wallace/module_resources.py:566 ../wallace/module_resources.py:614
+#, python-format
+msgid "Failed to parse event from message %s/%s: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:816
+#, python-format
+msgid "Existing event %r conflicts with invitation %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:823
+#: ../wallace/module_resources.py:419
+#, python-format
+msgid "start: %r, end: %r, total: %r, messages: %d"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:849
+#, python-format
+msgid "%r is locked, waiting..."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:913
+#, python-format
+msgid "Failed to save %s: no target folder found for user %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:916
+#, python-format
+msgid "Save %s %r to user folder %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:929
+#, python-format
+msgid "Failed to save %s to user folder at %r: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:945
+#, python-format
+msgid "Delete %s %r in %r: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:970
+#, python-format
+msgid "Compose participation status summary for %s %r to user %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1003
+#, python-format
+msgid ""
+"Waiting for more automated replies (got %d of %d); skipping notification"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1013
+#, python-format
+msgid "Changes submitted by %s have been automatically applied."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1022
+msgid "(removed)"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1045
+#: ../wallace/module_invitationpolicy.py:1103
+#: ../wallace/module_invitationpolicy.py:1193
+msgid "*** This is an automated message. Please do not reply. ***"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1076
+#, python-format
+msgid "Send cancellation notification for %s %r to user %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1183
+#, python-format
+msgid "Updated %s's copy of %r: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1186
+#, python-format
+msgid "Attendee %s's copy of %r not found"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1189
+#, python-format
+msgid "Attendee %r not found in LDAP"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1196
+#, python-format
+msgid "%(name)s has %(status)s your assignment for %(summary)s."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1198
+#, python-format
+msgid "%(name)s has %(status)s your invitation for %(summary)s."
+msgstr ""
+
 #. modules.next_module('optout')
 #: ../wallace/module_optout.py:70
 #, python-format
@@ -2074,7 +3494,8 @@ msgstr ""
 
 #: ../wallace/module_optout.py:96
 #, python-format
-msgid "Running opt-out consult from envelope sender '%s "
+msgid ""
+"Running opt-out consult from envelope sender '%s <%s>' to recipient %s <%s>"
 msgstr ""
 
 #: ../wallace/module_optout.py:160
@@ -2087,210 +3508,366 @@ msgstr ""
 msgid "Could not send request to optout_url %s"
 msgstr ""
 
-#: ../wallace/module_resources.py:81
+#: ../wallace/module_resources.py:115
 #, python-format
 msgid "Resource Management called for %r, %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:139
-msgid "Message is not an iTip message or does not contain any "
+#: ../wallace/module_resources.py:180
+#, python-format
+msgid "Failed to parse iTip events from message: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:147
-msgid "iTip events attached to this message contain the "
+#: ../wallace/module_resources.py:185
+msgid "Message is not an iTip message or does not contain any (valid) iTip."
 msgstr ""
 
-#: ../wallace/module_resources.py:174
+#: ../wallace/module_resources.py:193
+#, python-format
+msgid ""
+"iTip events attached to this message contain the following information: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:226
 msgid "Not an iTip message, but sent to resource nonetheless. Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:182
-msgid "No itips, no resources, pass along"
+#: ../wallace/module_resources.py:234
+#, python-format
+msgid "No itips, no resources, pass along %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:186
-msgid "iTips, but no resources, pass along"
+#: ../wallace/module_resources.py:237
+#, python-format
+msgid "iTips, but no resources, pass along %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:218
+#: ../wallace/module_resources.py:246
 #, python-format
-msgid "Resources: %r"
+msgid "No resource attendees matching envelope recipient %s, Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:236
+#: ../wallace/module_resources.py:256
 #, python-format
-msgid "Checking events in resource folder %r"
+msgid "Resources: %r; %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:243
+#: ../wallace/module_resources.py:274
 #, python-format
-msgid "Mailbox for resource %r doesn't exist"
-msgstr "Mailbox voor resource %r bestaat niet"
+msgid "Sender Attendee: %r => %r"
+msgstr ""
 
-#: ../wallace/module_resources.py:256
+#: ../wallace/module_resources.py:281
 #, python-format
-msgid "Fetching message UID %r from folder %r"
+msgid ""
+"The iTip reply sequence (%r) doesn't match the referred event version (%r). "
+"Ignoring."
+msgstr ""
+
+#: ../wallace/module_resources.py:306
+#, python-format
+msgid "Event referenced by this REPLY (%r) not found in resource calendar"
 msgstr ""
 
-#: ../wallace/module_resources.py:295
+#: ../wallace/module_resources.py:309
+msgid "No event reference found in this REPLY. Ignoring."
+msgstr ""
+
+#: ../wallace/module_resources.py:318
+#, python-format
+msgid "Receiving Resource: %r; %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:326
 #, python-format
-msgid "Event %r conflicts with event "
+msgid "Recipient %r is non-participant, ignoring message"
 msgstr ""
 
-#: ../wallace/module_resources.py:308
+#: ../wallace/module_resources.py:354
 #, python-format
-msgid "start: %r, end: %r, total: %r, messages: %r"
+msgid "Accept invitation for individual resource %r / %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:315
+#: ../wallace/module_resources.py:383
+#, python-format
+msgid "Delegate invitation for resource collection %r to %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:415
+#, python-format
+msgid "Failed to read resource calendar for %r: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:425
 #, python-format
 msgid "Polling for resource %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:319
+#: ../wallace/module_resources.py:428
 #, python-format
 msgid "Resource %r has been popped from the list"
 msgstr ""
 
-#: ../wallace/module_resources.py:326
+#: ../wallace/module_resources.py:432
 msgid "Resource is a collection"
 msgstr ""
 
-#: ../wallace/module_resources.py:374 ../wallace/module_resources.py:424
+#: ../wallace/module_resources.py:443
 #, python-format
-msgid "Adding event to %r"
+msgid "Removed conflicting resources from %r: (%r) => %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:473
+#: ../wallace/module_resources.py:455
 #, python-format
-msgid "Method %r not really interesting for us."
+msgid "Conflicting events: %r for resource %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:481
+#: ../wallace/module_resources.py:474
 #, python-format
-msgid "Raw iTip payload: %s"
+msgid "Delegate to another resource collection member: %r to %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:491
-msgid "Could not read iTip from message."
+#: ../wallace/module_resources.py:536
+#, python-format
+msgid "Checking events in resource folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:513
-msgid "iTip event without a start"
+#: ../wallace/module_resources.py:555
+#, python-format
+msgid "Fetching message UID %r from folder %r"
 msgstr ""
 
-#. end if c.name == "VEVENT"
-#. end for c in cal.walk()
-#. end if part.get_content_type() == "text/calendar"
-#. end for part in message.walk()
-#. if message.is_multipart()
-#: ../wallace/module_resources.py:543
-msgid "Message is not an iTip message (non-multipart message)"
+#: ../wallace/module_resources.py:578
+#, python-format
+msgid "Event %r conflicts with event %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:564
+#: ../wallace/module_resources.py:599
 #, python-format
-msgid "Checking if email address %r belongs to a resource (collection)"
+msgid "Searching %r for event %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:575 ../wallace/module_resources.py:649
-#: ../wallace/module_resources.py:699
+#: ../wallace/module_resources.py:605
 #, python-format
-msgid "No resource (collection) records found for %r"
+msgid "Failed to access resource calendar:: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:634
+#, python-format
+msgid "Apply invitation policies %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:653
+#, python-format
+msgid "Adding event to %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:583 ../wallace/module_resources.py:657
 #: ../wallace/module_resources.py:707
 #, python-format
+msgid "Failed to save event to resource calendar at %r: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:724
+#, python-format
+msgid "Delete resource calendar object %r in %r: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:767
+#, 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
+#, python-format
 msgid "Resource record(s): %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:589 ../wallace/module_resources.py:664
-#: ../wallace/module_resources.py:714
+#: ../wallace/module_resources.py:777 ../wallace/module_resources.py:851
+#: ../wallace/module_resources.py:886
+#, 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
 #, python-format
 msgid "Resource record: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:608
+#: ../wallace/module_resources.py:801
 #, python-format
 msgid "Raw itip_events: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:616
+#: ../wallace/module_resources.py:809
 #, python-format
 msgid "Raw set of attendees: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:624
+#: ../wallace/module_resources.py:817
 #, python-format
 msgid "Raw set of resources: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:638
+#: ../wallace/module_resources.py:822
+#, python-format
+msgid "Raw set of organizers: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:842
 #, python-format
 msgid "Checking if attendee %r is a resource (collection)"
 msgstr ""
 
-#: ../wallace/module_resources.py:671 ../wallace/module_resources.py:717
+#: ../wallace/module_resources.py:858 ../wallace/module_resources.py:892
 msgid "Resource reservation made but no resource records found"
 msgstr ""
 
-#: ../wallace/module_resources.py:689
+#: ../wallace/module_resources.py:877
 #, python-format
 msgid "Checking if resource %r is a resource (collection)"
 msgstr ""
 
-#: ../wallace/module_resources.py:721
-msgid "The following resources are being referred to in the "
+#: ../wallace/module_resources.py:895
+#, python-format
+msgid "The following resources are being referred to in the iTip: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:1060
+#, python-format
+msgid ""
+"\n"
+"                *** This is an automated response, please do not reply! ***\n"
+"\n"
+"                Your reservation was delegated to \"%s\" which is available for the requested time.\n"
+"            "
+msgstr ""
+
+#: ../wallace/module_resources.py:1079
+#, python-format
+msgid ""
+"\n"
+"        *** This is an automated response, please do not reply! ***\n"
+"        \n"
+"        We hereby inform you that your reservation was %s.\n"
+"    "
+msgstr ""
+
+#: ../wallace/module_resources.py:1086
+#, python-format
+msgid ""
+"\n"
+"            If you have questions about this reservation, please contact\n"
+"            %s <%s> %s\n"
+"        "
+msgstr ""
+
+#: ../wallace/module_resources.py:1117
+#, python-format
+msgid "Sending booking notification for event %r to %r from %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:1134
+msgid "failed"
+msgstr ""
+
+#: ../wallace/module_resources.py:1153
+#, python-format
+msgid ""
+"\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
+#, python-format
+msgid ""
+"\n"
+"            A reservation request for %(resource)s could not be processed automatically.\n"
+"            Please contact %(orgname)s <%(orgemail)s> who requested this resource for %(date)s. Subject: %(summary)s.\n"
+"\n"
+"            *** This is an automated message, sent to you as the resource owner. ***\n"
+"        "
+msgstr ""
+
+#: ../wallace/module_resources.py:1203
+#, python-format
+msgid "Clone invitation for owner confirmation: %r from %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:1209
+#, python-format
+msgid ""
+"\n"
+"        A reservation request for %(resource)s requires your approval!\n"
+"        Please either accept or decline this invitation without saving it to your calendar.\n"
+"\n"
+"        The reservation request was sent from %(orgname)s <%(orgemail)s>.\n"
+"\n"
+"        Subject: %(summary)s.\n"
+"        Date: %(date)s\n"
+"        Participants: %(attendees)s\n"
+"\n"
+"        *** This is an automated message, please don't reply by email. ***\n"
+"    "
 msgstr ""
 
 #. This is a nested module
-#: ../wallace/modules.py:96
+#: ../wallace/modules.py:97
 #, python-format
 msgid "Module Group: %s"
 msgstr "Module Groep: %s"
 
-#: ../wallace/modules.py:107 ../wallace/modules.py:112
-msgid "No such module."
-msgstr "Module bestaat niet"
+#: ../wallace/modules.py:108
+#, python-format
+msgid "No such module %r in modules %r (1)."
+msgstr ""
+
+#: ../wallace/modules.py:113
+#, python-format
+msgid "No such module %r in modules %r (2)."
+msgstr ""
 
-#: ../wallace/modules.py:118
+#: ../wallace/modules.py:119
 #, python-format
 msgid "Holding message in queue for manual review (%s by %s)"
 msgstr ""
 
-#: ../wallace/modules.py:121
+#: ../wallace/modules.py:122
 #, python-format
 msgid "Deferring message in %s (by module %s)"
 msgstr ""
 
-#: ../wallace/modules.py:131
+#: ../wallace/modules.py:134
 #, python-format
 msgid "The time when the message was sent: %r"
 msgstr ""
 
-#: ../wallace/modules.py:132
+#: ../wallace/modules.py:135
 #, python-format
 msgid "The time now: %r"
 msgstr "De huidige tijd: %r"
 
-#: ../wallace/modules.py:133
+#: ../wallace/modules.py:136
 #, python-format
 msgid "The time delta: %r"
 msgstr "Verschil in tijd: %r"
 
 #. TODO: Send NDR back to user
-#: ../wallace/modules.py:137
+#: ../wallace/modules.py:140
 #, python-format
 msgid "Message in file %s older then 5 days, deleting"
 msgstr "Bericht in bestand %s ouder dan 5 dagen, bezig met verwijderen"
 
-#: ../wallace/modules.py:162
+#: ../wallace/modules.py:165
 #, python-format
 msgid "Rejecting message in %s (by module %s)"
 msgstr "Bericht %s geweigerd (door module %s)"
 
-#: ../wallace/modules.py:180
+#: ../wallace/modules.py:186
 #, python-format
 msgid ""
 "This is the email system Wallace at %s.\n"
@@ -2305,19 +3882,29 @@ msgid ""
 "recipients.\n"
 msgstr ""
 
-#: ../wallace/modules.py:195
+#: ../wallace/modules.py:201
 #, python-format
 msgid ""
 "X-Wallace-Module: %s\n"
 "X-Wallace-Result: REJECT\n"
 msgstr ""
 
-#: ../wallace/modules.py:248
+#: ../wallace/modules.py:260
 #, python-format
 msgid "Accepting message in %s (by module %s)"
 msgstr ""
 
-#: ../wallace/modules.py:316
+#: ../wallace/modules.py:262
+#, python-format
+msgid "Accepting message in: %r"
+msgstr ""
+
+#: ../wallace/modules.py:269
+#, python-format
+msgid "recipients: %r"
+msgstr ""
+
+#: ../wallace/modules.py:347
 #, python-format
 msgid "Module '%s' already registered"
 msgstr "Module '%s' reeds geregistreerd"
diff --git a/po/pykolab.pot b/po/pykolab.pot
index d2152f1..c081230 100644
--- a/po/pykolab.pot
+++ b/po/pykolab.pot
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-22 16:29-0400\n"
+"POT-Creation-Date: 2014-09-11 18:01+0200\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"
@@ -65,8 +66,8 @@ msgstr ""
 #: ../bin/kolab_smtp_access_policy.py:748
 #, 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
@@ -320,7 +321,7 @@ msgstr ""
 msgid "Run as group GROUPNAME"
 msgstr ""
 
-#: ../kolabd/__init__.py:122 ../pykolab/logger.py:139 ../pykolab/utils.py:234
+#: ../kolabd/__init__.py:122 ../pykolab/utils.py:234
 #: ../saslauthd/__init__.py:301 ../wallace/__init__.py:329
 #, python-format
 msgid "Group %s does not exist"
@@ -332,7 +333,7 @@ msgstr ""
 msgid "Switching real and effective group id to %d"
 msgstr ""
 
-#: ../kolabd/__init__.py:153 ../pykolab/logger.py:159 ../pykolab/utils.py:258
+#: ../kolabd/__init__.py:153 ../pykolab/utils.py:258
 #: ../saslauthd/__init__.py:332 ../wallace/__init__.py:360
 #, python-format
 msgid "User %s does not exist"
@@ -355,7 +356,9 @@ msgid "Interrupted by user"
 msgstr ""
 
 #: ../kolabd/__init__.py:197 ../kolabd/__init__.py:208
-msgid "Traceback occurred, please report a "
+#: ../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"
 msgstr ""
 
 #: ../kolabd/__init__.py:203 ../saslauthd/__init__.py:150
@@ -368,7 +371,7 @@ msgstr ""
 msgid "Could not connect to LDAP, is it running?"
 msgstr ""
 
-#: ../kolabd/__init__.py:233 ../pykolab/auth/ldap/__init__.py:2171
+#: ../kolabd/__init__.py:233 ../pykolab/auth/ldap/__init__.py:2178
 #: ../pykolab/cli/cmd_sync.py:36
 msgid "Listing domains..."
 msgstr ""
@@ -525,244 +528,256 @@ msgstr ""
 msgid "Using timestamp %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:595
-msgid "Applying recipient policy disabled through configuration"
+#: ../pykolab/auth/ldap/__init__.py:597
+#, python-format
+msgid "Not applying recipient policy for %s (disabled through configuration)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:600
+#: ../pykolab/auth/ldap/__init__.py:607
 #, python-format
 msgid "Applying recipient policy to %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:617
+#: ../pykolab/auth/ldap/__init__.py:624
 #, python-format
-msgid "Using mail attributes: %r, with primary %r and "
+msgid "Using mail attributes: %r, with primary %r and secondary %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:628
+#: ../pykolab/auth/ldap/__init__.py:635
 #, python-format
 msgid "key %r not in entry"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:630
+#: ../pykolab/auth/ldap/__init__.py:637
 #, python-format
 msgid "key %r is the prim. mail attr."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:632
+#: ../pykolab/auth/ldap/__init__.py:639
 msgid "prim. mail pol. is not empty"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:635
+#: ../pykolab/auth/ldap/__init__.py:642
 #, python-format
 msgid "key %r is the sec. mail attr."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:637
+#: ../pykolab/auth/ldap/__init__.py:644
 msgid "sec. mail pol. is not empty"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:641 ../pykolab/auth/ldap/__init__.py:655
+#: ../pykolab/auth/ldap/__init__.py:648 ../pykolab/auth/ldap/__init__.py:662
 #, python-format
 msgid "Attributes %r are not yet available for entry %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:694
+#: ../pykolab/auth/ldap/__init__.py:701
 #, python-format
 msgid "No results for mail address %s found"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:705
+#: ../pykolab/auth/ldap/__init__.py:712
 #, python-format
 msgid "1 result for address %s found, verifying"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:715
+#: ../pykolab/auth/ldap/__init__.py:722
 #, python-format
-msgid "Too bad, primary email address %s "
+msgid "Too bad, primary email address %s already in use for %s (we are %s)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:726 ../pykolab/auth/ldap/__init__.py:815
+#: ../pykolab/auth/ldap/__init__.py:733 ../pykolab/auth/ldap/__init__.py:822
 msgid "Address assigned to us"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:781
+#: ../pykolab/auth/ldap/__init__.py:788
 #, python-format
 msgid "No results for address %s found"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:792
+#: ../pykolab/auth/ldap/__init__.py:799
 #, python-format
-msgid "1 result for address %s found, "
+msgid "1 result for address %s found, verifying..."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:803
-msgid "Too bad, secondary email "
+#: ../pykolab/auth/ldap/__init__.py:810
+#, python-format
+msgid "Too bad, secondary email address %s already in use for %s (we are %s)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:830
-msgid "Recipient policy composed the following set of secondary "
+#: ../pykolab/auth/ldap/__init__.py:837
+#, python-format
+msgid ""
+"Recipient policy composed the following set of secondary email addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:841
+#: ../pykolab/auth/ldap/__init__.py:848
 #, python-format
 msgid "Secondary mail addresses that we want is not None: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:852
-msgid "Avoiding the duplication of the primary mail "
+#: ../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"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:863
+#: ../pykolab/auth/ldap/__init__.py:870
 #, python-format
 msgid "Entry is getting secondary mail addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:871
-msgid "Entry did not have any secondary mail "
+#: ../pykolab/auth/ldap/__init__.py:878
+#, python-format
+msgid "Entry did not have any secondary mail addresses in %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:888 ../pykolab/auth/ldap/__init__.py:894
+#: ../pykolab/auth/ldap/__init__.py:895 ../pykolab/auth/ldap/__init__.py:901
 #, python-format
 msgid "secondary_mail_addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:889 ../pykolab/auth/ldap/__init__.py:895
+#: ../pykolab/auth/ldap/__init__.py:896 ../pykolab/auth/ldap/__init__.py:902
 #, python-format
 msgid "entry[%s]: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:906
+#: ../pykolab/auth/ldap/__init__.py:913
 #, python-format
 msgid "Entry modifications list: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:934
+#: ../pykolab/auth/ldap/__init__.py:941
 #, python-format
 msgid "Setting entry attribute %r to %r for %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:970
+#: ../pykolab/auth/ldap/__init__.py:977
 #, python-format
 msgid ""
 "Could not update dn %r:\n"
 "%r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:983
+#: ../pykolab/auth/ldap/__init__.py:990
 #, python-format
 msgid "Using filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:998
+#: ../pykolab/auth/ldap/__init__.py:1005
 #, python-format
 msgid "Synchronization is searching against base DN: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1044
+#: ../pykolab/auth/ldap/__init__.py:1051
 #, python-format
-msgid "About to consider the user quota for %r (used: %r, "
+msgid ""
+"About to consider the user quota for %r (used: %r, imap: %r, ldap: %r, "
+"default: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1115
+#: ../pykolab/auth/ldap/__init__.py:1122
 msgid "Invalid DN, username and/or password."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1240 ../pykolab/auth/ldap/__init__.py:1257
-#: ../pykolab/auth/ldap/__init__.py:1621 ../pykolab/auth/ldap/__init__.py:1638
+#: ../pykolab/auth/ldap/__init__.py:1247 ../pykolab/auth/ldap/__init__.py:1264
+#: ../pykolab/auth/ldap/__init__.py:1628 ../pykolab/auth/ldap/__init__.py:1645
 #, python-format
 msgid "Found a subject %r with access %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1359
+#: ../pykolab/auth/ldap/__init__.py:1366
 #, python-format
 msgid "Entry %s attribute value: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1367
+#: ../pykolab/auth/ldap/__init__.py:1374
 #, python-format
 msgid "imap.user_mailbox_server(%r) result: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1687 ../pykolab/auth/ldap/__init__.py:1887
+#: ../pykolab/auth/ldap/__init__.py:1694 ../pykolab/auth/ldap/__init__.py:1894
 #, python-format
 msgid "Result from recipient policy: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1942
+#: ../pykolab/auth/ldap/__init__.py:1949
 #, python-format
 msgid "Kolab user %s does not have a result attribute %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2101
+#: ../pykolab/auth/ldap/__init__.py:2108
 #, python-format
 msgid "Finding domain root dn for domain %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2198
+#: ../pykolab/auth/ldap/__init__.py:2205
 msgid "Authentication database DOWN"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2282 ../pykolab/auth/ldap/__init__.py:2330
+#: ../pykolab/auth/ldap/__init__.py:2289 ../pykolab/auth/ldap/__init__.py:2337
 #, python-format
 msgid "Entry type: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2419
+#: ../pykolab/auth/ldap/__init__.py:2426
 msgid "LDAP Search Result Data Entry:"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2435
+#: ../pykolab/auth/ldap/__init__.py:2442
 msgid "Entry Change Notification attributes:"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2440
+#: ../pykolab/auth/ldap/__init__.py:2447
 #, python-format
 msgid "Change Type: %r (%r)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2448
+#: ../pykolab/auth/ldap/__init__.py:2455
 #, python-format
 msgid "Previous DN: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2503
+#: ../pykolab/auth/ldap/__init__.py:2510
 #, python-format
 msgid "Object %s searched no longer exists"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2513
+#: ../pykolab/auth/ldap/__init__.py:2520
 #, python-format
 msgid "%d results..."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2616
+#: ../pykolab/auth/ldap/__init__.py:2623
 #, python-format
 msgid "Searching with filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2668
+#: ../pykolab/auth/ldap/__init__.py:2675
 #, python-format
 msgid "Checking for support for %s on %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2687
+#: ../pykolab/auth/ldap/__init__.py:2694
 #, python-format
 msgid "Found support for %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2732
+#: ../pykolab/auth/ldap/__init__.py:2739
 #, python-format
 msgid "An error occured using %s: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2738
+#: ../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 "
+msgid ""
+"The name of the persistent, unique attribute is very probably not compatible "
+"with the use of syncrepl."
 msgstr ""
 
 #: ../pykolab/cli/cmd_acl_cleanup.py:34
@@ -802,7 +817,8 @@ msgid "Recipient for alias %r already exists"
 msgstr ""
 
 #: ../pykolab/cli/cmd_add_alias.py:97
-msgid "Environment is not configured for "
+msgid ""
+"Environment is not configured for users to hold secondary mail attributes"
 msgstr ""
 
 #: ../pykolab/cli/cmd_add_alias.py:105
@@ -837,7 +853,9 @@ 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 permissions"
+msgid ""
+"Could not find credentials with sufficient permissionsto add a domain name "
+"space."
 msgstr ""
 
 #: ../pykolab/cli/cmd_add_domain.py:67 ../pykolab/cli/cmd_delete_domain.py:56
@@ -1335,7 +1353,8 @@ 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
-msgid "Invalid entitlement verification "
+#, python-format
+msgid "Invalid entitlement verification certificate at %s"
 msgstr ""
 
 #: ../pykolab/conf/entitlement.py:120 ../pykolab/conf/entitlement.py:123
@@ -1417,11 +1436,13 @@ msgid "Configuration file to use"
 msgstr ""
 
 #: ../pykolab/conf/__init__.py:278
-msgid "Set the debugging "
+msgid ""
+"Set the debugging verbosity. Maximum is 9, tracing protocols like LDAP, SQL "
+"and IMAP."
 msgstr ""
 
 #: ../pykolab/conf/__init__.py:286
-msgid "Set the logging level. "
+msgid "Set the logging level. One of info, warn, error, critical or debug"
 msgstr ""
 
 #: ../pykolab/conf/__init__.py:294
@@ -1563,7 +1584,10 @@ msgid "Checking actual backend server for folder %s through annotations"
 msgstr ""
 
 #: ../pykolab/imap/cyrus.py:173
-msgid "Possibly reproducing the find "
+#, python-format
+msgid ""
+"Possibly reproducing the find mailfolder server answer from previously "
+"detected and stored annotation value: %r"
 msgstr ""
 
 #: ../pykolab/imap/cyrus.py:196
@@ -1809,12 +1833,12 @@ msgstr ""
 
 #: ../pykolab/imap/__init__.py:749
 #, python-format
-msgid "Setting ACL rights %s for subject %s on folder "
+msgid "Setting ACL rights %s for subject %s on folder %s"
 msgstr ""
 
 #: ../pykolab/imap/__init__.py:760
 #, python-format
-msgid "Removing ACL rights %s for subject %s on folder "
+msgid "Removing ACL rights %s for subject %s on folder %s"
 msgstr ""
 
 #: ../pykolab/imap/__init__.py:781
@@ -1931,12 +1955,12 @@ msgstr ""
 msgid "Failed to compose iTip request message: %r"
 msgstr ""
 
-#: ../pykolab/logger.py:174 ../pykolab/logger.py:181
+#: ../pykolab/logger.py:168 ../pykolab/logger.py:175
 #, python-format
 msgid "Could not change permissions on %s: %r"
 msgstr ""
 
-#: ../pykolab/logger.py:198
+#: ../pykolab/logger.py:192
 #, python-format
 msgid "Cannot log to file %s: %s"
 msgstr ""
@@ -2115,11 +2139,10 @@ msgstr ""
 msgid "Could not start the cyrus-imapd and kolab-saslauthd services."
 msgstr ""
 
-#: ../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:238
-#: ../pykolab/setup/setup_syncroton.py:105
-msgid "Could not configure to start on boot, the "
+#: ../pykolab/setup/setup_imap.py:173
+msgid ""
+"Could not configure to start on boot, the cyrus-imapd and kolab-saslauthd "
+"services."
 msgstr ""
 
 #: ../pykolab/setup/setup_kolabd.py:44
@@ -2140,6 +2163,10 @@ 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 ""
@@ -2337,6 +2364,10 @@ 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"
@@ -2419,7 +2450,9 @@ msgid "Setting access control to %s"
 msgstr ""
 
 #: ../pykolab/setup/setup_ldap.py:679
-msgid "Could not start and configure to start on boot, the "
+msgid ""
+"Could not start and configure to start on boot, the directory server admin "
+"service."
 msgstr ""
 
 #: ../pykolab/setup/setup_mta.py:41
@@ -2447,6 +2480,12 @@ 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 ""
@@ -2455,6 +2494,10 @@ 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 ""
@@ -2581,6 +2624,11 @@ msgstr ""
 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 ""
@@ -2616,7 +2664,7 @@ msgid "Confirm %s: "
 msgstr ""
 
 #: ../pykolab/utils.py:67
-msgid "Incorrect confirmation. "
+msgid "Incorrect confirmation. Please try again."
 msgstr ""
 
 #: ../pykolab/utils.py:72 ../pykolab/utils.py:77
@@ -2980,13 +3028,9 @@ msgstr ""
 msgid "Could not create %r: %r"
 msgstr ""
 
-#: ../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"
-msgstr ""
-
 #: ../saslauthd/__init__.py:194
-msgid "kolab-saslauthd could not accept "
+#, python-format
+msgid "kolab-saslauthd could not accept connections on socket: %r"
 msgstr ""
 
 #: ../saslauthd/__init__.py:199
@@ -3090,7 +3134,7 @@ msgstr ""
 
 #: ../wallace/__init__.py:177
 #, python-format
-msgid "Could not bind to socket on port %d on bind "
+msgid "Could not bind to socket on port %d on bind address %s"
 msgstr ""
 
 #: ../wallace/__init__.py:189
@@ -3265,8 +3309,8 @@ msgstr ""
 #: ../wallace/module_invitationpolicy.py:415
 #, 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
@@ -3477,7 +3521,8 @@ msgstr ""
 
 #: ../wallace/module_optout.py:96
 #, python-format
-msgid "Running opt-out consult from envelope sender '%s "
+msgid ""
+"Running opt-out consult from envelope sender '%s <%s>' to recipient %s <%s>"
 msgstr ""
 
 #: ../wallace/module_optout.py:160
@@ -3501,11 +3546,13 @@ 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 "
+msgid "Message is not an iTip message or does not contain any (valid) iTip."
 msgstr ""
 
 #: ../wallace/module_resources.py:193
-msgid "iTip events attached to this message contain the "
+#, python-format
+msgid ""
+"iTip events attached to this message contain the following information: %r"
 msgstr ""
 
 #: ../wallace/module_resources.py:226
@@ -3710,7 +3757,8 @@ msgid "Checking if resource %r is a resource (collection)"
 msgstr ""
 
 #: ../wallace/module_resources.py:895
-msgid "The following resources are being referred to in the "
+#, python-format
+msgid "The following resources are being referred to in the iTip: %r"
 msgstr ""
 
 #: ../wallace/module_resources.py:1060
@@ -3756,8 +3804,8 @@ msgstr ""
 #, 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"


commit 89677947edf4d52ddc67f51aa85e51593060e5b0
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Sep 11 18:00:30 2014 +0200

    Release 0.7.2

diff --git a/configure.ac b/configure.ac
index 0aa71ff..18e4363 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([pykolab], 0.7.1)
+AC_INIT([pykolab], 0.7.2)
 AC_SUBST([RELEASE], 1)
 
 AC_CONFIG_SRCDIR(pykolab/constants.py.in)