Request 1762 (accepted)

Overview

Request 1762 (accepted)

Check in 0.8.3

Created by vanmeeuwen over 8 years ago
In state accepted

Submit pykolab

Submit package Kolab:Winterfell / pykolab to package Kolab:16 / pykolab

pykolab.spec Changed

@@ -28,17 +28,17 @@
 
 Summary:            Kolab Groupware Solution
 Name:               pykolab
-Version:            0.8.1
-Release:            2%{?dist}
+Version:            0.8.3
+Release:            1%{?dist}
 License:            GPLv3+
 Group:              Applications/System
 URL:                http://kolab.org/
 
-Source0:            pykolab-0.8.1.tar.gz
+Source0:            pykolab-0.8.2.tar.gz
 Source1:            pykolab.logrotate
 
-Patch0001:          0001-Use-the-correct-constants-import-and-__version__-val.patch
-Patch0002:          0002-ID-directly-after-authentication-before-asking-for-a.patch
+Patch0001:          pykolab-0.8-patch-out-manticore.patch
+Patch0002:          0001-Call-the-correct-functions.patch
 
 BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:          noarch
@@ -232,7 +232,10 @@
 %prep
 %setup -q
 
+%if 0%{?kolab_enterprise}
 %patch0001 -p1
+%endif
+
 %patch0002 -p1
 
 %build
@@ -281,6 +284,10 @@
 %fdupes %{buildroot}/%{python_sitelib}
 %endif
 
+%if 0%{?kolab_enterprise}
+rm -rf %{buildroot}%{python_sitelib}/pykolab/setup/setup_manticore.py*
+%endif
+
 %pre
 # Add the kolab user and group accounts
 getent group %{kolab_group} &>/dev/null || groupadd -r %{kolab_group} -g %{kolab_group_id} &>/dev/null
@@ -560,6 +567,9 @@
 %attr(0700,%{kolab_user},%{kolab_group}) %dir %{_var}/spool/pykolab/wallace
 
 %changelog
+* Fri Jul 22 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.3-1
+- Release of version 0.8.3
+
 * Wed Mar 09 2016 Timotheus Pokorra <tp@tbits.net> - 0.8.1-2
 - wallace requires python-gnupg to be installed. avoid ImportError: No module named gnupg

0001-Call-the-correct-functions.patch Added

@@ -0,0 +1,33 @@
+From 8e7ae3827770acf071eaea187f017d099d210e95 Mon Sep 17 00:00:00 2001
+From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
+Date: Fri, 8 Jul 2016 13:16:55 +0200
+Subject: [PATCH] Call the correct functions
+
+---
+ kolabd/__init__.py | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/kolabd/__init__.py b/kolabd/__init__.py
+index 9629836..a5869d5 100644
+--- a/kolabd/__init__.py
++++ b/kolabd/__init__.py
+@@ -285,7 +285,7 @@ class KolabDaemon(object):
+ 
+             for primary in primaries:
+                 naming_context = primary_auth.domain_naming_context(primary)
+-                domain_root_dn = primary_auth.domain_root_dn(primary)
++                domain_root_dn = primary_auth._auth._kolab_domain_root_dn(primary)
+                 log.debug(
+                         _("Domain %r naming context: %r, root dn: %r") % (
+                                 primary,
+@@ -307,7 +307,6 @@ class KolabDaemon(object):
+ 
+             # Find however many naming contexts we have, and what the
+             # corresponding domain name is for them.
+-            naming_contexts = list(set(naming_contexts.values()))
+             primary_domains = [x for x,y in naming_contexts.iteritems() if domain_root_dns[x] == y]
+ 
+             # Now we can check if any changes happened.
+-- 
+2.7.4
+

0001-Use-the-correct-constants-import-and-__version__-val.patch Deleted

@@ -1,35 +0,0 @@
-From f251c62827c1696dd2e0369800c82cc569c57011 Mon Sep 17 00:00:00 2001
-From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
-Date: Fri, 1 Jul 2016 16:31:50 +0200
-Subject: [PATCH 1/2] Use the correct constants import and __version__ value
- from it
-
----
- pykolab/imap/cyrus.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pykolab/imap/cyrus.py b/pykolab/imap/cyrus.py
-index 63b0615..2057a38 100644
---- a/pykolab/imap/cyrus.py
-+++ b/pykolab/imap/cyrus.py
-@@ -25,7 +25,7 @@ from urlparse import urlparse
- 
- import pykolab
- 
--from pykolab.constants import *
-+from pykolab import constants
- from pykolab.imap import IMAP
- from pykolab.translate import _
- 
-@@ -278,7 +278,7 @@ class Cyrus(cyruslib.CYRUS):
- 
-     def _id(self, identity=None):
-         if identity is None:
--            identity = '("name" "Python/Kolab" "version" "%s")' % (__version__)
-+            identity = '("name" "Python/Kolab" "version" "%s")' % (constants.__version__)
- 
-         typ, dat = self.m._simple_command('ID', identity)
-         res, dat = self.m._untagged_response(typ, dat, 'ID')
--- 
-2.5.5
-

0002-ID-directly-after-authentication-before-asking-for-a.patch Deleted

@@ -1,80 +0,0 @@
-From 132ea08148dfb903af3bffa1a2f74c7145a6e504 Mon Sep 17 00:00:00 2001
-From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
-Date: Mon, 4 Jul 2016 09:36:48 +0200
-Subject: [PATCH 2/2] ID directly after authentication, before asking for admin
- or hierarchy separators
-
----
- cyruslib.py | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/cyruslib.py b/cyruslib.py
-index 3802c00..9e42f39 100644
---- a/cyruslib.py
-+++ b/cyruslib.py
-@@ -130,7 +130,7 @@ class IMAP4(imaplib.IMAP4):
- 
-     def id(self):
-         try:
--            typ, dat = self._simple_command('ID', 'NIL')
-+            typ, dat = self._simple_command('ID', '("name" "PyKolab/Kolab")')
-             res, dat = self._untagged_response(typ, dat, 'ID')
-         except:
-             return False, dat[0]
-@@ -211,7 +211,7 @@ class IMAP4_SSL(imaplib.IMAP4_SSL):
- 
-     def id(self):
-         try:
--            typ, dat = self._simple_command('ID', 'NIL')
-+            typ, dat = self._simple_command('ID', '("name" "PyKolab/Kolab")')
-             res, dat = self._untagged_response(typ, dat, 'ID')
-         except:
-             return False, dat[0]
-@@ -275,6 +275,7 @@ class IMAP4_SSL(imaplib.IMAP4_SSL):
-             encoded = b2a_base64("%s\0%s\0%s" % (admin, admin, password)).strip()
- 
-         res, data = self._simple_command('AUTHENTICATE', 'PLAIN', encoded)
-+        self.AUTH = True
-         if ok(res):
-             self.state = 'AUTH'
-         return res, data
-@@ -409,8 +410,11 @@ class CYRUS:
-             self.__doexception("LOGIN", self.ERROR.get("AUTH")[1])
-         try:
-             res, msg = self.m.login(username, password)
-+            self.AUTH = True
-+            self.id()
-             admin = self.m.isadmin()
-         except Exception, info:
-+            self.AUTH = False
-             error = str(info).split(':').pop().strip()
-             self.__doexception("LOGIN", error)
- 
-@@ -418,7 +422,6 @@ class CYRUS:
-             self.ADMIN = username
- 
-         self.SEP = self.m.getsep()
--        self.AUTH = True
-         self.__verbose( '[LOGIN %s] %s: %s' % (username, res, msg[0]) )
- 
-     def login_plain(self, username, password, asUser = None):
-@@ -430,6 +433,8 @@ class CYRUS:
-         self.__verbose( '[AUTHENTICATE PLAIN %s] %s: %s' % (username, res, msg[0]) )
- 
-         if ok(res):
-+            self.AUTH = True
-+            self.id()
-             if asUser is None:
-                 if self.m.isadmin():
-                     self.ADMIN = admin
-@@ -437,7 +442,6 @@ class CYRUS:
-                 self.ADMIN = asUser
-                 self.AUSER = asUser
-             self.SEP = self.m.getsep()
--            self.AUTH = True
- 
-     def logout(self):
-         try:
--- 
-2.5.5
-

pykolab-0.8-patch-out-manticore.patch Added

debian.changelog Changed

@@ -1,3 +1,15 @@
+pykolab (0.8.3-0~kolab1) unstable; urgency=low
+
+  * Upstream release of version 0.8.3
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri, 22 Jul 2016 01:49:00 +0100
+
+pykolab (0.8.2-0~kolab1) unstable; urgency=low
+
+  * Release of 0.8.2
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu,  7 Jul 2016 01:49:00 +0100
+
 pykolab (0.8.1-0~kolab1) unstable; urgency=low
 
   * Fix setup
@@ -32,7 +44,7 @@
 
   * Leave changes related to #4459 in, dpkg-source cannot deal with them
 
- -- Christoph Wickert <wickert@kolabsys.com>  Mon, Jun 08 2015 17:30:46 +0200
+ -- Christoph Wickert <wickert@kolabsys.com>  Mon, 08 Jun 2015 17:30:46 +0200
 
 pykolab (0.7.14-0~kolab3) unstable; urgency=low
 
@@ -41,7 +53,7 @@
   * Fix lock check after changed in rP929e67a6
   * Make 'kolab sync' properly create mailboxes (#3975)
 
- -- Christoph Wickert <wickert@kolabsys.com>  Mon, Jun 08 2015 16:42:47 +0200
+ -- Christoph Wickert <wickert@kolabsys.com>  Mon, 08 Jun 2015 16:42:47 +0200
 
 pykolab (0.7.14-0~kolab2) unstable; urgency=low

debian.control Changed

debian.series Changed

pykolab-0.8.1.tar.gz/.arclint -> pykolab-0.8.3.tar.gz/.arclint Changed

pykolab-0.8.1.tar.gz/conf/kolab.conf -> pykolab-0.8.3.tar.gz/conf/kolab.conf Changed

pykolab-0.8.1.tar.gz/configure.ac -> pykolab-0.8.3.tar.gz/configure.ac Changed

pykolab-0.8.1.tar.gz/cyruslib.py -> pykolab-0.8.3.tar.gz/cyruslib.py Changed

@@ -130,7 +130,7 @@
 
     def id(self):
         try:
-            typ, dat = self._simple_command('ID', 'NIL')
+            typ, dat = self._simple_command('ID', '("name" "PyKolab/Kolab")')
             res, dat = self._untagged_response(typ, dat, 'ID')
         except:
             return False, dat[0]
@@ -211,7 +211,7 @@
 
     def id(self):
         try:
-            typ, dat = self._simple_command('ID', 'NIL')
+            typ, dat = self._simple_command('ID', '("name" "PyKolab/Kolab")')
             res, dat = self._untagged_response(typ, dat, 'ID')
         except:
             return False, dat[0]
@@ -275,6 +275,7 @@
             encoded = b2a_base64("%s\0%s\0%s" % (admin, admin, password)).strip()
 
         res, data = self._simple_command('AUTHENTICATE', 'PLAIN', encoded)
+        self.AUTH = True
         if ok(res):
             self.state = 'AUTH'
         return res, data
@@ -409,8 +410,11 @@
             self.__doexception("LOGIN", self.ERROR.get("AUTH")[1])
         try:
             res, msg = self.m.login(username, password)
+            self.AUTH = True
+            self.id()
             admin = self.m.isadmin()
         except Exception, info:
+            self.AUTH = False
             error = str(info).split(':').pop().strip()
             self.__doexception("LOGIN", error)
 
@@ -418,7 +422,6 @@
             self.ADMIN = username
 
         self.SEP = self.m.getsep()
-        self.AUTH = True
         self.__verbose( '[LOGIN %s] %s: %s' % (username, res, msg[0]) )
 
     def login_plain(self, username, password, asUser = None):
@@ -430,6 +433,8 @@
         self.__verbose( '[AUTHENTICATE PLAIN %s] %s: %s' % (username, res, msg[0]) )
 
         if ok(res):
+            self.AUTH = True
+            self.id()
             if asUser is None:
                 if self.m.isadmin():
                     self.ADMIN = admin
@@ -437,7 +442,6 @@
                 self.ADMIN = asUser
                 self.AUSER = asUser
             self.SEP = self.m.getsep()
-            self.AUTH = True
 
     def logout(self):
         try:

pykolab-0.8.1.tar.gz/kolabd/__init__.py -> pykolab-0.8.3.tar.gz/kolabd/__init__.py Changed

@@ -268,21 +268,46 @@
                 time.sleep(5)
                 continue
 
-            # domains now is a list of tuples in the format of
-            # ('primary',[secondaries]), we want the primary_domains
-            domain_base_dns = []
-            primary_domains = []
-            for primary_domain in list(set(domains.values())):
-                domain_base_dn = primary_auth.domain_naming_context(primary_domain)
-                log.debug(_("Domain Base DN for domain %r is %r") % (primary_domain, domain_base_dn), level=8)
-
-                if domain_base_dn is not None:
-                    if domain_base_dn not in domain_base_dns:
-                        domain_base_dns.append(domain_base_dn)
-                        primary_domain = primary_auth.primary_domain_for_naming_context(domain_base_dn)
-                        primary_domains.append(primary_domain)
-
-            log.debug(_("Naming contexts to synchronize: %r") % (primary_domains), level=8)
+            # domains now is a list of key-valye pairs in the format of
+            # {'secondary': 'primary'}, we want the primaries
+            primaries = list(set(domains.values()))
+
+            # Store the naming contexts for the domains as
+            #
+            #   {'domain': 'naming context'}
+            #
+            # and the domain root dns as
+            #
+            #   {'domain': 'domain root dn'}
+            #
+            domain_root_dns = {}
+            naming_contexts = {}
+
+            for primary in primaries:
+                naming_context = primary_auth.domain_naming_context(primary)
+                domain_root_dn = primary_auth._auth._kolab_domain_root_dn(primary)
+                log.debug(
+                        _("Domain %r naming context: %r, root dn: %r") % (
+                                primary,
+                                naming_context,
+                                domain_root_dn
+                            ),
+                        level=8
+                    )
+
+                domain_root_dns[primary] = domain_root_dn
+                naming_contexts[primary] = naming_context
+
+            log.debug(
+                    _("Naming contexts to synchronize: %r") % (
+                            list(set(naming_contexts.values()))
+                        ),
+                    level=8
+                )
+
+            # Find however many naming contexts we have, and what the
+            # corresponding domain name is for them.
+            primary_domains = [x for x,y in naming_contexts.iteritems() if domain_root_dns[x] == y]
 
             # Now we can check if any changes happened.
             added_domains = []
@@ -292,7 +317,7 @@
             # accounted for locally.
             all_domains = list(set(primary_domains + domain_auth.keys()))
 
-            log.debug(_("All naming contexts: %r") % (all_domains), level=8)
+            log.debug(_("Result set of domains: %r") % (all_domains), level=8)
 
             for domain in all_domains:
                 log.debug(_("Checking for domain %s") % (domain), level=8)

pykolab-0.8.1.tar.gz/po/POTFILES.in -> pykolab-0.8.3.tar.gz/po/POTFILES.in Changed

@@ -27,6 +27,7 @@
 pykolab/cli/cmd_add_domain.py
 pykolab/cli/cmd_add_user.py
 pykolab/cli/cmd_add_user_subscription.py
+pykolab/cli/cmd_check_quota.py
 pykolab/cli/cmd_count_domain_mailboxes.py
 pykolab/cli/cmd_create_mailbox.py
 pykolab/cli/cmd_delete_domain.py
@@ -82,6 +83,7 @@
 pykolab/constants.py.in
 pykolab/errors.py
 pykolab/imap/cyrus.py
+pykolab/imap/dovecot.py
 pykolab/imap/__init__.py
 pykolab/imap_utf7.py
 pykolab/__init__.py
@@ -96,9 +98,11 @@
 pykolab/setup/components.py
 pykolab/setup/__init__.py
 pykolab/setup/setup_freebusy.py
+pykolab/setup/setup_guam.py
 pykolab/setup/setup_imap.py
 pykolab/setup/setup_kolabd.py
 pykolab/setup/setup_ldap.py
+pykolab/setup/setup_manticore.py
 pykolab/setup/setup_mta.py
 pykolab/setup/setup_mysql.py
 pykolab/setup/setup_php.py
@@ -114,6 +118,7 @@
 pykolab/xml/contact_reference.py
 pykolab/xml/event.py
 pykolab/xml/__init__.py
+pykolab/xml/note.py
 pykolab/xml/recurrence_rule.py
 pykolab/xml/todo.py
 pykolab/xml/utils.py
@@ -173,6 +178,12 @@
 tests/unit/test-014-conf-and-raw.py
 tests/unit/test-015-translate.py
 tests/unit/test-016-todo.py
+tests/unit/test-017-diff.py
+tests/unit/test-018-note.py
+tests/unit/test-019-contact.py
+tests/unit/test-020-auth_cache.py
+tests/unit/test-022-utils.py
+tests/unit/test-030-recipientpolicy.py
 test-wallace.py
 ucs/kolab_sieve.py
 ucs/listener.py

pykolab-0.8.1.tar.gz/po/de.po -> pykolab-0.8.3.tar.gz/po/de.po Changed

@@ -6,412 +6,448 @@
 # Christoph Wickert <christoph.wickert@gmail.com>, 2015
 # Christoph Wickert <christoph.wickert@gmail.com>, 2011
 # Dirk Marschner <info@marschner.cx>, 2015
-# Ettore Atalan <atalanttore@googlemail.com>, 2014-2015
+# Dirk Marschner <info@marschner.cx>, 2015
+# Ettore Atalan <atalanttore@googlemail.com>, 2014-2016
+# Gerd Seyfarth <mail@netsecond.net>, 2015
 # Torsten Grote <grote@kolabsys.com>, 2012
 # Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>, 2015
 # balin <johannes_graumann@web.de>, 2012
 # Jo <jo@caj-augsburg.de>, 2012
+# Inperpetuammemoriam, 2016
 # bitnukl, 2014
-# Thomas Brüderli <roundcube@gmail.com>, 2014
+# Thomas Bruederli <roundcube@gmail.com>, 2014
 # Till Savekoul <till@koul.de>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-14 01:36+0100\n"
-"PO-Revision-Date: 2015-02-01 15:31+0000\n"
-"Last-Translator: Dirk Marschner <info@marschner.cx>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
+"POT-Creation-Date: 2016-07-22 15:31+0200\n"
+"PO-Revision-Date: 2016-07-22 13:31+0000\n"
+"Last-Translator: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>\n"
+"Language-Team: German (http://www.transifex.com/kolab/kolab/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../bin/kolab_smtp_access_policy.py:210
+#: ../bin/kolab_smtp_access_policy.py:214
 #, python-format
 msgid "Adding policy request to instance %s"
 msgstr "Füge Richtlinien-Anfrage zu Instanz %s hinzu"
 
-#: ../bin/kolab_smtp_access_policy.py:480
+#: ../bin/kolab_smtp_access_policy.py:484
 msgid "Unauthorized access not allowed"
 msgstr "Unberechtigter Zugriff nicht erlaubt"
 
-#: ../bin/kolab_smtp_access_policy.py:509
-#: ../bin/kolab_smtp_access_policy.py:690
+#: ../bin/kolab_smtp_access_policy.py:513
+#: ../bin/kolab_smtp_access_policy.py:711
 msgid "Could not find recipient"
 msgstr "Konnte den Empfänger nicht finden"
 
-#: ../bin/kolab_smtp_access_policy.py:528
+#: ../bin/kolab_smtp_access_policy.py:532
 #, python-format
 msgid "Could not find envelope sender user %s (511)"
 msgstr "Konnte Absender-Umschlag für Benutzer %s nicht finden (511)"
 
-#: ../bin/kolab_smtp_access_policy.py:571
+#: ../bin/kolab_smtp_access_policy.py:575
 #, python-format
 msgid "Obtained authenticated user details for %r: %r"
 msgstr "Erhaltene Details des authentifizieren Benutzers %r: %r"
 
-#: ../bin/kolab_smtp_access_policy.py:628
+#: ../bin/kolab_smtp_access_policy.py:633
 #, python-format
 msgid "Could not find envelope sender user %s"
 msgstr "Konnte den Absender-Umschlag für den Benutzer %s nicht finden"
 
-#: ../bin/kolab_smtp_access_policy.py:650
+#: ../bin/kolab_smtp_access_policy.py:666
+#: ../bin/kolab_smtp_access_policy.py:694
 #, python-format
 msgid "%s is unauthorized to send on behalf of %s"
 msgstr "Benutzer %s ist nicht berechtigt als Benutzer %s zu senden"
 
-#: ../bin/kolab_smtp_access_policy.py:660
+#: ../bin/kolab_smtp_access_policy.py:676
 #, python-format
 msgid ""
 "User %s attempted to use envelope sender address %s without authorization"
 msgstr "Benutzer %s versuchte die Absendeadresse %s ohne Berechtigung zu verwenden"
 
-#: ../bin/kolab_smtp_access_policy.py:714
-#: ../bin/kolab_smtp_access_policy.py:725
+#: ../bin/kolab_smtp_access_policy.py:736
+#: ../bin/kolab_smtp_access_policy.py:747
 #, python-format
 msgid "Found user %s to be a delegate user of %s"
 msgstr "Benutzer %s ist ein delegierter Benutzer von %s"
 
-#: ../bin/kolab_smtp_access_policy.py:749
+#: ../bin/kolab_smtp_access_policy.py:767
 #, python-format
 msgid ""
 "Verifying authenticated sender '%(sender)s' with sasl_username "
 "'%(sasl_username)s' for recipient '%(recipient)s'"
 msgstr "Überprüfe authentisierten Absender '%(sender)s' mit SASL-Benutzernamen '%(sasl_username)s' für Empfänger '%(recipient)s'"
 
-#: ../bin/kolab_smtp_access_policy.py:752
+#: ../bin/kolab_smtp_access_policy.py:770
 #, python-format
 msgid ""
 "Verifying unauthenticated sender '%(sender)s' for recipient '%(recipient)s'"
 msgstr "Überprüfe unauthentisierten Absender '%(sender)s' für Empfänger '%(recipient)s'"
 
-#: ../bin/kolab_smtp_access_policy.py:768
+#: ../bin/kolab_smtp_access_policy.py:786
 #, python-format
 msgid "Reproducing verify_recipient(%s, %s) from cache"
 msgstr "Reproduziere verify_recipient(%s, %s) aus Cache"
 
-#: ../bin/kolab_smtp_access_policy.py:805
+#: ../bin/kolab_smtp_access_policy.py:823
 #, python-format
 msgid "Using authentication domain %s instead of %s"
 msgstr "Authentisierungsdomain %s anstelle von %s wird verwendet"
 
-#: ../bin/kolab_smtp_access_policy.py:815
+#: ../bin/kolab_smtp_access_policy.py:833
 #, python-format
 msgid "Domain %s is a primary domain"
 msgstr "Die Domain %s ist die primäre Domain"
 
-#: ../bin/kolab_smtp_access_policy.py:823
+#: ../bin/kolab_smtp_access_policy.py:841
 #, python-format
 msgid ""
 "Checking the recipient for domain %s that is not ours. This is probably a "
 "configuration error."
 msgstr "Überprüfe Empfänger für fremde Domäne %s. Dies ist wahrscheinlich ein Konfigurationsfehler."
 
-#: ../bin/kolab_smtp_access_policy.py:838
+#: ../bin/kolab_smtp_access_policy.py:856
 msgid ""
 "This recipient address is related to multiple object entries and the SMTP "
 "Access Policy can therefore not restrict message flow"
 msgstr "Diese Empfänger-Adresse bezieht sich auf mehrere Objekt-Einträge. Die SMTP Access Policy kann deshalb den Nachrichtenfluss nicht einschränken."
 
-#: ../bin/kolab_smtp_access_policy.py:855
+#: ../bin/kolab_smtp_access_policy.py:873
 #, python-format
 msgid ""
 "Recipient address %r not found. Allowing since the MTA was configured to "
 "accept the recipient."
 msgstr "Emfänger-Adresse %r nicht gefunden. Erlauben, da MTA konfiguriert wurde, diesen Empfänger zu akzeptieren."
 
-#: ../bin/kolab_smtp_access_policy.py:891
+#: ../bin/kolab_smtp_access_policy.py:909
 msgid "Invalid recipient"
 msgstr "Ungültiger Empfänger"
 
-#: ../bin/kolab_smtp_access_policy.py:902
+#: ../bin/kolab_smtp_access_policy.py:920
 msgid "Could not find this user, accepting"
 msgstr "Konnte keine Einschränkung für diesen Benutzer finden, akzeptiere Nachricht"
 
-#: ../bin/kolab_smtp_access_policy.py:975
-#: ../bin/kolab_smtp_access_policy.py:1051
+#: ../bin/kolab_smtp_access_policy.py:993
+#: ../bin/kolab_smtp_access_policy.py:1070
 #, python-format
 msgid "Sender %s is not allowed to send to recipient %s"
 msgstr "Absender %s darf nicht an Empfänger %s senden"
 
-#: ../bin/kolab_smtp_access_policy.py:1039
+#: ../bin/kolab_smtp_access_policy.py:1057
 #, python-format
 msgid "Reproducing verify_sender(%r) from cache"
 msgstr "Reproduziere verify_sender(%r) aus Cache"
 
-#: ../bin/kolab_smtp_access_policy.py:1056
+#: ../bin/kolab_smtp_access_policy.py:1077
 msgid "Unverifiable sender."
 msgstr "Nicht überprüfbarer Absender."
 
-#: ../bin/kolab_smtp_access_policy.py:1061
+#: ../bin/kolab_smtp_access_policy.py:1082
 msgid "Sender is not using an alias"
 msgstr "Absender nutzt keinen Alias"
 
-#: ../bin/kolab_smtp_access_policy.py:1069
+#: ../bin/kolab_smtp_access_policy.py:1090
 msgid "Sender uses unauthorized envelope sender address"
 msgstr "Absender nutzt unerlaubte Absender-Umschlag Adresse"
 
-#: ../bin/kolab_smtp_access_policy.py:1086
+#: ../bin/kolab_smtp_access_policy.py:1107
 msgid "Could not verify sender"
 msgstr "Konnte den Absender nicht verifizieren"
 
-#: ../bin/kolab_smtp_access_policy.py:1093
+#: ../bin/kolab_smtp_access_policy.py:1114
 msgid ""
 "Verifying whether sender is allowed to send to recipient using sender policy"
 msgstr "Überprüfe ob Absender an Empfänger gemäß Absender-Richtlinie senden darf"
 
-#: ../bin/kolab_smtp_access_policy.py:1106
+#: ../bin/kolab_smtp_access_policy.py:1127
 #, python-format
 msgid "Result is %r"
 msgstr "Das Ergebnis ist %r"
 
-#: ../bin/kolab_smtp_access_policy.py:1111
+#: ../bin/kolab_smtp_access_policy.py:1132
 msgid "No recipient policy restrictions exist for this sender"
 msgstr "Es existiert keine Empfängerrichtlinie für diesen Absender"
 
-#: ../bin/kolab_smtp_access_policy.py:1120
+#: ../bin/kolab_smtp_access_policy.py:1141
 msgid "Found a recipient policy to apply for this sender."
 msgstr "Empfänger-Richtlinie für diesen Benutzer gefunden"
 
-#: ../bin/kolab_smtp_access_policy.py:1135
+#: ../bin/kolab_smtp_access_policy.py:1156
 #, python-format
 msgid "Sender %s not allowed to send to recipient %s"
 msgstr "Absender %s darf nicht an Empfänger %s senden"
 
-#: ../bin/kolab_smtp_access_policy.py:1156
+#: ../bin/kolab_smtp_access_policy.py:1184
 msgid "Cleaning up the cache"
 msgstr "Aufräumen des Cache"
 
-#: ../bin/kolab_smtp_access_policy.py:1179
+#: ../bin/kolab_smtp_access_policy.py:1207
 msgid ""
 "The 'uri' setting in the kolab_smtp_access_policy section is soon going to "
 "be deprecated in favor of 'cache_uri'"
 msgstr "Die 'uri' Einstellung im Abschnitt kolab_smtp_access_policy wird bald überholt sein. Nutzen Sie 'cache_uri' stattdessen "
 
-#: ../bin/kolab_smtp_access_policy.py:1195
+#: ../bin/kolab_smtp_access_policy.py:1223
 #, python-format
 msgid "Operational Error in caching: %s"
 msgstr "Betriebsbedingter Fehler beim Cachen: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1247
+#: ../bin/kolab_smtp_access_policy.py:1276
 #, python-format
 msgid "Caching the policy result with timestamp %d"
 msgstr "Cachen des Richtlinienergebnisses mit Zeitstempel %d"
 
-#: ../bin/kolab_smtp_access_policy.py:1321
+#: ../bin/kolab_smtp_access_policy.py:1353
 #, python-format
 msgid "Returning action DEFER_IF_PERMIT: %s"
 msgstr "Antwort Aktion DEFER_IF_PERMIT: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1326
+#: ../bin/kolab_smtp_access_policy.py:1358
 #, python-format
 msgid "Returning action DUNNO: %s"
 msgstr "Antwort Aktion DUNNO: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1331
+#: ../bin/kolab_smtp_access_policy.py:1363
 #, python-format
 msgid "Returning action HOLD: %s"
 msgstr "Antwort Aktion HOLD: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1336
+#: ../bin/kolab_smtp_access_policy.py:1368
 #, python-format
 msgid "Returning action PERMIT: %s"
 msgstr "Antwort Aktion PERMIT: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1461
+#: ../bin/kolab_smtp_access_policy.py:1496
 #, python-format
 msgid "Returning action REJECT: %s"
 msgstr "Antwort Aktion REJECT: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1507
+#: ../bin/kolab_smtp_access_policy.py:1542
 msgid "Starting to loop for new request"
 msgstr "Starte Schleife für neue Anfrage"
 
-#: ../bin/kolab_smtp_access_policy.py:1514
+#: ../bin/kolab_smtp_access_policy.py:1549
 msgid "Timeout for policy request reading exceeded"
 msgstr "Zeitüberschreitung beim Lesen der Richtlinienanfrage"
 
-#: ../bin/kolab_smtp_access_policy.py:1520
+#: ../bin/kolab_smtp_access_policy.py:1555
 msgid "End of current request"
 msgstr "Ende der aktuellen Anfrage"
 
-#: ../bin/kolab_smtp_access_policy.py:1524
+#: ../bin/kolab_smtp_access_policy.py:1559
 #, python-format
 msgid "Getting line: %s"
 msgstr "Lese Zeile: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1528
+#: ../bin/kolab_smtp_access_policy.py:1563
 msgid "Returning request"
 msgstr "Rückgabe Richtlinenanfordung"
 
-#: ../bin/kolab_smtp_access_policy.py:1557
+#: ../bin/kolab_smtp_access_policy.py:1592
 msgid "Access Policy Options"
 msgstr "Zugriffsrichtlinien-Einstellungen"
 
-#: ../bin/kolab_smtp_access_policy.py:1564
+#: ../bin/kolab_smtp_access_policy.py:1599
 msgid "SMTP Policy request timeout."
 msgstr "Zeitüberschreitung der SMTP Richtlinien-Anfrage"
 
-#: ../bin/kolab_smtp_access_policy.py:1570
+#: ../bin/kolab_smtp_access_policy.py:1605
 msgid "Verify the recipient access policy."
 msgstr "Verifiziere die Empfänger-Zugriffs-Richtlinie."
 
-#: ../bin/kolab_smtp_access_policy.py:1576
+#: ../bin/kolab_smtp_access_policy.py:1611
 msgid "Verify the sender access policy."
 msgstr "Verifiziere die Sender-Zugriffs-Richtlinie."
 
-#: ../bin/kolab_smtp_access_policy.py:1582
+#: ../bin/kolab_smtp_access_policy.py:1617
 msgid "Allow unauthenticated senders."
 msgstr "Erlaube nicht authentisierte Sender."
 
-#: ../bin/kolab_smtp_access_policy.py:1596
+#: ../bin/kolab_smtp_access_policy.py:1631
 #, python-format
 msgid "Got request instance %s"
 msgstr "Anfrage bekommen für Instanz %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1605
+#: ../bin/kolab_smtp_access_policy.py:1640
 #, python-format
 msgid "Request instance %s is in state %s"
 msgstr "Anfrage-Instanz %s ist im Status %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1613
-#, python-format
-msgid "Request instance %s is not yet in DATA state"
-msgstr "Anfrage-Instanz %s ist noch nicht im DATA Status"
-
-#: ../bin/kolab_smtp_access_policy.py:1625
-#, python-format
-msgid "Request instance %s reached DATA state"
-msgstr "Anfrage-Instanz %s hat DATA Status erreicht"
-
-#: ../bin/kolab_smtp_access_policy.py:1645
+#: ../bin/kolab_smtp_access_policy.py:1672
 #, python-format
 msgid "Unhandled exception caught: %r"
 msgstr "Unbehandelte Ausnahme abgefangen: %r"
 
-#: ../bin/kolab_smtp_access_policy.py:1649
+#: ../bin/kolab_smtp_access_policy.py:1676
 msgid "Sender access denied"
 msgstr "Sender Zugriff verweigert"
 
-#: ../bin/kolab_smtp_access_policy.py:1651
+#: ../bin/kolab_smtp_access_policy.py:1678
 msgid "Recipient access denied"
 msgstr "Empfänger Zugriff verweigert"
 
-#: ../bin/kolab_smtp_access_policy.py:1653
+#: ../bin/kolab_smtp_access_policy.py:1680
 msgid "No objections"
 msgstr "Keine Einwände"
 
-#: ../conf.py:37 ../kolab-cli.py:34 ../saslauthd.py:33
+#: ../conf.py:36 ../kolab-cli.py:34 ../saslauthd.py:33
 msgid "Cannot load pykolab/logger.py:"
 msgstr "Laden von pykolab/logger.py nicht möglich:"
 
-#: ../kolabd/__init__.py:49 ../saslauthd/__init__.py:51
-#: ../wallace/__init__.py:107
+#: ../kolabd/__init__.py:50 ../saslauthd/__init__.py:52
+#: ../wallace/__init__.py:108
 msgid "Daemon Options"
 msgstr "Daemon Optionen"
 
-#: ../kolabd/__init__.py:56 ../saslauthd/__init__.py:58
-#: ../wallace/__init__.py:114
+#: ../kolabd/__init__.py:57 ../saslauthd/__init__.py:59
+#: ../wallace/__init__.py:115
 msgid "Fork to the background."
 msgstr "In den Hintergrund abtauchen"
 
-#: ../kolabd/__init__.py:65 ../saslauthd/__init__.py:67
-#: ../wallace/__init__.py:148
+#: ../kolabd/__init__.py:66 ../saslauthd/__init__.py:68
+#: ../wallace/__init__.py:150
 msgid "Path to the PID file to use."
 msgstr "Pfad zur PID-Datei"
 
-#: ../kolabd/__init__.py:74 ../saslauthd/__init__.py:85
-#: ../wallace/__init__.py:165
+#: ../kolabd/__init__.py:75 ../saslauthd/__init__.py:86
+#: ../wallace/__init__.py:168
 msgid "Run as user USERNAME"
 msgstr "Als Benutzer USERNAME ausführen"
 
-#: ../kolabd/__init__.py:84 ../saslauthd/__init__.py:95
-#: ../wallace/__init__.py:131
+#: ../kolabd/__init__.py:85 ../saslauthd/__init__.py:96
+#: ../wallace/__init__.py:132
 msgid "Run as group GROUPNAME"
 msgstr "Als Gruppe GROUPNAME ausführen"
 
-#: ../kolabd/__init__.py:122 ../pykolab/utils.py:234
-#: ../saslauthd/__init__.py:301 ../wallace/__init__.py:365
+#: ../kolabd/__init__.py:123 ../pykolab/utils.py:254
+#: ../saslauthd/__init__.py:327 ../wallace/__init__.py:373
 #, python-format
 msgid "Group %s does not exist"
 msgstr "Gruppe %s exisitert nicht"
 
-#: ../kolabd/__init__.py:131 ../saslauthd/__init__.py:310
-#: ../wallace/__init__.py:374
+#: ../kolabd/__init__.py:132 ../saslauthd/__init__.py:336
+#: ../wallace/__init__.py:382
 #, python-format
 msgid "Switching real and effective group id to %d"
 msgstr "Wechsle reale und effektive Gruppen-ID zu %d"
 
-#: ../kolabd/__init__.py:153 ../pykolab/utils.py:258
-#: ../saslauthd/__init__.py:332 ../wallace/__init__.py:396
+#: ../kolabd/__init__.py:154 ../pykolab/utils.py:278
+#: ../saslauthd/__init__.py:358 ../wallace/__init__.py:404
 #, python-format
 msgid "User %s does not exist"
 msgstr "Benutzer %s existiert nicht"
 
-#: ../kolabd/__init__.py:163 ../saslauthd/__init__.py:342
-#: ../wallace/__init__.py:406
+#: ../kolabd/__init__.py:163 ../saslauthd/__init__.py:367
+#: ../wallace/__init__.py:414
 #, python-format
 msgid "Switching real and effective user id to %d"
 msgstr "Wechsle reale und effektive Benutzer-ID zu %d"
 
-#: ../kolabd/__init__.py:172 ../saslauthd/__init__.py:351
-#: ../wallace/__init__.py:415
+#: ../kolabd/__init__.py:172 ../saslauthd/__init__.py:376
+#: ../wallace/__init__.py:423
 msgid "Could not change real and effective uid and/or gid"
 msgstr "Konnte reale und effektive UID und/oder GID nicht ändern"
 
-#: ../kolabd/__init__.py:192 ../saslauthd/__init__.py:142
-#: ../wallace/__init__.py:435
+#: ../kolabd/__init__.py:215 ../saslauthd/__init__.py:166
+#: ../wallace/__init__.py:465
 msgid "Interrupted by user"
 msgstr "Vom Benutzer unterbrochen"
 
-#: ../kolabd/__init__.py:197 ../kolabd/__init__.py:208
-msgid "Traceback occurred, please report a "
-msgstr "Traceback passiert, bitte melden Sie einen"
+#: ../kolabd/__init__.py:220 ../kolabd/__init__.py:231
+#: ../saslauthd/__init__.py:170 ../saslauthd/__init__.py:179
+#: ../wallace/__init__.py:469 ../wallace/__init__.py:478
+msgid "Traceback occurred, please report a bug at https://issues.kolab.org"
+msgstr ""
 
-#: ../kolabd/__init__.py:203 ../saslauthd/__init__.py:150
-#: ../wallace/__init__.py:444
+#: ../kolabd/__init__.py:226 ../saslauthd/__init__.py:175
+#: ../wallace/__init__.py:474
 #, python-format
 msgid "Type Error: %s"
 msgstr "Typ-Fehler: %s"
 
-#: ../kolabd/__init__.py:230
+#: ../kolabd/__init__.py:253
 msgid "Could not connect to LDAP, is it running?"
 msgstr "Konnte nicht zu LDAP verbinden, läuft es?"
 
-#: ../kolabd/__init__.py:233 ../pykolab/auth/ldap/__init__.py:2242
-#: ../pykolab/cli/cmd_sync.py:67
+#: ../kolabd/__init__.py:256 ../pykolab/auth/ldap/__init__.py:2524
+#: ../pykolab/cli/cmd_sync.py:77
 msgid "Listing domains..."
 msgstr "Liste Domains auf..."
 
-#: ../kolabd/__init__.py:244
+#: ../kolabd/__init__.py:267
 msgid "No domains. Not syncing"
 msgstr "Keine Domänen. Keine Synchronisation"
 
-#: ../kolabd/__init__.py:279
+#: ../kolabd/__init__.py:290
+#, python-format
+msgid "Domain %r naming context: %r, root dn: %r"
+msgstr ""
+
+#: ../kolabd/__init__.py:302
+#, python-format
+msgid "Naming contexts to synchronize: %r"
+msgstr ""
+
+#: ../kolabd/__init__.py:320
+#, python-format
+msgid "Result set of domains: %r"
+msgstr ""
+
+#: ../kolabd/__init__.py:323
+#, python-format
+msgid "Checking for domain %s"
+msgstr ""
+
+#: ../kolabd/__init__.py:327
+#, python-format
+msgid "Domain %s isn't alive anymore."
+msgstr ""
+
+#: ../kolabd/__init__.py:331
+#, python-format
+msgid "Domain %s already there and alive."
+msgstr ""
+
+#: ../kolabd/__init__.py:335
+#, python-format
+msgid "Domain %s should not exist any longer."
+msgstr ""
+
+#: ../kolabd/__init__.py:338
+#, python-format
+msgid "Domain %s does not have a process yet."
+msgstr ""
+
+#: ../kolabd/__init__.py:349
 #, python-format
 msgid "added domains: %r, removed domains: %r"
 msgstr "Domänen hinzugefügt: %r, Domänen entfernt: %r"
 
-#: ../kolabd/process.py:33
+#: ../kolabd/process.py:34
 #, python-format
 msgid "Process created for domain %s"
 msgstr "Prozess gestartet für Domäne %s"
 
-#: ../kolabd/process.py:42
+#: ../kolabd/process.py:43
 #, python-format
 msgid "Synchronizing for domain %s"
 msgstr "Synchronisiere für Domäne %s"
 
-#: ../kolabd/process.py:59
+#: ../kolabd/process.py:60
 #, python-format
 msgid ""
 "Error in process %r, terminating:\n"
 "\t%r"
 msgstr "Fehler im Prozess %r, beende:\n\t%r"
 
-#: ../kolabd.py:31 ../setup-kolab.py:36 ../wallace.py:31
+#: ../kolabd.py:31 ../setup-kolab.py:37 ../wallace.py:31
 msgid "Cannot load pykolab/constants.py:"
 msgstr "Konnte nicht pykolab/constants.py laden:"
 
@@ -459,323 +495,428 @@
 msgid "Updating result_attribute for cache entry %r"
 msgstr "Aktualisiere result_attribute für Cacheeintrag %r"
 
-#: ../pykolab/auth/ldap/__init__.py:52
+#: ../pykolab/auth/ldap/__init__.py:54
 msgid "Python LDAP library does not support persistent search"
 msgstr "Die Python LDAP Bibliothek unterstützt keine persistente Suche"
 
-#: ../pykolab/auth/ldap/__init__.py:143
+#: ../pykolab/auth/ldap/__init__.py:147
 #, python-format
 msgid "Attempting to authenticate user %s in realm %s"
 msgstr "Versuche Benutzer %s in Bereich %s zu authentisieren"
 
-#: ../pykolab/auth/ldap/__init__.py:175 ../pykolab/auth/ldap/__init__.py:226
+#: ../pykolab/auth/ldap/__init__.py:165 ../pykolab/auth/ldap/__init__.py:180
+#: ../pykolab/auth/ldap/__init__.py:207 ../pykolab/auth/ldap/__init__.py:324
 #, python-format
 msgid "Authentication cache failed: %r"
 msgstr "Authentifizierungscache fehlgeschlagen: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:216 ../pykolab/auth/ldap/__init__.py:240
+#: ../pykolab/auth/ldap/__init__.py:229 ../pykolab/auth/ldap/__init__.py:1441
+#: ../pykolab/auth/ldap/__init__.py:1467 ../pykolab/auth/ldap/__init__.py:3066
 #, python-format
-msgid "Binding with user_dn %s and password %s"
-msgstr "Binde mit user_dn %s und Passwort %s"
+msgid "LDAP server unavailable: %r"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:231 ../pykolab/auth/ldap/__init__.py:263
+#: ../pykolab/auth/ldap/__init__.py:230 ../pykolab/auth/ldap/__init__.py:237
+#: ../pykolab/auth/ldap/__init__.py:1316 ../pykolab/auth/ldap/__init__.py:1442
+#: ../pykolab/auth/ldap/__init__.py:1468 ../pykolab/auth/ldap/__init__.py:1756
+#: ../pykolab/auth/ldap/__init__.py:3067 ../pykolab/auth/ldap/__init__.py:3077
 #, python-format
-msgid "Failed to authenticate as user %s"
-msgstr "Autorisation als Benutzer %s gescheitert"
+msgid "%s"
+msgstr "%s"
 
-#: ../pykolab/auth/ldap/__init__.py:249
+#: ../pykolab/auth/ldap/__init__.py:236
+#, python-format
+msgid "Exception occurred: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:243
+#, python-format
+msgid "Length of entries found: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:255
+#, python-format
+msgid "Authentication for %r failed (multiple entries)"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:269
+#, python-format
+msgid "Authentication for %r failed (no entry)"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:282
+#, python-format
+msgid "Authentication for %r failed (LDAP error?)"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:300 ../pykolab/auth/ldap/__init__.py:354
+#, python-format
+msgid "Authentication for %r succeeded"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:311
+#, python-format
+msgid "Authentication for %r failed (error)"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:328
+msgid "Authentication failed, LDAP server unavailable"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:336 ../pykolab/auth/ldap/__init__.py:391
+#, python-format
+msgid "Failed to authenticate as user %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:357
+#, python-format
+msgid "Authentication for %r failed (password)"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:369
 #, python-format
 msgid "Error occured, there is no such object: %r"
 msgstr "Ausnahme aufgetreten, es gibt kein solches Objekt: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:254
+#: ../pykolab/auth/ldap/__init__.py:381
 msgid "Authentication cache failed to clear entry"
 msgstr "Authentifizierungscache konnte Eintrag nicht entfernen"
 
-#: ../pykolab/auth/ldap/__init__.py:260
+#: ../pykolab/auth/ldap/__init__.py:387
 #, python-format
 msgid "Exception occured: %r"
 msgstr "Ausnahme aufgetreten: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:280
+#: ../pykolab/auth/ldap/__init__.py:419
 msgid "Connecting to LDAP..."
 msgstr "Verbinde zum LDAP..."
 
-#: ../pykolab/auth/ldap/__init__.py:284
+#: ../pykolab/auth/ldap/__init__.py:423
 #, python-format
 msgid "Attempting to use LDAP URI %s"
 msgstr "Versuche LDAP URI %s zu benutzen"
 
-#: ../pykolab/auth/ldap/__init__.py:371
+#: ../pykolab/auth/ldap/__init__.py:524
 #, python-format
 msgid "Entry ID: %r"
 msgstr "Eintragkennung: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:373
+#: ../pykolab/auth/ldap/__init__.py:526
 #, python-format
 msgid "Entry DN: %r"
 msgstr "Eintrag DN: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:376
+#: ../pykolab/auth/ldap/__init__.py:529
 #, python-format
 msgid ""
 "ldap search: (%r, %r, filterstr='(objectclass=*)', attrlist=[ 'dn' ] + %r"
 msgstr "LDAP Suche: (%r, %r, filterstr='(objectclass=*)', attrlist=[ 'dn' ] + %r"
 
-#: ../pykolab/auth/ldap/__init__.py:481
-#, python-format
-msgid "Finding recipient with filter %r"
-msgstr "Finde Empfänger mit Filter %r"
-
-#: ../pykolab/auth/ldap/__init__.py:557
+#: ../pykolab/auth/ldap/__init__.py:648 ../pykolab/auth/ldap/__init__.py:801
 #, python-format
 msgid "Finding resource with filter %r"
 msgstr "Finde Ressource mit Filter %r"
 
-#: ../pykolab/auth/ldap/__init__.py:588
+#: ../pykolab/auth/ldap/__init__.py:725
+#, python-format
+msgid "Finding recipient with filter %r"
+msgstr "Finde Empfänger mit Filter %r"
+
+#: ../pykolab/auth/ldap/__init__.py:832
 #, python-format
 msgid "Using timestamp %r"
 msgstr "Zeitstempel %r wird verwendet"
 
-#: ../pykolab/auth/ldap/__init__.py:625
+#: ../pykolab/auth/ldap/__init__.py:869
 #, python-format
-msgid "Not applying recipient policy for %s "
-msgstr "Keine Anwendung der Empfängerrichtlinie für %s"
+msgid "Not applying recipient policy for %s (disabled through configuration)"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:635
+#: ../pykolab/auth/ldap/__init__.py:879
 #, python-format
 msgid "Applying recipient policy to %r"
 msgstr "Anwendung Empfängerrichtlinie zu %r"
 
-#: ../pykolab/auth/ldap/__init__.py:652
+#: ../pykolab/auth/ldap/__init__.py:896
 #, python-format
-msgid "Using mail attributes: %r, with primary %r and "
-msgstr "Benutze Mailattribute: %r, mit primary %r und "
+msgid "Using mail attributes: %r, with primary %r and secondary %r"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:663
+#: ../pykolab/auth/ldap/__init__.py:907
 #, python-format
 msgid "key %r not in entry"
 msgstr "Key %r nicht im Eintrag"
 
-#: ../pykolab/auth/ldap/__init__.py:665
+#: ../pykolab/auth/ldap/__init__.py:909
 #, python-format
 msgid "key %r is the prim. mail attr."
 msgstr "Key %r ist das primäre Mailattr."
 
-#: ../pykolab/auth/ldap/__init__.py:667
+#: ../pykolab/auth/ldap/__init__.py:911
 msgid "prim. mail pol. is not empty"
 msgstr "Primäre Mailrichtlinie ist nicht leer"
 
-#: ../pykolab/auth/ldap/__init__.py:670
+#: ../pykolab/auth/ldap/__init__.py:914
 #, python-format
 msgid "key %r is the sec. mail attr."
 msgstr "Key %r ist das sekundäre Mailattr."
 
-#: ../pykolab/auth/ldap/__init__.py:672
+#: ../pykolab/auth/ldap/__init__.py:916
 msgid "sec. mail pol. is not empty"
 msgstr "Sekundäre Mailrichtlinie ist nicht leer"
 
-#: ../pykolab/auth/ldap/__init__.py:676 ../pykolab/auth/ldap/__init__.py:690
+#: ../pykolab/auth/ldap/__init__.py:920 ../pykolab/auth/ldap/__init__.py:934
 #, python-format
 msgid "Attributes %r are not yet available for entry %r"
 msgstr "Attribute %r sind für Eintrag %r noch nicht verfügbar"
 
-#: ../pykolab/auth/ldap/__init__.py:729
+#: ../pykolab/auth/ldap/__init__.py:973
 #, python-format
 msgid "No results for mail address %s found"
 msgstr "Keine Ergebnisse für E-Mail-Adresse %s gefunden"
 
-#: ../pykolab/auth/ldap/__init__.py:740
+#: ../pykolab/auth/ldap/__init__.py:984
 #, python-format
 msgid "1 result for address %s found, verifying"
-msgstr ""
+msgstr "1 Ergebnis für Adresse %s gefunden, prüfe"
 
-#: ../pykolab/auth/ldap/__init__.py:750
+#: ../pykolab/auth/ldap/__init__.py:994
 #, python-format
-msgid "Too bad, primary email address %s "
-msgstr "Schlecht, primäre E-Mail-Adresse %s"
+msgid "Too bad, primary email address %s already in use for %s (we are %s)"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:761 ../pykolab/auth/ldap/__init__.py:850
+#: ../pykolab/auth/ldap/__init__.py:1005 ../pykolab/auth/ldap/__init__.py:1094
 msgid "Address assigned to us"
 msgstr "Uns zugewiesene Adresse"
 
-#: ../pykolab/auth/ldap/__init__.py:816
+#: ../pykolab/auth/ldap/__init__.py:1060
 #, python-format
 msgid "No results for address %s found"
 msgstr "Keine Ergebnisse für Adresse %s gefunden"
 
-#: ../pykolab/auth/ldap/__init__.py:827
+#: ../pykolab/auth/ldap/__init__.py:1071
 #, python-format
-msgid "1 result for address %s found, "
-msgstr "1 Ergebnis für Adresse %s gefunden, "
+msgid "1 result for address %s found, verifying..."
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:838
-msgid "Too bad, secondary email "
-msgstr "Schlecht, sekundäre E-Mail-Adresse"
+#: ../pykolab/auth/ldap/__init__.py:1082
+#, python-format
+msgid "Too bad, secondary email address %s already in use for %s (we are %s)"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:865
-msgid "Recipient policy composed the following set of secondary "
+#: ../pykolab/auth/ldap/__init__.py:1109
+#, python-format
+msgid ""
+"Recipient policy composed the following set of secondary email addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:876
+#: ../pykolab/auth/ldap/__init__.py:1120
 #, python-format
 msgid "Secondary mail addresses that we want is not None: %r"
 msgstr "Gewünschte sekundäre E-Mail-Adresse ist nicht leer: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:887
-msgid "Avoiding the duplication of the primary mail "
-msgstr "Verhindere die Dopplung der primären E-Mail"
+#: ../pykolab/auth/ldap/__init__.py:1131
+#, 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:898
+#: ../pykolab/auth/ldap/__init__.py:1142
 #, python-format
 msgid "Entry is getting secondary mail addresses: %r"
-msgstr ""
+msgstr "Eintrag erhält die sekundären E-Mail-Adressen: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:906
-msgid "Entry did not have any secondary mail "
+#: ../pykolab/auth/ldap/__init__.py:1150
+#, python-format
+msgid "Entry did not have any secondary mail addresses in %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:923 ../pykolab/auth/ldap/__init__.py:929
+#: ../pykolab/auth/ldap/__init__.py:1167 ../pykolab/auth/ldap/__init__.py:1173
 #, python-format
 msgid "secondary_mail_addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:924 ../pykolab/auth/ldap/__init__.py:930
+#: ../pykolab/auth/ldap/__init__.py:1168 ../pykolab/auth/ldap/__init__.py:1174
 #, python-format
 msgid "entry[%s]: %r"
 msgstr "Eintrag[%s]: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:941
+#: ../pykolab/auth/ldap/__init__.py:1185
 #, python-format
 msgid "Entry modifications list: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:969
+#: ../pykolab/auth/ldap/__init__.py:1219
 #, python-format
 msgid "Setting entry attribute %r to %r for %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1005
+#: ../pykolab/auth/ldap/__init__.py:1255
 #, python-format
 msgid ""
 "Could not update dn %r:\n"
 "%r"
-msgstr ""
+msgstr "Konnte dn %r nicht aktualisieren:\n%r"
 
-#: ../pykolab/auth/ldap/__init__.py:1031
+#: ../pykolab/auth/ldap/__init__.py:1281
 #, python-format
 msgid "Using filter %r"
 msgstr "Filter %r wird verwendet"
 
-#: ../pykolab/auth/ldap/__init__.py:1046
+#: ../pykolab/auth/ldap/__init__.py:1296
 #, python-format
 msgid "Synchronization is searching against base DN: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1095
+#: ../pykolab/auth/ldap/__init__.py:1343
 #, 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:1166
-msgid "Invalid DN, username and/or password."
+#: ../pykolab/auth/ldap/__init__.py:1406
+msgid "Attempting to bind without a DN but with a password"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1411
+msgid "Attempting to bind with a DN but without a password"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1291 ../pykolab/auth/ldap/__init__.py:1308
-#: ../pykolab/auth/ldap/__init__.py:1682 ../pykolab/auth/ldap/__init__.py:1699
+#: ../pykolab/auth/ldap/__init__.py:1429
 #, python-format
-msgid "Found a subject %r with access %r"
+msgid "Binding with bind_dn: %s and password: %s"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1447 ../pykolab/auth/ldap/__init__.py:1471
+msgid "Invalid DN, username and/or password."
+msgstr "Ungültiger DN, Nutzername und/oder Passwort."
+
+#: ../pykolab/auth/ldap/__init__.py:1452
+msgid "bind() called but already bound"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1474
+msgid "bind_priv() called but already bound"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1410
+#: ../pykolab/auth/ldap/__init__.py:1686
 #, python-format
 msgid "Entry %s attribute value: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1418
+#: ../pykolab/auth/ldap/__init__.py:1694
 #, python-format
 msgid "imap.user_mailbox_server(%r) result: %r"
-msgstr ""
+msgstr "imap.user_mailbox_server(%r)-Ergebnis: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:1481 ../pykolab/auth/ldap/__init__.py:2809
+#: ../pykolab/auth/ldap/__init__.py:1755
 #, python-format
-msgid "%s"
-msgstr "%s"
+msgid "An error occured: %r"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1748 ../pykolab/auth/ldap/__init__.py:1948
+#: ../pykolab/auth/ldap/__init__.py:1993 ../pykolab/auth/ldap/__init__.py:2187
 #, python-format
 msgid "Result from recipient policy: %r"
-msgstr ""
+msgstr "Ergebnis der Empfängerrichtlinie: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:2003
+#: ../pykolab/auth/ldap/__init__.py:2242
 #, python-format
 msgid "Kolab user %s does not have a result attribute %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2162
+#: ../pykolab/auth/ldap/__init__.py:2267
+#, python-format
+msgid "Naming contexts found: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:2274
+#, python-format
+msgid "Domains/Root DNs found: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:2434
+#, python-format
+msgid "Searching root dn for domain %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:2439
+#, python-format
+msgid "Returning from cache: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:2444
 #, python-format
 msgid "Finding domain root dn for domain %s"
 msgstr "Suche root dn für die Domain %s"
 
-#: ../pykolab/auth/ldap/__init__.py:2269
-msgid "Authentication database DOWN"
-msgstr "Authentisierungsdatenbank UNTEN"
+#: ../pykolab/auth/ldap/__init__.py:2474
+#, python-format
+msgid "Setting domain root dn from LDAP for domain %r: %r"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2353 ../pykolab/auth/ldap/__init__.py:2401
+#: ../pykolab/auth/ldap/__init__.py:2620 ../pykolab/auth/ldap/__init__.py:2668
 #, python-format
 msgid "Entry type: %s"
 msgstr "Eintragtyp: %s"
 
-#: ../pykolab/auth/ldap/__init__.py:2490
+#: ../pykolab/auth/ldap/__init__.py:2746
 msgid "LDAP Search Result Data Entry:"
-msgstr ""
+msgstr "LDAP-Suchergebnisdateneintrag:"
 
-#: ../pykolab/auth/ldap/__init__.py:2506
+#: ../pykolab/auth/ldap/__init__.py:2762
 msgid "Entry Change Notification attributes:"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2511
+#: ../pykolab/auth/ldap/__init__.py:2767
 #, python-format
 msgid "Change Type: %r (%r)"
 msgstr "Typ ändern: %r (%r)"
 
-#: ../pykolab/auth/ldap/__init__.py:2519
+#: ../pykolab/auth/ldap/__init__.py:2775
 #, python-format
 msgid "Previous DN: %r"
-msgstr ""
+msgstr "Vorheriger DN: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:2574
+#: ../pykolab/auth/ldap/__init__.py:2830
 #, python-format
 msgid "Object %s searched no longer exists"
 msgstr "Das gesuchte Objekt %s existiert nicht mehr"
 
-#: ../pykolab/auth/ldap/__init__.py:2584
+#: ../pykolab/auth/ldap/__init__.py:2840
 #, python-format
 msgid "%d results..."
 msgstr "%d Ergebnisse..."
 
-#: ../pykolab/auth/ldap/__init__.py:2687
+#: ../pykolab/auth/ldap/__init__.py:2943
 #, python-format
 msgid "Searching with filter %r"
-msgstr ""
+msgstr "Suchvorgang mit Filter %r"
 
-#: ../pykolab/auth/ldap/__init__.py:2739
+#: ../pykolab/auth/ldap/__init__.py:2995
 #, python-format
 msgid "Checking for support for %s on %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2758
+#: ../pykolab/auth/ldap/__init__.py:3014
 #, python-format
 msgid "Found support for %s"
 msgstr "Unterstützung für %s gefunden"
 
-#: ../pykolab/auth/ldap/__init__.py:2803
+#: ../pykolab/auth/ldap/__init__.py:3068
+msgid "-- reconnecting in 10 seconds."
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:3076
 #, python-format
 msgid "An error occured using %s: %r"
 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
@@ -790,7 +931,7 @@
 
 #: ../pykolab/cli/cmd_add_alias.py:42
 msgid "Specify the (new) alias address"
-msgstr ""
+msgstr "Geben Sie eine (neue) Alias-Adresse an"
 
 #: ../pykolab/cli/cmd_add_alias.py:45
 msgid "Specify the existing recipient address"
@@ -808,7 +949,7 @@
 #: ../pykolab/cli/cmd_add_alias.py:81
 #, python-format
 msgid "No such recipient %r"
-msgstr ""
+msgstr "Kein solcher Benutzer %r"
 
 #: ../pykolab/cli/cmd_add_alias.py:87
 #, python-format
@@ -816,7 +957,8 @@
 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
@@ -824,12 +966,13 @@
 msgid "Recipient %r is not the primary recipient for address %r"
 msgstr "Empfänger %r ist nicht der primäre Empfänger für Adresse %r"
 
-#: ../pykolab/cli/cmd_add_domain.py:36
+#: ../pykolab/cli/cmd_add_domain.py:36 ../pykolab/cli/cmd_check_quota.py:37
 #: ../pykolab/cli/cmd_count_domain_mailboxes.py:38
 #: ../pykolab/cli/cmd_create_mailbox.py:36
+#: ../pykolab/cli/cmd_delete_domain.py:39
 #: ../pykolab/cli/cmd_export_mailbox.py:33
 #: ../pykolab/cli/cmd_list_deleted_mailboxes.py:38
-#: ../pykolab/cli/cmd_list_domain_mailboxes.py:36
+#: ../pykolab/cli/cmd_list_domain_mailboxes.py:37
 #: ../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
@@ -850,12 +993,14 @@
 msgid "Add a new domain."
 msgstr "Hinzufügen einer neuen Domäne."
 
-#: ../pykolab/cli/cmd_add_domain.py:55 ../pykolab/cli/cmd_delete_domain.py:44
+#: ../pykolab/cli/cmd_add_domain.py:55 ../pykolab/cli/cmd_delete_domain.py:55
 #: ../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
+#: ../pykolab/cli/cmd_add_domain.py:67 ../pykolab/cli/cmd_delete_domain.py:67
 #: ../pykolab/cli/cmd_find_domain.py:56
 msgid "Domain name"
 msgstr "Name der Domain"
@@ -885,20 +1030,45 @@
 
 #: ../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_list_messages.py:100
 #: ../pykolab/cli/cmd_remove_user_subscription.py:73
 msgid "No such folder"
 msgstr "Dieser Ordner ist nicht vorhanden"
 
+#: ../pykolab/cli/cmd_check_quota.py:44
+msgid "Do not apply any changes."
+msgstr ""
+
+#: ../pykolab/cli/cmd_check_quota.py:53
 #: ../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_list_domain_mailboxes.py:49
+#: ../pykolab/cli/cmd_list_mailboxes.py:52
+#: ../pykolab/cli/cmd_list_messages.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_check_quota.py:57
+msgid "Compare existing IMAP quota with LDAP quota."
+msgstr ""
+
+#: ../pykolab/cli/cmd_check_quota.py:84 ../pykolab/cli/cmd_user_info.py:51
+#, python-format
+msgid "No such user %s"
+msgstr "Kein solcher Benutzer %s"
+
+#: ../pykolab/cli/cmd_check_quota.py:98
+#, python-format
+msgid "No quota for user %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_check_quota.py:105
+#, python-format
+msgid "user quota does not match for %s (IMAP: %d, LDAP: %d)"
+msgstr ""
+
 #: ../pykolab/cli/cmd_create_mailbox.py:42
 msgid "Set metadata for folder to ANNOTATION=VALUE"
 msgstr ""
@@ -919,6 +1089,10 @@
 msgid "Delete a domain."
 msgstr "Domäne löschen."
 
+#: ../pykolab/cli/cmd_delete_domain.py:46
+msgid "Force deleting the domain even if it contains user accounts"
+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
@@ -931,10 +1105,8 @@
 #: ../pykolab/cli/cmd_list_mailbox_metadata.py:54
 #: ../pykolab/cli/cmd_set_mailbox_acl.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
+#: ../pykolab/cli/cmd_set_quota.py:48 ../tests/unit/test-015-translate.py:15
+#: ../tests/unit/test-015-translate.py:19
 msgid "Folder name"
 msgstr "Ordnername"
 
@@ -943,7 +1115,7 @@
 #: ../pykolab/cli/cmd_list_mailbox_metadata.py:80
 #: ../pykolab/cli/cmd_set_mailbox_acl.py:67
 #: ../pykolab/cli/cmd_set_mailbox_metadata.py:94
-#: ../pykolab/cli/cmd_set_quota.py:58
+#: ../pykolab/cli/cmd_set_quota.py:60
 #, python-format
 msgid "No such folder %r"
 msgstr "Kein Ordner %r verfügbar"
@@ -972,12 +1144,12 @@
 
 #: ../pykolab/cli/cmd_delete_message.py:49
 msgid "Specify a UID"
-msgstr ""
+msgstr "Geben Sie eine Benutzerkennung an"
 
 #: ../pykolab/cli/cmd_delete_message.py:52
-#: ../pykolab/cli/cmd_list_messages.py:58
+#: ../pykolab/cli/cmd_list_messages.py:76
 msgid "Specify a folder"
-msgstr ""
+msgstr "Geben Sie einen Ordner an"
 
 #: ../pykolab/cli/cmd_export_mailbox.py:38
 msgid "All folders this user has access to"
@@ -996,20 +1168,20 @@
 #: ../pykolab/cli/cmd_export_mailbox.py:120
 #, python-format
 msgid "No directories found for user %s"
-msgstr ""
+msgstr "Keine Verzeichnisse für Benutzer %s gefunden"
 
 #: ../pykolab/cli/cmd_find_domain.py:36
 msgid "Find a domain."
-msgstr ""
+msgstr "Domain finden."
 
 #: ../pykolab/cli/cmd_list_deleted_mailboxes.py:43
-#: ../pykolab/cli/cmd_list_domain_mailboxes.py:41
+#: ../pykolab/cli/cmd_list_domain_mailboxes.py:42
 #: ../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_domain_mailboxes.py:58
+#: ../pykolab/cli/cmd_list_domain_mailboxes.py:59
 msgid "Domain"
 msgstr "Domäne"
 
@@ -1026,10 +1198,14 @@
 msgid "Include messages flagged as \\Deleted"
 msgstr ""
 
-#: ../pykolab/cli/cmd_list_messages.py:47
-msgid "List messages in a folder"
+#: ../pykolab/cli/cmd_list_messages.py:61
+msgid "List messages as user USER"
 msgstr ""
 
+#: ../pykolab/cli/cmd_list_messages.py:65
+msgid "List messages in a folder"
+msgstr "Nachrichten in einem Ordner auflisten"
+
 #: ../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."
@@ -1056,7 +1232,7 @@
 
 #: ../pykolab/cli/cmd_mailbox_cleanup.py:49
 msgid "Clean up mailboxes that do no longer have an owner."
-msgstr ""
+msgstr "Mailboxen bereinigen, die keinen Besitzer mehr haben."
 
 #: ../pykolab/cli/cmd_mailbox_cleanup.py:85
 #: ../pykolab/cli/cmd_mailbox_cleanup.py:95
@@ -1068,7 +1244,7 @@
 #: ../pykolab/cli/cmd_mailbox_cleanup.py:97
 #, python-format
 msgid "Deleting folder 'user/%s'"
-msgstr ""
+msgstr "Ordner 'user/%s' wird gelöscht"
 
 #: ../pykolab/cli/cmd_mailbox_cleanup.py:101
 #, python-format
@@ -1096,7 +1272,7 @@
 #: ../pykolab/cli/cmd_mailbox_cleanup.py:144
 #, python-format
 msgid "Error deleting folder '%s'"
-msgstr ""
+msgstr "Fehler beim Löschen des Ordners '%s'"
 
 #: ../pykolab/cli/cmd_mailbox_cleanup.py:153
 #, python-format
@@ -1161,12 +1337,12 @@
 #: ../pykolab/cli/cmd_rename_mailbox.py:66
 #, python-format
 msgid "Source folder %r does not exist"
-msgstr ""
+msgstr "Ursprungsordner %r existiert nicht"
 
 #: ../pykolab/cli/cmd_rename_mailbox.py:70
 #, python-format
 msgid "Target folder %r already exists"
-msgstr ""
+msgstr "Zielordner %r existiert bereits"
 
 #: ../pykolab/cli/cmd_set_mailbox_acl.py:47
 #: ../pykolab/cli/cmd_set_mailbox_acl.py:51
@@ -1189,7 +1365,7 @@
 msgid "Metadata path"
 msgstr "Metadatenpfad"
 
-#: ../pykolab/cli/cmd_set_quota.py:43 ../pykolab/cli/cmd_set_quota.py:47
+#: ../pykolab/cli/cmd_set_quota.py:45 ../pykolab/cli/cmd_set_quota.py:49
 msgid "New quota"
 msgstr "Neues Kontingent"
 
@@ -1206,67 +1382,71 @@
 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
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:105
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:153
 #, 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
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:110
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:158
 #, 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
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:114
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:162
 #, 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
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:116
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:164
 #, 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
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:118
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:166
 #, python-format
 msgid "No recipients for '%s' (use --delete to delete)!"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:136
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:147
 #, python-format
 msgid "Multiple recipients for '%s'!"
 msgstr ""
 
 #: ../pykolab/cli/cmd_sync.py:52
 msgid "Synchronize LDAP and IMAP"
-msgstr ""
+msgstr "Synchronisiere LDAP und IMAP"
 
 #: ../pykolab/cli/cmd_sync.py:60
 msgid "Resync from the beginning"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync.py:72
+#: ../pykolab/cli/cmd_sync.py:68
+msgid "Only sync the specified domain"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:82
 #, python-format
 msgid "Found %d domains in %d seconds"
 msgstr "%d Domains in %d Sekunden gefunden"
 
-#: ../pykolab/cli/cmd_sync.py:85
+#: ../pykolab/cli/cmd_sync.py:98
 #, python-format
 msgid "Running for domain %s"
 msgstr "Starte für Domain %s"
 
-#: ../pykolab/cli/cmd_sync.py:92
+#: ../pykolab/cli/cmd_sync.py:105
 #, python-format
 msgid "Synchronizing users for %s took %d seconds"
 msgstr "Benutzer für %s zu synchronisieren dauerte %d Sekunden"
 
-#: ../pykolab/cli/cmd_sync.py:109
+#: ../pykolab/cli/cmd_sync.py:123
 #, python-format
 msgid "Worker process %s handling %s"
 msgstr ""
@@ -1277,17 +1457,12 @@
 
 #: ../pykolab/cli/cmd_undelete_mailbox.py:42
 msgid "Recover mailboxes previously deleted."
-msgstr ""
+msgstr "Kürzlich gelöschte Mailboxen wiederherstellen."
 
 #: ../pykolab/cli/cmd_user_info.py:41
 msgid "Email address"
 msgstr "E-Mail-Adresse"
 
-#: ../pykolab/cli/cmd_user_info.py:51
-#, python-format
-msgid "No such user %s"
-msgstr ""
-
 #. This is a nested command
 #. This is a nested component
 #: ../pykolab/cli/commands.py:97 ../pykolab/setup/components.py:90
@@ -1302,10 +1477,10 @@
 #: ../pykolab/cli/commands.py:167 ../pykolab/setup/components.py:231
 #, python-format
 msgid "Command '%s' already registered"
-msgstr ""
+msgstr "Befehl '%s' ist bereits registriert"
 
 #: ../pykolab/cli/commands.py:192 ../pykolab/setup/components.py:257
-#: ../wallace/modules.py:376
+#: ../wallace/modules.py:391
 #, python-format
 msgid "Alias for %s"
 msgstr "Alias für %s"
@@ -1314,7 +1489,7 @@
 msgid "Not yet implemented"
 msgstr "Diese Funktion ist noch nicht implementiert"
 
-#: ../pykolab/cli/sieve/cmd_list.py:43 ../pykolab/cli/sieve/cmd_put.py:42
+#: ../pykolab/cli/sieve/cmd_list.py:49 ../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-Adresse"
@@ -1347,7 +1522,7 @@
 #: ../pykolab/cli/sieve/cmd_refresh.py:359
 #, python-format
 msgid "MANAGEMENT script for user %s contents: %r"
-msgstr ""
+msgstr "VERWALTUNGS-Skript für Benutzer %s enthält: %r"
 
 #: ../pykolab/cli/sieve/cmd_refresh.py:364
 #: ../pykolab/plugins/sievemgmt/__init__.py:374
@@ -1408,7 +1583,7 @@
 #: ../pykolab/cli/telemetry/cmd_examine_session.py:100
 #, python-format
 msgid "Session by %s on server %s"
-msgstr ""
+msgstr "Sitzung von %s auf Server %s"
 
 #: ../pykolab/cli/telemetry/cmd_examine_session.py:43
 msgid "Unspecified session identifier"
@@ -1431,7 +1606,8 @@
 #: ../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
@@ -1513,100 +1689,106 @@
 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 "Use the default answer to all questions."
+msgstr ""
 
-#: ../pykolab/conf/__init__.py:294
+#: ../pykolab/conf/__init__.py:292
+msgid "Set the logging level. One of info, warn, error, critical or debug"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:300
 msgid "Log file to use"
 msgstr "Protokolldatei"
 
-#: ../pykolab/conf/__init__.py:300
+#: ../pykolab/conf/__init__.py:306
 msgid "Be quiet."
 msgstr "Sei still."
 
-#: ../pykolab/conf/__init__.py:306
+#: ../pykolab/conf/__init__.py:312
 msgid "Answer yes to all questions."
 msgstr "Ja auf alle Fragen."
 
-#: ../pykolab/conf/__init__.py:328
+#: ../pykolab/conf/__init__.py:334
 msgid "No command supplied"
 msgstr "Kein Befehl angegeben"
 
-#: ../pykolab/conf/__init__.py:416
+#: ../pykolab/conf/__init__.py:422
 msgid "Insufficient options. Need section, key and value -in that order."
 msgstr "Unzureichende Optionen. Brauche Sektion, Schlüssel und Wert in dieser Reihenfolge."
 
-#: ../pykolab/conf/__init__.py:419
+#: ../pykolab/conf/__init__.py:425
 #, python-format
 msgid "No section '%s' exists."
 msgstr "Es existiert keine Sektion '%s'."
 
-#: ../pykolab/conf/__init__.py:461
+#: ../pykolab/conf/__init__.py:467
 #, python-format
 msgid "Setting %s to %r (from the default values for CLI options)"
 msgstr "Setze %s auf %r (aus den Standardwerten für Kommandozeilenoptionen)"
 
-#: ../pykolab/conf/__init__.py:534
+#: ../pykolab/conf/__init__.py:540
 #, python-format
 msgid "Could not execute configuration function: %s"
 msgstr "Konnte die Konfigurationsfunktion nicht ausführen: %s"
 
-#: ../pykolab/conf/__init__.py:542
+#: ../pykolab/conf/__init__.py:548
 #, python-format
 msgid "Option %s/%s does not exist in config file %s, pulling from defaults"
 msgstr "Die Option %s/%s existiert in der Konfigurationsdatei %s nicht, sie wird aus den Standardeinstellungen geholt"
 
-#: ../pykolab/conf/__init__.py:550 ../pykolab/conf/__init__.py:553
+#: ../pykolab/conf/__init__.py:556 ../pykolab/conf/__init__.py:559
 msgid "Option does not exist in defaults."
 msgstr "Diese Option hat keinen Standardwert."
 
-#: ../pykolab/conf/__init__.py:563
+#: ../pykolab/conf/__init__.py:569
 #, python-format
 msgid "Configuration file %s not readable."
 msgstr "Konfigurationsdatei %s ist nicht lesbar."
 
-#: ../pykolab/conf/__init__.py:566
+#: ../pykolab/conf/__init__.py:572
 #, python-format
 msgid "Configuration file %s does not exist."
 msgstr "Konfigurationsdatei %s existiert nicht."
 
-#: ../pykolab/conf/__init__.py:571
+#: ../pykolab/conf/__init__.py:577
 msgid ""
 "WARNING: A negative debug level value does not make this program be any more"
 " silent."
 msgstr "Warnung: Eine negative Fehlerprotokollierungszahl macht dieses Programm nicht noch stiller."
 
-#: ../pykolab/conf/__init__.py:577
+#: ../pykolab/conf/__init__.py:583
 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
+#: ../pykolab/conf/__init__.py:591 ../pykolab/conf/__init__.py:597
+#: ../pykolab/conf/__init__.py:601 ../pykolab/conf/__init__.py:607
 msgid "Cannot start SASL authentication daemon"
 msgstr "Konnte SASL Authentisierungsdaemon nicht starten"
 
-#: ../pykolab/conf/__init__.py:612
+#: ../pykolab/conf/__init__.py:618
 msgid "No imaplib library found."
 msgstr "Keine imaplib-Bibliothek gefunden."
 
-#: ../pykolab/conf/__init__.py:622
+#: ../pykolab/conf/__init__.py:628
 msgid "No LMTP class found in the smtplib library."
 msgstr "Keine Klasse namens LMTP in der smtplib-Bibliothek gefunden."
 
-#: ../pykolab/conf/__init__.py:632
+#: ../pykolab/conf/__init__.py:638
 msgid "No SMTP class found in the smtplib library."
 msgstr "Keine Klasse namens SMTP in der smtplib-Bibliothek gefunden."
 
-#: ../pykolab/conf/__init__.py:646
+#: ../pykolab/conf/__init__.py:652
 #, python-format
 msgid "Found you specified a specific set of items to test: %s"
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:654
+#: ../pykolab/conf/__init__.py:660
 #, python-format
 msgid "Selectively selecting: %s"
 msgstr ""
@@ -1635,98 +1817,121 @@
 msgid "OpenLDAP or compatible"
 msgstr "OpenLDAP oder kompatibel"
 
-#: ../pykolab/imap/cyrus.py:80
+#: ../pykolab/imap/cyrus.py:83
 #, python-format
 msgid "Could not connect to Cyrus IMAP server %r"
 msgstr "Verbindung zum Cyrus IMAP-Server %r nicht möglich"
 
-#: ../pykolab/imap/cyrus.py:138
+#: ../pykolab/imap/cyrus.py:150 ../pykolab/imap/dovecot.py:285
 #, python-format
 msgid "Continuing with separator: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:143
+#: ../pykolab/imap/cyrus.py:159
 msgid "Detected we are running in a Murder topology"
 msgstr "Dieses System läuft in einer Murder-Topologie"
 
-#: ../pykolab/imap/cyrus.py:147
+#: ../pykolab/imap/cyrus.py:167
 msgid "This system is not part of a murder topology"
 msgstr "Dieses System ist nicht Teil einer Murder-Topologie"
 
-#: ../pykolab/imap/cyrus.py:168
+#: ../pykolab/imap/cyrus.py:196
 #, python-format
 msgid "Checking actual backend server for folder %s through annotations"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:173
-msgid "Possibly reproducing the find "
+#: ../pykolab/imap/cyrus.py:206
+#, python-format
+msgid ""
+"Possibly reproducing the find mailfolder server answer from previously "
+"detected and stored annotation value: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:196
+#: ../pykolab/imap/cyrus.py:236
 #, python-format
 msgid "Could not get the annotations after %s tries."
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:200
+#: ../pykolab/imap/cyrus.py:250
 #, python-format
 msgid "No annotations for %s: %r"
 msgstr "Keine Annotationen für %s: %r"
 
-#: ../pykolab/imap/cyrus.py:207
+#: ../pykolab/imap/cyrus.py:262
 #, python-format
 msgid "Server for INBOX folder %s is %s"
-msgstr ""
+msgstr "Server für EINGANGS-Ordner %s ist %s"
 
-#: ../pykolab/imap/cyrus.py:227
+#. Removed server reconnection for dovecot, we only have one server
+#: ../pykolab/imap/cyrus.py:294 ../pykolab/imap/dovecot.py:311
 #, python-format
 msgid "Setting quota for folder %s to %s"
 msgstr "Setze Quota für Verzeichnis %s auf %s"
 
-#: ../pykolab/imap/cyrus.py:231
+#: ../pykolab/imap/cyrus.py:305 ../pykolab/imap/dovecot.py:315
 #, python-format
 msgid "Could not set quota for mailfolder %s"
 msgstr "Konnte Quota für Verzeichnis %s nicht setzen"
 
-#: ../pykolab/imap/cyrus.py:241
+#: ../pykolab/imap/cyrus.py:319 ../pykolab/imap/dovecot.py:320
 #, python-format
 msgid "Moving INBOX folder %s to %s on partition %s"
-msgstr "Verschiebe INBOX Verzeichnis %s nach %s auf Partition %s"
+msgstr "EINGANGS-Ordner wird von %s nach %s auf Partition %s verschoben"
 
-#: ../pykolab/imap/cyrus.py:243
+#: ../pykolab/imap/cyrus.py:329 ../pykolab/imap/dovecot.py:322
 #, python-format
 msgid "Moving INBOX folder %s to %s"
-msgstr "Verschiebe Eingangsordner %s nach %s"
+msgstr "EINGANGS-Ordner wird von %s nach %s verschoben"
 
-#: ../pykolab/imap/cyrus.py:259
+#: ../pykolab/imap/cyrus.py:355
 #, python-format
 msgid "Setting annotation %s on folder %s"
 msgstr "Setze Annotation %s auf Verzeichnis %s"
 
-#: ../pykolab/imap/cyrus.py:264
+#: ../pykolab/imap/cyrus.py:366
 #, python-format
 msgid "Could not set annotation %r on mail folder %r: %r"
 msgstr "Konnte Annotation %r auf Verzeichnis %r nicht setzen: %r"
 
-#: ../pykolab/imap/cyrus.py:268
+#: ../pykolab/imap/cyrus.py:376 ../pykolab/imap/dovecot.py:451
 #, python-format
 msgid "Transferring folder %s from %s to %s"
 msgstr "Übertrage Verzeichnis %s von %s nach %s"
 
-#: ../pykolab/imap/cyrus.py:328
+#: ../pykolab/imap/cyrus.py:464 ../pykolab/imap/dovecot.py:511
 #, python-format
 msgid "Undeleting %s to %s"
 msgstr "Wiederherstellen %s nach %s"
 
-#: ../pykolab/imap/cyrus.py:339
+#: ../pykolab/imap/cyrus.py:484
 #, python-format
-msgid "Would have transfered %s from %s to %s"
-msgstr "Haben %s von %s nach %s übertragen"
+msgid "Would have transferred %s from %s to %s"
+msgstr ""
 
-#: ../pykolab/imap/cyrus.py:341
+#: ../pykolab/imap/cyrus.py:491 ../pykolab/imap/dovecot.py:524
 #, python-format
 msgid "Would have renamed %s to %s"
 msgstr ""
 
+#: ../pykolab/imap/dovecot.py:220
+#, python-format
+msgid "Could not connect to Dovecot IMAP server %r"
+msgstr ""
+
+#: ../pykolab/imap/dovecot.py:292
+msgid "Detected METADATA support"
+msgstr ""
+
+#: ../pykolab/imap/dovecot.py:295
+#, python-format
+msgid "This system does not support METADATA: '%s'"
+msgstr ""
+
+#: ../pykolab/imap/dovecot.py:522
+#, python-format
+msgid "Would have transfered %s from %s to %s"
+msgstr "Haben %s von %s nach %s übertragen"
+
 #: ../pykolab/imap/__init__.py:46
 #, python-format
 msgid "Cleaning up ACL entries for %s across all folders"
@@ -1796,180 +2001,191 @@
 msgid "%r has no attribute %s"
 msgstr "%r hat kein Attribut %s"
 
-#: ../pykolab/imap/__init__.py:393
+#: ../pykolab/imap/__init__.py:360
+#, python-format
+msgid "Invalid access identifier %r for subject %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:397
 #, python-format
 msgid "Could not set ACL for %s on folder %s: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:427 ../pykolab/imap/__init__.py:462
+#: ../pykolab/imap/__init__.py:431 ../pykolab/imap/__init__.py:467
 #, python-format
 msgid "Creating new shared folder %s"
 msgstr "Erzeuge einen neuen geteilten Ordner %s"
 
-#: ../pykolab/imap/__init__.py:487 ../pykolab/imap/__init__.py:740
+#: ../pykolab/imap/__init__.py:496 ../pykolab/imap/__init__.py:776
 #, python-format
 msgid "Downcasing mailbox name %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:491
+#: ../pykolab/imap/__init__.py:500
 #, python-format
 msgid "Creating new mailbox for user %s"
 msgstr "Erzeuge eine neue Mailbox für Benutzer %s"
 
-#: ../pykolab/imap/__init__.py:506 ../pykolab/imap/__init__.py:613
+#: ../pykolab/imap/__init__.py:515 ../pykolab/imap/__init__.py:644
 msgid "Waiting for the Cyrus IMAP Murder to settle..."
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:559
+#: ../pykolab/imap/__init__.py:590
 #, python-format
 msgid "Creating additional folders for user %s"
 msgstr "Erzeuge weitere Order für Benutzer %s"
 
-#: ../pykolab/imap/__init__.py:587
+#: ../pykolab/imap/__init__.py:618
 #, python-format
 msgid "Waiting for the Cyrus murder to settle... %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:602
+#: ../pykolab/imap/__init__.py:633
 #, python-format
 msgid "Correcting additional folder name from %r to %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:618
+#: ../pykolab/imap/__init__.py:649
 #, python-format
 msgid "Mailbox already exists: %s"
 msgstr "Mailbox existiert bereits: %s"
 
-#: ../pykolab/imap/__init__.py:658
+#: ../pykolab/imap/__init__.py:689
 msgid "Subscribing user to the additional folders"
 msgstr "Abonniere weitere Ordner für den Benutzer"
 
-#: ../pykolab/imap/__init__.py:672
+#: ../pykolab/imap/__init__.py:703
 msgid "Using the following tests for folder subscriptions:"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:674
+#: ../pykolab/imap/__init__.py:705
 #, python-format
 msgid "    %r"
 msgstr "    %r"
 
-#: ../pykolab/imap/__init__.py:677
+#: ../pykolab/imap/__init__.py:708
 #, python-format
 msgid "Folder %s"
 msgstr "Ordner %s"
 
-#: ../pykolab/imap/__init__.py:689
+#: ../pykolab/imap/__init__.py:720
 #, python-format
 msgid "Subscribing %s to folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:693
+#: ../pykolab/imap/__init__.py:724
 #, python-format
 msgid "Subscribing %s to folder %s failed: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:723
+#: ../pykolab/imap/__init__.py:750
+#, python-format
+msgid "Could not set quota on %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:757
 #, python-format
 msgid "Could not rename %s to reside on partition %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:756
+#: ../pykolab/imap/__init__.py:794
 #, python-format
 msgid "INBOX folder to rename (%s) does not exist"
-msgstr ""
+msgstr "Umzubenennender EINGANGS-Ordner (%s) ist nicht vorhanden"
 
-#: ../pykolab/imap/__init__.py:759 ../pykolab/imap/__init__.py:835
+#: ../pykolab/imap/__init__.py:797 ../pykolab/imap/__init__.py:905
 #, python-format
 msgid "Renaming INBOX from %s to %s"
-msgstr "Benenne INBOX Ordner von %s in %s um"
+msgstr "EINGANGS-Ordner wird von %s in %s umbenannt"
 
-#: ../pykolab/imap/__init__.py:763
+#: ../pykolab/imap/__init__.py:801
 #, python-format
 msgid "Could not rename INBOX folder %s to %s"
-msgstr "Konnte INBOX Ordner nicht von %s in %s umbenennen"
+msgstr "Konnte EINGANGS-Ordner nicht von %s in %s umbenennen"
 
-#: ../pykolab/imap/__init__.py:765 ../pykolab/imap/__init__.py:839
+#: ../pykolab/imap/__init__.py:803 ../pykolab/imap/__init__.py:909
 #, 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"
+msgstr "EINGANGS-Ordner %s kann nicht verschoben werden, weil der Zielordner %s bereits vorhanden ist"
 
-#: ../pykolab/imap/__init__.py:769
+#: ../pykolab/imap/__init__.py:807
 #, python-format
 msgid "Server for mailbox %r is %r"
 msgstr "Server für Postfach %r ist %r"
 
-#: ../pykolab/imap/__init__.py:777
+#: ../pykolab/imap/__init__.py:815
 #, 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:800
+#: ../pykolab/imap/__init__.py:829 ../pykolab/imap/__init__.py:872
+#: ../pykolab/imap/__init__.py:886
 #, 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 "Removing ACL rights %s for subject %s on folder %s"
+msgstr ""
 
-#: ../pykolab/imap/__init__.py:811
+#: ../pykolab/imap/__init__.py:861
 #, python-format
-msgid "Removing ACL rights %s for subject %s on folder "
+msgid "Setting ACL rights %s for subject %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:832
+#: ../pykolab/imap/__init__.py:902
 #, python-format
 msgid "Found old INBOX folder %s"
-msgstr "Alter INBOX-Ordner %s gefunden"
+msgstr "Alter EINGANGS-Ordner %s gefunden"
 
-#: ../pykolab/imap/__init__.py:841
+#: ../pykolab/imap/__init__.py:911
 #, 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:843
+#: ../pykolab/imap/__init__.py:913
 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:911
+#: ../pykolab/imap/__init__.py:981
 #, 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:924
+#: ../pykolab/imap/__init__.py:994
 #, python-format
 msgid "Quota for %s currently is %s"
 msgstr "Kontingent für %s ist aktuell %s"
 
-#: ../pykolab/imap/__init__.py:930
+#: ../pykolab/imap/__init__.py:1000
 #, python-format
 msgid "Adjusting authentication database quota for folder %s to %d"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:935
+#: ../pykolab/imap/__init__.py:1005
 #, python-format
 msgid "Correcting quota for %s to %s (currently %s)"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1012
+#: ../pykolab/imap/__init__.py:1082
 #, python-format
 msgid "Checking folder: %s"
 msgstr "Überprüfe Ordner: %s"
 
-#: ../pykolab/imap/__init__.py:1017
+#: ../pykolab/imap/__init__.py:1087
 #, python-format
 msgid "Folder has no corresponding user (1): %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1020
+#: ../pykolab/imap/__init__.py:1090
 #, python-format
 msgid "Folder has no corresponding user (2): %s"
 msgstr ""
 
 #. We got user identifier only
-#: ../pykolab/imap/__init__.py:1035
+#: ../pykolab/imap/__init__.py:1105
 msgid "Please don't give us just a user identifier"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1038
+#: ../pykolab/imap/__init__.py:1108
 #, python-format
 msgid "Deleting folder %s"
 msgstr "Lösche Verzeichnis %s"
@@ -1978,52 +2194,52 @@
 msgid "Returning thread local configuration"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:45
+#: ../pykolab/itip/__init__.py:46
 #, python-format
 msgid "Method %r not really interesting for us."
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:51
+#: ../pykolab/itip/__init__.py:52
 #, python-format
 msgid "Raw iTip payload (%r): %r"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:61
+#: ../pykolab/itip/__init__.py:62
 msgid "Could not read iTip from message."
 msgstr "Konnte iTip nicht aus Nachricht lesen."
 
-#: ../pykolab/itip/__init__.py:69
+#: ../pykolab/itip/__init__.py:70
 #, python-format
 msgid "Duplicate iTip object: %s"
 msgstr "Verdopple iTip Objekt: %s"
 
-#: ../pykolab/itip/__init__.py:93
+#: ../pykolab/itip/__init__.py:95
 msgid "iTip event without a start"
 msgstr "iTip Termin ohne einen Beginn"
 
-#: ../pykolab/itip/__init__.py:138
+#: ../pykolab/itip/__init__.py:140
 msgid "Message is not an iTip message (non-multipart message)"
 msgstr "Nachricht ist keine iTip Nachricht (keine Multipart Nachricht)"
 
-#: ../pykolab/itip/__init__.py:221
+#: ../pykolab/itip/__init__.py:261
 #, python-format
 msgid "Send iTip reply %s for %s %r"
 msgstr "Sende iTip Antwort %s für %s %r"
 
-#: ../pykolab/itip/__init__.py:237
+#: ../pykolab/itip/__init__.py:277
 #, python-format
 msgid "Failed to compose iTip reply message: %r: %s"
 msgstr "Erstellung iTip Antwortnachricht fehlgeschlagen: %r: %s"
 
-#: ../pykolab/itip/__init__.py:248 ../pykolab/itip/__init__.py:292
-#: ../wallace/module_invitationpolicy.py:1082
-#: ../wallace/module_invitationpolicy.py:1144
-#: ../wallace/module_resources.py:1247
+#: ../pykolab/itip/__init__.py:288 ../pykolab/itip/__init__.py:332
+#: ../wallace/module_invitationpolicy.py:1253
+#: ../wallace/module_invitationpolicy.py:1328
+#: ../wallace/module_resources.py:1347
 #, python-format
 msgid "SMTP sendmail error: %r"
 msgstr "SMTP sendmail-Fehler: %r"
 
-#: ../pykolab/itip/__init__.py:280
+#: ../pykolab/itip/__init__.py:320
 #, python-format
 msgid "Failed to compose iTip request message: %r"
 msgstr "Erstellung iTip Anforderungsnachricht fehlgeschlagen: %r"
@@ -2165,10 +2381,10 @@
 #: ../pykolab/plugins/roundcubedb/__init__.py:48
 #, python-format
 msgid "user_delete: %r"
-msgstr ""
+msgstr "user_delete: %r"
 
 #: ../pykolab/plugins/roundcubedb/__init__.py:55
-#: ../pykolab/setup/setup_roundcube.py:167
+#: ../pykolab/setup/setup_roundcube.py:106
 msgid "Roundcube installation path not found."
 msgstr ""
 
@@ -2188,14 +2404,40 @@
 msgid "No such component."
 msgstr "Keine solche Komponente."
 
-#: ../pykolab/setup/setup_freebusy.py:46
+#: ../pykolab/setup/__init__.py:55
+msgid "SELinux currently enforcing. Read https://git.kolab.org/u/1"
+msgstr ""
+
+#: ../pykolab/setup/__init__.py:67
+msgid ""
+"SELinux configured to enforce a policy on startup. Read "
+"https://git.kolab.org/u/1"
+msgstr ""
+
+#: ../pykolab/setup/setup_freebusy.py:47
 msgid "Setup Free/Busy."
 msgstr ""
 
-#: ../pykolab/setup/setup_freebusy.py:50
+#: ../pykolab/setup/setup_freebusy.py:51
 msgid "Free/Busy is not installed on this system"
 msgstr ""
 
+#: ../pykolab/setup/setup_guam.py:41
+msgid "Setup Guam."
+msgstr ""
+
+#: ../pykolab/setup/setup_guam.py:45
+msgid "Guam is not installed on this system"
+msgstr ""
+
+#: ../pykolab/setup/setup_guam.py:58
+msgid "Could not start the guam service."
+msgstr ""
+
+#: ../pykolab/setup/setup_guam.py:63
+msgid "Could not configure the guam service to start on boot"
+msgstr ""
+
 #: ../pykolab/setup/setup_imap.py:45
 msgid "Setup IMAP."
 msgstr "Richte IMAP ein."
@@ -2208,15 +2450,14 @@
 msgid "Could not write out Cyrus IMAP configuration file /etc/cyrus.conf"
 msgstr ""
 
-#: ../pykolab/setup/setup_imap.py:158
+#: ../pykolab/setup/setup_imap.py:162
 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:244
-#: ../pykolab/setup/setup_syncroton.py:105
-msgid "Could not configure to start on boot, the "
+#: ../pykolab/setup/setup_imap.py:177
+msgid ""
+"Could not configure to start on boot, the cyrus-imapd and kolab-saslauthd "
+"services."
 msgstr ""
 
 #: ../pykolab/setup/setup_kolabd.py:44
@@ -2232,10 +2473,14 @@
 "                        "
 msgstr ""
 
-#: ../pykolab/setup/setup_kolabd.py:81
+#: ../pykolab/setup/setup_kolabd.py:84
 msgid "Could not start the kolab server service."
 msgstr ""
 
+#: ../pykolab/setup/setup_kolabd.py:96
+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"
@@ -2260,15 +2505,19 @@
 msgid "Setup configuration for Active Directory compatibility."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:88
+#: ../pykolab/setup/setup_ldap.py:92
+msgid "Specify password for the Domain Manager."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:96
 msgid "Setup LDAP."
 msgstr "LDAP Einrichten"
 
-#: ../pykolab/setup/setup_ldap.py:97
+#: ../pykolab/setup/setup_ldap.py:105
 msgid "Skipping setup of LDAP, as specified"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:126
+#: ../pykolab/setup/setup_ldap.py:134
 msgid ""
 "\n"
 "                        You can not configure Kolab to run against OpenLDAP\n"
@@ -2276,7 +2525,7 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:139
+#: ../pykolab/setup/setup_ldap.py:147
 msgid ""
 "\n"
 "                                It seems 389 Directory Server has an existing\n"
@@ -2287,7 +2536,7 @@
 "                            "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:154
+#: ../pykolab/setup/setup_ldap.py:162
 msgid ""
 "\n"
 "                        Please supply a password for the LDAP administrator user\n"
@@ -2296,11 +2545,11 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:162
+#: ../pykolab/setup/setup_ldap.py:170
 msgid "Administrator password"
 msgstr "Administrator Passwort"
 
-#: ../pykolab/setup/setup_ldap.py:169
+#: ../pykolab/setup/setup_ldap.py:180
 msgid ""
 "\n"
 "                        Please supply a password for the LDAP Directory Manager\n"
@@ -2310,11 +2559,11 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:178
+#: ../pykolab/setup/setup_ldap.py:189
 msgid "Directory Manager password"
 msgstr "Verzeichnismanager Passwort"
 
-#: ../pykolab/setup/setup_ldap.py:185
+#: ../pykolab/setup/setup_ldap.py:196
 msgid ""
 "\n"
 "                        Please choose the system user and group the service\n"
@@ -2323,15 +2572,15 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:195 ../pykolab/setup/setup_ldap.py:198
+#: ../pykolab/setup/setup_ldap.py:206 ../pykolab/setup/setup_ldap.py:209
 msgid "User"
 msgstr "Benutzer"
 
-#: ../pykolab/setup/setup_ldap.py:196 ../pykolab/setup/setup_ldap.py:199
+#: ../pykolab/setup/setup_ldap.py:207 ../pykolab/setup/setup_ldap.py:210
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../pykolab/setup/setup_ldap.py:234
+#: ../pykolab/setup/setup_ldap.py:245
 msgid ""
 "\n"
 "                        This setup procedure plans to set up Kolab Groupware for\n"
@@ -2342,18 +2591,18 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:248
+#: ../pykolab/setup/setup_ldap.py:259
 msgid "Domain name to use"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:253 ../pykolab/setup/setup_ldap.py:278
+#: ../pykolab/setup/setup_ldap.py:264 ../pykolab/setup/setup_ldap.py:289
 msgid ""
 "\n"
 "                                    Invalid input. Please try again.\n"
 "                                "
 msgstr "\n                                    Ungültige Eingabe. Bitte nochmals versuchen.\n                                "
 
-#: ../pykolab/setup/setup_ldap.py:262
+#: ../pykolab/setup/setup_ldap.py:273
 msgid ""
 "\n"
 "                        The standard root dn we composed for you follows. Please\n"
@@ -2361,15 +2610,15 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:273
+#: ../pykolab/setup/setup_ldap.py:284
 msgid "Root DN to use"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:325
+#: ../pykolab/setup/setup_ldap.py:336
 msgid "No directory server setup tool available."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:337
+#: ../pykolab/setup/setup_ldap.py:348
 msgid ""
 "\n"
 "                    Setup is now going to set up the 389 Directory Server. This\n"
@@ -2378,11 +2627,11 @@
 "                "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:344
+#: ../pykolab/setup/setup_ldap.py:355
 msgid "Setting up 389 Directory Server"
 msgstr "Richte 389 Verzeichnisserver ein"
 
-#: ../pykolab/setup/setup_ldap.py:356
+#: ../pykolab/setup/setup_ldap.py:367
 msgid ""
 "\n"
 "                        An error was detected in the setup procedure for 389\n"
@@ -2393,27 +2642,31 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:373
+#: ../pykolab/setup/setup_ldap.py:384
 msgid "Setup DS stdout:"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:376
+#: ../pykolab/setup/setup_ldap.py:387
 msgid "Setup DS stderr:"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:402
+#: ../pykolab/setup/setup_ldap.py:413
 msgid "Could not copy the LDAP extensions for Kolab"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:405
+#: ../pykolab/setup/setup_ldap.py:416
 msgid "Could not find the ldap Kolab schema file"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:417
+#: ../pykolab/setup/setup_ldap.py:429
 msgid "Could not start the directory server service."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:431
+#: ../pykolab/setup/setup_ldap.py:438
+msgid "Could not configure to start on boot, the directory server service."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:443
 msgid ""
 "\n"
 "                        Please supply a Cyrus Administrator password. This\n"
@@ -2424,11 +2677,11 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:441
+#: ../pykolab/setup/setup_ldap.py:453
 msgid "Cyrus Administrator password"
 msgstr "Cyrus Administrator Passwort"
 
-#: ../pykolab/setup/setup_ldap.py:448
+#: ../pykolab/setup/setup_ldap.py:460
 msgid ""
 "\n"
 "                        Please supply a Kolab Service account password. This\n"
@@ -2438,61 +2691,81 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:457
+#: ../pykolab/setup/setup_ldap.py:469
 msgid "Kolab Service password"
 msgstr "Kolab-Dienst-Passwort"
 
-#: ../pykolab/setup/setup_ldap.py:467
+#: ../pykolab/setup/setup_ldap.py:479
 msgid "Writing out configuration to kolab.conf"
 msgstr "Schreibe Einstellungen in kolab.conf"
 
-#: ../pykolab/setup/setup_ldap.py:481
+#: ../pykolab/setup/setup_ldap.py:493
 msgid "Inserting service users into LDAP."
 msgstr "Füge Service-Benutzer ins LDAP ein."
 
-#: ../pykolab/setup/setup_ldap.py:555
+#: ../pykolab/setup/setup_ldap.py:567
 msgid "Writing out cn=kolab,cn=config"
 msgstr "Schreibe cn=kolab,cn=config"
 
-#. TODO: Add kolab-admin role
-#. TODO: Assign kolab-admin admin ACLs
-#: ../pykolab/setup/setup_ldap.py:579
+#: ../pykolab/setup/setup_ldap.py:583
 #, python-format
 msgid "Adding domain %s to list of domains for this deployment"
 msgstr "Füge Domain %s zu dieser Installation hinzu"
 
-#: ../pykolab/setup/setup_ldap.py:607
+#: ../pykolab/setup/setup_ldap.py:611
 msgid "Disabling anonymous binds"
 msgstr "Stelle anonymes Binden ab"
 
 #. TODO: Ensure the uid attribute is unique
 #. TODO^2: Consider renaming the general "attribute uniqueness to "uid
 #. attribute uniqueness"
-#: ../pykolab/setup/setup_ldap.py:615
+#: ../pykolab/setup/setup_ldap.py:619
 msgid "Enabling attribute uniqueness plugin"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:621
+#: ../pykolab/setup/setup_ldap.py:625
 msgid "Enabling referential integrity plugin"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:627
+#: ../pykolab/setup/setup_ldap.py:631
 msgid "Enabling and configuring account policy plugin"
 msgstr ""
 
-#. TODO: Add kolab-admin role
-#: ../pykolab/setup/setup_ldap.py:642
+#. Add kolab-admin role
+#: ../pykolab/setup/setup_ldap.py:646
 msgid "Adding the kolab-admin role"
 msgstr "Füge Kolab-Admin Rolle hinzu"
 
-#. TODO: User writeable attributes on root_dn
-#: ../pykolab/setup/setup_ldap.py:653
+#. User writeable attributes on root_dn
+#: ../pykolab/setup/setup_ldap.py:657
 #, python-format
 msgid "Setting access control to %s"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:679
-msgid "Could not start and configure to start on boot, the "
+#: ../pykolab/setup/setup_ldap.py:677
+msgid "directory server admin service not available"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:685
+msgid ""
+"Could not start and configure to start on boot, the directory server admin "
+"service."
+msgstr ""
+
+#: ../pykolab/setup/setup_manticore.py:44
+msgid "Setup Manticore."
+msgstr ""
+
+#: ../pykolab/setup/setup_manticore.py:48
+msgid "Manticore is not installed on this system"
+msgstr ""
+
+#: ../pykolab/setup/setup_manticore.py:94
+msgid "Could not start the manticore service."
+msgstr ""
+
+#: ../pykolab/setup/setup_manticore.py:100
+msgid "Could not configure the manticore service to start on boot"
 msgstr ""
 
 #: ../pykolab/setup/setup_mta.py:41
@@ -2508,31 +2781,53 @@
 msgid "Could not write out Postfix configuration file /etc/postfix/master.cf"
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:399
+#: ../pykolab/setup/setup_mta.py:413
 msgid "Could not write out Amavis configuration file amavisd.conf"
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:407
+#: ../pykolab/setup/setup_mta.py:421
 msgid "Not writing out any configuration for Amavis."
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:447
+#: ../pykolab/setup/setup_mta.py:482
 msgid "Could not start the postfix, clamav and amavisd services services."
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:39
+#: ../pykolab/setup/setup_mta.py:500
+msgid ""
+"Could not configure to start on boot, the postfix, clamav and amavisd "
+"services."
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:40
+msgid "MySQL Options"
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:46
+msgid "Specify whether to use an (existing) or (new) MySQL server."
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:50
 msgid "Setup MySQL."
 msgstr "Richte MySQL ein."
 
-#: ../pykolab/setup/setup_mysql.py:49
+#: ../pykolab/setup/setup_mysql.py:78
 msgid "Could not start the MySQL database service."
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:71
+#: ../pykolab/setup/setup_mysql.py:87
+msgid "Could not configure to start on boot, the MySQL database service."
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:90
+msgid "Waiting for at most 30 seconds for MySQL/MariaDB to settle..."
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:114
 msgid "What MySQL server are we setting up?"
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:75
+#: ../pykolab/setup/setup_mysql.py:118
 msgid ""
 "\n"
 "                        Please supply the root password for MySQL, so we can set\n"
@@ -2540,13 +2835,13 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:82 ../pykolab/setup/setup_mysql.py:99
-#: ../pykolab/setup/setup_roundcube.py:190
+#: ../pykolab/setup/setup_mysql.py:125 ../pykolab/setup/setup_mysql.py:142
+#: ../pykolab/setup/setup_roundcube.py:218
 #: ../pykolab/setup/setup_syncroton.py:66
 msgid "MySQL root password"
 msgstr "MySQL root Password"
 
-#: ../pykolab/setup/setup_mysql.py:88
+#: ../pykolab/setup/setup_mysql.py:131
 msgid ""
 "\n"
 "                        Please supply a root password for MySQL. This password\n"
@@ -2558,7 +2853,7 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:143
+#: ../pykolab/setup/setup_mysql.py:186
 msgid ""
 "\n"
 "                        Please supply a password for the MySQL user 'kolab'.\n"
@@ -2567,11 +2862,11 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:151
+#: ../pykolab/setup/setup_mysql.py:194
 msgid "MySQL kolab password"
 msgstr "MySQL-kolab Password"
 
-#: ../pykolab/setup/setup_mysql.py:170
+#: ../pykolab/setup/setup_mysql.py:213
 msgid "Could not find the MySQL Kolab schema file"
 msgstr ""
 
@@ -2613,11 +2908,11 @@
 msgid "Could not find PHP configuration file php.ini"
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:44
+#: ../pykolab/setup/setup_roundcube.py:45
 msgid "Setup Roundcube."
 msgstr "Stelle Roundcube ein."
 
-#: ../pykolab/setup/setup_roundcube.py:48
+#: ../pykolab/setup/setup_roundcube.py:49
 msgid ""
 "\n"
 "                    Please supply a password for the MySQL user 'roundcube'.\n"
@@ -2626,25 +2921,34 @@
 "                "
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:56
+#: ../pykolab/setup/setup_roundcube.py:57
 msgid "MySQL roundcube password"
 msgstr "MySQL roundcube Passwort"
 
-#: ../pykolab/setup/setup_roundcube.py:126
+#: ../pykolab/setup/setup_roundcube.py:144
 #, python-format
 msgid "Using template file %r"
 msgstr "Vorlagendatei %r wird verwendet"
 
-#: ../pykolab/setup/setup_roundcube.py:133
+#: ../pykolab/setup/setup_roundcube.py:151
 #, python-format
 msgid "Successfully compiled template %r, writing out to %r"
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:235
-#: ../pykolab/setup/setup_syncroton.py:96
+#: ../pykolab/setup/setup_roundcube.py:263
+msgid "Cannot find the configuration directory for roundcube."
+msgstr ""
+
+#: ../pykolab/setup/setup_roundcube.py:291
+#: ../pykolab/setup/setup_syncroton.py:100
 msgid "Could not start the webserver server service."
 msgstr ""
 
+#: ../pykolab/setup/setup_roundcube.py:300
+#: ../pykolab/setup/setup_syncroton.py:109
+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."
@@ -2674,404 +2978,431 @@
 msgid "No database available"
 msgstr "Keine Datenbank verfügbar"
 
-#: ../pykolab/utils.py:62 ../pykolab/utils.py:64
+#: ../pykolab/utils.py:69 ../pykolab/utils.py:71
 #, python-format
 msgid "Confirm %s: "
 msgstr "Bestätige %s:"
 
-#: ../pykolab/utils.py:67
-msgid "Incorrect confirmation. "
-msgstr "Ungültige Bestätigung."
+#: ../pykolab/utils.py:74
+msgid "Incorrect confirmation. Please try again."
+msgstr ""
 
-#: ../pykolab/utils.py:72 ../pykolab/utils.py:77
+#: ../pykolab/utils.py:79 ../pykolab/utils.py:84
 #, python-format
 msgid "%s: "
 msgstr "%s:"
 
-#: ../pykolab/utils.py:74 ../pykolab/utils.py:79
+#: ../pykolab/utils.py:81 ../pykolab/utils.py:86
 #, python-format
 msgid "%s [%s]: "
 msgstr "%s [%s]: "
 
-#: ../pykolab/utils.py:124
+#: ../pykolab/utils.py:139
 msgid "Please answer 'yes' or 'no'."
 msgstr "Bitte antworten Sie mit 'yes' (ja) oder 'no' (nein)."
 
-#: ../pykolab/utils.py:164
+#: ../pykolab/utils.py:184
 msgid "Choice"
 msgstr ""
 
-#: ../pykolab/utils.py:167
+#: ../pykolab/utils.py:187
 msgid "Choice (type '?' for options)"
 msgstr ""
 
-#: ../pykolab/utils.py:268
+#: ../pykolab/utils.py:288
 #, python-format
 msgid "Could not change the permissions on %s"
 msgstr ""
 
-#: ../pykolab/utils.py:488
+#: ../pykolab/utils.py:526
 #, python-format
 msgid "Transliterating string %r with locale %r"
 msgstr ""
 
-#: ../pykolab/utils.py:496
+#: ../pykolab/utils.py:534
 msgid "Attempting to set locale"
 msgstr ""
 
-#: ../pykolab/utils.py:498
+#: ../pykolab/utils.py:536
 msgid "Success setting locale"
 msgstr ""
 
-#: ../pykolab/utils.py:500
+#: ../pykolab/utils.py:538
 msgid "Failure to set locale"
 msgstr ""
 
-#: ../pykolab/utils.py:508
+#: ../pykolab/utils.py:546
 #, python-format
 msgid "Executing '%s | %s'"
 msgstr ""
 
-#: ../pykolab/utils.py:519
+#: ../pykolab/utils.py:557
 #, python-format
 msgid "Could not translate %s using locale %s"
 msgstr ""
 
-#: ../pykolab/wap_client/__init__.py:399
+#: ../pykolab/wap_client/__init__.py:416
 #, python-format
 msgid "Requesting %r with params %r"
 msgstr ""
 
-#: ../pykolab/wap_client/__init__.py:407
+#: ../pykolab/wap_client/__init__.py:424
 #, python-format
 msgid "Got response: %r"
 msgstr ""
 
+#: ../pykolab/wap_client/__init__.py:429
+#, python-format
+msgid "Connection error: %r; re-connecting..."
+msgstr ""
+
 #. Some data is not JSON
-#: ../pykolab/wap_client/__init__.py:413
+#: ../pykolab/wap_client/__init__.py:441
 msgid "Response data is not JSON"
 msgstr ""
 
 #. support integer values, too
-#: ../pykolab/xml/attendee.py:9 ../pykolab/xml/attendee.py:17
+#: ../pykolab/xml/attendee.py:9 ../pykolab/xml/attendee.py:18
 msgid "Needs Action"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:10 ../pykolab/xml/attendee.py:18
+#: ../pykolab/xml/attendee.py:10 ../pykolab/xml/attendee.py:19
 msgid "Accepted"
 msgstr "Akzeptiert"
 
-#: ../pykolab/xml/attendee.py:11 ../pykolab/xml/attendee.py:19
+#: ../pykolab/xml/attendee.py:11 ../pykolab/xml/attendee.py:20
 msgid "Declined"
 msgstr "Abgelehnt"
 
-#: ../pykolab/xml/attendee.py:12 ../pykolab/xml/attendee.py:20
+#: ../pykolab/xml/attendee.py:12 ../pykolab/xml/attendee.py:21
 msgid "Tentatively Accepted"
 msgstr "Provisorisch Akzeptiert"
 
-#: ../pykolab/xml/attendee.py:13 ../pykolab/xml/attendee.py:21
+#: ../pykolab/xml/attendee.py:13 ../pykolab/xml/attendee.py:22
 msgid "Delegated"
 msgstr "Delegiert"
 
-#: ../pykolab/xml/attendee.py:14 ../pykolab/xml/attendee.py:22
+#: ../pykolab/xml/attendee.py:14 ../pykolab/xml/attendee.py:23
+msgid "Started"
+msgstr "Gestarted"
+
+#: ../pykolab/xml/attendee.py:15 ../pykolab/xml/attendee.py:24
 msgid "Completed"
 msgstr "Erledigt"
 
-#: ../pykolab/xml/attendee.py:15 ../pykolab/xml/attendee.py:23
-msgid "Started"
+#: ../pykolab/xml/attendee.py:16
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:914
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:926
+msgid "Pending"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:132 ../pykolab/xml/attendee.py:154
+#: ../pykolab/xml/attendee.py:133 ../pykolab/xml/attendee.py:155
 msgid "Not a valid attendee"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:139
+#: ../pykolab/xml/attendee.py:140
 msgid "No valid delegator references found"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:159
+#: ../pykolab/xml/attendee.py:160
 msgid "No valid delegatee references found"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:219
+#: ../pykolab/xml/attendee.py:220
 #, python-format
 msgid "Invalid cutype %r"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:231
+#: ../pykolab/xml/attendee.py:232
 #, python-format
 msgid "Invalid participant status %r"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:239
+#: ../pykolab/xml/attendee.py:240
 #, python-format
 msgid "Invalid role %r"
+msgstr "Ungültige Rolle %r"
+
+#: ../pykolab/xml/event.py:168
+#, python-format
+msgid "Rdate needs datetime.date or datetime.datetime instance, got %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:163 ../pykolab/xml/event.py:802
-#: ../pykolab/xml/event.py:845
-msgid "Event start needs datetime.date or datetime.datetime instance"
+#: ../pykolab/xml/event.py:185
+#, python-format
+msgid "Exdate needs datetime.date or datetime.datetime instance, got %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:308
+#: ../pykolab/xml/event.py:403
 #, python-format
 msgid "No attendee with email or name %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:316
+#: ../pykolab/xml/event.py:411
 #, python-format
 msgid "Invalid argument value attendee %r, must be basestring or Attendee"
 msgstr ""
 
-#: ../pykolab/xml/event.py:328
+#: ../pykolab/xml/event.py:423
 #, python-format
 msgid "No attendee with email %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:334
+#: ../pykolab/xml/event.py:429
 #, python-format
 msgid "No attendee with name %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:384 ../pykolab/xml/utils.py:157
+#: ../pykolab/xml/event.py:479 ../pykolab/xml/utils.py:180
 msgid "%Y-%m-%d"
-msgstr ""
+msgstr "%Y-%m-%d"
 
-#: ../pykolab/xml/event.py:386 ../pykolab/xml/utils.py:158
+#: ../pykolab/xml/event.py:481 ../pykolab/xml/utils.py:181
 msgid "%H:%M (%Z)"
-msgstr ""
+msgstr "%H:%M (%Z)"
 
-#: ../pykolab/xml/event.py:510
+#: ../pykolab/xml/event.py:614
 msgid "Invalid participant status"
 msgstr ""
 
-#: ../pykolab/xml/event.py:636
+#: ../pykolab/xml/event.py:820 ../pykolab/xml/note.py:94
 #, python-format
 msgid "Invalid classification %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:667
-msgid "Event end needs datetime.date or datetime.datetime instance"
+#: ../pykolab/xml/event.py:851
+#, python-format
+msgid "Event end needs datetime.date or datetime.datetime instance, got %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:677
+#: ../pykolab/xml/event.py:865
 #, python-format
 msgid "Invalid custom property name %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:855
+#: ../pykolab/xml/event.py:1017
+#, python-format
+msgid ""
+"Event last-modified needs datetime.date or datetime.datetime instance, got "
+"%r"
+msgstr ""
+
+#: ../pykolab/xml/event.py:1060
+#, python-format
+msgid "Event start needs datetime.date or datetime.datetime instance, got %r"
+msgstr ""
+
+#: ../pykolab/xml/event.py:1070
 #, python-format
 msgid "Invalid status set: %r"
+msgstr "Ungültiger Status festgelegt: %r"
+
+#: ../pykolab/xml/event.py:1093
+msgid "Event recurrence-id needs datetime.datetime instance"
 msgstr ""
 
-#: ../pykolab/xml/event.py:1094
+#: ../pykolab/xml/event.py:1330
 msgid "No sender specified"
-msgstr ""
+msgstr "Kein Absender angegeben"
 
-#: ../pykolab/xml/event.py:1103
+#: ../pykolab/xml/event.py:1339
 #, python-format
 msgid "Invitation for %s was %s"
-msgstr ""
+msgstr "Einladung für %s war %s"
 
-#: ../pykolab/xml/event.py:1108
+#: ../pykolab/xml/event.py:1344
 msgid "This is an automated response to one of your event requests."
 msgstr ""
 
-#: ../pykolab/xml/recurrence_rule.py:38
+#: ../pykolab/xml/recurrence_rule.py:41
 #, python-format
 msgid "Every %d year(s)"
 msgstr "Alle %d Jahr(e)"
 
-#: ../pykolab/xml/recurrence_rule.py:39
+#: ../pykolab/xml/recurrence_rule.py:42
 #, python-format
 msgid "Every %d month(s)"
 msgstr "Alle %d Monat(e)"
 
-#: ../pykolab/xml/recurrence_rule.py:40
+#: ../pykolab/xml/recurrence_rule.py:43
 #, python-format
 msgid "Every %d week(s)"
 msgstr "Alle %d Woche(n)"
 
-#: ../pykolab/xml/recurrence_rule.py:41
+#: ../pykolab/xml/recurrence_rule.py:44
 #, python-format
 msgid "Every %d day(s)"
 msgstr "Alle %d Tag(e)"
 
-#: ../pykolab/xml/recurrence_rule.py:42
+#: ../pykolab/xml/recurrence_rule.py:45
 #, python-format
 msgid "Every %d hours"
 msgstr "Alle %d Stunden"
 
-#: ../pykolab/xml/recurrence_rule.py:43
+#: ../pykolab/xml/recurrence_rule.py:46
 #, python-format
 msgid "Every %d minutes"
 msgstr "Alle %d Minuten"
 
-#: ../pykolab/xml/recurrence_rule.py:44
+#: ../pykolab/xml/recurrence_rule.py:47
 #, python-format
 msgid "Every %d seconds"
 msgstr "Alle %d Sekunden"
 
-#: ../pykolab/xml/todo.py:110
+#: ../pykolab/xml/todo.py:162
 msgid "Todo due needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:126
+#: ../pykolab/xml/utils.py:149
 msgid "Name"
 msgstr "Name"
 
-#: ../pykolab/xml/utils.py:127
+#: ../pykolab/xml/utils.py:150
 msgid "Summary"
 msgstr "Zusammenfassung"
 
-#: ../pykolab/xml/utils.py:128
+#: ../pykolab/xml/utils.py:151
 msgid "Location"
 msgstr "Ort"
 
-#: ../pykolab/xml/utils.py:129
+#: ../pykolab/xml/utils.py:152
 msgid "Description"
 msgstr "Beschreibung"
 
-#: ../pykolab/xml/utils.py:130
+#: ../pykolab/xml/utils.py:153
 msgid "URL"
 msgstr "URL"
 
-#: ../pykolab/xml/utils.py:131
+#: ../pykolab/xml/utils.py:154
 msgid "Status"
 msgstr "Status"
 
-#: ../pykolab/xml/utils.py:132
+#: ../pykolab/xml/utils.py:155
 msgid "Priority"
 msgstr "Priorität"
 
-#: ../pykolab/xml/utils.py:133
+#: ../pykolab/xml/utils.py:156
 msgid "Attendee"
 msgstr "Teilnehmer"
 
-#: ../pykolab/xml/utils.py:134
+#: ../pykolab/xml/utils.py:157
 msgid "Start"
 msgstr "Beginn"
 
-#: ../pykolab/xml/utils.py:135
+#: ../pykolab/xml/utils.py:158
 msgid "End"
 msgstr "Ende"
 
-#: ../pykolab/xml/utils.py:136
+#: ../pykolab/xml/utils.py:159
 msgid "Due"
 msgstr "Fällig"
 
-#: ../pykolab/xml/utils.py:137
+#: ../pykolab/xml/utils.py:160
 msgid "Repeat"
 msgstr "Wiederholung"
 
-#: ../pykolab/xml/utils.py:138
+#: ../pykolab/xml/utils.py:161
 msgid "Repeat Exception"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:139
+#: ../pykolab/xml/utils.py:162
 msgid "Organizer"
 msgstr "Organisator"
 
-#: ../pykolab/xml/utils.py:140
+#: ../pykolab/xml/utils.py:163
 msgid "Attachment"
 msgstr "Anhang"
 
-#: ../pykolab/xml/utils.py:141
+#: ../pykolab/xml/utils.py:164
 msgid "Alarm"
 msgstr "Alarm"
 
-#: ../pykolab/xml/utils.py:142
+#: ../pykolab/xml/utils.py:165
 msgid "Classification"
 msgstr "Einstufung"
 
-#: ../pykolab/xml/utils.py:143
+#: ../pykolab/xml/utils.py:166
 msgid "Progress"
 msgstr "Fortschritt"
 
-#: ../pykolab/xml/utils.py:188
+#: ../pykolab/xml/utils.py:211
 #, python-format
 msgid "for %d times"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:190
+#: ../pykolab/xml/utils.py:213
 #, python-format
 msgid "until %s"
-msgstr ""
+msgstr "bis %s"
 
-#: ../pykolab/xml/utils.py:195
+#: ../pykolab/xml/utils.py:218
 msgid "Display message"
-msgstr ""
+msgstr "Nachricht anzeigen"
 
-#: ../pykolab/xml/utils.py:196
+#: ../pykolab/xml/utils.py:219
 msgid "Send email"
-msgstr ""
+msgstr "E-Mail senden"
 
-#: ../pykolab/xml/utils.py:197
+#: ../pykolab/xml/utils.py:220
 msgid "Play sound"
 msgstr "Audio abspielen"
 
-#: ../pykolab/xml/utils.py:203
+#: ../pykolab/xml/utils.py:226
 #, python-format
 msgid "%s after"
-msgstr ""
+msgstr "%s danach"
 
-#: ../pykolab/xml/utils.py:203
+#: ../pykolab/xml/utils.py:226
 #, python-format
 msgid "%s before"
-msgstr ""
+msgstr "%s davor"
 
-#: ../pykolab/xml/utils.py:212
+#: ../pykolab/xml/utils.py:235
 #, python-format
 msgid "%d day(s)"
-msgstr ""
+msgstr "%d Tag(e)"
 
-#: ../pykolab/xml/utils.py:218
+#: ../pykolab/xml/utils.py:241
 #, python-format
 msgid "%d hour(s)"
-msgstr ""
+msgstr "%d Stunde(n)"
 
-#: ../pykolab/xml/utils.py:220
+#: ../pykolab/xml/utils.py:243
 #, python-format
 msgid "%d minute(s)"
-msgstr ""
+msgstr "%d Minute(n)"
 
-#: ../saslauthd/__init__.py:76
+#: ../saslauthd/__init__.py:77
 msgid "Socket file to bind to."
 msgstr ""
 
-#: ../saslauthd/__init__.py:108
+#: ../saslauthd/__init__.py:109
 #, python-format
 msgid "Could not create %r: %r"
 msgstr ""
 
-#: ../saslauthd/__init__.py:146 ../saslauthd/__init__.py:154
-#: ../wallace/__init__.py:439 ../wallace/__init__.py:448
-msgid ""
-"Traceback occurred, please report a bug at http://bugzilla.kolabsys.com"
-msgstr "Ein Fehler mit Traceback trat auf, bitte legen Sie einen Bericht auf  http://bugzilla.kolabsys.com an"
-
-#: ../saslauthd/__init__.py:194
-msgid "kolab-saslauthd could not accept "
+#: ../saslauthd/__init__.py:220
+#, python-format
+msgid "kolab-saslauthd could not accept connections on socket: %r"
 msgstr ""
 
-#: ../saslauthd/__init__.py:199
+#: ../saslauthd/__init__.py:225
 msgid "Maximum tries exceeded, exiting"
 msgstr ""
 
-#: ../tests/functional/test_wallace/test_005_resource_invitation.py:195
-#: ../wallace/module_resources.py:1151
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:196
+#: ../wallace/module_resources.py:1251
 #, 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:1235
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:641
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:657
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:715
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:771
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:785
+#: ../wallace/module_resources.py:1335
 #, python-format
 msgid "Booking for %s has been %s"
 msgstr "Buchung für %s wurde %s"
@@ -3080,60 +3411,60 @@
 #. 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:1333
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:677
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:704
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:742
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:759
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:814
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:968
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:984
+#: ../wallace/module_resources.py:1433
 #, python-format
 msgid "Booking request for %s requires confirmation"
 msgstr "Buchungsanfrage für %s benötigt eine Bestätigung"
 
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:240
-#: ../wallace/module_invitationpolicy.py:448
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:242
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1267
+#: ../wallace/module_invitationpolicy.py:479
 #, python-format
 msgid "\"%(summary)s\" has been %(status)s"
 msgstr "\"%(summary)s\" wurde %(status)s"
 
+#. this should trigger a notification message
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:886
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1251
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1396
+#: ../wallace/module_invitationpolicy.py:1316
+#, python-format
+msgid "\"%s\" has been cancelled"
+msgstr "\"%s\" wurde abgesagt"
+
 #. 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:802
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:808
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:821
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:839
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:942
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:947
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1008
-#: ../wallace/module_invitationpolicy.py:1071
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:903
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:909
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:922
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:939
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1039
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1044
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1377
+#: ../wallace/module_invitationpolicy.py:1234
 #, python-format
 msgid "\"%s\" has been updated"
 msgstr "\"%s\" wurde aktualisiert"
 
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:813
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:825
-msgid "PENDING"
-msgstr ""
-
-#. this should trigger a notification message
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1028
-#: ../wallace/module_invitationpolicy.py:1133
-#, python-format
-msgid "\"%s\" has been cancelled"
-msgstr "\"%s\" wurde abgesagt"
-
-#: ../tests/unit/test-011-itip.py:465
+#: ../tests/unit/test-011-itip.py:529
 #, python-format
 msgid "Invitation for %(summary)s was %(status)s"
-msgstr ""
+msgstr "Einladung für %(summary)s war %(status)s"
 
 #: ../wallace/__init__.py:51
 #, python-format
 msgid "Wallace modules: %r"
-msgstr ""
+msgstr "Wallace-Module: %r"
 
 #: ../wallace/__init__.py:67
 #, python-format
@@ -3150,370 +3481,423 @@
 msgid "Worker process %s initializing"
 msgstr ""
 
-#: ../wallace/__init__.py:122
+#: ../wallace/__init__.py:123
 msgid "Bind address for Wallace."
 msgstr "Bind-Adresse für Wallace."
 
-#: ../wallace/__init__.py:140
+#: ../wallace/__init__.py:142
 msgid "Number of threads to use."
 msgstr ""
 
-#: ../wallace/__init__.py:156
+#: ../wallace/__init__.py:159
 msgid "Port that Wallace is supposed to use."
 msgstr "Port, den Wallace benutzen soll."
 
-#: ../wallace/__init__.py:205
+#: ../wallace/__init__.py:208
 #, 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:217
+#: ../wallace/__init__.py:220
 msgid "Could not shut down socket"
 msgstr "Konnte Socket nicht schließen"
 
-#: ../wallace/__init__.py:286
+#: ../wallace/__init__.py:289
 msgid "Accepted connection"
 msgstr "Verbindung akzeptiert"
 
-#: ../wallace/__init__.py:464
+#: ../wallace/__init__.py:494
 #, python-format
 msgid "Could not write pid file %s"
 msgstr ""
 
-#: ../wallace/module_footer.py:60 ../wallace/module_gpgencrypt.py:60
-#: ../wallace/module_invitationpolicy.py:210 ../wallace/module_optout.py:61
-#: ../wallace/module_resources.py:126
+#: ../wallace/module_footer.py:63 ../wallace/module_gpgencrypt.py:100
+#: ../wallace/module_invitationpolicy.py:227 ../wallace/module_optout.py:61
+#: ../wallace/module_resources.py:127
 #, python-format
 msgid "Issuing callback after processing to stage %s"
 msgstr ""
 
-#: ../wallace/module_footer.py:61 ../wallace/module_gpgencrypt.py:61
-#: ../wallace/module_invitationpolicy.py:212 ../wallace/module_optout.py:62
-#: ../wallace/module_resources.py:132
+#: ../wallace/module_footer.py:64 ../wallace/module_gpgencrypt.py:101
+#: ../wallace/module_invitationpolicy.py:229 ../wallace/module_optout.py:62
+#: ../wallace/module_resources.py:133
 #, python-format
 msgid "Testing cb_action_%s()"
 msgstr ""
 
-#: ../wallace/module_footer.py:63 ../wallace/module_gpgencrypt.py:63
-#: ../wallace/module_invitationpolicy.py:214 ../wallace/module_optout.py:64
-#: ../wallace/module_resources.py:135
+#: ../wallace/module_footer.py:66 ../wallace/module_gpgencrypt.py:103
+#: ../wallace/module_invitationpolicy.py:231 ../wallace/module_optout.py:64
+#: ../wallace/module_resources.py:136
 #, python-format
 msgid "Attempting to execute cb_action_%s()"
 msgstr ""
 
-#: ../wallace/module_footer.py:67
+#: ../wallace/module_footer.py:70
 #, python-format
 msgid "Executing module footer for %r, %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:66
+#: ../wallace/module_footer.py:88
+msgid "No contents configured for footer module"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:106
 #, python-format
 msgid "Executing module gpgencrypt for %r, %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:98
+#: ../wallace/module_gpgencrypt.py:138
 msgid "Message is already encrypted (app/pgp-enc content-type)"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:102
+#: ../wallace/module_gpgencrypt.py:142
 msgid "Message already encrypted by main content-type header"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:131
+#: ../wallace/module_gpgencrypt.py:171
 msgid ""
 "Configured to encrypt to a key not configured, and strict policy enabled. "
 "Bailing out."
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:134
+#: ../wallace/module_gpgencrypt.py:174
 msgid ""
 "Configured to encrypt to a key not configured, but continuing anyway (see "
 "'gpgencrypt_strict')."
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:171
+#: ../wallace/module_gpgencrypt.py:211
 #, python-format
 msgid "Recipients: %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:183
+#: ../wallace/module_gpgencrypt.py:222
 #, python-format
 msgid "Current keys: %r"
-msgstr ""
+msgstr "Aktuelle Schlüssel: %r"
 
-#: ../wallace/module_gpgencrypt.py:188
+#: ../wallace/module_gpgencrypt.py:227
 #, python-format
 msgid "Retrieving key for recipient: %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:192 ../wallace/module_gpgencrypt.py:208
+#: ../wallace/module_gpgencrypt.py:231 ../wallace/module_gpgencrypt.py:247
 #, python-format
 msgid "Found matching address %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:200
+#: ../wallace/module_gpgencrypt.py:239
 #, python-format
 msgid "Found matching address %r in remote keys"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:232
+#: ../wallace/module_gpgencrypt.py:259
+msgid "Mime Message - we need to build multipart/encrypted structure"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:268
+msgid "No Mime Message - encypt plain"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:284
 #, python-format
 msgid "An error occurred: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:196
+#: ../wallace/module_invitationpolicy.py:213
 #, python-format
 msgid "Invitation policy called for %r, %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:258
+#: ../wallace/module_invitationpolicy.py:275
 #, python-format
 msgid "Failed to parse iTip objects from message: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:262
+#: ../wallace/module_invitationpolicy.py:279
 msgid ""
 "Message is not an iTip message or does not contain any (valid) iTip objects."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:266
+#: ../wallace/module_invitationpolicy.py:283
 #, python-format
 msgid ""
 "iTip objects attached to this message contain the following information: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:278
+#: ../wallace/module_invitationpolicy.py:306
 #, python-format
 msgid "Recipient emails for %s: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:282
+#: ../wallace/module_invitationpolicy.py:310
 #, python-format
 msgid "No itips, no users, pass along %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:285
+#: ../wallace/module_invitationpolicy.py:313
 #, python-format
 msgid "iTips, but no users, pass along %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:306
+#: ../wallace/module_invitationpolicy.py:331
 #, python-format
 msgid "No user attendee matching envelope recipient %s, skip message"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:309
+#: ../wallace/module_invitationpolicy.py:334
 #, python-format
 msgid "Receiving user: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:337
+#: ../wallace/module_invitationpolicy.py:362
 #, python-format
 msgid "Apply invitation policy %r for sender %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:348
+#: ../wallace/module_invitationpolicy.py:373
 #, python-format
 msgid "Ignoring '%s' iTip method"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:352
+#: ../wallace/module_invitationpolicy.py:377
 #, python-format
 msgid "iTip message %r consumed by the invitationpolicy module"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:368
+#: ../wallace/module_invitationpolicy.py:393
 msgid "Pass invitation for manual processing"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:373
+#: ../wallace/module_invitationpolicy.py:398
 #, python-format
 msgid "Receiving Attendee: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:393
+#: ../wallace/module_invitationpolicy.py:418
 #, python-format
 msgid "Existing %s: %r"
-msgstr ""
+msgstr "Vorhanden %s: %r"
 
-#: ../wallace/module_invitationpolicy.py:404
+#: ../wallace/module_invitationpolicy.py:429
 #, python-format
 msgid "Precondition for object %r fulfilled: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:422
+#: ../wallace/module_invitationpolicy.py:449
 #, python-format
 msgid ""
 "The iTip request sequence (%r) doesn't match the referred object version "
 "(%r). Ignoring."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:427
+#: ../wallace/module_invitationpolicy.py:454
 #, python-format
 msgid "Auto-updating %s %r on iTip REQUEST (no re-scheduling)"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:482
+#: ../wallace/module_invitationpolicy.py:505
+msgid "Forward invitation for notification"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:520
 msgid "Pass reply for manual processing"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:489
+#: ../wallace/module_invitationpolicy.py:527
 #, python-format
 msgid "Sender Attendee: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:501
+#: ../wallace/module_invitationpolicy.py:539
 #, python-format
 msgid ""
 "The iTip reply sequence (%r) doesn't match the referred object version (%r)."
 " Forwarding to Inbox."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:507
+#: ../wallace/module_invitationpolicy.py:545
 #, python-format
 msgid "Auto-updating %s %r on iTip REPLY"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:532
+#: ../wallace/module_invitationpolicy.py:572
 #, python-format
 msgid "Add delegatee: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:535
+#: ../wallace/module_invitationpolicy.py:575
 #, python-format
 msgid "Update existing delegatee: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:540
+#: ../wallace/module_invitationpolicy.py:582
 #, python-format
 msgid "Update delegator: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:557
-#: ../wallace/module_invitationpolicy.py:589
+#: ../wallace/module_invitationpolicy.py:600
 msgid ""
 "The object referred by this reply was not found in the user's folders. "
 "Forwarding to Inbox."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:570
+#: ../wallace/module_invitationpolicy.py:613
 msgid "Pass cancellation for manual processing"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:618
+#: ../wallace/module_invitationpolicy.py:636
+#, python-format
+msgid "Remove cancelled %s instance %s from %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:647
+#, python-format
+msgid "Update cancelled %s %r with STATUS=CANCELLED"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:662
+msgid ""
+"The object referred by this cancel request was not found in the user's "
+"folders. Forwarding to Inbox."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:691
 #, python-format
 msgid "Checking if email address %r belongs to a local user"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:623
+#: ../wallace/module_invitationpolicy.py:696
 #, python-format
 msgid "User DN: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:625
+#: ../wallace/module_invitationpolicy.py:698
 #, python-format
 msgid "No user record(s) found for %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:681
+#: ../wallace/module_invitationpolicy.py:754
 #, python-format
 msgid "User record doesn't have the mailbox attribute %r set"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:694
+#: ../wallace/module_invitationpolicy.py:767
 #, python-format
 msgid "IMAP proxy authentication failed: %r"
 msgstr "IMAP-Proxy Authentifizierung fehlgeschlagen: %r"
 
-#: ../wallace/module_invitationpolicy.py:716
+#: ../wallace/module_invitationpolicy.py:789
 #, python-format
 msgid "List %r folders for user %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:732
+#: ../wallace/module_invitationpolicy.py:804
 #, python-format
 msgid "IMAP metadata for %r: %r"
-msgstr ""
+msgstr "IMAP-Metadaten für %r: %r"
 
-#: ../wallace/module_invitationpolicy.py:767
+#: ../wallace/module_invitationpolicy.py:842
 #, python-format
 msgid "Searching folder %r for %s %r"
+msgstr "Ordnersuche %r nach %s %r"
+
+#: ../wallace/module_invitationpolicy.py:852
+#: ../wallace/module_resources.py:675 ../wallace/module_resources.py:736
+#, python-format
+msgid "No UID found in IMAP response: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:783
+#: ../wallace/module_invitationpolicy.py:878
 #, python-format
 msgid "Failed to parse %s from message %s/%s: %s"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:809
+#: ../wallace/module_invitationpolicy.py:906
 #, python-format
 msgid "Listing events from folder %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:822
-#: ../wallace/module_resources.py:474 ../wallace/module_resources.py:665
-#: ../wallace/module_resources.py:713
+#: ../wallace/module_invitationpolicy.py:919
+#: ../wallace/module_resources.py:482 ../wallace/module_resources.py:683
+#: ../wallace/module_resources.py:763
 #, python-format
 msgid "Failed to parse event from message %s/%s: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:828
+#: ../wallace/module_invitationpolicy.py:925
 #, python-format
 msgid "Existing event %r conflicts with invitation %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:835
-#: ../wallace/module_resources.py:518
+#: ../wallace/module_invitationpolicy.py:932
+#: ../wallace/module_resources.py:526
 #, python-format
 msgid "start: %r, end: %r, total: %r, messages: %d"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:861
+#: ../wallace/module_invitationpolicy.py:960
 #, python-format
 msgid "%r is locked, waiting..."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:928
+#: ../wallace/module_invitationpolicy.py:1040
 #, python-format
 msgid "Failed to save %s: no target folder found for user %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:931
+#: ../wallace/module_invitationpolicy.py:1051
 #, python-format
 msgid "Save %s %r to user folder %r"
-msgstr ""
+msgstr "%s %r in Benutzerordner %r speichern"
 
-#: ../wallace/module_invitationpolicy.py:944
+#: ../wallace/module_invitationpolicy.py:1064
 #, python-format
 msgid "Failed to save %s to user folder at %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:960
+#: ../wallace/module_invitationpolicy.py:1083
+#, python-format
+msgid "Delete %s %r in %r by UID: %r"
+msgstr "%s %r in %r von Benutzerkennung: %r löschen"
+
+#: ../wallace/module_invitationpolicy.py:1091
 #, python-format
 msgid "Delete %s %r in %r: %r"
+msgstr "%s %r in %r: %r löschen"
+
+#: ../wallace/module_invitationpolicy.py:1102
+#, python-format
+msgid "Failed to delete %s from folder %r: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1130
+#: ../wallace/module_invitationpolicy.py:1304
+#, python-format
+msgid "%s commented: %s"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:989
+#: ../wallace/module_invitationpolicy.py:1133
 #, python-format
 msgid "Compose participation status summary for %s %r to user %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1022
+#: ../wallace/module_invitationpolicy.py:1171
 #, python-format
 msgid ""
 "Waiting for more automated replies (got %d of %d); skipping notification"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1032
+#: ../wallace/module_invitationpolicy.py:1192
 #, python-format
 msgid "Changes submitted by %s have been automatically applied."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1041
+#: ../wallace/module_invitationpolicy.py:1201
 msgid "(removed)"
 msgstr "(entfernt)"
 
-#: ../wallace/module_invitationpolicy.py:1047
+#: ../wallace/module_invitationpolicy.py:1207
 #, python-format
 msgid ""
 "\n"
@@ -3522,7 +3906,7 @@
 "        "
 msgstr "\nDie Zuweisung für '%(summary)s' wurde in ihrer Aufgabenliste aktualisiert.\n%(roundup)s\n        "
 
-#: ../wallace/module_invitationpolicy.py:1055
+#: ../wallace/module_invitationpolicy.py:1215
 #, python-format
 msgid ""
 "\n"
@@ -3531,56 +3915,78 @@
 "        "
 msgstr "\nDas Ereignis '%(summary)s' um %(start)s wurde in ihrem Kalender aktualisiert.\n%(roundup)s\n        "
 
-#: ../wallace/module_invitationpolicy.py:1064
-#: ../wallace/module_invitationpolicy.py:1126
-#: ../wallace/module_invitationpolicy.py:1216
+#: ../wallace/module_invitationpolicy.py:1225
+msgid "NOTE: This update only refers to this single occurrence!"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1227
+#: ../wallace/module_invitationpolicy.py:1309
+#: ../wallace/module_invitationpolicy.py:1411
 msgid "*** This is an automated message. Please do not reply. ***"
 msgstr "*** Dies ist eine automatisierte Nachricht. Bitte antworten Sie nicht. ***"
 
-#: ../wallace/module_invitationpolicy.py:1099
+#: ../wallace/module_invitationpolicy.py:1249
+#, python-format
+msgid "Sent update notification to %r: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1274
 #, python-format
 msgid "Send cancellation notification for %s %r to user %r"
 msgstr "Benachrichtigung über die Absage von %s %r an Nutzer %r senden"
 
-#: ../wallace/module_invitationpolicy.py:1109
+#: ../wallace/module_invitationpolicy.py:1284
 #, python-format
-msgid ""
-"\n"
-"            The assignment for '%(summary)s' has been cancelled by %(organizer)s.\n"
-"            The copy in your tasklist as been marked as cancelled accordingly.\n"
-"        "
-msgstr "\nDie Zuweisung für Aufgabe '%(summary)s' wurde von %(organizer)s abgesagt.\nDie Kopie in Ihrer Taskliste wurde entsprechend aktualisiert."
+msgid "The assignment for '%(summary)s' has been cancelled by %(organizer)s."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1289
+msgid "The copy in your tasklist has been removed accordingly."
+msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1117
+#: ../wallace/module_invitationpolicy.py:1291
+msgid "The copy in your tasklist has been marked as cancelled accordingly."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1293
 #, python-format
 msgid ""
-"\n"
-"            The event '%(summary)s' at %(start)s has been cancelled by %(organizer)s.\n"
-"            The copy in your calendar as been marked as cancelled accordingly.\n"
-"        "
-msgstr "\nDas Ereignis '%(summary)s' um %(start)s wurde von %(organizer)s abgesagt.\nDie Kopie in ihrem Kalender wurde entsprechend aktualisiert."
+"The event '%(summary)s' at %(start)s has been cancelled by %(organizer)s."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1299
+msgid "The copy in your calendar has been removed accordingly."
+msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1206
+#: ../wallace/module_invitationpolicy.py:1301
+msgid "The copy in your calendar has been marked as cancelled accordingly."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1307
+msgid "NOTE: This cancellation only refers to this single occurrence!"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1401
 #, python-format
 msgid "Updated %s's copy of %r: %r"
 msgstr "%s's Kopie von %r wurde aktualisiert: %r"
 
-#: ../wallace/module_invitationpolicy.py:1209
+#: ../wallace/module_invitationpolicy.py:1404
 #, python-format
 msgid "Attendee %s's copy of %r not found"
 msgstr "Die Kopie des Teilnehmers %s von %r wurde nicht gefunden"
 
-#: ../wallace/module_invitationpolicy.py:1212
+#: ../wallace/module_invitationpolicy.py:1407
 #, python-format
 msgid "Attendee %r not found in LDAP"
 msgstr "Teilnehmer %r wurde nicht in LDAP gefunden"
 
-#: ../wallace/module_invitationpolicy.py:1219
+#: ../wallace/module_invitationpolicy.py:1414
 #, python-format
 msgid "%(name)s has %(status)s your assignment for %(summary)s."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1221
+#: ../wallace/module_invitationpolicy.py:1416
 #, python-format
 msgid "%(name)s has %(status)s your invitation for %(summary)s."
 msgstr ""
@@ -3593,7 +3999,8 @@
 
 #: ../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
@@ -3606,255 +4013,308 @@
 msgid "Could not send request to optout_url %s"
 msgstr ""
 
-#: ../wallace/module_resources.py:116
+#: ../wallace/module_resources.py:117
 #, python-format
 msgid "Resource Management called for %r, %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:181
+#: ../wallace/module_resources.py:182
 #, python-format
 msgid "Failed to parse iTip events from message: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:186
-msgid "Message is not an iTip message or does not contain any "
+#: ../wallace/module_resources.py:187
+msgid "Message is not an iTip message or does not contain any (valid) iTip."
 msgstr ""
 
-#: ../wallace/module_resources.py:194
-msgid "iTip events attached to this message contain the "
+#: ../wallace/module_resources.py:195
+#, python-format
+msgid ""
+"iTip events attached to this message contain the following information: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:225
+#: ../wallace/module_resources.py:226
 msgid "Not an iTip message, but sent to resource nonetheless. Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:233
+#: ../wallace/module_resources.py:234
 #, python-format
 msgid "No itips, no resources, pass along %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:236
+#: ../wallace/module_resources.py:237
 #, python-format
 msgid "iTips, but no resources, pass along %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:245
+#: ../wallace/module_resources.py:246
 #, python-format
 msgid "No resource attendees matching envelope recipient %s, Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:255
+#: ../wallace/module_resources.py:256
 #, python-format
 msgid "Resources: %r; %r"
+msgstr "Ressourcen: %r; %r"
+
+#: ../wallace/module_resources.py:270
+#, python-format
+msgid "iTip REPLY to %r, %r; matches %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:273
+#: ../wallace/module_resources.py:276
 #, python-format
 msgid "Sender Attendee: %r => %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:280
+#: ../wallace/module_resources.py:278
+#, python-format
+msgid "Could not find envelope sender attendee: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:283
 #, python-format
 msgid ""
 "The iTip reply sequence (%r) doesn't match the referred event version (%r). "
 "Ignoring."
 msgstr ""
 
-#: ../wallace/module_resources.py:305
+#: ../wallace/module_resources.py:302
+#, python-format
+msgid "Invalid response (%r) received from resource owner for event %r"
+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:308
+#: ../wallace/module_resources.py:309
 msgid "No event reference found in this REPLY. Ignoring."
 msgstr ""
 
-#: ../wallace/module_resources.py:317
+#: ../wallace/module_resources.py:318
 #, python-format
 msgid "Receiving Resource: %r; %r"
-msgstr ""
+msgstr "Empfange Ressource: %r; %r"
+
+#: ../wallace/module_resources.py:320
+#, python-format
+msgid "Could not find envelope attendee: %r"
+msgstr "Kann Umschlag-Teilnehmer nicht finden: %r"
 
-#: ../wallace/module_resources.py:325
+#: ../wallace/module_resources.py:326
 #, python-format
 msgid "Recipient %r is non-participant, ignoring message"
-msgstr ""
+msgstr "Empfänger %r ist kein Teilnehmer, ignoriere Nachricht"
+
+#: ../wallace/module_resources.py:336
+#, python-format
+msgid "Cancellation for entire event %r: deleting"
+msgstr "Absage für gesamtes Ereignis %r: lösche"
+
+#: ../wallace/module_resources.py:340
+#, python-format
+msgid "Cancellation for a single occurrence %r of %r: updating..."
+msgstr "Absage für einzelne Wiederholung %r von %r: aktualisiere..."
 
-#: ../wallace/module_resources.py:353
+#: ../wallace/module_resources.py:361
 #, python-format
 msgid "Accept invitation for individual resource %r / %r"
-msgstr ""
+msgstr "Akzeptiere Einladung für individuelle Ressource %r / %r"
 
-#: ../wallace/module_resources.py:382
+#: ../wallace/module_resources.py:390
 #, python-format
 msgid "Delegate invitation for resource collection %r to %r"
-msgstr ""
+msgstr "Delegiere Einladung für Ressourcen-Gruppe %r zu %r"
 
-#: ../wallace/module_resources.py:403
+#: ../wallace/module_resources.py:411
 #, python-format
 msgid "module_resources.heartbeat(%d)"
-msgstr ""
+msgstr "module_resources.heartbeat(%d)"
 
-#: ../wallace/module_resources.py:426
+#: ../wallace/module_resources.py:434
 #, python-format
 msgid "Expunge resource calendar for %s (%s) failed: %r"
-msgstr ""
+msgstr "Entfernen Ressourcen-Kalender für %s (%s) fehlgeschlagen: %r"
 
-#: ../wallace/module_resources.py:450
+#: ../wallace/module_resources.py:458
 #, python-format
 msgid "Expunge events in resource folder %r older than %d days"
-msgstr ""
+msgstr "Entferne Ereignisse in Ressourcen-Verzeichnis %r älter als %d Tage"
 
-#: ../wallace/module_resources.py:463
+#: ../wallace/module_resources.py:471
 #, python-format
 msgid "Fetching message ID %r from folder %r"
-msgstr ""
+msgstr "Lade Nachrichten-ID %r aus Verzeichnis %r"
 
-#: ../wallace/module_resources.py:489
+#: ../wallace/module_resources.py:497
 #, python-format
 msgid "Flag event %s from message %s/%s as deleted (age = %d days)"
-msgstr ""
+msgstr "Kennzeiche Ereigniss %s aus Nachricht %s/%s als gelöscht (Alter = %d Tage)"
 
-#: ../wallace/module_resources.py:514
+#: ../wallace/module_resources.py:522
 #, python-format
 msgid "Failed to read resource calendar for %r: %r"
-msgstr ""
+msgstr "Lesen des Ressourcen-Kalender for %r fehlgeschlagen: %r"
 
-#: ../wallace/module_resources.py:524
+#: ../wallace/module_resources.py:532
 #, python-format
 msgid "Polling for resource %r"
-msgstr ""
+msgstr "Suchen für Ressource %r"
 
-#: ../wallace/module_resources.py:527
+#: ../wallace/module_resources.py:535
 #, python-format
 msgid "Resource %r has been popped from the list"
-msgstr ""
+msgstr "Resource %r wurde von Liste entfernt"
 
-#: ../wallace/module_resources.py:531
+#: ../wallace/module_resources.py:539
 msgid "Resource is a collection"
-msgstr ""
+msgstr "Ressource ist eine Sammlung"
 
-#: ../wallace/module_resources.py:542
+#: ../wallace/module_resources.py:550
 #, python-format
 msgid "Removed conflicting resources from %r: (%r) => %r"
-msgstr ""
+msgstr "Kollidierende Ressourcen von %r entfernt: (%r) => %r"
 
-#: ../wallace/module_resources.py:554
+#: ../wallace/module_resources.py:562
 #, python-format
 msgid "Conflicting events: %r for resource %r"
-msgstr ""
+msgstr "Kollidierende Ereignisse:  %r für Ressource %r"
 
-#: ../wallace/module_resources.py:573
+#: ../wallace/module_resources.py:585
 #, python-format
 msgid "Delegate to another resource collection member: %r to %r"
-msgstr ""
+msgstr "Delegiere an anderes Ressource-Gruppenmitglied: %r zu %r"
 
-#: ../wallace/module_resources.py:635
+#: ../wallace/module_resources.py:647
 #, python-format
 msgid "Checking events in resource folder %r"
-msgstr ""
+msgstr "Prüfe Ereignisse in Ressourcen-Verzeichnis %r"
 
-#: ../wallace/module_resources.py:654
+#: ../wallace/module_resources.py:666
 #, python-format
 msgid "Fetching message UID %r from folder %r"
-msgstr ""
+msgstr "Lade Nachricht UID %r aus Verzeichnis %r"
 
-#: ../wallace/module_resources.py:677
+#: ../wallace/module_resources.py:699
 #, python-format
 msgid "Event %r conflicts with event %r"
-msgstr ""
+msgstr "Ereignis %r kollidiert mit Ereignis %r"
 
-#: ../wallace/module_resources.py:698
+#: ../wallace/module_resources.py:721
 #, python-format
 msgid "Searching %r for event %r"
-msgstr ""
+msgstr "Suchvorgang %r nach Ereignis %r"
 
-#: ../wallace/module_resources.py:704
+#: ../wallace/module_resources.py:727
 #, python-format
 msgid "Failed to access resource calendar:: %r"
 msgstr "Zugriff auf Ressourcenkalender fehlgeschlagen: %r"
 
-#: ../wallace/module_resources.py:733
+#: ../wallace/module_resources.py:754
+#, python-format
+msgid "Recurrence-ID not matching on message %s, skipping: %r != %r"
+msgstr "Recurrence-ID stimmt nicht mit Nachricht %s überein, überspringe: %r != %r"
+
+#: ../wallace/module_resources.py:785
 #, python-format
 msgid "Apply invitation policies %r"
 msgstr "Anwenden der Einladungsrichtlinie %r"
 
-#: ../wallace/module_resources.py:752
+#: ../wallace/module_resources.py:804
 #, python-format
 msgid "Adding event to %r: %r"
 msgstr "Hinzufügen Termin zu %r: %r"
 
-#: ../wallace/module_resources.py:806
+#: ../wallace/module_resources.py:888
 #, python-format
 msgid "Failed to save event to resource calendar at %r: %r"
 msgstr "Speichern des Termins im Ressourcenkalender fehlgeschlagen in %r: %r"
 
-#: ../wallace/module_resources.py:823
+#: ../wallace/module_resources.py:907
+#, python-format
+msgid "Delete resource calendar object from %r by UID %r"
+msgstr "Lösche Ressourcen-Kalenderobjekt %r mittels UID %r"
+
+#: ../wallace/module_resources.py:915
 #, python-format
 msgid "Delete resource calendar object %r in %r: %r"
 msgstr "Lösche Kalenderobjekt der Ressource %r in %r: %r"
 
-#: ../wallace/module_resources.py:866
+#: ../wallace/module_resources.py:926
+#, python-format
+msgid "Failed to delete calendar object %r from folder %r: %r"
+msgstr "Löschen des Kalenderobjekts %r aus Verzeichnis %r fehlgeschlagen: %r"
+
+#: ../wallace/module_resources.py:966
 #, python-format
 msgid "Checking if email address %r belongs to a resource (collection)"
 msgstr "Prüfe ob E-Mail-Adresse %r zu einer Ressource (Sammlung) gehört"
 
-#: ../wallace/module_resources.py:874 ../wallace/module_resources.py:946
-#: ../wallace/module_resources.py:980
+#: ../wallace/module_resources.py:974 ../wallace/module_resources.py:1046
+#: ../wallace/module_resources.py:1080
 #, python-format
 msgid "Resource record(s): %r"
 msgstr "Ressourcen-Eintrag/Einträge: %r"
 
-#: ../wallace/module_resources.py:876 ../wallace/module_resources.py:948
-#: ../wallace/module_resources.py:983
+#: ../wallace/module_resources.py:976 ../wallace/module_resources.py:1048
+#: ../wallace/module_resources.py:1083
 #, python-format
 msgid "No resource (collection) records found for %r"
 msgstr "Kein Ressourcen (Sammlung) - Eintrag für %r gefunden"
 
-#: ../wallace/module_resources.py:880 ../wallace/module_resources.py:952
-#: ../wallace/module_resources.py:987
+#: ../wallace/module_resources.py:980 ../wallace/module_resources.py:1052
+#: ../wallace/module_resources.py:1087
 #, python-format
 msgid "Resource record: %r"
 msgstr "Ressourceneinträge: %r"
 
-#: ../wallace/module_resources.py:898
+#: ../wallace/module_resources.py:998
 #, python-format
 msgid "Raw itip_events: %r"
 msgstr "Originale itip_events: %r"
 
-#: ../wallace/module_resources.py:906
+#: ../wallace/module_resources.py:1006
 #, python-format
 msgid "Raw set of attendees: %r"
 msgstr "Originalset der Teilnehmer: %r"
 
-#: ../wallace/module_resources.py:914
+#: ../wallace/module_resources.py:1014
 #, python-format
 msgid "Raw set of resources: %r"
 msgstr "Originalset der Ressourcen: %r"
 
-#: ../wallace/module_resources.py:919
+#: ../wallace/module_resources.py:1019
 #, python-format
 msgid "Raw set of organizers: %r"
 msgstr "Originalset der Organisatoren: %r"
 
-#: ../wallace/module_resources.py:939
+#: ../wallace/module_resources.py:1039
 #, python-format
 msgid "Checking if attendee %r is a resource (collection)"
 msgstr "Prüfe ob Teilnehmer %r eine Ressource (Sammlung) ist"
 
-#: ../wallace/module_resources.py:955 ../wallace/module_resources.py:989
+#: ../wallace/module_resources.py:1055 ../wallace/module_resources.py:1089
 msgid "Resource reservation made but no resource records found"
 msgstr "Ressourcenbuchung erfolgt, jedoch keine Ressourceneinträge gefunden"
 
-#: ../wallace/module_resources.py:974
+#: ../wallace/module_resources.py:1074
 #, python-format
 msgid "Checking if resource %r is a resource (collection)"
 msgstr "Prüfe ob Resource %r eine Resource (Sammlung)"
 
-#: ../wallace/module_resources.py:992
-msgid "The following resources are being referred to in the "
-msgstr "Auf die folgenden Ressourcen wurde Bezug genommen in"
+#: ../wallace/module_resources.py:1092
+#, python-format
+msgid "The following resources are being referred to in the iTip: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:1219
+#, python-format
+msgid "Check collections %r for kolabinvitationpolicy attributes"
+msgstr "Prüfe Gruppe %r auf kolabinvitationpolicy Attribute"
 
-#: ../wallace/module_resources.py:1157
+#: ../wallace/module_resources.py:1257
 #, python-format
 msgid ""
 "\n"
@@ -3864,7 +4324,7 @@
 "            "
 msgstr "\n*** Dies ist eine automatisch erstellte E-Mail. Bitte antworten Sie nicht direkt darauf. ***\n\nIhre Reservierung wurde an \"%s\" delegiert, welche(r) zum angeforderten Termin verfügbar ist.\n            "
 
-#: ../wallace/module_resources.py:1176
+#: ../wallace/module_resources.py:1276
 #, python-format
 msgid ""
 "\n"
@@ -3874,25 +4334,25 @@
 "    "
 msgstr "\n*** Dies ist eine automatisch erstellte E-Mail. Bitte antworten Sie nicht direkt darauf. ***\n\nHiermit informieren wir Sie, dass die Buchung %s wurde.\n    "
 
-#: ../wallace/module_resources.py:1183
+#: ../wallace/module_resources.py:1283
 #, python-format
 msgid ""
 "\n"
 "            If you have questions about this reservation, please contact\n"
 "            %s <%s> %s\n"
 "        "
-msgstr ""
+msgstr "\nWenn Sie Fragen zu dieser Reservierung haben, kontaktieren Sie bitte\n%s <%s> %s\n        "
 
-#: ../wallace/module_resources.py:1218
+#: ../wallace/module_resources.py:1318
 #, python-format
 msgid "Sending booking notification for event %r to %r from %r"
 msgstr "Sende Buchungsbenachrichtigung für Termin %r zu %r von %r"
 
-#: ../wallace/module_resources.py:1236
+#: ../wallace/module_resources.py:1336
 msgid "failed"
 msgstr "fehlgeschlagen"
 
-#: ../wallace/module_resources.py:1256
+#: ../wallace/module_resources.py:1356
 #, python-format
 msgid ""
 "\n"
@@ -3902,7 +4362,7 @@
 "        "
 msgstr "\nDie Buchungsanfrage für %(resource)s durch %(orgname)s <%(orgemail)s> ist %(status)s für %(date)s.\n\n*** Dies ist eine automatisch erstellte E-Mail. Bitte antworten Sie nicht direkt darauf. ***\n        "
 
-#: ../wallace/module_resources.py:1262
+#: ../wallace/module_resources.py:1362
 #, python-format
 msgid ""
 "\n"
@@ -3913,12 +4373,12 @@
 "        "
 msgstr "\nEine Buchungsanfrage für %(resource)s konnte nicht automatisch verarbeitet werden.\nBitte kontaktieren Sie %(orgname)s <%(orgemail)s>, welcher die Resource für den %(date)s angefragt hat.\nSubject: %(summary)s.\n\n*** Dies ist eine automatisch erstellte E-Mail. Bitte antworten Sie nicht direkt darauf. ***"
 
-#: ../wallace/module_resources.py:1306
+#: ../wallace/module_resources.py:1393
 #, python-format
 msgid "Clone invitation for owner confirmation: %r from %r"
 msgstr "Kopiere Einladung für Eigentümer Bestätigung: %r von %r"
 
-#: ../wallace/module_resources.py:1312
+#: ../wallace/module_resources.py:1412
 #, python-format
 msgid ""
 "\n"
@@ -3936,58 +4396,63 @@
 msgstr "\nEine Buchungsanfrage für %(resource)s benötigt Ihre Zustimmung!\nBitte akzeptieren Sie die Anfrage oder lehnen Sie diese ab ohne die Anfrage in Ihrem Kalender zu speichern.\n\nDie Buchungsanfrage wurde gesendet von %(orgname)s <%(orgemail)s>.\n\nBetreff: %(summary)s.\nTermin: %(date)s\nTeilnehmer: %(attendees)s\n\n*** Dies ist eine automatisch erstellte E-Mail. Bitte antworten Sie nicht direkt darauf. ***"
 
 #. This is a nested module
-#: ../wallace/modules.py:97
+#: ../wallace/modules.py:98
 #, python-format
 msgid "Module Group: %s"
 msgstr "Modulgruppe: %s"
 
-#: ../wallace/modules.py:108 ../wallace/modules.py:120
+#: ../wallace/modules.py:109 ../wallace/modules.py:125
 #, python-format
 msgid "No such module %r in modules %r (1)."
 msgstr "Kein solches Modul %r in Modulen %r  (1)."
 
-#: ../wallace/modules.py:113
+#: ../wallace/modules.py:114
 #, python-format
 msgid "No such module %r in modules %r (2)."
 msgstr "Kein solches Modul %r in Modulen %r (2)."
 
-#: ../wallace/modules.py:126
+#: ../wallace/modules.py:120 ../wallace/modules.py:172
+#, python-format
+msgid "Unknown error occurred; %r"
+msgstr ""
+
+#: ../wallace/modules.py:178
 #, python-format
 msgid "Holding message in queue for manual review (%s by %s)"
 msgstr "Behalte Nachricht zur manuellen Prüfung in der Warteliste (%s von %s)"
 
-#: ../wallace/modules.py:129
+#: ../wallace/modules.py:181
 #, python-format
 msgid "Deferring message in %s (by module %s)"
 msgstr "Zurückgestellte Nachricht in %s (durch Modul %s)"
 
-#: ../wallace/modules.py:141
+#: ../wallace/modules.py:193
 #, python-format
 msgid "The time when the message was sent: %r"
 msgstr "Zeitpunkt des Versandts: %r"
 
-#: ../wallace/modules.py:142
+#: ../wallace/modules.py:194
 #, python-format
 msgid "The time now: %r"
 msgstr "Die Zeit ist jetzt: %r"
 
-#: ../wallace/modules.py:143
+#: ../wallace/modules.py:195
 #, python-format
 msgid "The time delta: %r"
 msgstr "Die Zeitdifferenz: %r"
 
 #. TODO: Send NDR back to user
-#: ../wallace/modules.py:147
+#: ../wallace/modules.py:199
 #, python-format
 msgid "Message in file %s older then 5 days, deleting"
 msgstr "Nachricht in Datei %s älter als 5 Tage, lösche"
 
-#: ../wallace/modules.py:172
+#: ../wallace/modules.py:224
 #, python-format
 msgid "Rejecting message in %s (by module %s)"
 msgstr "Weise Nachricht in %s (durch Modul %s) zurück"
 
-#: ../wallace/modules.py:193
+#: ../wallace/modules.py:245
 #, python-format
 msgid ""
 "This is the email system Wallace at %s.\n"
@@ -4002,29 +4467,29 @@
 "recipients.\n"
 msgstr "Ich bin das E-Mail-System Wallace auf %s.\n\nMit Bedauern muß ich Sie informieren, daß die angehängte Nachricht\nnicht an die folgenden Empfänger zugestellt werden konnte:\n\n- %s\n\nFalls Sie noch andere Empfänger angegeben haben wurde die Nachricht\nan diese zugestellt. An diese Empfänger müssen sie die Nachricht\nnicht erneut senden.\n"
 
-#: ../wallace/modules.py:208
+#: ../wallace/modules.py:260
 #, python-format
 msgid ""
 "X-Wallace-Module: %s\n"
 "X-Wallace-Result: REJECT\n"
 msgstr "X-Wallace-Modul: %s\nX-Wallace-Ergebnis: REJECT\n"
 
-#: ../wallace/modules.py:267
+#: ../wallace/modules.py:304
 #, python-format
 msgid "Accepting message in %s (by module %s)"
 msgstr "Akzeptiere Nachricht in %s (durch Modul %s)"
 
-#: ../wallace/modules.py:269
+#: ../wallace/modules.py:306
 #, python-format
 msgid "Accepting message in: %r"
 msgstr "Akzeptiere Nachricht in: %r"
 
-#: ../wallace/modules.py:276
+#: ../wallace/modules.py:313
 #, python-format
 msgid "recipients: %r"
 msgstr "Empfänger: %r"
 
-#: ../wallace/modules.py:354
+#: ../wallace/modules.py:369
 #, python-format
 msgid "Module '%s' already registered"
 msgstr "Modul '%s' ist bereits registriert"

pykolab-0.8.1.tar.gz/po/de_DE.po -> pykolab-0.8.3.tar.gz/po/de_DE.po Changed

@@ -3,779 +3,909 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Christoph Wickert <christoph.wickert@gmail.com>, 2015
-# Christoph Wickert <christoph.wickert@gmail.com>, 2011
-# Dirk Marschner <info@marschner.cx>, 2015
-# Ettore Atalan <atalanttore@googlemail.com>, 2014-2015
+# Christoph Wickert <christoph.wickert@gmail.com>, 2012
 # Torsten Grote <grote@kolabsys.com>, 2012
-# Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>, 2015
-# balin <johannes_graumann@web.de>, 2012
-# Jo <jo@caj-augsburg.de>, 2012
-# bitnukl, 2014
-# Thomas Brüderli <roundcube@gmail.com>, 2014
-# Till Savekoul <till@koul.de>, 2012
+# Thomas Bruederli <roundcube@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-14 01:36+0100\n"
-"PO-Revision-Date: 2015-02-01 15:31+0000\n"
-"Last-Translator: Dirk Marschner <info@marschner.cx>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
+"POT-Creation-Date: 2016-07-22 15:31+0200\n"
+"PO-Revision-Date: 2016-07-22 13:31+0000\n"
+"Last-Translator: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>\n"
+"Language-Team: German (Germany) (http://www.transifex.com/kolab/kolab/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
+"Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../bin/kolab_smtp_access_policy.py:210
+#: ../bin/kolab_smtp_access_policy.py:214
 #, python-format
 msgid "Adding policy request to instance %s"
 msgstr "Füge Richtlinien-Anfrage zu Instanz %s hinzu"
 
-#: ../bin/kolab_smtp_access_policy.py:480
+#: ../bin/kolab_smtp_access_policy.py:484
 msgid "Unauthorized access not allowed"
 msgstr "Unberechtigter Zugriff nicht erlaubt"
 
-#: ../bin/kolab_smtp_access_policy.py:509
-#: ../bin/kolab_smtp_access_policy.py:690
+#: ../bin/kolab_smtp_access_policy.py:513
+#: ../bin/kolab_smtp_access_policy.py:711
 msgid "Could not find recipient"
 msgstr "Konnte den Empfänger nicht finden"
 
-#: ../bin/kolab_smtp_access_policy.py:528
+#: ../bin/kolab_smtp_access_policy.py:532
 #, python-format
 msgid "Could not find envelope sender user %s (511)"
-msgstr "Konnte Absender-Umschlag für Benutzer %s nicht finden (511)"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:571
+#: ../bin/kolab_smtp_access_policy.py:575
 #, python-format
 msgid "Obtained authenticated user details for %r: %r"
-msgstr "Erhaltene Details des authentifizieren Benutzers %r: %r"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:628
+#: ../bin/kolab_smtp_access_policy.py:633
 #, python-format
 msgid "Could not find envelope sender user %s"
 msgstr "Konnte den Absender-Umschlag für den Benutzer %s nicht finden"
 
-#: ../bin/kolab_smtp_access_policy.py:650
+#: ../bin/kolab_smtp_access_policy.py:666
+#: ../bin/kolab_smtp_access_policy.py:694
 #, python-format
 msgid "%s is unauthorized to send on behalf of %s"
 msgstr "Benutzer %s ist nicht berechtigt als Benutzer %s zu senden"
 
-#: ../bin/kolab_smtp_access_policy.py:660
+#: ../bin/kolab_smtp_access_policy.py:676
 #, python-format
 msgid ""
 "User %s attempted to use envelope sender address %s without authorization"
-msgstr "Benutzer %s versuchte die Absendeadresse %s ohne Berechtigung zu verwenden"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:714
-#: ../bin/kolab_smtp_access_policy.py:725
+#: ../bin/kolab_smtp_access_policy.py:736
+#: ../bin/kolab_smtp_access_policy.py:747
 #, python-format
 msgid "Found user %s to be a delegate user of %s"
 msgstr "Benutzer %s ist ein delegierter Benutzer von %s"
 
-#: ../bin/kolab_smtp_access_policy.py:749
+#: ../bin/kolab_smtp_access_policy.py:767
 #, python-format
 msgid ""
 "Verifying authenticated sender '%(sender)s' with sasl_username "
 "'%(sasl_username)s' for recipient '%(recipient)s'"
-msgstr "Überprüfe authentisierten Absender '%(sender)s' mit SASL-Benutzernamen '%(sasl_username)s' für Empfänger '%(recipient)s'"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:752
+#: ../bin/kolab_smtp_access_policy.py:770
 #, python-format
 msgid ""
 "Verifying unauthenticated sender '%(sender)s' for recipient '%(recipient)s'"
-msgstr "Überprüfe unauthentisierten Absender '%(sender)s' für Empfänger '%(recipient)s'"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:768
+#: ../bin/kolab_smtp_access_policy.py:786
 #, python-format
 msgid "Reproducing verify_recipient(%s, %s) from cache"
-msgstr "Reproduziere verify_recipient(%s, %s) aus Cache"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:805
+#: ../bin/kolab_smtp_access_policy.py:823
 #, python-format
 msgid "Using authentication domain %s instead of %s"
-msgstr "Authentisierungsdomain %s anstelle von %s wird verwendet"
+msgstr "Benutze Authentisierungsdomain %s anstelle von %s"
 
-#: ../bin/kolab_smtp_access_policy.py:815
+#: ../bin/kolab_smtp_access_policy.py:833
 #, python-format
 msgid "Domain %s is a primary domain"
 msgstr "Die Domain %s ist die primäre Domain"
 
-#: ../bin/kolab_smtp_access_policy.py:823
+#: ../bin/kolab_smtp_access_policy.py:841
 #, python-format
 msgid ""
 "Checking the recipient for domain %s that is not ours. This is probably a "
 "configuration error."
-msgstr "Überprüfe Empfänger für fremde Domäne %s. Dies ist wahrscheinlich ein Konfigurationsfehler."
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:838
+#: ../bin/kolab_smtp_access_policy.py:856
 msgid ""
 "This recipient address is related to multiple object entries and the SMTP "
 "Access Policy can therefore not restrict message flow"
-msgstr "Diese Empfänger-Adresse bezieht sich auf mehrere Objekt-Einträge. Die SMTP Access Policy kann deshalb den Nachrichtenfluss nicht einschränken."
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:855
+#: ../bin/kolab_smtp_access_policy.py:873
 #, python-format
 msgid ""
 "Recipient address %r not found. Allowing since the MTA was configured to "
 "accept the recipient."
-msgstr "Emfänger-Adresse %r nicht gefunden. Erlauben, da MTA konfiguriert wurde, diesen Empfänger zu akzeptieren."
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:891
+#: ../bin/kolab_smtp_access_policy.py:909
 msgid "Invalid recipient"
 msgstr "Ungültiger Empfänger"
 
-#: ../bin/kolab_smtp_access_policy.py:902
+#: ../bin/kolab_smtp_access_policy.py:920
 msgid "Could not find this user, accepting"
-msgstr "Konnte keine Einschränkung für diesen Benutzer finden, akzeptiere Nachricht"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:975
-#: ../bin/kolab_smtp_access_policy.py:1051
+#: ../bin/kolab_smtp_access_policy.py:993
+#: ../bin/kolab_smtp_access_policy.py:1070
 #, python-format
 msgid "Sender %s is not allowed to send to recipient %s"
-msgstr "Absender %s darf nicht an Empfänger %s senden"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1039
+#: ../bin/kolab_smtp_access_policy.py:1057
 #, python-format
 msgid "Reproducing verify_sender(%r) from cache"
-msgstr "Reproduziere verify_sender(%r) aus Cache"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1056
+#: ../bin/kolab_smtp_access_policy.py:1077
 msgid "Unverifiable sender."
-msgstr "Nicht überprüfbarer Absender."
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1061
+#: ../bin/kolab_smtp_access_policy.py:1082
 msgid "Sender is not using an alias"
-msgstr "Absender nutzt keinen Alias"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1069
+#: ../bin/kolab_smtp_access_policy.py:1090
 msgid "Sender uses unauthorized envelope sender address"
-msgstr "Absender nutzt unerlaubte Absender-Umschlag Adresse"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1086
+#: ../bin/kolab_smtp_access_policy.py:1107
 msgid "Could not verify sender"
 msgstr "Konnte den Absender nicht verifizieren"
 
-#: ../bin/kolab_smtp_access_policy.py:1093
+#: ../bin/kolab_smtp_access_policy.py:1114
 msgid ""
 "Verifying whether sender is allowed to send to recipient using sender policy"
-msgstr "Überprüfe ob Absender an Empfänger gemäß Absender-Richtlinie senden darf"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1106
+#: ../bin/kolab_smtp_access_policy.py:1127
 #, python-format
 msgid "Result is %r"
 msgstr "Das Ergebnis ist %r"
 
-#: ../bin/kolab_smtp_access_policy.py:1111
+#: ../bin/kolab_smtp_access_policy.py:1132
 msgid "No recipient policy restrictions exist for this sender"
 msgstr "Es existiert keine Empfängerrichtlinie für diesen Absender"
 
-#: ../bin/kolab_smtp_access_policy.py:1120
+#: ../bin/kolab_smtp_access_policy.py:1141
 msgid "Found a recipient policy to apply for this sender."
 msgstr "Empfänger-Richtlinie für diesen Benutzer gefunden"
 
-#: ../bin/kolab_smtp_access_policy.py:1135
+#: ../bin/kolab_smtp_access_policy.py:1156
 #, python-format
 msgid "Sender %s not allowed to send to recipient %s"
-msgstr "Absender %s darf nicht an Empfänger %s senden"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1156
+#: ../bin/kolab_smtp_access_policy.py:1184
 msgid "Cleaning up the cache"
 msgstr "Aufräumen des Cache"
 
-#: ../bin/kolab_smtp_access_policy.py:1179
+#: ../bin/kolab_smtp_access_policy.py:1207
 msgid ""
 "The 'uri' setting in the kolab_smtp_access_policy section is soon going to "
 "be deprecated in favor of 'cache_uri'"
-msgstr "Die 'uri' Einstellung im Abschnitt kolab_smtp_access_policy wird bald überholt sein. Nutzen Sie 'cache_uri' stattdessen "
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1195
+#: ../bin/kolab_smtp_access_policy.py:1223
 #, python-format
 msgid "Operational Error in caching: %s"
-msgstr "Betriebsbedingter Fehler beim Cachen: %s"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1247
+#: ../bin/kolab_smtp_access_policy.py:1276
 #, python-format
 msgid "Caching the policy result with timestamp %d"
-msgstr "Cachen des Richtlinienergebnisses mit Zeitstempel %d"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1321
+#: ../bin/kolab_smtp_access_policy.py:1353
 #, python-format
 msgid "Returning action DEFER_IF_PERMIT: %s"
-msgstr "Antwort Aktion DEFER_IF_PERMIT: %s"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1326
+#: ../bin/kolab_smtp_access_policy.py:1358
 #, python-format
 msgid "Returning action DUNNO: %s"
-msgstr "Antwort Aktion DUNNO: %s"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1331
+#: ../bin/kolab_smtp_access_policy.py:1363
 #, python-format
 msgid "Returning action HOLD: %s"
-msgstr "Antwort Aktion HOLD: %s"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1336
+#: ../bin/kolab_smtp_access_policy.py:1368
 #, python-format
 msgid "Returning action PERMIT: %s"
-msgstr "Antwort Aktion PERMIT: %s"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1461
+#: ../bin/kolab_smtp_access_policy.py:1496
 #, python-format
 msgid "Returning action REJECT: %s"
-msgstr "Antwort Aktion REJECT: %s"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1507
+#: ../bin/kolab_smtp_access_policy.py:1542
 msgid "Starting to loop for new request"
 msgstr "Starte Schleife für neue Anfrage"
 
-#: ../bin/kolab_smtp_access_policy.py:1514
+#: ../bin/kolab_smtp_access_policy.py:1549
 msgid "Timeout for policy request reading exceeded"
-msgstr "Zeitüberschreitung beim Lesen der Richtlinienanfrage"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1520
+#: ../bin/kolab_smtp_access_policy.py:1555
 msgid "End of current request"
 msgstr "Ende der aktuellen Anfrage"
 
-#: ../bin/kolab_smtp_access_policy.py:1524
+#: ../bin/kolab_smtp_access_policy.py:1559
 #, python-format
 msgid "Getting line: %s"
-msgstr "Lese Zeile: %s"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1528
+#: ../bin/kolab_smtp_access_policy.py:1563
 msgid "Returning request"
-msgstr "Rückgabe Richtlinenanfordung"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1557
+#: ../bin/kolab_smtp_access_policy.py:1592
 msgid "Access Policy Options"
 msgstr "Zugriffsrichtlinien-Einstellungen"
 
-#: ../bin/kolab_smtp_access_policy.py:1564
+#: ../bin/kolab_smtp_access_policy.py:1599
 msgid "SMTP Policy request timeout."
 msgstr "Zeitüberschreitung der SMTP Richtlinien-Anfrage"
 
-#: ../bin/kolab_smtp_access_policy.py:1570
+#: ../bin/kolab_smtp_access_policy.py:1605
 msgid "Verify the recipient access policy."
-msgstr "Verifiziere die Empfänger-Zugriffs-Richtlinie."
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1576
+#: ../bin/kolab_smtp_access_policy.py:1611
 msgid "Verify the sender access policy."
-msgstr "Verifiziere die Sender-Zugriffs-Richtlinie."
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1582
+#: ../bin/kolab_smtp_access_policy.py:1617
 msgid "Allow unauthenticated senders."
-msgstr "Erlaube nicht authentisierte Sender."
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1596
+#: ../bin/kolab_smtp_access_policy.py:1631
 #, python-format
 msgid "Got request instance %s"
-msgstr "Anfrage bekommen für Instanz %s"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1605
+#: ../bin/kolab_smtp_access_policy.py:1640
 #, python-format
 msgid "Request instance %s is in state %s"
-msgstr "Anfrage-Instanz %s ist im Status %s"
-
-#: ../bin/kolab_smtp_access_policy.py:1613
-#, python-format
-msgid "Request instance %s is not yet in DATA state"
-msgstr "Anfrage-Instanz %s ist noch nicht im DATA Status"
-
-#: ../bin/kolab_smtp_access_policy.py:1625
-#, python-format
-msgid "Request instance %s reached DATA state"
-msgstr "Anfrage-Instanz %s hat DATA Status erreicht"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1645
+#: ../bin/kolab_smtp_access_policy.py:1672
 #, python-format
 msgid "Unhandled exception caught: %r"
-msgstr "Unbehandelte Ausnahme abgefangen: %r"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1649
+#: ../bin/kolab_smtp_access_policy.py:1676
 msgid "Sender access denied"
-msgstr "Sender Zugriff verweigert"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1651
+#: ../bin/kolab_smtp_access_policy.py:1678
 msgid "Recipient access denied"
-msgstr "Empfänger Zugriff verweigert"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1653
+#: ../bin/kolab_smtp_access_policy.py:1680
 msgid "No objections"
-msgstr "Keine Einwände"
+msgstr ""
 
-#: ../conf.py:37 ../kolab-cli.py:34 ../saslauthd.py:33
+#: ../conf.py:36 ../kolab-cli.py:34 ../saslauthd.py:33
 msgid "Cannot load pykolab/logger.py:"
-msgstr "Laden von pykolab/logger.py nicht möglich:"
+msgstr ""
 
-#: ../kolabd/__init__.py:49 ../saslauthd/__init__.py:51
-#: ../wallace/__init__.py:107
+#: ../kolabd/__init__.py:50 ../saslauthd/__init__.py:52
+#: ../wallace/__init__.py:108
 msgid "Daemon Options"
-msgstr "Daemon Optionen"
+msgstr ""
 
-#: ../kolabd/__init__.py:56 ../saslauthd/__init__.py:58
-#: ../wallace/__init__.py:114
+#: ../kolabd/__init__.py:57 ../saslauthd/__init__.py:59
+#: ../wallace/__init__.py:115
 msgid "Fork to the background."
-msgstr "In den Hintergrund abtauchen"
+msgstr ""
 
-#: ../kolabd/__init__.py:65 ../saslauthd/__init__.py:67
-#: ../wallace/__init__.py:148
+#: ../kolabd/__init__.py:66 ../saslauthd/__init__.py:68
+#: ../wallace/__init__.py:150
 msgid "Path to the PID file to use."
-msgstr "Pfad zur PID-Datei"
+msgstr ""
 
-#: ../kolabd/__init__.py:74 ../saslauthd/__init__.py:85
-#: ../wallace/__init__.py:165
+#: ../kolabd/__init__.py:75 ../saslauthd/__init__.py:86
+#: ../wallace/__init__.py:168
 msgid "Run as user USERNAME"
-msgstr "Als Benutzer USERNAME ausführen"
+msgstr ""
 
-#: ../kolabd/__init__.py:84 ../saslauthd/__init__.py:95
-#: ../wallace/__init__.py:131
+#: ../kolabd/__init__.py:85 ../saslauthd/__init__.py:96
+#: ../wallace/__init__.py:132
 msgid "Run as group GROUPNAME"
-msgstr "Als Gruppe GROUPNAME ausführen"
+msgstr ""
 
-#: ../kolabd/__init__.py:122 ../pykolab/utils.py:234
-#: ../saslauthd/__init__.py:301 ../wallace/__init__.py:365
+#: ../kolabd/__init__.py:123 ../pykolab/utils.py:254
+#: ../saslauthd/__init__.py:327 ../wallace/__init__.py:373
 #, python-format
 msgid "Group %s does not exist"
-msgstr "Gruppe %s exisitert nicht"
+msgstr ""
 
-#: ../kolabd/__init__.py:131 ../saslauthd/__init__.py:310
-#: ../wallace/__init__.py:374
+#: ../kolabd/__init__.py:132 ../saslauthd/__init__.py:336
+#: ../wallace/__init__.py:382
 #, python-format
 msgid "Switching real and effective group id to %d"
-msgstr "Wechsle reale und effektive Gruppen-ID zu %d"
+msgstr ""
 
-#: ../kolabd/__init__.py:153 ../pykolab/utils.py:258
-#: ../saslauthd/__init__.py:332 ../wallace/__init__.py:396
+#: ../kolabd/__init__.py:154 ../pykolab/utils.py:278
+#: ../saslauthd/__init__.py:358 ../wallace/__init__.py:404
 #, python-format
 msgid "User %s does not exist"
-msgstr "Benutzer %s existiert nicht"
+msgstr ""
 
-#: ../kolabd/__init__.py:163 ../saslauthd/__init__.py:342
-#: ../wallace/__init__.py:406
+#: ../kolabd/__init__.py:163 ../saslauthd/__init__.py:367
+#: ../wallace/__init__.py:414
 #, python-format
 msgid "Switching real and effective user id to %d"
-msgstr "Wechsle reale und effektive Benutzer-ID zu %d"
+msgstr ""
 
-#: ../kolabd/__init__.py:172 ../saslauthd/__init__.py:351
-#: ../wallace/__init__.py:415
+#: ../kolabd/__init__.py:172 ../saslauthd/__init__.py:376
+#: ../wallace/__init__.py:423
 msgid "Could not change real and effective uid and/or gid"
-msgstr "Konnte reale und effektive UID und/oder GID nicht ändern"
+msgstr ""
 
-#: ../kolabd/__init__.py:192 ../saslauthd/__init__.py:142
-#: ../wallace/__init__.py:435
+#: ../kolabd/__init__.py:215 ../saslauthd/__init__.py:166
+#: ../wallace/__init__.py:465
 msgid "Interrupted by user"
-msgstr "Vom Benutzer unterbrochen"
+msgstr ""
 
-#: ../kolabd/__init__.py:197 ../kolabd/__init__.py:208
-msgid "Traceback occurred, please report a "
-msgstr "Traceback passiert, bitte melden Sie einen"
+#: ../kolabd/__init__.py:220 ../kolabd/__init__.py:231
+#: ../saslauthd/__init__.py:170 ../saslauthd/__init__.py:179
+#: ../wallace/__init__.py:469 ../wallace/__init__.py:478
+msgid "Traceback occurred, please report a bug at https://issues.kolab.org"
+msgstr ""
 
-#: ../kolabd/__init__.py:203 ../saslauthd/__init__.py:150
-#: ../wallace/__init__.py:444
+#: ../kolabd/__init__.py:226 ../saslauthd/__init__.py:175
+#: ../wallace/__init__.py:474
 #, python-format
 msgid "Type Error: %s"
-msgstr "Typ-Fehler: %s"
+msgstr ""
 
-#: ../kolabd/__init__.py:230
+#: ../kolabd/__init__.py:253
 msgid "Could not connect to LDAP, is it running?"
-msgstr "Konnte nicht zu LDAP verbinden, läuft es?"
+msgstr ""
 
-#: ../kolabd/__init__.py:233 ../pykolab/auth/ldap/__init__.py:2242
-#: ../pykolab/cli/cmd_sync.py:67
+#: ../kolabd/__init__.py:256 ../pykolab/auth/ldap/__init__.py:2524
+#: ../pykolab/cli/cmd_sync.py:77
 msgid "Listing domains..."
-msgstr "Liste Domains auf..."
+msgstr "Domänen werden geladen…"
 
-#: ../kolabd/__init__.py:244
+#: ../kolabd/__init__.py:267
 msgid "No domains. Not syncing"
-msgstr "Keine Domänen. Keine Synchronisation"
+msgstr ""
+
+#: ../kolabd/__init__.py:290
+#, python-format
+msgid "Domain %r naming context: %r, root dn: %r"
+msgstr ""
+
+#: ../kolabd/__init__.py:302
+#, python-format
+msgid "Naming contexts to synchronize: %r"
+msgstr ""
+
+#: ../kolabd/__init__.py:320
+#, python-format
+msgid "Result set of domains: %r"
+msgstr ""
+
+#: ../kolabd/__init__.py:323
+#, python-format
+msgid "Checking for domain %s"
+msgstr ""
+
+#: ../kolabd/__init__.py:327
+#, python-format
+msgid "Domain %s isn't alive anymore."
+msgstr ""
 
-#: ../kolabd/__init__.py:279
+#: ../kolabd/__init__.py:331
+#, python-format
+msgid "Domain %s already there and alive."
+msgstr ""
+
+#: ../kolabd/__init__.py:335
+#, python-format
+msgid "Domain %s should not exist any longer."
+msgstr ""
+
+#: ../kolabd/__init__.py:338
+#, python-format
+msgid "Domain %s does not have a process yet."
+msgstr ""
+
+#: ../kolabd/__init__.py:349
 #, python-format
 msgid "added domains: %r, removed domains: %r"
-msgstr "Domänen hinzugefügt: %r, Domänen entfernt: %r"
+msgstr ""
 
-#: ../kolabd/process.py:33
+#: ../kolabd/process.py:34
 #, python-format
 msgid "Process created for domain %s"
-msgstr "Prozess gestartet für Domäne %s"
+msgstr ""
 
-#: ../kolabd/process.py:42
+#: ../kolabd/process.py:43
 #, python-format
 msgid "Synchronizing for domain %s"
-msgstr "Synchronisiere für Domäne %s"
+msgstr ""
 
-#: ../kolabd/process.py:59
+#: ../kolabd/process.py:60
 #, python-format
 msgid ""
 "Error in process %r, terminating:\n"
 "\t%r"
-msgstr "Fehler im Prozess %r, beende:\n\t%r"
+msgstr ""
 
-#: ../kolabd.py:31 ../setup-kolab.py:36 ../wallace.py:31
+#: ../kolabd.py:31 ../setup-kolab.py:37 ../wallace.py:31
 msgid "Cannot load pykolab/constants.py:"
-msgstr "Konnte nicht pykolab/constants.py laden:"
+msgstr ""
 
 #: ../pykolab/auth/__init__.py:89
 #, python-format
 msgid "Called for domain %r"
-msgstr "Aufgerufen für Domäne %r"
+msgstr ""
 
 #: ../pykolab/auth/__init__.py:106 ../pykolab/auth/__init__.py:115
 #, python-format
 msgid "Using section %s and domain %s"
-msgstr "Benutze Abschnitt %s und Domäne %s"
+msgstr ""
 
 #: ../pykolab/auth/__init__.py:120
 #, python-format
 msgid "Connecting to Authentication backend for domain %s"
-msgstr "Verbinde zu Authentifizierungsbackend für Domäne %s"
+msgstr ""
 
 #: ../pykolab/auth/__init__.py:131
 #, python-format
 msgid "Section %s has no option 'auth_mechanism'"
-msgstr "Abschnitt %s hat keinen Wert 'auth_mechanism'"
+msgstr ""
 
 #: ../pykolab/auth/__init__.py:138
 #, python-format
 msgid "Section %s has auth_mechanism: %r"
-msgstr "Abschnitt %s hat auth_mechanism: %r"
+msgstr ""
 
 #: ../pykolab/auth/__init__.py:147 ../pykolab/auth/__init__.py:156
 msgid "Starting LDAP..."
-msgstr "Starte LDAP..."
+msgstr ""
 
 #: ../pykolab/auth/ldap/cache.py:126
 #, python-format
 msgid "Inserting cache entry %r"
-msgstr "Hinzufügen Cacheeintrag %r"
+msgstr ""
 
 #: ../pykolab/auth/ldap/cache.py:147
 #, python-format
 msgid "Updating timestamp for cache entry %r"
-msgstr "Aktualisiere Zeitstempel für Cacheeintrag %r"
+msgstr ""
 
 #: ../pykolab/auth/ldap/cache.py:155
 #, python-format
 msgid "Updating result_attribute for cache entry %r"
-msgstr "Aktualisiere result_attribute für Cacheeintrag %r"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:52
+#: ../pykolab/auth/ldap/__init__.py:54
 msgid "Python LDAP library does not support persistent search"
-msgstr "Die Python LDAP Bibliothek unterstützt keine persistente Suche"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:143
+#: ../pykolab/auth/ldap/__init__.py:147
 #, python-format
 msgid "Attempting to authenticate user %s in realm %s"
-msgstr "Versuche Benutzer %s in Bereich %s zu authentisieren"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:175 ../pykolab/auth/ldap/__init__.py:226
+#: ../pykolab/auth/ldap/__init__.py:165 ../pykolab/auth/ldap/__init__.py:180
+#: ../pykolab/auth/ldap/__init__.py:207 ../pykolab/auth/ldap/__init__.py:324
 #, python-format
 msgid "Authentication cache failed: %r"
-msgstr "Authentifizierungscache fehlgeschlagen: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:229 ../pykolab/auth/ldap/__init__.py:1441
+#: ../pykolab/auth/ldap/__init__.py:1467 ../pykolab/auth/ldap/__init__.py:3066
+#, python-format
+msgid "LDAP server unavailable: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:230 ../pykolab/auth/ldap/__init__.py:237
+#: ../pykolab/auth/ldap/__init__.py:1316 ../pykolab/auth/ldap/__init__.py:1442
+#: ../pykolab/auth/ldap/__init__.py:1468 ../pykolab/auth/ldap/__init__.py:1756
+#: ../pykolab/auth/ldap/__init__.py:3067 ../pykolab/auth/ldap/__init__.py:3077
+#, python-format
+msgid "%s"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:236
+#, python-format
+msgid "Exception occurred: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:243
+#, python-format
+msgid "Length of entries found: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:255
+#, python-format
+msgid "Authentication for %r failed (multiple entries)"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:269
+#, python-format
+msgid "Authentication for %r failed (no entry)"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:282
+#, python-format
+msgid "Authentication for %r failed (LDAP error?)"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:300 ../pykolab/auth/ldap/__init__.py:354
+#, python-format
+msgid "Authentication for %r succeeded"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:311
+#, python-format
+msgid "Authentication for %r failed (error)"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:328
+msgid "Authentication failed, LDAP server unavailable"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:216 ../pykolab/auth/ldap/__init__.py:240
+#: ../pykolab/auth/ldap/__init__.py:336 ../pykolab/auth/ldap/__init__.py:391
 #, python-format
-msgid "Binding with user_dn %s and password %s"
-msgstr "Binde mit user_dn %s und Passwort %s"
+msgid "Failed to authenticate as user %r"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:231 ../pykolab/auth/ldap/__init__.py:263
+#: ../pykolab/auth/ldap/__init__.py:357
 #, python-format
-msgid "Failed to authenticate as user %s"
-msgstr "Autorisation als Benutzer %s gescheitert"
+msgid "Authentication for %r failed (password)"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:249
+#: ../pykolab/auth/ldap/__init__.py:369
 #, python-format
 msgid "Error occured, there is no such object: %r"
-msgstr "Ausnahme aufgetreten, es gibt kein solches Objekt: %r"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:254
+#: ../pykolab/auth/ldap/__init__.py:381
 msgid "Authentication cache failed to clear entry"
-msgstr "Authentifizierungscache konnte Eintrag nicht entfernen"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:260
+#: ../pykolab/auth/ldap/__init__.py:387
 #, python-format
 msgid "Exception occured: %r"
-msgstr "Ausnahme aufgetreten: %r"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:280
+#: ../pykolab/auth/ldap/__init__.py:419
 msgid "Connecting to LDAP..."
-msgstr "Verbinde zum LDAP..."
+msgstr "Zum LDAP verbinden…"
 
-#: ../pykolab/auth/ldap/__init__.py:284
+#: ../pykolab/auth/ldap/__init__.py:423
 #, python-format
 msgid "Attempting to use LDAP URI %s"
-msgstr "Versuche LDAP URI %s zu benutzen"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:371
+#: ../pykolab/auth/ldap/__init__.py:524
 #, python-format
 msgid "Entry ID: %r"
-msgstr "Eintragkennung: %r"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:373
+#: ../pykolab/auth/ldap/__init__.py:526
 #, python-format
 msgid "Entry DN: %r"
-msgstr "Eintrag DN: %r"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:376
+#: ../pykolab/auth/ldap/__init__.py:529
 #, python-format
 msgid ""
 "ldap search: (%r, %r, filterstr='(objectclass=*)', attrlist=[ 'dn' ] + %r"
-msgstr "LDAP Suche: (%r, %r, filterstr='(objectclass=*)', attrlist=[ 'dn' ] + %r"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:481
+#: ../pykolab/auth/ldap/__init__.py:648 ../pykolab/auth/ldap/__init__.py:801
 #, python-format
-msgid "Finding recipient with filter %r"
-msgstr "Finde Empfänger mit Filter %r"
+msgid "Finding resource with filter %r"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:557
+#: ../pykolab/auth/ldap/__init__.py:725
 #, python-format
-msgid "Finding resource with filter %r"
-msgstr "Finde Ressource mit Filter %r"
+msgid "Finding recipient with filter %r"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:588
+#: ../pykolab/auth/ldap/__init__.py:832
 #, python-format
 msgid "Using timestamp %r"
-msgstr "Zeitstempel %r wird verwendet"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:625
+#: ../pykolab/auth/ldap/__init__.py:869
 #, python-format
-msgid "Not applying recipient policy for %s "
-msgstr "Keine Anwendung der Empfängerrichtlinie für %s"
+msgid "Not applying recipient policy for %s (disabled through configuration)"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:635
+#: ../pykolab/auth/ldap/__init__.py:879
 #, python-format
 msgid "Applying recipient policy to %r"
-msgstr "Anwendung Empfängerrichtlinie zu %r"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:652
+#: ../pykolab/auth/ldap/__init__.py:896
 #, python-format
-msgid "Using mail attributes: %r, with primary %r and "
-msgstr "Benutze Mailattribute: %r, mit primary %r und "
+msgid "Using mail attributes: %r, with primary %r and secondary %r"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:663
+#: ../pykolab/auth/ldap/__init__.py:907
 #, python-format
 msgid "key %r not in entry"
-msgstr "Key %r nicht im Eintrag"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:665
+#: ../pykolab/auth/ldap/__init__.py:909
 #, python-format
 msgid "key %r is the prim. mail attr."
-msgstr "Key %r ist das primäre Mailattr."
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:667
+#: ../pykolab/auth/ldap/__init__.py:911
 msgid "prim. mail pol. is not empty"
-msgstr "Primäre Mailrichtlinie ist nicht leer"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:670
+#: ../pykolab/auth/ldap/__init__.py:914
 #, python-format
 msgid "key %r is the sec. mail attr."
-msgstr "Key %r ist das sekundäre Mailattr."
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:672
+#: ../pykolab/auth/ldap/__init__.py:916
 msgid "sec. mail pol. is not empty"
-msgstr "Sekundäre Mailrichtlinie ist nicht leer"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:676 ../pykolab/auth/ldap/__init__.py:690
+#: ../pykolab/auth/ldap/__init__.py:920 ../pykolab/auth/ldap/__init__.py:934
 #, python-format
 msgid "Attributes %r are not yet available for entry %r"
-msgstr "Attribute %r sind für Eintrag %r noch nicht verfügbar"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:729
+#: ../pykolab/auth/ldap/__init__.py:973
 #, python-format
 msgid "No results for mail address %s found"
-msgstr "Keine Ergebnisse für E-Mail-Adresse %s gefunden"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:740
+#: ../pykolab/auth/ldap/__init__.py:984
 #, python-format
 msgid "1 result for address %s found, verifying"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:750
+#: ../pykolab/auth/ldap/__init__.py:994
 #, python-format
-msgid "Too bad, primary email address %s "
-msgstr "Schlecht, primäre E-Mail-Adresse %s"
+msgid "Too bad, primary email address %s already in use for %s (we are %s)"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:761 ../pykolab/auth/ldap/__init__.py:850
+#: ../pykolab/auth/ldap/__init__.py:1005 ../pykolab/auth/ldap/__init__.py:1094
 msgid "Address assigned to us"
-msgstr "Uns zugewiesene Adresse"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:816
+#: ../pykolab/auth/ldap/__init__.py:1060
 #, python-format
 msgid "No results for address %s found"
-msgstr "Keine Ergebnisse für Adresse %s gefunden"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:827
+#: ../pykolab/auth/ldap/__init__.py:1071
 #, python-format
-msgid "1 result for address %s found, "
-msgstr "1 Ergebnis für Adresse %s gefunden, "
+msgid "1 result for address %s found, verifying..."
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:838
-msgid "Too bad, secondary email "
-msgstr "Schlecht, sekundäre E-Mail-Adresse"
+#: ../pykolab/auth/ldap/__init__.py:1082
+#, python-format
+msgid "Too bad, secondary email address %s already in use for %s (we are %s)"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:865
-msgid "Recipient policy composed the following set of secondary "
+#: ../pykolab/auth/ldap/__init__.py:1109
+#, python-format
+msgid ""
+"Recipient policy composed the following set of secondary email addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:876
+#: ../pykolab/auth/ldap/__init__.py:1120
 #, python-format
 msgid "Secondary mail addresses that we want is not None: %r"
-msgstr "Gewünschte sekundäre E-Mail-Adresse ist nicht leer: %r"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:887
-msgid "Avoiding the duplication of the primary mail "
-msgstr "Verhindere die Dopplung der primären E-Mail"
+#: ../pykolab/auth/ldap/__init__.py:1131
+#, 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:898
+#: ../pykolab/auth/ldap/__init__.py:1142
 #, python-format
 msgid "Entry is getting secondary mail addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:906
-msgid "Entry did not have any secondary mail "
+#: ../pykolab/auth/ldap/__init__.py:1150
+#, python-format
+msgid "Entry did not have any secondary mail addresses in %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:923 ../pykolab/auth/ldap/__init__.py:929
+#: ../pykolab/auth/ldap/__init__.py:1167 ../pykolab/auth/ldap/__init__.py:1173
 #, python-format
 msgid "secondary_mail_addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:924 ../pykolab/auth/ldap/__init__.py:930
+#: ../pykolab/auth/ldap/__init__.py:1168 ../pykolab/auth/ldap/__init__.py:1174
 #, python-format
 msgid "entry[%s]: %r"
-msgstr "Eintrag[%s]: %r"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:941
+#: ../pykolab/auth/ldap/__init__.py:1185
 #, python-format
 msgid "Entry modifications list: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:969
+#: ../pykolab/auth/ldap/__init__.py:1219
 #, python-format
 msgid "Setting entry attribute %r to %r for %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1005
+#: ../pykolab/auth/ldap/__init__.py:1255
 #, python-format
 msgid ""
 "Could not update dn %r:\n"
 "%r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1031
+#: ../pykolab/auth/ldap/__init__.py:1281
 #, python-format
 msgid "Using filter %r"
-msgstr "Filter %r wird verwendet"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1046
+#: ../pykolab/auth/ldap/__init__.py:1296
 #, python-format
 msgid "Synchronization is searching against base DN: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1095
+#: ../pykolab/auth/ldap/__init__.py:1343
 #, 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:1166
-msgid "Invalid DN, username and/or password."
+#: ../pykolab/auth/ldap/__init__.py:1406
+msgid "Attempting to bind without a DN but with a password"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1291 ../pykolab/auth/ldap/__init__.py:1308
-#: ../pykolab/auth/ldap/__init__.py:1682 ../pykolab/auth/ldap/__init__.py:1699
+#: ../pykolab/auth/ldap/__init__.py:1411
+msgid "Attempting to bind with a DN but without a password"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1429
 #, python-format
-msgid "Found a subject %r with access %r"
+msgid "Binding with bind_dn: %s and password: %s"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1447 ../pykolab/auth/ldap/__init__.py:1471
+msgid "Invalid DN, username and/or password."
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1452
+msgid "bind() called but already bound"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1410
+#: ../pykolab/auth/ldap/__init__.py:1474
+msgid "bind_priv() called but already bound"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1686
 #, python-format
 msgid "Entry %s attribute value: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1418
+#: ../pykolab/auth/ldap/__init__.py:1694
 #, python-format
 msgid "imap.user_mailbox_server(%r) result: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1481 ../pykolab/auth/ldap/__init__.py:2809
+#: ../pykolab/auth/ldap/__init__.py:1755
 #, python-format
-msgid "%s"
-msgstr "%s"
+msgid "An error occured: %r"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1748 ../pykolab/auth/ldap/__init__.py:1948
+#: ../pykolab/auth/ldap/__init__.py:1993 ../pykolab/auth/ldap/__init__.py:2187
 #, python-format
 msgid "Result from recipient policy: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2003
+#: ../pykolab/auth/ldap/__init__.py:2242
 #, python-format
 msgid "Kolab user %s does not have a result attribute %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2162
+#: ../pykolab/auth/ldap/__init__.py:2267
+#, python-format
+msgid "Naming contexts found: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:2274
+#, python-format
+msgid "Domains/Root DNs found: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:2434
+#, python-format
+msgid "Searching root dn for domain %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:2439
+#, python-format
+msgid "Returning from cache: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:2444
 #, python-format
 msgid "Finding domain root dn for domain %s"
-msgstr "Suche root dn für die Domain %s"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2269
-msgid "Authentication database DOWN"
-msgstr "Authentisierungsdatenbank UNTEN"
+#: ../pykolab/auth/ldap/__init__.py:2474
+#, python-format
+msgid "Setting domain root dn from LDAP for domain %r: %r"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2353 ../pykolab/auth/ldap/__init__.py:2401
+#: ../pykolab/auth/ldap/__init__.py:2620 ../pykolab/auth/ldap/__init__.py:2668
 #, python-format
 msgid "Entry type: %s"
-msgstr "Eintragtyp: %s"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2490
+#: ../pykolab/auth/ldap/__init__.py:2746
 msgid "LDAP Search Result Data Entry:"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2506
+#: ../pykolab/auth/ldap/__init__.py:2762
 msgid "Entry Change Notification attributes:"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2511
+#: ../pykolab/auth/ldap/__init__.py:2767
 #, python-format
 msgid "Change Type: %r (%r)"
-msgstr "Typ ändern: %r (%r)"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2519
+#: ../pykolab/auth/ldap/__init__.py:2775
 #, python-format
 msgid "Previous DN: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2574
+#: ../pykolab/auth/ldap/__init__.py:2830
 #, python-format
 msgid "Object %s searched no longer exists"
 msgstr "Das gesuchte Objekt %s existiert nicht mehr"
 
-#: ../pykolab/auth/ldap/__init__.py:2584
+#: ../pykolab/auth/ldap/__init__.py:2840
 #, python-format
 msgid "%d results..."
-msgstr "%d Ergebnisse..."
+msgstr "%d Ergebnisse…"
 
-#: ../pykolab/auth/ldap/__init__.py:2687
+#: ../pykolab/auth/ldap/__init__.py:2943
 #, python-format
 msgid "Searching with filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2739
+#: ../pykolab/auth/ldap/__init__.py:2995
 #, python-format
 msgid "Checking for support for %s on %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2758
+#: ../pykolab/auth/ldap/__init__.py:3014
 #, python-format
 msgid "Found support for %s"
-msgstr "Unterstützung für %s gefunden"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2803
+#: ../pykolab/auth/ldap/__init__.py:3068
+msgid "-- reconnecting in 10 seconds."
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:3076
 #, python-format
 msgid "An error occured using %s: %r"
 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
@@ -816,20 +946,22 @@
 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
 #, python-format
 msgid "Recipient %r is not the primary recipient for address %r"
-msgstr "Empfänger %r ist nicht der primäre Empfänger für Adresse %r"
+msgstr ""
 
-#: ../pykolab/cli/cmd_add_domain.py:36
+#: ../pykolab/cli/cmd_add_domain.py:36 ../pykolab/cli/cmd_check_quota.py:37
 #: ../pykolab/cli/cmd_count_domain_mailboxes.py:38
 #: ../pykolab/cli/cmd_create_mailbox.py:36
+#: ../pykolab/cli/cmd_delete_domain.py:39
 #: ../pykolab/cli/cmd_export_mailbox.py:33
 #: ../pykolab/cli/cmd_list_deleted_mailboxes.py:38
-#: ../pykolab/cli/cmd_list_domain_mailboxes.py:36
+#: ../pykolab/cli/cmd_list_domain_mailboxes.py:37
 #: ../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
@@ -840,42 +972,44 @@
 #: ../pykolab/cli/cmd_sync_mailhost_attrs.py:39 ../pykolab/cli/cmd_sync.py:45
 #: ../pykolab/cli/cmd_undelete_mailbox.py:34
 msgid "CLI Options"
-msgstr "Kommandozeilen-Parameter"
+msgstr "Kommandozeilenoptionen"
 
 #: ../pykolab/cli/cmd_add_domain.py:42
 msgid "Add alias domain."
-msgstr "Hinzufügen Alias-Domäne."
+msgstr ""
 
 #: ../pykolab/cli/cmd_add_domain.py:47
 msgid "Add a new domain."
-msgstr "Hinzufügen einer neuen Domäne."
+msgstr ""
 
-#: ../pykolab/cli/cmd_add_domain.py:55 ../pykolab/cli/cmd_delete_domain.py:44
+#: ../pykolab/cli/cmd_add_domain.py:55 ../pykolab/cli/cmd_delete_domain.py:55
 #: ../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
+#: ../pykolab/cli/cmd_add_domain.py:67 ../pykolab/cli/cmd_delete_domain.py:67
 #: ../pykolab/cli/cmd_find_domain.py:56
 msgid "Domain name"
-msgstr "Name der Domain"
+msgstr ""
 
 #: ../pykolab/cli/cmd_add_user_subscription.py:37
 msgid "Subscribe a user to a folder."
-msgstr "Aboniere einen Ordner für einen Benutzer."
+msgstr ""
 
 #: ../pykolab/cli/cmd_add_user_subscription.py:47
 #: ../pykolab/cli/cmd_add_user_subscription.py:51
 #: ../pykolab/cli/cmd_remove_user_subscription.py:47
 #: ../pykolab/cli/cmd_remove_user_subscription.py:51
 msgid "Folder pattern"
-msgstr "Ordnermuster"
+msgstr ""
 
 #: ../pykolab/cli/cmd_add_user_subscription.py:50
 #: ../pykolab/cli/cmd_list_user_subscriptions.py:63
 #: ../pykolab/cli/cmd_remove_user_subscription.py:50
 msgid "User ID"
-msgstr "Benutzer ID"
+msgstr "Benutzer-ID"
 
 #: ../pykolab/cli/cmd_add_user_subscription.py:72
 #: ../pykolab/cli/cmd_remove_user_subscription.py:72
@@ -885,39 +1019,68 @@
 
 #: ../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_list_messages.py:100
 #: ../pykolab/cli/cmd_remove_user_subscription.py:73
 msgid "No such folder"
-msgstr "Dieser Ordner ist nicht vorhanden"
+msgstr ""
 
+#: ../pykolab/cli/cmd_check_quota.py:44
+msgid "Do not apply any changes."
+msgstr ""
+
+#: ../pykolab/cli/cmd_check_quota.py:53
 #: ../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_list_domain_mailboxes.py:49
+#: ../pykolab/cli/cmd_list_mailboxes.py:52
+#: ../pykolab/cli/cmd_list_messages.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_check_quota.py:57
+msgid "Compare existing IMAP quota with LDAP quota."
+msgstr ""
+
+#: ../pykolab/cli/cmd_check_quota.py:84 ../pykolab/cli/cmd_user_info.py:51
+#, python-format
+msgid "No such user %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_check_quota.py:98
+#, python-format
+msgid "No quota for user %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_check_quota.py:105
+#, python-format
+msgid "user quota does not match for %s (IMAP: %d, LDAP: %d)"
+msgstr ""
+
 #: ../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 "Verzeichnis anlegen auf PARTITION."
+msgstr ""
 
 #: ../pykolab/cli/cmd_create_mailbox.py:60
 msgid "Invalid argument"
-msgstr "Ungültiges Argument"
+msgstr ""
 
 #: ../pykolab/cli/cmd_create_mailbox.py:68
 msgid "Invalid argument for metadata"
-msgstr "Ungültiges Argument für die Metadaten"
+msgstr ""
 
 #: ../pykolab/cli/cmd_delete_domain.py:36
 msgid "Delete a domain."
-msgstr "Domäne löschen."
+msgstr ""
+
+#: ../pykolab/cli/cmd_delete_domain.py:46
+msgid "Force deleting the domain even if it contains user accounts"
+msgstr ""
 
 #: ../pykolab/cli/cmd_delete_mailbox_acl.py:45
 #: ../pykolab/cli/cmd_delete_mailbox_acl.py:49
@@ -931,51 +1094,49 @@
 #: ../pykolab/cli/cmd_list_mailbox_metadata.py:54
 #: ../pykolab/cli/cmd_set_mailbox_acl.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
+#: ../pykolab/cli/cmd_set_quota.py:48 ../tests/unit/test-015-translate.py:15
+#: ../tests/unit/test-015-translate.py:19
 msgid "Folder name"
-msgstr "Ordnername"
+msgstr ""
 
 #: ../pykolab/cli/cmd_delete_mailbox_acl.py:60
 #: ../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:94
-#: ../pykolab/cli/cmd_set_quota.py:58
+#: ../pykolab/cli/cmd_set_quota.py:60
 #, python-format
 msgid "No such folder %r"
-msgstr "Kein Ordner %r verfügbar"
+msgstr ""
 
 #: ../pykolab/cli/cmd_delete_mailbox.py:44
 msgid "No mailbox specified"
-msgstr "Keine Mailbox angegeben"
+msgstr ""
 
 #: ../pykolab/cli/cmd_delete_mailbox.py:57
 #, python-format
 msgid "No such folder(s): %s"
-msgstr "Kein solch Verzeichnis: %s"
+msgstr ""
 
 #: ../pykolab/cli/cmd_delete_mailbox.py:62
 msgid "No folders to delete."
-msgstr "Keine zu löschenden Ordner."
+msgstr ""
 
 #: ../pykolab/cli/cmd_delete_mailbox.py:69
 #, python-format
 msgid "Could not delete mailbox '%s'"
-msgstr "Konnte Postfach '%s' nicht löschen"
+msgstr ""
 
 #: ../pykolab/cli/cmd_delete_message.py:36
 msgid "Delete a message from a folder"
-msgstr "Lösche eine Nachricht aus Verzeichnis"
+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
+#: ../pykolab/cli/cmd_list_messages.py:76
 msgid "Specify a folder"
 msgstr ""
 
@@ -986,12 +1147,12 @@
 #: ../pykolab/cli/cmd_export_mailbox.py:108
 #, python-format
 msgid "%s is not a directory"
-msgstr "%s ist kein Verzeichnis"
+msgstr ""
 
 #: ../pykolab/cli/cmd_export_mailbox.py:118
 #, python-format
 msgid "ZIP file at %s.zip"
-msgstr "ZIP-Datei unter %s.zip"
+msgstr ""
 
 #: ../pykolab/cli/cmd_export_mailbox.py:120
 #, python-format
@@ -1003,13 +1164,13 @@
 msgstr ""
 
 #: ../pykolab/cli/cmd_list_deleted_mailboxes.py:43
-#: ../pykolab/cli/cmd_list_domain_mailboxes.py:41
+#: ../pykolab/cli/cmd_list_domain_mailboxes.py:42
 #: ../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_domain_mailboxes.py:58
+#: ../pykolab/cli/cmd_list_domain_mailboxes.py:59
 msgid "Domain"
 msgstr "Domäne"
 
@@ -1026,7 +1187,11 @@
 msgid "Include messages flagged as \\Deleted"
 msgstr ""
 
-#: ../pykolab/cli/cmd_list_messages.py:47
+#: ../pykolab/cli/cmd_list_messages.py:61
+msgid "List messages as user USER"
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_messages.py:65
 msgid "List messages in a folder"
 msgstr ""
 
@@ -1037,11 +1202,11 @@
 
 #: ../pykolab/cli/cmd_list_user_subscriptions.py:47
 msgid "List unsubscribed folders"
-msgstr "Liste nicht abonnierte Ordner"
+msgstr ""
 
 #: ../pykolab/cli/cmd_list_user_subscriptions.py:50
 msgid "List the folders a user is subscribed to."
-msgstr "Liste die Ordner, die ein Benutzer abonniert hat."
+msgstr ""
 
 #: ../pykolab/cli/cmd_list_user_subscriptions.py:98
 #, python-format
@@ -1090,7 +1255,7 @@
 #: ../pykolab/cli/cmd_mailbox_cleanup.py:140
 #, python-format
 msgid "Deleting folder '%s'"
-msgstr "Ordner '%s' wird gelöscht"
+msgstr ""
 
 #: ../pykolab/cli/cmd_mailbox_cleanup.py:134
 #: ../pykolab/cli/cmd_mailbox_cleanup.py:144
@@ -1115,30 +1280,30 @@
 
 #: ../pykolab/cli/cmd_remove_mailaddress.py:49
 msgid "Invalid or unqualified email address."
-msgstr "Ungültige oder unqualifizierte E-Mail-Adresse."
+msgstr ""
 
 #: ../pykolab/cli/cmd_remove_mailaddress.py:57
 #, python-format
 msgid "No recipient found for email address %r"
-msgstr "Kein Empfänger gefunden für E-Mail-Adresse %r"
+msgstr ""
 
 #: ../pykolab/cli/cmd_remove_mailaddress.py:60
 #, python-format
 msgid "Found the following recipient(s): %r"
-msgstr "Folgende Empfänger gefunden: %r"
+msgstr ""
 
 #: ../pykolab/cli/cmd_remove_mailaddress.py:66
 #, python-format
 msgid "Using the following mail attributes: %r"
-msgstr "Nutze folgende Mail-Attribute: %r"
+msgstr ""
 
 #: ../pykolab/cli/cmd_remove_mailaddress.py:90
 msgid "Found the following recipients:"
-msgstr "Folgende Empfänger gefunden:"
+msgstr ""
 
 #: ../pykolab/cli/cmd_remove_user_subscription.py:37
 msgid "Unsubscribe a user from a folder."
-msgstr "Entferne einen Benutzer-Abonement von einem Ordner."
+msgstr ""
 
 #: ../pykolab/cli/cmd_remove_user_subscription.py:86
 #, python-format
@@ -1152,11 +1317,11 @@
 
 #: ../pykolab/cli/cmd_rename_mailbox.py:52
 msgid "No target mailbox name specified"
-msgstr "Keine Name für Ziel-Postfach angegeben"
+msgstr ""
 
 #: ../pykolab/cli/cmd_rename_mailbox.py:54
 msgid "No source mailbox name specified"
-msgstr "Keine Name für Quell-Postfach angegeben"
+msgstr ""
 
 #: ../pykolab/cli/cmd_rename_mailbox.py:66
 #, python-format
@@ -1172,7 +1337,7 @@
 #: ../pykolab/cli/cmd_set_mailbox_acl.py:51
 #: ../pykolab/cli/cmd_set_mailbox_acl.py:56
 msgid "ACI Permissions"
-msgstr "ACI-Berechtigungen"
+msgstr ""
 
 #: ../pykolab/cli/cmd_set_mailbox_metadata.py:45
 msgid "Set annotation as user USER"
@@ -1182,16 +1347,16 @@
 #: ../pykolab/cli/cmd_set_mailbox_metadata.py:63
 #: ../pykolab/cli/cmd_set_mailbox_metadata.py:68
 msgid "Metadata value"
-msgstr "Metadatenwert"
+msgstr ""
 
 #: ../pykolab/cli/cmd_set_mailbox_metadata.py:62
 #: ../pykolab/cli/cmd_set_mailbox_metadata.py:67
 msgid "Metadata path"
-msgstr "Metadatenpfad"
+msgstr ""
 
-#: ../pykolab/cli/cmd_set_quota.py:43 ../pykolab/cli/cmd_set_quota.py:47
+#: ../pykolab/cli/cmd_set_quota.py:45 ../pykolab/cli/cmd_set_quota.py:49
 msgid "New quota"
-msgstr "Neues Kontingent"
+msgstr ""
 
 #: ../pykolab/cli/cmd_sync_mailhost_attrs.py:44
 msgid "Delete mailboxes for recipients that do not appear to exist in LDAP."
@@ -1206,39 +1371,39 @@
 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
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:105
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:153
 #, 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
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:110
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:158
 #, 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
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:114
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:162
 #, 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
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:116
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:164
 #, 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
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:118
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:166
 #, python-format
 msgid "No recipients for '%s' (use --delete to delete)!"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:136
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:147
 #, python-format
 msgid "Multiple recipients for '%s'!"
 msgstr ""
@@ -1251,22 +1416,26 @@
 msgid "Resync from the beginning"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync.py:72
+#: ../pykolab/cli/cmd_sync.py:68
+msgid "Only sync the specified domain"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:82
 #, python-format
 msgid "Found %d domains in %d seconds"
-msgstr "%d Domains in %d Sekunden gefunden"
+msgstr ""
 
-#: ../pykolab/cli/cmd_sync.py:85
+#: ../pykolab/cli/cmd_sync.py:98
 #, python-format
 msgid "Running for domain %s"
-msgstr "Starte für Domain %s"
+msgstr ""
 
-#: ../pykolab/cli/cmd_sync.py:92
+#: ../pykolab/cli/cmd_sync.py:105
 #, python-format
 msgid "Synchronizing users for %s took %d seconds"
-msgstr "Benutzer für %s zu synchronisieren dauerte %d Sekunden"
+msgstr ""
 
-#: ../pykolab/cli/cmd_sync.py:109
+#: ../pykolab/cli/cmd_sync.py:123
 #, python-format
 msgid "Worker process %s handling %s"
 msgstr ""
@@ -1283,21 +1452,16 @@
 msgid "Email address"
 msgstr "E-Mail-Adresse"
 
-#: ../pykolab/cli/cmd_user_info.py:51
-#, python-format
-msgid "No such user %s"
-msgstr ""
-
 #. This is a nested command
 #. This is a nested component
 #: ../pykolab/cli/commands.py:97 ../pykolab/setup/components.py:90
 #, python-format
 msgid "Command Group: %s"
-msgstr "Befehlsgruppe: %s"
+msgstr ""
 
 #: ../pykolab/cli/commands.py:112 ../pykolab/cli/commands.py:117
 msgid "No such command."
-msgstr "Dieses Kommando existiert nicht."
+msgstr ""
 
 #: ../pykolab/cli/commands.py:167 ../pykolab/setup/components.py:231
 #, python-format
@@ -1305,19 +1469,19 @@
 msgstr ""
 
 #: ../pykolab/cli/commands.py:192 ../pykolab/setup/components.py:257
-#: ../wallace/modules.py:376
+#: ../wallace/modules.py:391
 #, python-format
 msgid "Alias for %s"
-msgstr "Alias für %s"
+msgstr ""
 
 #: ../pykolab/cli/commands.py:200 ../pykolab/setup/components.py:265
 msgid "Not yet implemented"
-msgstr "Diese Funktion ist noch nicht implementiert"
+msgstr ""
 
-#: ../pykolab/cli/sieve/cmd_list.py:43 ../pykolab/cli/sieve/cmd_put.py:42
+#: ../pykolab/cli/sieve/cmd_list.py:49 ../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-Adresse"
+msgstr "E-Mail-Adresse"
 
 #: ../pykolab/cli/sieve/cmd_refresh.py:99
 #: ../pykolab/plugins/sievemgmt/__init__.py:111
@@ -1402,7 +1566,7 @@
 #: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:60
 #: ../pykolab/cli/telemetry/cmd_examine_session.py:65
 msgid "Invalid session identifier"
-msgstr "Ungültiger Sitzungsbezeichner"
+msgstr ""
 
 #: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:75
 #: ../pykolab/cli/telemetry/cmd_examine_session.py:100
@@ -1416,11 +1580,11 @@
 
 #: ../pykolab/cli/telemetry/cmd_list_sessions.py:35
 msgid "List Options"
-msgstr "Liste Optionen"
+msgstr ""
 
 #: ../pykolab/cli/telemetry/cmd_list_sessions.py:40
 msgid "Display sessions since ..."
-msgstr "Zeige Sitzungen seit..."
+msgstr ""
 
 #: ../pykolab/cli/telemetry/cmd_list_sessions.py:58
 #, python-format
@@ -1431,7 +1595,8 @@
 #: ../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
@@ -1446,7 +1611,7 @@
 #: ../pykolab/conf/entitlement.py:141
 #, python-format
 msgid "License file %s not readable!"
-msgstr "Lizenzdatei %s nicht lesbar!"
+msgstr ""
 
 #: ../pykolab/conf/entitlement.py:147
 msgid "No entitlement directory found"
@@ -1455,46 +1620,46 @@
 #: ../pykolab/conf/__init__.py:87
 #, python-format
 msgid "Setting %s to %r (from defaults)"
-msgstr "Setze %s auf %r (aus den Standardeinstellungen)"
+msgstr ""
 
 #: ../pykolab/conf/__init__.py:106
 #, python-format
 msgid "Setting %s to %r (from CLI, verified)"
-msgstr "Setze %s auf %r (von der Kommandozeile, überprüft)"
+msgstr ""
 
 #: ../pykolab/conf/__init__.py:109
 #, python-format
 msgid "Setting %s to %r (from CLI, not checked)"
-msgstr "Setze %s auf %r (von der Kommandozeile, nicht überprüft)"
+msgstr ""
 
 #: ../pykolab/conf/__init__.py:150 ../pykolab/conf/__init__.py:207
 #, python-format
 msgid "Setting %s_%s to '****' (from configuration file)"
-msgstr "Setze %s_%s auf '****' (aus Konfigurationsdatei)"
+msgstr ""
 
 #: ../pykolab/conf/__init__.py:152 ../pykolab/conf/__init__.py:209
 #, python-format
 msgid "Setting %s_%s to %r (from configuration file)"
-msgstr "Setze %s_%s auf %r (aus Konfigurationsdatei)"
+msgstr ""
 
 #: ../pykolab/conf/__init__.py:162
 msgid "Setting options from configuration file"
-msgstr "Hole Optionen aus Konfigurationsdatei"
+msgstr ""
 
 #: ../pykolab/conf/__init__.py:223
 #, python-format
 msgid "Configuration file %s not readable"
-msgstr "Konfigurationsdatei %s ist nicht lesbar"
+msgstr ""
 
 #: ../pykolab/conf/__init__.py:226
 #, python-format
 msgid "Reading configuration file %s"
-msgstr "Lese Konfigurationsdatei %s"
+msgstr ""
 
 #: ../pykolab/conf/__init__.py:230
 #, python-format
 msgid "Invalid configuration file %s"
-msgstr "Ungültige Konfigurationsdatei %s"
+msgstr ""
 
 #: ../pykolab/conf/__init__.py:233
 #, python-format
@@ -1506,107 +1671,113 @@
 #. #
 #: ../pykolab/conf/__init__.py:267
 msgid "Runtime Options"
-msgstr "Laufzeit-Einstellungen"
+msgstr ""
 
 #: ../pykolab/conf/__init__.py:272
 msgid "Configuration file to use"
-msgstr "Konfigurationsdatei, die benutzt werden soll"
+msgstr ""
 
 #: ../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 "Use the default answer to all questions."
+msgstr ""
 
-#: ../pykolab/conf/__init__.py:294
-msgid "Log file to use"
-msgstr "Protokolldatei"
+#: ../pykolab/conf/__init__.py:292
+msgid "Set the logging level. One of info, warn, error, critical or debug"
+msgstr ""
 
 #: ../pykolab/conf/__init__.py:300
-msgid "Be quiet."
-msgstr "Sei still."
+msgid "Log file to use"
+msgstr ""
 
 #: ../pykolab/conf/__init__.py:306
+msgid "Be quiet."
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:312
 msgid "Answer yes to all questions."
-msgstr "Ja auf alle Fragen."
+msgstr ""
 
-#: ../pykolab/conf/__init__.py:328
+#: ../pykolab/conf/__init__.py:334
 msgid "No command supplied"
-msgstr "Kein Befehl angegeben"
+msgstr ""
 
-#: ../pykolab/conf/__init__.py:416
+#: ../pykolab/conf/__init__.py:422
 msgid "Insufficient options. Need section, key and value -in that order."
-msgstr "Unzureichende Optionen. Brauche Sektion, Schlüssel und Wert in dieser Reihenfolge."
+msgstr ""
 
-#: ../pykolab/conf/__init__.py:419
+#: ../pykolab/conf/__init__.py:425
 #, python-format
 msgid "No section '%s' exists."
-msgstr "Es existiert keine Sektion '%s'."
+msgstr ""
 
-#: ../pykolab/conf/__init__.py:461
+#: ../pykolab/conf/__init__.py:467
 #, python-format
 msgid "Setting %s to %r (from the default values for CLI options)"
-msgstr "Setze %s auf %r (aus den Standardwerten für Kommandozeilenoptionen)"
+msgstr ""
 
-#: ../pykolab/conf/__init__.py:534
+#: ../pykolab/conf/__init__.py:540
 #, python-format
 msgid "Could not execute configuration function: %s"
-msgstr "Konnte die Konfigurationsfunktion nicht ausführen: %s"
+msgstr ""
 
-#: ../pykolab/conf/__init__.py:542
+#: ../pykolab/conf/__init__.py:548
 #, python-format
 msgid "Option %s/%s does not exist in config file %s, pulling from defaults"
-msgstr "Die Option %s/%s existiert in der Konfigurationsdatei %s nicht, sie wird aus den Standardeinstellungen geholt"
+msgstr ""
 
-#: ../pykolab/conf/__init__.py:550 ../pykolab/conf/__init__.py:553
+#: ../pykolab/conf/__init__.py:556 ../pykolab/conf/__init__.py:559
 msgid "Option does not exist in defaults."
-msgstr "Diese Option hat keinen Standardwert."
+msgstr ""
 
-#: ../pykolab/conf/__init__.py:563
+#: ../pykolab/conf/__init__.py:569
 #, python-format
 msgid "Configuration file %s not readable."
-msgstr "Konfigurationsdatei %s ist nicht lesbar."
+msgstr ""
 
-#: ../pykolab/conf/__init__.py:566
+#: ../pykolab/conf/__init__.py:572
 #, python-format
 msgid "Configuration file %s does not exist."
-msgstr "Konfigurationsdatei %s existiert nicht."
+msgstr ""
 
-#: ../pykolab/conf/__init__.py:571
+#: ../pykolab/conf/__init__.py:577
 msgid ""
 "WARNING: A negative debug level value does not make this program be any more"
 " silent."
-msgstr "Warnung: Eine negative Fehlerprotokollierungszahl macht dieses Programm nicht noch stiller."
+msgstr ""
 
-#: ../pykolab/conf/__init__.py:577
+#: ../pykolab/conf/__init__.py:583
 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."
+msgstr ""
 
-#: ../pykolab/conf/__init__.py:585 ../pykolab/conf/__init__.py:591
-#: ../pykolab/conf/__init__.py:595 ../pykolab/conf/__init__.py:601
+#: ../pykolab/conf/__init__.py:591 ../pykolab/conf/__init__.py:597
+#: ../pykolab/conf/__init__.py:601 ../pykolab/conf/__init__.py:607
 msgid "Cannot start SASL authentication daemon"
-msgstr "Konnte SASL Authentisierungsdaemon nicht starten"
+msgstr ""
 
-#: ../pykolab/conf/__init__.py:612
+#: ../pykolab/conf/__init__.py:618
 msgid "No imaplib library found."
-msgstr "Keine imaplib-Bibliothek gefunden."
+msgstr ""
 
-#: ../pykolab/conf/__init__.py:622
+#: ../pykolab/conf/__init__.py:628
 msgid "No LMTP class found in the smtplib library."
-msgstr "Keine Klasse namens LMTP in der smtplib-Bibliothek gefunden."
+msgstr ""
 
-#: ../pykolab/conf/__init__.py:632
+#: ../pykolab/conf/__init__.py:638
 msgid "No SMTP class found in the smtplib library."
-msgstr "Keine Klasse namens SMTP in der smtplib-Bibliothek gefunden."
+msgstr ""
 
-#: ../pykolab/conf/__init__.py:646
+#: ../pykolab/conf/__init__.py:652
 #, python-format
 msgid "Found you specified a specific set of items to test: %s"
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:654
+#: ../pykolab/conf/__init__.py:660
 #, python-format
 msgid "Selectively selecting: %s"
 msgstr ""
@@ -1619,7 +1790,7 @@
 
 #: ../pykolab/constants.py.in:53
 msgid "WARNING"
-msgstr "WARNUNG"
+msgstr ""
 
 #: ../pykolab/constants.py.in:53
 msgid ""
@@ -1629,104 +1800,127 @@
 
 #: ../pykolab/constants.py.in:72
 msgid "389 Directory Server or Red Hat Directory Server"
-msgstr "389 Verzeichnisserver oder Red Hat Verzeichnisserver"
+msgstr ""
 
 #: ../pykolab/constants.py.in:76 ../pykolab/constants.py.in:80
 msgid "OpenLDAP or compatible"
-msgstr "OpenLDAP oder kompatibel"
+msgstr ""
 
-#: ../pykolab/imap/cyrus.py:80
+#: ../pykolab/imap/cyrus.py:83
 #, python-format
 msgid "Could not connect to Cyrus IMAP server %r"
-msgstr "Verbindung zum Cyrus IMAP-Server %r nicht möglich"
+msgstr ""
 
-#: ../pykolab/imap/cyrus.py:138
+#: ../pykolab/imap/cyrus.py:150 ../pykolab/imap/dovecot.py:285
 #, python-format
 msgid "Continuing with separator: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:143
+#: ../pykolab/imap/cyrus.py:159
 msgid "Detected we are running in a Murder topology"
-msgstr "Dieses System läuft in einer Murder-Topologie"
+msgstr ""
 
-#: ../pykolab/imap/cyrus.py:147
+#: ../pykolab/imap/cyrus.py:167
 msgid "This system is not part of a murder topology"
-msgstr "Dieses System ist nicht Teil einer Murder-Topologie"
+msgstr ""
 
-#: ../pykolab/imap/cyrus.py:168
+#: ../pykolab/imap/cyrus.py:196
 #, python-format
 msgid "Checking actual backend server for folder %s through annotations"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:173
-msgid "Possibly reproducing the find "
+#: ../pykolab/imap/cyrus.py:206
+#, python-format
+msgid ""
+"Possibly reproducing the find mailfolder server answer from previously "
+"detected and stored annotation value: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:196
+#: ../pykolab/imap/cyrus.py:236
 #, python-format
 msgid "Could not get the annotations after %s tries."
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:200
+#: ../pykolab/imap/cyrus.py:250
 #, python-format
 msgid "No annotations for %s: %r"
-msgstr "Keine Annotationen für %s: %r"
+msgstr ""
 
-#: ../pykolab/imap/cyrus.py:207
+#: ../pykolab/imap/cyrus.py:262
 #, python-format
 msgid "Server for INBOX folder %s is %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:227
+#. Removed server reconnection for dovecot, we only have one server
+#: ../pykolab/imap/cyrus.py:294 ../pykolab/imap/dovecot.py:311
 #, python-format
 msgid "Setting quota for folder %s to %s"
-msgstr "Setze Quota für Verzeichnis %s auf %s"
+msgstr ""
 
-#: ../pykolab/imap/cyrus.py:231
+#: ../pykolab/imap/cyrus.py:305 ../pykolab/imap/dovecot.py:315
 #, python-format
 msgid "Could not set quota for mailfolder %s"
-msgstr "Konnte Quota für Verzeichnis %s nicht setzen"
+msgstr ""
 
-#: ../pykolab/imap/cyrus.py:241
+#: ../pykolab/imap/cyrus.py:319 ../pykolab/imap/dovecot.py:320
 #, python-format
 msgid "Moving INBOX folder %s to %s on partition %s"
-msgstr "Verschiebe INBOX Verzeichnis %s nach %s auf Partition %s"
+msgstr ""
 
-#: ../pykolab/imap/cyrus.py:243
+#: ../pykolab/imap/cyrus.py:329 ../pykolab/imap/dovecot.py:322
 #, python-format
 msgid "Moving INBOX folder %s to %s"
-msgstr "Verschiebe Eingangsordner %s nach %s"
+msgstr ""
 
-#: ../pykolab/imap/cyrus.py:259
+#: ../pykolab/imap/cyrus.py:355
 #, python-format
 msgid "Setting annotation %s on folder %s"
-msgstr "Setze Annotation %s auf Verzeichnis %s"
+msgstr ""
 
-#: ../pykolab/imap/cyrus.py:264
+#: ../pykolab/imap/cyrus.py:366
 #, python-format
 msgid "Could not set annotation %r on mail folder %r: %r"
-msgstr "Konnte Annotation %r auf Verzeichnis %r nicht setzen: %r"
+msgstr ""
 
-#: ../pykolab/imap/cyrus.py:268
+#: ../pykolab/imap/cyrus.py:376 ../pykolab/imap/dovecot.py:451
 #, python-format
 msgid "Transferring folder %s from %s to %s"
-msgstr "Übertrage Verzeichnis %s von %s nach %s"
+msgstr ""
 
-#: ../pykolab/imap/cyrus.py:328
+#: ../pykolab/imap/cyrus.py:464 ../pykolab/imap/dovecot.py:511
 #, python-format
 msgid "Undeleting %s to %s"
-msgstr "Wiederherstellen %s nach %s"
+msgstr ""
 
-#: ../pykolab/imap/cyrus.py:339
+#: ../pykolab/imap/cyrus.py:484
 #, python-format
-msgid "Would have transfered %s from %s to %s"
-msgstr "Haben %s von %s nach %s übertragen"
+msgid "Would have transferred %s from %s to %s"
+msgstr ""
 
-#: ../pykolab/imap/cyrus.py:341
+#: ../pykolab/imap/cyrus.py:491 ../pykolab/imap/dovecot.py:524
 #, python-format
 msgid "Would have renamed %s to %s"
 msgstr ""
 
+#: ../pykolab/imap/dovecot.py:220
+#, python-format
+msgid "Could not connect to Dovecot IMAP server %r"
+msgstr ""
+
+#: ../pykolab/imap/dovecot.py:292
+msgid "Detected METADATA support"
+msgstr ""
+
+#: ../pykolab/imap/dovecot.py:295
+#, python-format
+msgid "This system does not support METADATA: '%s'"
+msgstr ""
+
+#: ../pykolab/imap/dovecot.py:522
+#, python-format
+msgid "Would have transfered %s from %s to %s"
+msgstr ""
+
 #: ../pykolab/imap/__init__.py:46
 #, python-format
 msgid "Cleaning up ACL entries for %s across all folders"
@@ -1740,7 +1934,7 @@
 #: ../pykolab/imap/__init__.py:70
 #, python-format
 msgid "Iterating over %d folders"
-msgstr "Iteriere über %d Verzeichnisse"
+msgstr ""
 
 #. Set the ACL to '' (effectively deleting the ACL entry)
 #: ../pykolab/imap/__init__.py:83
@@ -1755,27 +1949,27 @@
 #: ../pykolab/imap/__init__.py:168
 #, python-format
 msgid "Logging on to Cyrus IMAP server %s"
-msgstr "Anmeldung am Cyrus IMAP Server %s"
+msgstr ""
 
 #: ../pykolab/imap/__init__.py:177
 #, python-format
 msgid "Logging on to Dovecot IMAP server %s"
-msgstr "Anmeldung am Dovecot IMAP Server %s"
+msgstr ""
 
 #: ../pykolab/imap/__init__.py:186
 #, python-format
 msgid "Logging on to generic IMAP server %s"
-msgstr "Anmeldung am generischen IMAP Server %s"
+msgstr ""
 
 #: ../pykolab/imap/__init__.py:204
 #, python-format
 msgid "Reusing existing IMAP server connection to %s"
-msgstr "Verbindung zum IMAP-Server %s wird wieder verwendet"
+msgstr ""
 
 #: ../pykolab/imap/__init__.py:206
 #, python-format
 msgid "Reconnecting to IMAP server %s"
-msgstr "Verbinde nochmal zum IMAP Server %s"
+msgstr ""
 
 #: ../pykolab/imap/__init__.py:223
 msgid "Called imap.disconnect() on a server that we had no connection to."
@@ -1789,249 +1983,260 @@
 #: ../pykolab/imap/__init__.py:247
 #, python-format
 msgid "Could not create folder %r"
-msgstr "Ordner %r konnte nicht erstellt werden"
+msgstr ""
 
 #: ../pykolab/imap/__init__.py:257 ../pykolab/imap/__init__.py:259
 #, python-format
 msgid "%r has no attribute %s"
-msgstr "%r hat kein Attribut %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:360
+#, python-format
+msgid "Invalid access identifier %r for subject %r"
+msgstr ""
 
-#: ../pykolab/imap/__init__.py:393
+#: ../pykolab/imap/__init__.py:397
 #, python-format
 msgid "Could not set ACL for %s on folder %s: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:427 ../pykolab/imap/__init__.py:462
+#: ../pykolab/imap/__init__.py:431 ../pykolab/imap/__init__.py:467
 #, python-format
 msgid "Creating new shared folder %s"
-msgstr "Erzeuge einen neuen geteilten Ordner %s"
+msgstr ""
 
-#: ../pykolab/imap/__init__.py:487 ../pykolab/imap/__init__.py:740
+#: ../pykolab/imap/__init__.py:496 ../pykolab/imap/__init__.py:776
 #, python-format
 msgid "Downcasing mailbox name %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:491
+#: ../pykolab/imap/__init__.py:500
 #, python-format
 msgid "Creating new mailbox for user %s"
-msgstr "Erzeuge eine neue Mailbox für Benutzer %s"
+msgstr ""
 
-#: ../pykolab/imap/__init__.py:506 ../pykolab/imap/__init__.py:613
+#: ../pykolab/imap/__init__.py:515 ../pykolab/imap/__init__.py:644
 msgid "Waiting for the Cyrus IMAP Murder to settle..."
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:559
+#: ../pykolab/imap/__init__.py:590
 #, python-format
 msgid "Creating additional folders for user %s"
-msgstr "Erzeuge weitere Order für Benutzer %s"
+msgstr ""
 
-#: ../pykolab/imap/__init__.py:587
+#: ../pykolab/imap/__init__.py:618
 #, python-format
 msgid "Waiting for the Cyrus murder to settle... %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:602
+#: ../pykolab/imap/__init__.py:633
 #, python-format
 msgid "Correcting additional folder name from %r to %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:618
+#: ../pykolab/imap/__init__.py:649
 #, python-format
 msgid "Mailbox already exists: %s"
-msgstr "Mailbox existiert bereits: %s"
+msgstr ""
 
-#: ../pykolab/imap/__init__.py:658
+#: ../pykolab/imap/__init__.py:689
 msgid "Subscribing user to the additional folders"
-msgstr "Abonniere weitere Ordner für den Benutzer"
+msgstr ""
 
-#: ../pykolab/imap/__init__.py:672
+#: ../pykolab/imap/__init__.py:703
 msgid "Using the following tests for folder subscriptions:"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:674
+#: ../pykolab/imap/__init__.py:705
 #, python-format
 msgid "    %r"
-msgstr "    %r"
+msgstr ""
 
-#: ../pykolab/imap/__init__.py:677
+#: ../pykolab/imap/__init__.py:708
 #, python-format
 msgid "Folder %s"
-msgstr "Ordner %s"
+msgstr ""
 
-#: ../pykolab/imap/__init__.py:689
+#: ../pykolab/imap/__init__.py:720
 #, python-format
 msgid "Subscribing %s to folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:693
+#: ../pykolab/imap/__init__.py:724
 #, python-format
 msgid "Subscribing %s to folder %s failed: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:723
+#: ../pykolab/imap/__init__.py:750
+#, python-format
+msgid "Could not set quota on %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:757
 #, python-format
 msgid "Could not rename %s to reside on partition %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:756
+#: ../pykolab/imap/__init__.py:794
 #, python-format
 msgid "INBOX folder to rename (%s) does not exist"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:759 ../pykolab/imap/__init__.py:835
+#: ../pykolab/imap/__init__.py:797 ../pykolab/imap/__init__.py:905
 #, python-format
 msgid "Renaming INBOX from %s to %s"
-msgstr "Benenne INBOX Ordner von %s in %s um"
+msgstr ""
 
-#: ../pykolab/imap/__init__.py:763
+#: ../pykolab/imap/__init__.py:801
 #, python-format
 msgid "Could not rename INBOX folder %s to %s"
-msgstr "Konnte INBOX Ordner nicht von %s in %s umbenennen"
+msgstr ""
 
-#: ../pykolab/imap/__init__.py:765 ../pykolab/imap/__init__.py:839
+#: ../pykolab/imap/__init__.py:803 ../pykolab/imap/__init__.py:909
 #, 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"
+msgstr ""
 
-#: ../pykolab/imap/__init__.py:769
+#: ../pykolab/imap/__init__.py:807
 #, python-format
 msgid "Server for mailbox %r is %r"
-msgstr "Server für Postfach %r ist %r"
+msgstr ""
 
-#: ../pykolab/imap/__init__.py:777
+#: ../pykolab/imap/__init__.py:815
 #, 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"
+msgstr ""
 
-#: ../pykolab/imap/__init__.py:800
+#: ../pykolab/imap/__init__.py:829 ../pykolab/imap/__init__.py:872
+#: ../pykolab/imap/__init__.py:886
 #, 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 "Removing ACL rights %s for subject %s on folder %s"
+msgstr ""
 
-#: ../pykolab/imap/__init__.py:811
+#: ../pykolab/imap/__init__.py:861
 #, python-format
-msgid "Removing ACL rights %s for subject %s on folder "
+msgid "Setting ACL rights %s for subject %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:832
+#: ../pykolab/imap/__init__.py:902
 #, python-format
 msgid "Found old INBOX folder %s"
-msgstr "Alter INBOX-Ordner %s gefunden"
+msgstr ""
 
-#: ../pykolab/imap/__init__.py:841
+#: ../pykolab/imap/__init__.py:911
 #, python-format
 msgid "Did not find old folder user/%s to rename"
-msgstr "Konnte alten Ordner user/%s nicht zum umbenennen finden."
+msgstr ""
 
-#: ../pykolab/imap/__init__.py:843
+#: ../pykolab/imap/__init__.py:913
 msgid "Value for user is not a dictionary"
-msgstr "Der Wert für user ist kein dictionary"
+msgstr ""
 
 #. TODO: Go in fact correct the quota.
-#: ../pykolab/imap/__init__.py:911
+#: ../pykolab/imap/__init__.py:981
 #, python-format
 msgid "Cannot get current IMAP quota for folder %s"
-msgstr "Kann aktuelles IMAP Kontingent für den Ordner %s nicht bekommen"
+msgstr ""
 
-#: ../pykolab/imap/__init__.py:924
+#: ../pykolab/imap/__init__.py:994
 #, python-format
 msgid "Quota for %s currently is %s"
-msgstr "Kontingent für %s ist aktuell %s"
+msgstr ""
 
-#: ../pykolab/imap/__init__.py:930
+#: ../pykolab/imap/__init__.py:1000
 #, python-format
 msgid "Adjusting authentication database quota for folder %s to %d"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:935
+#: ../pykolab/imap/__init__.py:1005
 #, python-format
 msgid "Correcting quota for %s to %s (currently %s)"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1012
+#: ../pykolab/imap/__init__.py:1082
 #, python-format
 msgid "Checking folder: %s"
-msgstr "Überprüfe Ordner: %s"
+msgstr ""
 
-#: ../pykolab/imap/__init__.py:1017
+#: ../pykolab/imap/__init__.py:1087
 #, python-format
 msgid "Folder has no corresponding user (1): %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1020
+#: ../pykolab/imap/__init__.py:1090
 #, python-format
 msgid "Folder has no corresponding user (2): %s"
 msgstr ""
 
 #. We got user identifier only
-#: ../pykolab/imap/__init__.py:1035
+#: ../pykolab/imap/__init__.py:1105
 msgid "Please don't give us just a user identifier"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1038
+#: ../pykolab/imap/__init__.py:1108
 #, python-format
 msgid "Deleting folder %s"
-msgstr "Lösche Verzeichnis %s"
+msgstr ""
 
 #: ../pykolab/__init__.py:50
 msgid "Returning thread local configuration"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:45
+#: ../pykolab/itip/__init__.py:46
 #, python-format
 msgid "Method %r not really interesting for us."
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:51
+#: ../pykolab/itip/__init__.py:52
 #, python-format
 msgid "Raw iTip payload (%r): %r"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:61
+#: ../pykolab/itip/__init__.py:62
 msgid "Could not read iTip from message."
-msgstr "Konnte iTip nicht aus Nachricht lesen."
+msgstr ""
 
-#: ../pykolab/itip/__init__.py:69
+#: ../pykolab/itip/__init__.py:70
 #, python-format
 msgid "Duplicate iTip object: %s"
-msgstr "Verdopple iTip Objekt: %s"
+msgstr ""
 
-#: ../pykolab/itip/__init__.py:93
+#: ../pykolab/itip/__init__.py:95
 msgid "iTip event without a start"
-msgstr "iTip Termin ohne einen Beginn"
+msgstr ""
 
-#: ../pykolab/itip/__init__.py:138
+#: ../pykolab/itip/__init__.py:140
 msgid "Message is not an iTip message (non-multipart message)"
-msgstr "Nachricht ist keine iTip Nachricht (keine Multipart Nachricht)"
+msgstr ""
 
-#: ../pykolab/itip/__init__.py:221
+#: ../pykolab/itip/__init__.py:261
 #, python-format
 msgid "Send iTip reply %s for %s %r"
-msgstr "Sende iTip Antwort %s für %s %r"
+msgstr ""
 
-#: ../pykolab/itip/__init__.py:237
+#: ../pykolab/itip/__init__.py:277
 #, python-format
 msgid "Failed to compose iTip reply message: %r: %s"
-msgstr "Erstellung iTip Antwortnachricht fehlgeschlagen: %r: %s"
+msgstr ""
 
-#: ../pykolab/itip/__init__.py:248 ../pykolab/itip/__init__.py:292
-#: ../wallace/module_invitationpolicy.py:1082
-#: ../wallace/module_invitationpolicy.py:1144
-#: ../wallace/module_resources.py:1247
+#: ../pykolab/itip/__init__.py:288 ../pykolab/itip/__init__.py:332
+#: ../wallace/module_invitationpolicy.py:1253
+#: ../wallace/module_invitationpolicy.py:1328
+#: ../wallace/module_resources.py:1347
 #, python-format
 msgid "SMTP sendmail error: %r"
-msgstr "SMTP sendmail-Fehler: %r"
+msgstr ""
 
-#: ../pykolab/itip/__init__.py:280
+#: ../pykolab/itip/__init__.py:320
 #, python-format
 msgid "Failed to compose iTip request message: %r"
-msgstr "Erstellung iTip Anforderungsnachricht fehlgeschlagen: %r"
+msgstr ""
 
 #: ../pykolab/logger.py:168 ../pykolab/logger.py:175
 #, python-format
 msgid "Could not change permissions on %s: %r"
-msgstr "Konnte Berechtigungen auf %s nicht ändern: %r"
+msgstr ""
 
 #: ../pykolab/logger.py:192
 #, python-format
@@ -2065,12 +2270,12 @@
 #: ../pykolab/plugins/__init__.py:74
 #, python-format
 msgid "RuntimeError for plugin %s: %s"
-msgstr "Laufzeitfehler von Plugin %s: %s"
+msgstr ""
 
 #: ../pykolab/plugins/__init__.py:78
 #, python-format
 msgid "Plugin %s failed to load (%s: %s)"
-msgstr "Plugin %s konnte nicht geladen werden (%s: %s)"
+msgstr ""
 
 #: ../pykolab/plugins/__init__.py:116 ../pykolab/plugins/__init__.py:118
 #, python-format
@@ -2110,7 +2315,7 @@
 #: ../pykolab/plugins/__init__.py:187
 #, python-format
 msgid "Cannot check options for plugin %s: %s"
-msgstr "Kein Zugriff auf Einstellungen des Plugins %s: %s"
+msgstr ""
 
 #: ../pykolab/plugins/__init__.py:189
 #, python-format
@@ -2168,7 +2373,7 @@
 msgstr ""
 
 #: ../pykolab/plugins/roundcubedb/__init__.py:55
-#: ../pykolab/setup/setup_roundcube.py:167
+#: ../pykolab/setup/setup_roundcube.py:106
 msgid "Roundcube installation path not found."
 msgstr ""
 
@@ -2178,7 +2383,7 @@
 
 #: ../pykolab/setup/components.py:58
 msgid "Display this help."
-msgstr "Zeige diese Hilfe."
+msgstr ""
 
 #: ../pykolab/setup/components.py:149
 msgid "No component selected, continuing for all components"
@@ -2186,19 +2391,45 @@
 
 #: ../pykolab/setup/components.py:187 ../pykolab/setup/components.py:192
 msgid "No such component."
-msgstr "Keine solche Komponente."
+msgstr ""
+
+#: ../pykolab/setup/__init__.py:55
+msgid "SELinux currently enforcing. Read https://git.kolab.org/u/1"
+msgstr ""
 
-#: ../pykolab/setup/setup_freebusy.py:46
+#: ../pykolab/setup/__init__.py:67
+msgid ""
+"SELinux configured to enforce a policy on startup. Read "
+"https://git.kolab.org/u/1"
+msgstr ""
+
+#: ../pykolab/setup/setup_freebusy.py:47
 msgid "Setup Free/Busy."
 msgstr ""
 
-#: ../pykolab/setup/setup_freebusy.py:50
+#: ../pykolab/setup/setup_freebusy.py:51
 msgid "Free/Busy is not installed on this system"
 msgstr ""
 
+#: ../pykolab/setup/setup_guam.py:41
+msgid "Setup Guam."
+msgstr ""
+
+#: ../pykolab/setup/setup_guam.py:45
+msgid "Guam is not installed on this system"
+msgstr ""
+
+#: ../pykolab/setup/setup_guam.py:58
+msgid "Could not start the guam service."
+msgstr ""
+
+#: ../pykolab/setup/setup_guam.py:63
+msgid "Could not configure the guam service to start on boot"
+msgstr ""
+
 #: ../pykolab/setup/setup_imap.py:45
 msgid "Setup IMAP."
-msgstr "Richte IMAP ein."
+msgstr ""
 
 #: ../pykolab/setup/setup_imap.py:89
 msgid "Could not write out Cyrus IMAP configuration file /etc/imapd.conf"
@@ -2208,20 +2439,19 @@
 msgid "Could not write out Cyrus IMAP configuration file /etc/cyrus.conf"
 msgstr ""
 
-#: ../pykolab/setup/setup_imap.py:158
+#: ../pykolab/setup/setup_imap.py:162
 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:244
-#: ../pykolab/setup/setup_syncroton.py:105
-msgid "Could not configure to start on boot, the "
+#: ../pykolab/setup/setup_imap.py:177
+msgid ""
+"Could not configure to start on boot, the cyrus-imapd and kolab-saslauthd "
+"services."
 msgstr ""
 
 #: ../pykolab/setup/setup_kolabd.py:44
 msgid "Setup the Kolab daemon."
-msgstr "Richte den Kolab Daemon ein."
+msgstr ""
 
 #: ../pykolab/setup/setup_kolabd.py:52
 #, python-format
@@ -2232,13 +2462,17 @@
 "                        "
 msgstr ""
 
-#: ../pykolab/setup/setup_kolabd.py:81
+#: ../pykolab/setup/setup_kolabd.py:84
 msgid "Could not start the kolab server service."
 msgstr ""
 
+#: ../pykolab/setup/setup_kolabd.py:96
+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"
+msgstr ""
 
 #: ../pykolab/setup/setup_ldap.py:52
 msgid "Specify FQDN (overriding defaults)."
@@ -2260,15 +2494,19 @@
 msgid "Setup configuration for Active Directory compatibility."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:88
+#: ../pykolab/setup/setup_ldap.py:92
+msgid "Specify password for the Domain Manager."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:96
 msgid "Setup LDAP."
-msgstr "LDAP Einrichten"
+msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:97
+#: ../pykolab/setup/setup_ldap.py:105
 msgid "Skipping setup of LDAP, as specified"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:126
+#: ../pykolab/setup/setup_ldap.py:134
 msgid ""
 "\n"
 "                        You can not configure Kolab to run against OpenLDAP\n"
@@ -2276,7 +2514,7 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:139
+#: ../pykolab/setup/setup_ldap.py:147
 msgid ""
 "\n"
 "                                It seems 389 Directory Server has an existing\n"
@@ -2287,7 +2525,7 @@
 "                            "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:154
+#: ../pykolab/setup/setup_ldap.py:162
 msgid ""
 "\n"
 "                        Please supply a password for the LDAP administrator user\n"
@@ -2296,11 +2534,11 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:162
+#: ../pykolab/setup/setup_ldap.py:170
 msgid "Administrator password"
-msgstr "Administrator Passwort"
+msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:169
+#: ../pykolab/setup/setup_ldap.py:180
 msgid ""
 "\n"
 "                        Please supply a password for the LDAP Directory Manager\n"
@@ -2310,11 +2548,11 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:178
+#: ../pykolab/setup/setup_ldap.py:189
 msgid "Directory Manager password"
-msgstr "Verzeichnismanager Passwort"
+msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:185
+#: ../pykolab/setup/setup_ldap.py:196
 msgid ""
 "\n"
 "                        Please choose the system user and group the service\n"
@@ -2323,15 +2561,15 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:195 ../pykolab/setup/setup_ldap.py:198
+#: ../pykolab/setup/setup_ldap.py:206 ../pykolab/setup/setup_ldap.py:209
 msgid "User"
 msgstr "Benutzer"
 
-#: ../pykolab/setup/setup_ldap.py:196 ../pykolab/setup/setup_ldap.py:199
+#: ../pykolab/setup/setup_ldap.py:207 ../pykolab/setup/setup_ldap.py:210
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../pykolab/setup/setup_ldap.py:234
+#: ../pykolab/setup/setup_ldap.py:245
 msgid ""
 "\n"
 "                        This setup procedure plans to set up Kolab Groupware for\n"
@@ -2342,18 +2580,18 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:248
+#: ../pykolab/setup/setup_ldap.py:259
 msgid "Domain name to use"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:253 ../pykolab/setup/setup_ldap.py:278
+#: ../pykolab/setup/setup_ldap.py:264 ../pykolab/setup/setup_ldap.py:289
 msgid ""
 "\n"
 "                                    Invalid input. Please try again.\n"
 "                                "
-msgstr "\n                                    Ungültige Eingabe. Bitte nochmals versuchen.\n                                "
+msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:262
+#: ../pykolab/setup/setup_ldap.py:273
 msgid ""
 "\n"
 "                        The standard root dn we composed for you follows. Please\n"
@@ -2361,15 +2599,15 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:273
+#: ../pykolab/setup/setup_ldap.py:284
 msgid "Root DN to use"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:325
+#: ../pykolab/setup/setup_ldap.py:336
 msgid "No directory server setup tool available."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:337
+#: ../pykolab/setup/setup_ldap.py:348
 msgid ""
 "\n"
 "                    Setup is now going to set up the 389 Directory Server. This\n"
@@ -2378,11 +2616,11 @@
 "                "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:344
+#: ../pykolab/setup/setup_ldap.py:355
 msgid "Setting up 389 Directory Server"
-msgstr "Richte 389 Verzeichnisserver ein"
+msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:356
+#: ../pykolab/setup/setup_ldap.py:367
 msgid ""
 "\n"
 "                        An error was detected in the setup procedure for 389\n"
@@ -2393,27 +2631,31 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:373
+#: ../pykolab/setup/setup_ldap.py:384
 msgid "Setup DS stdout:"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:376
+#: ../pykolab/setup/setup_ldap.py:387
 msgid "Setup DS stderr:"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:402
+#: ../pykolab/setup/setup_ldap.py:413
 msgid "Could not copy the LDAP extensions for Kolab"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:405
+#: ../pykolab/setup/setup_ldap.py:416
 msgid "Could not find the ldap Kolab schema file"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:417
+#: ../pykolab/setup/setup_ldap.py:429
 msgid "Could not start the directory server service."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:431
+#: ../pykolab/setup/setup_ldap.py:438
+msgid "Could not configure to start on boot, the directory server service."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:443
 msgid ""
 "\n"
 "                        Please supply a Cyrus Administrator password. This\n"
@@ -2424,11 +2666,11 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:441
+#: ../pykolab/setup/setup_ldap.py:453
 msgid "Cyrus Administrator password"
-msgstr "Cyrus Administrator Passwort"
+msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:448
+#: ../pykolab/setup/setup_ldap.py:460
 msgid ""
 "\n"
 "                        Please supply a Kolab Service account password. This\n"
@@ -2438,101 +2680,143 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:457
+#: ../pykolab/setup/setup_ldap.py:469
 msgid "Kolab Service password"
-msgstr "Kolab-Dienst-Passwort"
+msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:467
+#: ../pykolab/setup/setup_ldap.py:479
 msgid "Writing out configuration to kolab.conf"
-msgstr "Schreibe Einstellungen in kolab.conf"
+msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:481
+#: ../pykolab/setup/setup_ldap.py:493
 msgid "Inserting service users into LDAP."
-msgstr "Füge Service-Benutzer ins LDAP ein."
+msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:555
+#: ../pykolab/setup/setup_ldap.py:567
 msgid "Writing out cn=kolab,cn=config"
-msgstr "Schreibe cn=kolab,cn=config"
+msgstr ""
 
-#. TODO: Add kolab-admin role
-#. TODO: Assign kolab-admin admin ACLs
-#: ../pykolab/setup/setup_ldap.py:579
+#: ../pykolab/setup/setup_ldap.py:583
 #, python-format
 msgid "Adding domain %s to list of domains for this deployment"
-msgstr "Füge Domain %s zu dieser Installation hinzu"
+msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:607
+#: ../pykolab/setup/setup_ldap.py:611
 msgid "Disabling anonymous binds"
-msgstr "Stelle anonymes Binden ab"
+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:615
+#: ../pykolab/setup/setup_ldap.py:619
 msgid "Enabling attribute uniqueness plugin"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:621
+#: ../pykolab/setup/setup_ldap.py:625
 msgid "Enabling referential integrity plugin"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:627
+#: ../pykolab/setup/setup_ldap.py:631
 msgid "Enabling and configuring account policy plugin"
 msgstr ""
 
-#. TODO: Add kolab-admin role
-#: ../pykolab/setup/setup_ldap.py:642
+#. Add kolab-admin role
+#: ../pykolab/setup/setup_ldap.py:646
 msgid "Adding the kolab-admin role"
-msgstr "Füge Kolab-Admin Rolle hinzu"
+msgstr ""
 
-#. TODO: User writeable attributes on root_dn
-#: ../pykolab/setup/setup_ldap.py:653
+#. User writeable attributes on root_dn
+#: ../pykolab/setup/setup_ldap.py:657
 #, python-format
 msgid "Setting access control to %s"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:679
-msgid "Could not start and configure to start on boot, the "
+#: ../pykolab/setup/setup_ldap.py:677
+msgid "directory server admin service not available"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:685
+msgid ""
+"Could not start and configure to start on boot, the directory server admin "
+"service."
+msgstr ""
+
+#: ../pykolab/setup/setup_manticore.py:44
+msgid "Setup Manticore."
+msgstr ""
+
+#: ../pykolab/setup/setup_manticore.py:48
+msgid "Manticore is not installed on this system"
+msgstr ""
+
+#: ../pykolab/setup/setup_manticore.py:94
+msgid "Could not start the manticore service."
+msgstr ""
+
+#: ../pykolab/setup/setup_manticore.py:100
+msgid "Could not configure the manticore service to start on boot"
 msgstr ""
 
 #: ../pykolab/setup/setup_mta.py:41
 msgid "Setup MTA."
-msgstr "Richte MTA ein."
+msgstr ""
 
 #: ../pykolab/setup/setup_mta.py:317 ../pykolab/setup/setup_php.py:106
 #, python-format
 msgid "Setting key %r to %r"
-msgstr "Schlüssel %r wird auf %r festgelegt"
+msgstr ""
 
 #: ../pykolab/setup/setup_mta.py:350
 msgid "Could not write out Postfix configuration file /etc/postfix/master.cf"
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:399
+#: ../pykolab/setup/setup_mta.py:413
 msgid "Could not write out Amavis configuration file amavisd.conf"
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:407
+#: ../pykolab/setup/setup_mta.py:421
 msgid "Not writing out any configuration for Amavis."
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:447
+#: ../pykolab/setup/setup_mta.py:482
 msgid "Could not start the postfix, clamav and amavisd services services."
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:39
+#: ../pykolab/setup/setup_mta.py:500
+msgid ""
+"Could not configure to start on boot, the postfix, clamav and amavisd "
+"services."
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:40
+msgid "MySQL Options"
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:46
+msgid "Specify whether to use an (existing) or (new) MySQL server."
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:50
 msgid "Setup MySQL."
-msgstr "Richte MySQL ein."
+msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:49
+#: ../pykolab/setup/setup_mysql.py:78
 msgid "Could not start the MySQL database service."
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:71
+#: ../pykolab/setup/setup_mysql.py:87
+msgid "Could not configure to start on boot, the MySQL database service."
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:90
+msgid "Waiting for at most 30 seconds for MySQL/MariaDB to settle..."
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:114
 msgid "What MySQL server are we setting up?"
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:75
+#: ../pykolab/setup/setup_mysql.py:118
 msgid ""
 "\n"
 "                        Please supply the root password for MySQL, so we can set\n"
@@ -2540,13 +2824,13 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:82 ../pykolab/setup/setup_mysql.py:99
-#: ../pykolab/setup/setup_roundcube.py:190
+#: ../pykolab/setup/setup_mysql.py:125 ../pykolab/setup/setup_mysql.py:142
+#: ../pykolab/setup/setup_roundcube.py:218
 #: ../pykolab/setup/setup_syncroton.py:66
 msgid "MySQL root password"
-msgstr "MySQL root Password"
+msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:88
+#: ../pykolab/setup/setup_mysql.py:131
 msgid ""
 "\n"
 "                        Please supply a root password for MySQL. This password\n"
@@ -2558,7 +2842,7 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:143
+#: ../pykolab/setup/setup_mysql.py:186
 msgid ""
 "\n"
 "                        Please supply a password for the MySQL user 'kolab'.\n"
@@ -2567,21 +2851,21 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:151
+#: ../pykolab/setup/setup_mysql.py:194
 msgid "MySQL kolab password"
-msgstr "MySQL-kolab Password"
+msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:170
+#: ../pykolab/setup/setup_mysql.py:213
 msgid "Could not find the MySQL Kolab schema file"
 msgstr ""
 
 #: ../pykolab/setup/setup_php.py:42
 msgid "PHP Options"
-msgstr "PHP Optionen"
+msgstr ""
 
 #: ../pykolab/setup/setup_php.py:49
 msgid "Specify the timezone for PHP."
-msgstr "Zeitzone für PHP definieren."
+msgstr ""
 
 #: ../pykolab/setup/setup_php.py:57
 msgid "Specify the path to the php.ini file used with the webserver."
@@ -2589,7 +2873,7 @@
 
 #: ../pykolab/setup/setup_php.py:61
 msgid "Setup PHP."
-msgstr "Richte PHP ein."
+msgstr ""
 
 #: ../pykolab/setup/setup_php.py:66
 msgid ""
@@ -2602,7 +2886,7 @@
 
 #: ../pykolab/setup/setup_php.py:74
 msgid "Timezone ID"
-msgstr "Zeitzonen ID"
+msgstr ""
 
 #: ../pykolab/setup/setup_php.py:80
 #, python-format
@@ -2613,11 +2897,11 @@
 msgid "Could not find PHP configuration file php.ini"
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:44
+#: ../pykolab/setup/setup_roundcube.py:45
 msgid "Setup Roundcube."
-msgstr "Stelle Roundcube ein."
+msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:48
+#: ../pykolab/setup/setup_roundcube.py:49
 msgid ""
 "\n"
 "                    Please supply a password for the MySQL user 'roundcube'.\n"
@@ -2626,28 +2910,37 @@
 "                "
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:56
+#: ../pykolab/setup/setup_roundcube.py:57
 msgid "MySQL roundcube password"
-msgstr "MySQL roundcube Passwort"
+msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:126
+#: ../pykolab/setup/setup_roundcube.py:144
 #, python-format
 msgid "Using template file %r"
-msgstr "Vorlagendatei %r wird verwendet"
+msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:133
+#: ../pykolab/setup/setup_roundcube.py:151
 #, python-format
 msgid "Successfully compiled template %r, writing out to %r"
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:235
-#: ../pykolab/setup/setup_syncroton.py:96
+#: ../pykolab/setup/setup_roundcube.py:263
+msgid "Cannot find the configuration directory for roundcube."
+msgstr ""
+
+#: ../pykolab/setup/setup_roundcube.py:291
+#: ../pykolab/setup/setup_syncroton.py:100
 msgid "Could not start the webserver server service."
 msgstr ""
 
+#: ../pykolab/setup/setup_roundcube.py:300
+#: ../pykolab/setup/setup_syncroton.py:109
+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."
+msgstr ""
 
 #. start_max = (int)(time.time())
 #: ../pykolab/telemetry.py:588
@@ -2672,460 +2965,487 @@
 
 #: ../pykolab/telemetry.py:652
 msgid "No database available"
-msgstr "Keine Datenbank verfügbar"
+msgstr ""
 
-#: ../pykolab/utils.py:62 ../pykolab/utils.py:64
+#: ../pykolab/utils.py:69 ../pykolab/utils.py:71
 #, python-format
 msgid "Confirm %s: "
-msgstr "Bestätige %s:"
+msgstr ""
 
-#: ../pykolab/utils.py:67
-msgid "Incorrect confirmation. "
-msgstr "Ungültige Bestätigung."
+#: ../pykolab/utils.py:74
+msgid "Incorrect confirmation. Please try again."
+msgstr ""
 
-#: ../pykolab/utils.py:72 ../pykolab/utils.py:77
+#: ../pykolab/utils.py:79 ../pykolab/utils.py:84
 #, python-format
 msgid "%s: "
-msgstr "%s:"
+msgstr ""
 
-#: ../pykolab/utils.py:74 ../pykolab/utils.py:79
+#: ../pykolab/utils.py:81 ../pykolab/utils.py:86
 #, python-format
 msgid "%s [%s]: "
-msgstr "%s [%s]: "
+msgstr ""
 
-#: ../pykolab/utils.py:124
+#: ../pykolab/utils.py:139
 msgid "Please answer 'yes' or 'no'."
-msgstr "Bitte antworten Sie mit 'yes' (ja) oder 'no' (nein)."
+msgstr ""
 
-#: ../pykolab/utils.py:164
+#: ../pykolab/utils.py:184
 msgid "Choice"
 msgstr ""
 
-#: ../pykolab/utils.py:167
+#: ../pykolab/utils.py:187
 msgid "Choice (type '?' for options)"
 msgstr ""
 
-#: ../pykolab/utils.py:268
+#: ../pykolab/utils.py:288
 #, python-format
 msgid "Could not change the permissions on %s"
 msgstr ""
 
-#: ../pykolab/utils.py:488
+#: ../pykolab/utils.py:526
 #, python-format
 msgid "Transliterating string %r with locale %r"
 msgstr ""
 
-#: ../pykolab/utils.py:496
+#: ../pykolab/utils.py:534
 msgid "Attempting to set locale"
 msgstr ""
 
-#: ../pykolab/utils.py:498
+#: ../pykolab/utils.py:536
 msgid "Success setting locale"
 msgstr ""
 
-#: ../pykolab/utils.py:500
+#: ../pykolab/utils.py:538
 msgid "Failure to set locale"
 msgstr ""
 
-#: ../pykolab/utils.py:508
+#: ../pykolab/utils.py:546
 #, python-format
 msgid "Executing '%s | %s'"
 msgstr ""
 
-#: ../pykolab/utils.py:519
+#: ../pykolab/utils.py:557
 #, python-format
 msgid "Could not translate %s using locale %s"
 msgstr ""
 
-#: ../pykolab/wap_client/__init__.py:399
+#: ../pykolab/wap_client/__init__.py:416
 #, python-format
 msgid "Requesting %r with params %r"
 msgstr ""
 
-#: ../pykolab/wap_client/__init__.py:407
+#: ../pykolab/wap_client/__init__.py:424
 #, python-format
 msgid "Got response: %r"
 msgstr ""
 
+#: ../pykolab/wap_client/__init__.py:429
+#, python-format
+msgid "Connection error: %r; re-connecting..."
+msgstr ""
+
 #. Some data is not JSON
-#: ../pykolab/wap_client/__init__.py:413
+#: ../pykolab/wap_client/__init__.py:441
 msgid "Response data is not JSON"
 msgstr ""
 
 #. support integer values, too
-#: ../pykolab/xml/attendee.py:9 ../pykolab/xml/attendee.py:17
+#: ../pykolab/xml/attendee.py:9 ../pykolab/xml/attendee.py:18
 msgid "Needs Action"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:10 ../pykolab/xml/attendee.py:18
+#: ../pykolab/xml/attendee.py:10 ../pykolab/xml/attendee.py:19
 msgid "Accepted"
 msgstr "Akzeptiert"
 
-#: ../pykolab/xml/attendee.py:11 ../pykolab/xml/attendee.py:19
+#: ../pykolab/xml/attendee.py:11 ../pykolab/xml/attendee.py:20
 msgid "Declined"
 msgstr "Abgelehnt"
 
-#: ../pykolab/xml/attendee.py:12 ../pykolab/xml/attendee.py:20
+#: ../pykolab/xml/attendee.py:12 ../pykolab/xml/attendee.py:21
 msgid "Tentatively Accepted"
 msgstr "Provisorisch Akzeptiert"
 
-#: ../pykolab/xml/attendee.py:13 ../pykolab/xml/attendee.py:21
+#: ../pykolab/xml/attendee.py:13 ../pykolab/xml/attendee.py:22
 msgid "Delegated"
 msgstr "Delegiert"
 
-#: ../pykolab/xml/attendee.py:14 ../pykolab/xml/attendee.py:22
+#: ../pykolab/xml/attendee.py:14 ../pykolab/xml/attendee.py:23
+msgid "Started"
+msgstr ""
+
+#: ../pykolab/xml/attendee.py:15 ../pykolab/xml/attendee.py:24
 msgid "Completed"
-msgstr "Erledigt"
+msgstr "Abgeschlossen"
 
-#: ../pykolab/xml/attendee.py:15 ../pykolab/xml/attendee.py:23
-msgid "Started"
+#: ../pykolab/xml/attendee.py:16
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:914
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:926
+msgid "Pending"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:132 ../pykolab/xml/attendee.py:154
+#: ../pykolab/xml/attendee.py:133 ../pykolab/xml/attendee.py:155
 msgid "Not a valid attendee"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:139
+#: ../pykolab/xml/attendee.py:140
 msgid "No valid delegator references found"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:159
+#: ../pykolab/xml/attendee.py:160
 msgid "No valid delegatee references found"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:219
+#: ../pykolab/xml/attendee.py:220
 #, python-format
 msgid "Invalid cutype %r"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:231
+#: ../pykolab/xml/attendee.py:232
 #, python-format
 msgid "Invalid participant status %r"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:239
+#: ../pykolab/xml/attendee.py:240
 #, python-format
 msgid "Invalid role %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:163 ../pykolab/xml/event.py:802
-#: ../pykolab/xml/event.py:845
-msgid "Event start needs datetime.date or datetime.datetime instance"
+#: ../pykolab/xml/event.py:168
+#, python-format
+msgid "Rdate needs datetime.date or datetime.datetime instance, got %r"
+msgstr ""
+
+#: ../pykolab/xml/event.py:185
+#, python-format
+msgid "Exdate needs datetime.date or datetime.datetime instance, got %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:308
+#: ../pykolab/xml/event.py:403
 #, python-format
 msgid "No attendee with email or name %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:316
+#: ../pykolab/xml/event.py:411
 #, python-format
 msgid "Invalid argument value attendee %r, must be basestring or Attendee"
 msgstr ""
 
-#: ../pykolab/xml/event.py:328
+#: ../pykolab/xml/event.py:423
 #, python-format
 msgid "No attendee with email %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:334
+#: ../pykolab/xml/event.py:429
 #, python-format
 msgid "No attendee with name %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:384 ../pykolab/xml/utils.py:157
+#: ../pykolab/xml/event.py:479 ../pykolab/xml/utils.py:180
 msgid "%Y-%m-%d"
 msgstr ""
 
-#: ../pykolab/xml/event.py:386 ../pykolab/xml/utils.py:158
+#: ../pykolab/xml/event.py:481 ../pykolab/xml/utils.py:181
 msgid "%H:%M (%Z)"
 msgstr ""
 
-#: ../pykolab/xml/event.py:510
+#: ../pykolab/xml/event.py:614
 msgid "Invalid participant status"
 msgstr ""
 
-#: ../pykolab/xml/event.py:636
+#: ../pykolab/xml/event.py:820 ../pykolab/xml/note.py:94
 #, python-format
 msgid "Invalid classification %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:667
-msgid "Event end needs datetime.date or datetime.datetime instance"
+#: ../pykolab/xml/event.py:851
+#, python-format
+msgid "Event end needs datetime.date or datetime.datetime instance, got %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:677
+#: ../pykolab/xml/event.py:865
 #, python-format
 msgid "Invalid custom property name %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:855
+#: ../pykolab/xml/event.py:1017
+#, python-format
+msgid ""
+"Event last-modified needs datetime.date or datetime.datetime instance, got "
+"%r"
+msgstr ""
+
+#: ../pykolab/xml/event.py:1060
+#, python-format
+msgid "Event start needs datetime.date or datetime.datetime instance, got %r"
+msgstr ""
+
+#: ../pykolab/xml/event.py:1070
 #, python-format
 msgid "Invalid status set: %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:1094
+#: ../pykolab/xml/event.py:1093
+msgid "Event recurrence-id needs datetime.datetime instance"
+msgstr ""
+
+#: ../pykolab/xml/event.py:1330
 msgid "No sender specified"
 msgstr ""
 
-#: ../pykolab/xml/event.py:1103
+#: ../pykolab/xml/event.py:1339
 #, python-format
 msgid "Invitation for %s was %s"
 msgstr ""
 
-#: ../pykolab/xml/event.py:1108
+#: ../pykolab/xml/event.py:1344
 msgid "This is an automated response to one of your event requests."
 msgstr ""
 
-#: ../pykolab/xml/recurrence_rule.py:38
+#: ../pykolab/xml/recurrence_rule.py:41
 #, python-format
 msgid "Every %d year(s)"
-msgstr "Alle %d Jahr(e)"
+msgstr ""
 
-#: ../pykolab/xml/recurrence_rule.py:39
+#: ../pykolab/xml/recurrence_rule.py:42
 #, python-format
 msgid "Every %d month(s)"
-msgstr "Alle %d Monat(e)"
+msgstr ""
 
-#: ../pykolab/xml/recurrence_rule.py:40
+#: ../pykolab/xml/recurrence_rule.py:43
 #, python-format
 msgid "Every %d week(s)"
-msgstr "Alle %d Woche(n)"
+msgstr ""
 
-#: ../pykolab/xml/recurrence_rule.py:41
+#: ../pykolab/xml/recurrence_rule.py:44
 #, python-format
 msgid "Every %d day(s)"
-msgstr "Alle %d Tag(e)"
+msgstr ""
 
-#: ../pykolab/xml/recurrence_rule.py:42
+#: ../pykolab/xml/recurrence_rule.py:45
 #, python-format
 msgid "Every %d hours"
-msgstr "Alle %d Stunden"
+msgstr ""
 
-#: ../pykolab/xml/recurrence_rule.py:43
+#: ../pykolab/xml/recurrence_rule.py:46
 #, python-format
 msgid "Every %d minutes"
-msgstr "Alle %d Minuten"
+msgstr ""
 
-#: ../pykolab/xml/recurrence_rule.py:44
+#: ../pykolab/xml/recurrence_rule.py:47
 #, python-format
 msgid "Every %d seconds"
-msgstr "Alle %d Sekunden"
+msgstr ""
 
-#: ../pykolab/xml/todo.py:110
+#: ../pykolab/xml/todo.py:162
 msgid "Todo due needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:126
+#: ../pykolab/xml/utils.py:149
 msgid "Name"
 msgstr "Name"
 
-#: ../pykolab/xml/utils.py:127
+#: ../pykolab/xml/utils.py:150
 msgid "Summary"
 msgstr "Zusammenfassung"
 
-#: ../pykolab/xml/utils.py:128
+#: ../pykolab/xml/utils.py:151
 msgid "Location"
 msgstr "Ort"
 
-#: ../pykolab/xml/utils.py:129
+#: ../pykolab/xml/utils.py:152
 msgid "Description"
 msgstr "Beschreibung"
 
-#: ../pykolab/xml/utils.py:130
+#: ../pykolab/xml/utils.py:153
 msgid "URL"
 msgstr "URL"
 
-#: ../pykolab/xml/utils.py:131
+#: ../pykolab/xml/utils.py:154
 msgid "Status"
 msgstr "Status"
 
-#: ../pykolab/xml/utils.py:132
+#: ../pykolab/xml/utils.py:155
 msgid "Priority"
 msgstr "Priorität"
 
-#: ../pykolab/xml/utils.py:133
+#: ../pykolab/xml/utils.py:156
 msgid "Attendee"
-msgstr "Teilnehmer"
+msgstr ""
 
-#: ../pykolab/xml/utils.py:134
+#: ../pykolab/xml/utils.py:157
 msgid "Start"
-msgstr "Beginn"
+msgstr "Start"
 
-#: ../pykolab/xml/utils.py:135
+#: ../pykolab/xml/utils.py:158
 msgid "End"
 msgstr "Ende"
 
-#: ../pykolab/xml/utils.py:136
+#: ../pykolab/xml/utils.py:159
 msgid "Due"
-msgstr "Fällig"
+msgstr ""
 
-#: ../pykolab/xml/utils.py:137
+#: ../pykolab/xml/utils.py:160
 msgid "Repeat"
-msgstr "Wiederholung"
+msgstr "Wiederholen"
 
-#: ../pykolab/xml/utils.py:138
+#: ../pykolab/xml/utils.py:161
 msgid "Repeat Exception"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:139
+#: ../pykolab/xml/utils.py:162
 msgid "Organizer"
 msgstr "Organisator"
 
-#: ../pykolab/xml/utils.py:140
+#: ../pykolab/xml/utils.py:163
 msgid "Attachment"
-msgstr "Anhang"
+msgstr ""
 
-#: ../pykolab/xml/utils.py:141
+#: ../pykolab/xml/utils.py:164
 msgid "Alarm"
-msgstr "Alarm"
+msgstr ""
 
-#: ../pykolab/xml/utils.py:142
+#: ../pykolab/xml/utils.py:165
 msgid "Classification"
-msgstr "Einstufung"
+msgstr ""
 
-#: ../pykolab/xml/utils.py:143
+#: ../pykolab/xml/utils.py:166
 msgid "Progress"
 msgstr "Fortschritt"
 
-#: ../pykolab/xml/utils.py:188
+#: ../pykolab/xml/utils.py:211
 #, python-format
 msgid "for %d times"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:190
+#: ../pykolab/xml/utils.py:213
 #, python-format
 msgid "until %s"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:195
+#: ../pykolab/xml/utils.py:218
 msgid "Display message"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:196
+#: ../pykolab/xml/utils.py:219
 msgid "Send email"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:197
+#: ../pykolab/xml/utils.py:220
 msgid "Play sound"
-msgstr "Audio abspielen"
+msgstr "Klang abspielen"
 
-#: ../pykolab/xml/utils.py:203
+#: ../pykolab/xml/utils.py:226
 #, python-format
 msgid "%s after"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:203
+#: ../pykolab/xml/utils.py:226
 #, python-format
 msgid "%s before"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:212
+#: ../pykolab/xml/utils.py:235
 #, python-format
 msgid "%d day(s)"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:218
+#: ../pykolab/xml/utils.py:241
 #, python-format
 msgid "%d hour(s)"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:220
+#: ../pykolab/xml/utils.py:243
 #, python-format
 msgid "%d minute(s)"
 msgstr ""
 
-#: ../saslauthd/__init__.py:76
+#: ../saslauthd/__init__.py:77
 msgid "Socket file to bind to."
 msgstr ""
 
-#: ../saslauthd/__init__.py:108
+#: ../saslauthd/__init__.py:109
 #, python-format
 msgid "Could not create %r: %r"
 msgstr ""
 
-#: ../saslauthd/__init__.py:146 ../saslauthd/__init__.py:154
-#: ../wallace/__init__.py:439 ../wallace/__init__.py:448
-msgid ""
-"Traceback occurred, please report a bug at http://bugzilla.kolabsys.com"
-msgstr "Ein Fehler mit Traceback trat auf, bitte legen Sie einen Bericht auf  http://bugzilla.kolabsys.com an"
-
-#: ../saslauthd/__init__.py:194
-msgid "kolab-saslauthd could not accept "
+#: ../saslauthd/__init__.py:220
+#, python-format
+msgid "kolab-saslauthd could not accept connections on socket: %r"
 msgstr ""
 
-#: ../saslauthd/__init__.py:199
+#: ../saslauthd/__init__.py:225
 msgid "Maximum tries exceeded, exiting"
 msgstr ""
 
-#: ../tests/functional/test_wallace/test_005_resource_invitation.py:195
-#: ../wallace/module_resources.py:1151
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:196
+#: ../wallace/module_resources.py:1251
 #, 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:1235
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:641
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:657
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:715
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:771
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:785
+#: ../wallace/module_resources.py:1335
 #, python-format
 msgid "Booking for %s has been %s"
-msgstr "Buchung für %s wurde %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:1333
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:677
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:704
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:742
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:759
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:814
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:968
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:984
+#: ../wallace/module_resources.py:1433
 #, python-format
 msgid "Booking request for %s requires confirmation"
-msgstr "Buchungsanfrage für %s benötigt eine Bestätigung"
+msgstr ""
 
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:240
-#: ../wallace/module_invitationpolicy.py:448
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:242
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1267
+#: ../wallace/module_invitationpolicy.py:479
 #, python-format
 msgid "\"%(summary)s\" has been %(status)s"
-msgstr "\"%(summary)s\" wurde %(status)s"
+msgstr ""
+
+#. this should trigger a notification message
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:886
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1251
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1396
+#: ../wallace/module_invitationpolicy.py:1316
+#, python-format
+msgid "\"%s\" has been cancelled"
+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:802
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:808
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:821
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:839
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:942
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:947
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1008
-#: ../wallace/module_invitationpolicy.py:1071
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:903
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:909
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:922
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:939
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1039
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1044
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1377
+#: ../wallace/module_invitationpolicy.py:1234
 #, python-format
 msgid "\"%s\" has been updated"
-msgstr "\"%s\" wurde aktualisiert"
-
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:813
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:825
-msgid "PENDING"
 msgstr ""
 
-#. this should trigger a notification message
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1028
-#: ../wallace/module_invitationpolicy.py:1133
-#, python-format
-msgid "\"%s\" has been cancelled"
-msgstr "\"%s\" wurde abgesagt"
-
-#: ../tests/unit/test-011-itip.py:465
+#: ../tests/unit/test-011-itip.py:529
 #, python-format
 msgid "Invitation for %(summary)s was %(status)s"
 msgstr ""
@@ -3150,437 +3470,512 @@
 msgid "Worker process %s initializing"
 msgstr ""
 
-#: ../wallace/__init__.py:122
+#: ../wallace/__init__.py:123
 msgid "Bind address for Wallace."
-msgstr "Bind-Adresse für Wallace."
+msgstr ""
 
-#: ../wallace/__init__.py:140
+#: ../wallace/__init__.py:142
 msgid "Number of threads to use."
 msgstr ""
 
-#: ../wallace/__init__.py:156
+#: ../wallace/__init__.py:159
 msgid "Port that Wallace is supposed to use."
-msgstr "Port, den Wallace benutzen soll."
+msgstr ""
 
-#: ../wallace/__init__.py:205
+#: ../wallace/__init__.py:208
 #, 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:217
+#: ../wallace/__init__.py:220
 msgid "Could not shut down socket"
-msgstr "Konnte Socket nicht schließen"
+msgstr ""
 
-#: ../wallace/__init__.py:286
+#: ../wallace/__init__.py:289
 msgid "Accepted connection"
-msgstr "Verbindung akzeptiert"
+msgstr ""
 
-#: ../wallace/__init__.py:464
+#: ../wallace/__init__.py:494
 #, python-format
 msgid "Could not write pid file %s"
 msgstr ""
 
-#: ../wallace/module_footer.py:60 ../wallace/module_gpgencrypt.py:60
-#: ../wallace/module_invitationpolicy.py:210 ../wallace/module_optout.py:61
-#: ../wallace/module_resources.py:126
+#: ../wallace/module_footer.py:63 ../wallace/module_gpgencrypt.py:100
+#: ../wallace/module_invitationpolicy.py:227 ../wallace/module_optout.py:61
+#: ../wallace/module_resources.py:127
 #, python-format
 msgid "Issuing callback after processing to stage %s"
 msgstr ""
 
-#: ../wallace/module_footer.py:61 ../wallace/module_gpgencrypt.py:61
-#: ../wallace/module_invitationpolicy.py:212 ../wallace/module_optout.py:62
-#: ../wallace/module_resources.py:132
+#: ../wallace/module_footer.py:64 ../wallace/module_gpgencrypt.py:101
+#: ../wallace/module_invitationpolicy.py:229 ../wallace/module_optout.py:62
+#: ../wallace/module_resources.py:133
 #, python-format
 msgid "Testing cb_action_%s()"
 msgstr ""
 
-#: ../wallace/module_footer.py:63 ../wallace/module_gpgencrypt.py:63
-#: ../wallace/module_invitationpolicy.py:214 ../wallace/module_optout.py:64
-#: ../wallace/module_resources.py:135
+#: ../wallace/module_footer.py:66 ../wallace/module_gpgencrypt.py:103
+#: ../wallace/module_invitationpolicy.py:231 ../wallace/module_optout.py:64
+#: ../wallace/module_resources.py:136
 #, python-format
 msgid "Attempting to execute cb_action_%s()"
 msgstr ""
 
-#: ../wallace/module_footer.py:67
+#: ../wallace/module_footer.py:70
 #, python-format
 msgid "Executing module footer for %r, %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:66
+#: ../wallace/module_footer.py:88
+msgid "No contents configured for footer module"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:106
 #, python-format
 msgid "Executing module gpgencrypt for %r, %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:98
+#: ../wallace/module_gpgencrypt.py:138
 msgid "Message is already encrypted (app/pgp-enc content-type)"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:102
+#: ../wallace/module_gpgencrypt.py:142
 msgid "Message already encrypted by main content-type header"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:131
+#: ../wallace/module_gpgencrypt.py:171
 msgid ""
 "Configured to encrypt to a key not configured, and strict policy enabled. "
 "Bailing out."
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:134
+#: ../wallace/module_gpgencrypt.py:174
 msgid ""
 "Configured to encrypt to a key not configured, but continuing anyway (see "
 "'gpgencrypt_strict')."
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:171
+#: ../wallace/module_gpgencrypt.py:211
 #, python-format
 msgid "Recipients: %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:183
+#: ../wallace/module_gpgencrypt.py:222
 #, python-format
 msgid "Current keys: %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:188
+#: ../wallace/module_gpgencrypt.py:227
 #, python-format
 msgid "Retrieving key for recipient: %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:192 ../wallace/module_gpgencrypt.py:208
+#: ../wallace/module_gpgencrypt.py:231 ../wallace/module_gpgencrypt.py:247
 #, python-format
 msgid "Found matching address %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:200
+#: ../wallace/module_gpgencrypt.py:239
 #, python-format
 msgid "Found matching address %r in remote keys"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:232
+#: ../wallace/module_gpgencrypt.py:259
+msgid "Mime Message - we need to build multipart/encrypted structure"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:268
+msgid "No Mime Message - encypt plain"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:284
 #, python-format
 msgid "An error occurred: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:196
+#: ../wallace/module_invitationpolicy.py:213
 #, python-format
 msgid "Invitation policy called for %r, %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:258
+#: ../wallace/module_invitationpolicy.py:275
 #, python-format
 msgid "Failed to parse iTip objects from message: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:262
+#: ../wallace/module_invitationpolicy.py:279
 msgid ""
 "Message is not an iTip message or does not contain any (valid) iTip objects."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:266
+#: ../wallace/module_invitationpolicy.py:283
 #, python-format
 msgid ""
 "iTip objects attached to this message contain the following information: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:278
+#: ../wallace/module_invitationpolicy.py:306
 #, python-format
 msgid "Recipient emails for %s: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:282
+#: ../wallace/module_invitationpolicy.py:310
 #, python-format
 msgid "No itips, no users, pass along %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:285
+#: ../wallace/module_invitationpolicy.py:313
 #, python-format
 msgid "iTips, but no users, pass along %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:306
+#: ../wallace/module_invitationpolicy.py:331
 #, python-format
 msgid "No user attendee matching envelope recipient %s, skip message"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:309
+#: ../wallace/module_invitationpolicy.py:334
 #, python-format
 msgid "Receiving user: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:337
+#: ../wallace/module_invitationpolicy.py:362
 #, python-format
 msgid "Apply invitation policy %r for sender %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:348
+#: ../wallace/module_invitationpolicy.py:373
 #, python-format
 msgid "Ignoring '%s' iTip method"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:352
+#: ../wallace/module_invitationpolicy.py:377
 #, python-format
 msgid "iTip message %r consumed by the invitationpolicy module"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:368
+#: ../wallace/module_invitationpolicy.py:393
 msgid "Pass invitation for manual processing"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:373
+#: ../wallace/module_invitationpolicy.py:398
 #, python-format
 msgid "Receiving Attendee: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:393
+#: ../wallace/module_invitationpolicy.py:418
 #, python-format
 msgid "Existing %s: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:404
+#: ../wallace/module_invitationpolicy.py:429
 #, python-format
 msgid "Precondition for object %r fulfilled: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:422
+#: ../wallace/module_invitationpolicy.py:449
 #, python-format
 msgid ""
 "The iTip request sequence (%r) doesn't match the referred object version "
 "(%r). Ignoring."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:427
+#: ../wallace/module_invitationpolicy.py:454
 #, python-format
 msgid "Auto-updating %s %r on iTip REQUEST (no re-scheduling)"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:482
+#: ../wallace/module_invitationpolicy.py:505
+msgid "Forward invitation for notification"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:520
 msgid "Pass reply for manual processing"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:489
+#: ../wallace/module_invitationpolicy.py:527
 #, python-format
 msgid "Sender Attendee: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:501
+#: ../wallace/module_invitationpolicy.py:539
 #, python-format
 msgid ""
 "The iTip reply sequence (%r) doesn't match the referred object version (%r)."
 " Forwarding to Inbox."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:507
+#: ../wallace/module_invitationpolicy.py:545
 #, python-format
 msgid "Auto-updating %s %r on iTip REPLY"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:532
+#: ../wallace/module_invitationpolicy.py:572
 #, python-format
 msgid "Add delegatee: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:535
+#: ../wallace/module_invitationpolicy.py:575
 #, python-format
 msgid "Update existing delegatee: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:540
+#: ../wallace/module_invitationpolicy.py:582
 #, python-format
 msgid "Update delegator: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:557
-#: ../wallace/module_invitationpolicy.py:589
+#: ../wallace/module_invitationpolicy.py:600
 msgid ""
 "The object referred by this reply was not found in the user's folders. "
 "Forwarding to Inbox."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:570
+#: ../wallace/module_invitationpolicy.py:613
 msgid "Pass cancellation for manual processing"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:618
+#: ../wallace/module_invitationpolicy.py:636
+#, python-format
+msgid "Remove cancelled %s instance %s from %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:647
+#, python-format
+msgid "Update cancelled %s %r with STATUS=CANCELLED"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:662
+msgid ""
+"The object referred by this cancel request was not found in the user's "
+"folders. Forwarding to Inbox."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:691
 #, python-format
 msgid "Checking if email address %r belongs to a local user"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:623
+#: ../wallace/module_invitationpolicy.py:696
 #, python-format
 msgid "User DN: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:625
+#: ../wallace/module_invitationpolicy.py:698
 #, python-format
 msgid "No user record(s) found for %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:681
+#: ../wallace/module_invitationpolicy.py:754
 #, python-format
 msgid "User record doesn't have the mailbox attribute %r set"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:694
+#: ../wallace/module_invitationpolicy.py:767
 #, python-format
 msgid "IMAP proxy authentication failed: %r"
-msgstr "IMAP-Proxy Authentifizierung fehlgeschlagen: %r"
+msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:716
+#: ../wallace/module_invitationpolicy.py:789
 #, python-format
 msgid "List %r folders for user %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:732
+#: ../wallace/module_invitationpolicy.py:804
 #, python-format
 msgid "IMAP metadata for %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:767
+#: ../wallace/module_invitationpolicy.py:842
 #, python-format
 msgid "Searching folder %r for %s %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:783
+#: ../wallace/module_invitationpolicy.py:852
+#: ../wallace/module_resources.py:675 ../wallace/module_resources.py:736
+#, python-format
+msgid "No UID found in IMAP response: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:878
 #, python-format
 msgid "Failed to parse %s from message %s/%s: %s"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:809
+#: ../wallace/module_invitationpolicy.py:906
 #, python-format
 msgid "Listing events from folder %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:822
-#: ../wallace/module_resources.py:474 ../wallace/module_resources.py:665
-#: ../wallace/module_resources.py:713
+#: ../wallace/module_invitationpolicy.py:919
+#: ../wallace/module_resources.py:482 ../wallace/module_resources.py:683
+#: ../wallace/module_resources.py:763
 #, python-format
 msgid "Failed to parse event from message %s/%s: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:828
+#: ../wallace/module_invitationpolicy.py:925
 #, python-format
 msgid "Existing event %r conflicts with invitation %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:835
-#: ../wallace/module_resources.py:518
+#: ../wallace/module_invitationpolicy.py:932
+#: ../wallace/module_resources.py:526
 #, python-format
 msgid "start: %r, end: %r, total: %r, messages: %d"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:861
+#: ../wallace/module_invitationpolicy.py:960
 #, python-format
 msgid "%r is locked, waiting..."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:928
+#: ../wallace/module_invitationpolicy.py:1040
 #, python-format
 msgid "Failed to save %s: no target folder found for user %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:931
+#: ../wallace/module_invitationpolicy.py:1051
 #, python-format
 msgid "Save %s %r to user folder %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:944
+#: ../wallace/module_invitationpolicy.py:1064
 #, python-format
 msgid "Failed to save %s to user folder at %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:960
+#: ../wallace/module_invitationpolicy.py:1083
+#, python-format
+msgid "Delete %s %r in %r by UID: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1091
 #, python-format
 msgid "Delete %s %r in %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:989
+#: ../wallace/module_invitationpolicy.py:1102
+#, python-format
+msgid "Failed to delete %s from folder %r: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1130
+#: ../wallace/module_invitationpolicy.py:1304
+#, python-format
+msgid "%s commented: %s"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1133
 #, python-format
 msgid "Compose participation status summary for %s %r to user %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1022
+#: ../wallace/module_invitationpolicy.py:1171
 #, python-format
 msgid ""
 "Waiting for more automated replies (got %d of %d); skipping notification"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1032
+#: ../wallace/module_invitationpolicy.py:1192
 #, python-format
 msgid "Changes submitted by %s have been automatically applied."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1041
+#: ../wallace/module_invitationpolicy.py:1201
 msgid "(removed)"
-msgstr "(entfernt)"
+msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1047
+#: ../wallace/module_invitationpolicy.py:1207
 #, python-format
 msgid ""
 "\n"
 "            The assignment for '%(summary)s' has been updated in your tasklist.\n"
 "            %(roundup)s\n"
 "        "
-msgstr "\nDie Zuweisung für '%(summary)s' wurde in ihrer Aufgabenliste aktualisiert.\n%(roundup)s\n        "
+msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1055
+#: ../wallace/module_invitationpolicy.py:1215
 #, python-format
 msgid ""
 "\n"
 "            The event '%(summary)s' at %(start)s has been updated in your calendar.\n"
 "            %(roundup)s\n"
 "        "
-msgstr "\nDas Ereignis '%(summary)s' um %(start)s wurde in ihrem Kalender aktualisiert.\n%(roundup)s\n        "
+msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1064
-#: ../wallace/module_invitationpolicy.py:1126
-#: ../wallace/module_invitationpolicy.py:1216
+#: ../wallace/module_invitationpolicy.py:1225
+msgid "NOTE: This update only refers to this single occurrence!"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1227
+#: ../wallace/module_invitationpolicy.py:1309
+#: ../wallace/module_invitationpolicy.py:1411
 msgid "*** This is an automated message. Please do not reply. ***"
-msgstr "*** Dies ist eine automatisierte Nachricht. Bitte antworten Sie nicht. ***"
+msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1099
+#: ../wallace/module_invitationpolicy.py:1249
+#, python-format
+msgid "Sent update notification to %r: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1274
 #, python-format
 msgid "Send cancellation notification for %s %r to user %r"
-msgstr "Benachrichtigung über die Absage von %s %r an Nutzer %r senden"
+msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1109
+#: ../wallace/module_invitationpolicy.py:1284
 #, python-format
-msgid ""
-"\n"
-"            The assignment for '%(summary)s' has been cancelled by %(organizer)s.\n"
-"            The copy in your tasklist as been marked as cancelled accordingly.\n"
-"        "
-msgstr "\nDie Zuweisung für Aufgabe '%(summary)s' wurde von %(organizer)s abgesagt.\nDie Kopie in Ihrer Taskliste wurde entsprechend aktualisiert."
+msgid "The assignment for '%(summary)s' has been cancelled by %(organizer)s."
+msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1117
+#: ../wallace/module_invitationpolicy.py:1289
+msgid "The copy in your tasklist has been removed accordingly."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1291
+msgid "The copy in your tasklist has been marked as cancelled accordingly."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1293
 #, python-format
 msgid ""
-"\n"
-"            The event '%(summary)s' at %(start)s has been cancelled by %(organizer)s.\n"
-"            The copy in your calendar as been marked as cancelled accordingly.\n"
-"        "
-msgstr "\nDas Ereignis '%(summary)s' um %(start)s wurde von %(organizer)s abgesagt.\nDie Kopie in ihrem Kalender wurde entsprechend aktualisiert."
+"The event '%(summary)s' at %(start)s has been cancelled by %(organizer)s."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1299
+msgid "The copy in your calendar has been removed accordingly."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1301
+msgid "The copy in your calendar has been marked as cancelled accordingly."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1307
+msgid "NOTE: This cancellation only refers to this single occurrence!"
+msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1206
+#: ../wallace/module_invitationpolicy.py:1401
 #, python-format
 msgid "Updated %s's copy of %r: %r"
-msgstr "%s's Kopie von %r wurde aktualisiert: %r"
+msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1209
+#: ../wallace/module_invitationpolicy.py:1404
 #, python-format
 msgid "Attendee %s's copy of %r not found"
-msgstr "Die Kopie des Teilnehmers %s von %r wurde nicht gefunden"
+msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1212
+#: ../wallace/module_invitationpolicy.py:1407
 #, python-format
 msgid "Attendee %r not found in LDAP"
-msgstr "Teilnehmer %r wurde nicht in LDAP gefunden"
+msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1219
+#: ../wallace/module_invitationpolicy.py:1414
 #, python-format
 msgid "%(name)s has %(status)s your assignment for %(summary)s."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1221
+#: ../wallace/module_invitationpolicy.py:1416
 #, python-format
 msgid "%(name)s has %(status)s your invitation for %(summary)s."
 msgstr ""
@@ -3593,7 +3988,8 @@
 
 #: ../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
@@ -3606,255 +4002,308 @@
 msgid "Could not send request to optout_url %s"
 msgstr ""
 
-#: ../wallace/module_resources.py:116
+#: ../wallace/module_resources.py:117
 #, python-format
 msgid "Resource Management called for %r, %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:181
+#: ../wallace/module_resources.py:182
 #, python-format
 msgid "Failed to parse iTip events from message: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:186
-msgid "Message is not an iTip message or does not contain any "
+#: ../wallace/module_resources.py:187
+msgid "Message is not an iTip message or does not contain any (valid) iTip."
 msgstr ""
 
-#: ../wallace/module_resources.py:194
-msgid "iTip events attached to this message contain the "
+#: ../wallace/module_resources.py:195
+#, python-format
+msgid ""
+"iTip events attached to this message contain the following information: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:225
+#: ../wallace/module_resources.py:226
 msgid "Not an iTip message, but sent to resource nonetheless. Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:233
+#: ../wallace/module_resources.py:234
 #, python-format
 msgid "No itips, no resources, pass along %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:236
+#: ../wallace/module_resources.py:237
 #, python-format
 msgid "iTips, but no resources, pass along %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:245
+#: ../wallace/module_resources.py:246
 #, python-format
 msgid "No resource attendees matching envelope recipient %s, Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:255
+#: ../wallace/module_resources.py:256
 #, python-format
 msgid "Resources: %r; %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:273
+#: ../wallace/module_resources.py:270
+#, python-format
+msgid "iTip REPLY to %r, %r; matches %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:276
 #, python-format
 msgid "Sender Attendee: %r => %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:280
+#: ../wallace/module_resources.py:278
+#, python-format
+msgid "Could not find envelope sender attendee: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:283
 #, python-format
 msgid ""
 "The iTip reply sequence (%r) doesn't match the referred event version (%r). "
 "Ignoring."
 msgstr ""
 
-#: ../wallace/module_resources.py:305
+#: ../wallace/module_resources.py:302
+#, python-format
+msgid "Invalid response (%r) received from resource owner for event %r"
+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:308
+#: ../wallace/module_resources.py:309
 msgid "No event reference found in this REPLY. Ignoring."
 msgstr ""
 
-#: ../wallace/module_resources.py:317
+#: ../wallace/module_resources.py:318
 #, python-format
 msgid "Receiving Resource: %r; %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:325
+#: ../wallace/module_resources.py:320
+#, python-format
+msgid "Could not find envelope attendee: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:326
 #, python-format
 msgid "Recipient %r is non-participant, ignoring message"
 msgstr ""
 
-#: ../wallace/module_resources.py:353
+#: ../wallace/module_resources.py:336
+#, python-format
+msgid "Cancellation for entire event %r: deleting"
+msgstr ""
+
+#: ../wallace/module_resources.py:340
+#, python-format
+msgid "Cancellation for a single occurrence %r of %r: updating..."
+msgstr ""
+
+#: ../wallace/module_resources.py:361
 #, python-format
 msgid "Accept invitation for individual resource %r / %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:382
+#: ../wallace/module_resources.py:390
 #, python-format
 msgid "Delegate invitation for resource collection %r to %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:403
+#: ../wallace/module_resources.py:411
 #, python-format
 msgid "module_resources.heartbeat(%d)"
 msgstr ""
 
-#: ../wallace/module_resources.py:426
+#: ../wallace/module_resources.py:434
 #, python-format
 msgid "Expunge resource calendar for %s (%s) failed: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:450
+#: ../wallace/module_resources.py:458
 #, python-format
 msgid "Expunge events in resource folder %r older than %d days"
 msgstr ""
 
-#: ../wallace/module_resources.py:463
+#: ../wallace/module_resources.py:471
 #, python-format
 msgid "Fetching message ID %r from folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:489
+#: ../wallace/module_resources.py:497
 #, python-format
 msgid "Flag event %s from message %s/%s as deleted (age = %d days)"
 msgstr ""
 
-#: ../wallace/module_resources.py:514
+#: ../wallace/module_resources.py:522
 #, python-format
 msgid "Failed to read resource calendar for %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:524
+#: ../wallace/module_resources.py:532
 #, python-format
 msgid "Polling for resource %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:527
+#: ../wallace/module_resources.py:535
 #, python-format
 msgid "Resource %r has been popped from the list"
 msgstr ""
 
-#: ../wallace/module_resources.py:531
+#: ../wallace/module_resources.py:539
 msgid "Resource is a collection"
 msgstr ""
 
-#: ../wallace/module_resources.py:542
+#: ../wallace/module_resources.py:550
 #, python-format
 msgid "Removed conflicting resources from %r: (%r) => %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:554
+#: ../wallace/module_resources.py:562
 #, python-format
 msgid "Conflicting events: %r for resource %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:573
+#: ../wallace/module_resources.py:585
 #, python-format
 msgid "Delegate to another resource collection member: %r to %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:635
+#: ../wallace/module_resources.py:647
 #, python-format
 msgid "Checking events in resource folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:654
+#: ../wallace/module_resources.py:666
 #, python-format
 msgid "Fetching message UID %r from folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:677
+#: ../wallace/module_resources.py:699
 #, python-format
 msgid "Event %r conflicts with event %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:698
+#: ../wallace/module_resources.py:721
 #, python-format
 msgid "Searching %r for event %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:704
+#: ../wallace/module_resources.py:727
 #, python-format
 msgid "Failed to access resource calendar:: %r"
-msgstr "Zugriff auf Ressourcenkalender fehlgeschlagen: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:754
+#, python-format
+msgid "Recurrence-ID not matching on message %s, skipping: %r != %r"
+msgstr ""
 
-#: ../wallace/module_resources.py:733
+#: ../wallace/module_resources.py:785
 #, python-format
 msgid "Apply invitation policies %r"
-msgstr "Anwenden der Einladungsrichtlinie %r"
+msgstr ""
 
-#: ../wallace/module_resources.py:752
+#: ../wallace/module_resources.py:804
 #, python-format
 msgid "Adding event to %r: %r"
-msgstr "Hinzufügen Termin zu %r: %r"
+msgstr ""
 
-#: ../wallace/module_resources.py:806
+#: ../wallace/module_resources.py:888
 #, python-format
 msgid "Failed to save event to resource calendar at %r: %r"
-msgstr "Speichern des Termins im Ressourcenkalender fehlgeschlagen in %r: %r"
+msgstr ""
 
-#: ../wallace/module_resources.py:823
+#: ../wallace/module_resources.py:907
+#, python-format
+msgid "Delete resource calendar object from %r by UID %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:915
 #, python-format
 msgid "Delete resource calendar object %r in %r: %r"
-msgstr "Lösche Kalenderobjekt der Ressource %r in %r: %r"
+msgstr ""
 
-#: ../wallace/module_resources.py:866
+#: ../wallace/module_resources.py:926
+#, python-format
+msgid "Failed to delete calendar object %r from folder %r: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:966
 #, python-format
 msgid "Checking if email address %r belongs to a resource (collection)"
-msgstr "Prüfe ob E-Mail-Adresse %r zu einer Ressource (Sammlung) gehört"
+msgstr ""
 
-#: ../wallace/module_resources.py:874 ../wallace/module_resources.py:946
-#: ../wallace/module_resources.py:980
+#: ../wallace/module_resources.py:974 ../wallace/module_resources.py:1046
+#: ../wallace/module_resources.py:1080
 #, python-format
 msgid "Resource record(s): %r"
-msgstr "Ressourcen-Eintrag/Einträge: %r"
+msgstr ""
 
-#: ../wallace/module_resources.py:876 ../wallace/module_resources.py:948
-#: ../wallace/module_resources.py:983
+#: ../wallace/module_resources.py:976 ../wallace/module_resources.py:1048
+#: ../wallace/module_resources.py:1083
 #, python-format
 msgid "No resource (collection) records found for %r"
-msgstr "Kein Ressourcen (Sammlung) - Eintrag für %r gefunden"
+msgstr ""
 
-#: ../wallace/module_resources.py:880 ../wallace/module_resources.py:952
-#: ../wallace/module_resources.py:987
+#: ../wallace/module_resources.py:980 ../wallace/module_resources.py:1052
+#: ../wallace/module_resources.py:1087
 #, python-format
 msgid "Resource record: %r"
-msgstr "Ressourceneinträge: %r"
+msgstr ""
 
-#: ../wallace/module_resources.py:898
+#: ../wallace/module_resources.py:998
 #, python-format
 msgid "Raw itip_events: %r"
-msgstr "Originale itip_events: %r"
+msgstr ""
 
-#: ../wallace/module_resources.py:906
+#: ../wallace/module_resources.py:1006
 #, python-format
 msgid "Raw set of attendees: %r"
-msgstr "Originalset der Teilnehmer: %r"
+msgstr ""
 
-#: ../wallace/module_resources.py:914
+#: ../wallace/module_resources.py:1014
 #, python-format
 msgid "Raw set of resources: %r"
-msgstr "Originalset der Ressourcen: %r"
+msgstr ""
 
-#: ../wallace/module_resources.py:919
+#: ../wallace/module_resources.py:1019
 #, python-format
 msgid "Raw set of organizers: %r"
-msgstr "Originalset der Organisatoren: %r"
+msgstr ""
 
-#: ../wallace/module_resources.py:939
+#: ../wallace/module_resources.py:1039
 #, python-format
 msgid "Checking if attendee %r is a resource (collection)"
-msgstr "Prüfe ob Teilnehmer %r eine Ressource (Sammlung) ist"
+msgstr ""
 
-#: ../wallace/module_resources.py:955 ../wallace/module_resources.py:989
+#: ../wallace/module_resources.py:1055 ../wallace/module_resources.py:1089
 msgid "Resource reservation made but no resource records found"
-msgstr "Ressourcenbuchung erfolgt, jedoch keine Ressourceneinträge gefunden"
+msgstr ""
 
-#: ../wallace/module_resources.py:974
+#: ../wallace/module_resources.py:1074
 #, python-format
 msgid "Checking if resource %r is a resource (collection)"
-msgstr "Prüfe ob Resource %r eine Resource (Sammlung)"
+msgstr ""
+
+#: ../wallace/module_resources.py:1092
+#, python-format
+msgid "The following resources are being referred to in the iTip: %r"
+msgstr ""
 
-#: ../wallace/module_resources.py:992
-msgid "The following resources are being referred to in the "
-msgstr "Auf die folgenden Ressourcen wurde Bezug genommen in"
+#: ../wallace/module_resources.py:1219
+#, python-format
+msgid "Check collections %r for kolabinvitationpolicy attributes"
+msgstr ""
 
-#: ../wallace/module_resources.py:1157
+#: ../wallace/module_resources.py:1257
 #, python-format
 msgid ""
 "\n"
@@ -3862,9 +4311,9 @@
 "\n"
 "                Your reservation was delegated to \"%s\" which is available for the requested time.\n"
 "            "
-msgstr "\n*** Dies ist eine automatisch erstellte E-Mail. Bitte antworten Sie nicht direkt darauf. ***\n\nIhre Reservierung wurde an \"%s\" delegiert, welche(r) zum angeforderten Termin verfügbar ist.\n            "
+msgstr ""
 
-#: ../wallace/module_resources.py:1176
+#: ../wallace/module_resources.py:1276
 #, python-format
 msgid ""
 "\n"
@@ -3872,9 +4321,9 @@
 "        \n"
 "        We hereby inform you that your reservation was %s.\n"
 "    "
-msgstr "\n*** Dies ist eine automatisch erstellte E-Mail. Bitte antworten Sie nicht direkt darauf. ***\n\nHiermit informieren wir Sie, dass die Buchung %s wurde.\n    "
+msgstr ""
 
-#: ../wallace/module_resources.py:1183
+#: ../wallace/module_resources.py:1283
 #, python-format
 msgid ""
 "\n"
@@ -3883,16 +4332,16 @@
 "        "
 msgstr ""
 
-#: ../wallace/module_resources.py:1218
+#: ../wallace/module_resources.py:1318
 #, python-format
 msgid "Sending booking notification for event %r to %r from %r"
-msgstr "Sende Buchungsbenachrichtigung für Termin %r zu %r von %r"
+msgstr ""
 
-#: ../wallace/module_resources.py:1236
+#: ../wallace/module_resources.py:1336
 msgid "failed"
-msgstr "fehlgeschlagen"
+msgstr ""
 
-#: ../wallace/module_resources.py:1256
+#: ../wallace/module_resources.py:1356
 #, python-format
 msgid ""
 "\n"
@@ -3900,9 +4349,9 @@
 "\n"
 "            *** This is an automated message, sent to you as the resource owner. ***\n"
 "        "
-msgstr "\nDie Buchungsanfrage für %(resource)s durch %(orgname)s <%(orgemail)s> ist %(status)s für %(date)s.\n\n*** Dies ist eine automatisch erstellte E-Mail. Bitte antworten Sie nicht direkt darauf. ***\n        "
+msgstr ""
 
-#: ../wallace/module_resources.py:1262
+#: ../wallace/module_resources.py:1362
 #, python-format
 msgid ""
 "\n"
@@ -3911,14 +4360,14 @@
 "\n"
 "            *** This is an automated message, sent to you as the resource owner. ***\n"
 "        "
-msgstr "\nEine Buchungsanfrage für %(resource)s konnte nicht automatisch verarbeitet werden.\nBitte kontaktieren Sie %(orgname)s <%(orgemail)s>, welcher die Resource für den %(date)s angefragt hat.\nSubject: %(summary)s.\n\n*** Dies ist eine automatisch erstellte E-Mail. Bitte antworten Sie nicht direkt darauf. ***"
+msgstr ""
 
-#: ../wallace/module_resources.py:1306
+#: ../wallace/module_resources.py:1393
 #, python-format
 msgid "Clone invitation for owner confirmation: %r from %r"
-msgstr "Kopiere Einladung für Eigentümer Bestätigung: %r von %r"
+msgstr ""
 
-#: ../wallace/module_resources.py:1312
+#: ../wallace/module_resources.py:1412
 #, python-format
 msgid ""
 "\n"
@@ -3933,61 +4382,66 @@
 "\n"
 "        *** This is an automated message, please don't reply by email. ***\n"
 "    "
-msgstr "\nEine Buchungsanfrage für %(resource)s benötigt Ihre Zustimmung!\nBitte akzeptieren Sie die Anfrage oder lehnen Sie diese ab ohne die Anfrage in Ihrem Kalender zu speichern.\n\nDie Buchungsanfrage wurde gesendet von %(orgname)s <%(orgemail)s>.\n\nBetreff: %(summary)s.\nTermin: %(date)s\nTeilnehmer: %(attendees)s\n\n*** Dies ist eine automatisch erstellte E-Mail. Bitte antworten Sie nicht direkt darauf. ***"
+msgstr ""
 
 #. This is a nested module
-#: ../wallace/modules.py:97
+#: ../wallace/modules.py:98
 #, python-format
 msgid "Module Group: %s"
-msgstr "Modulgruppe: %s"
+msgstr ""
 
-#: ../wallace/modules.py:108 ../wallace/modules.py:120
+#: ../wallace/modules.py:109 ../wallace/modules.py:125
 #, python-format
 msgid "No such module %r in modules %r (1)."
-msgstr "Kein solches Modul %r in Modulen %r  (1)."
+msgstr ""
 
-#: ../wallace/modules.py:113
+#: ../wallace/modules.py:114
 #, python-format
 msgid "No such module %r in modules %r (2)."
-msgstr "Kein solches Modul %r in Modulen %r (2)."
+msgstr ""
+
+#: ../wallace/modules.py:120 ../wallace/modules.py:172
+#, python-format
+msgid "Unknown error occurred; %r"
+msgstr ""
 
-#: ../wallace/modules.py:126
+#: ../wallace/modules.py:178
 #, python-format
 msgid "Holding message in queue for manual review (%s by %s)"
-msgstr "Behalte Nachricht zur manuellen Prüfung in der Warteliste (%s von %s)"
+msgstr ""
 
-#: ../wallace/modules.py:129
+#: ../wallace/modules.py:181
 #, python-format
 msgid "Deferring message in %s (by module %s)"
-msgstr "Zurückgestellte Nachricht in %s (durch Modul %s)"
+msgstr ""
 
-#: ../wallace/modules.py:141
+#: ../wallace/modules.py:193
 #, python-format
 msgid "The time when the message was sent: %r"
-msgstr "Zeitpunkt des Versandts: %r"
+msgstr ""
 
-#: ../wallace/modules.py:142
+#: ../wallace/modules.py:194
 #, python-format
 msgid "The time now: %r"
-msgstr "Die Zeit ist jetzt: %r"
+msgstr ""
 
-#: ../wallace/modules.py:143
+#: ../wallace/modules.py:195
 #, python-format
 msgid "The time delta: %r"
-msgstr "Die Zeitdifferenz: %r"
+msgstr ""
 
 #. TODO: Send NDR back to user
-#: ../wallace/modules.py:147
+#: ../wallace/modules.py:199
 #, python-format
 msgid "Message in file %s older then 5 days, deleting"
-msgstr "Nachricht in Datei %s älter als 5 Tage, lösche"
+msgstr ""
 
-#: ../wallace/modules.py:172
+#: ../wallace/modules.py:224
 #, python-format
 msgid "Rejecting message in %s (by module %s)"
-msgstr "Weise Nachricht in %s (durch Modul %s) zurück"
+msgstr ""
 
-#: ../wallace/modules.py:193
+#: ../wallace/modules.py:245
 #, python-format
 msgid ""
 "This is the email system Wallace at %s.\n"
@@ -4000,31 +4454,31 @@
 "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 "Ich bin das E-Mail-System Wallace auf %s.\n\nMit Bedauern muß ich Sie informieren, daß die angehängte Nachricht\nnicht an die folgenden Empfänger zugestellt werden konnte:\n\n- %s\n\nFalls Sie noch andere Empfänger angegeben haben wurde die Nachricht\nan diese zugestellt. An diese Empfänger müssen sie die Nachricht\nnicht erneut senden.\n"
+msgstr ""
 
-#: ../wallace/modules.py:208
+#: ../wallace/modules.py:260
 #, python-format
 msgid ""
 "X-Wallace-Module: %s\n"
 "X-Wallace-Result: REJECT\n"
-msgstr "X-Wallace-Modul: %s\nX-Wallace-Ergebnis: REJECT\n"
+msgstr ""
 
-#: ../wallace/modules.py:267
+#: ../wallace/modules.py:304
 #, python-format
 msgid "Accepting message in %s (by module %s)"
-msgstr "Akzeptiere Nachricht in %s (durch Modul %s)"
+msgstr ""
 
-#: ../wallace/modules.py:269
+#: ../wallace/modules.py:306
 #, python-format
 msgid "Accepting message in: %r"
-msgstr "Akzeptiere Nachricht in: %r"
+msgstr ""
 
-#: ../wallace/modules.py:276
+#: ../wallace/modules.py:313
 #, python-format
 msgid "recipients: %r"
-msgstr "Empfänger: %r"
+msgstr ""
 
-#: ../wallace/modules.py:354
+#: ../wallace/modules.py:369
 #, python-format
 msgid "Module '%s' already registered"
-msgstr "Modul '%s' ist bereits registriert"
+msgstr ""

pykolab-0.8.1.tar.gz/po/es.po -> pykolab-0.8.3.tar.gz/po/es.po Changed

@@ -8,400 +8,433 @@
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-14 01:36+0100\n"
-"PO-Revision-Date: 2015-01-21 16:41+0000\n"
-"Last-Translator: Thomas Brüderli <roundcube@gmail.com>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
+"POT-Creation-Date: 2016-07-22 15:31+0200\n"
+"PO-Revision-Date: 2016-07-22 13:31+0000\n"
+"Last-Translator: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/kolab/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"
 
-#: ../bin/kolab_smtp_access_policy.py:210
+#: ../bin/kolab_smtp_access_policy.py:214
 #, python-format
 msgid "Adding policy request to instance %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:480
+#: ../bin/kolab_smtp_access_policy.py:484
 msgid "Unauthorized access not allowed"
 msgstr "El acceso no autorizado no está permitido"
 
-#: ../bin/kolab_smtp_access_policy.py:509
-#: ../bin/kolab_smtp_access_policy.py:690
+#: ../bin/kolab_smtp_access_policy.py:513
+#: ../bin/kolab_smtp_access_policy.py:711
 msgid "Could not find recipient"
 msgstr "No se ha podido encontrar el destinatario"
 
-#: ../bin/kolab_smtp_access_policy.py:528
+#: ../bin/kolab_smtp_access_policy.py:532
 #, python-format
 msgid "Could not find envelope sender user %s (511)"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:571
+#: ../bin/kolab_smtp_access_policy.py:575
 #, python-format
 msgid "Obtained authenticated user details for %r: %r"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:628
+#: ../bin/kolab_smtp_access_policy.py:633
 #, python-format
 msgid "Could not find envelope sender user %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:650
+#: ../bin/kolab_smtp_access_policy.py:666
+#: ../bin/kolab_smtp_access_policy.py:694
 #, python-format
 msgid "%s is unauthorized to send on behalf of %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:660
+#: ../bin/kolab_smtp_access_policy.py:676
 #, python-format
 msgid ""
 "User %s attempted to use envelope sender address %s without authorization"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:714
-#: ../bin/kolab_smtp_access_policy.py:725
+#: ../bin/kolab_smtp_access_policy.py:736
+#: ../bin/kolab_smtp_access_policy.py:747
 #, python-format
 msgid "Found user %s to be a delegate user of %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:749
+#: ../bin/kolab_smtp_access_policy.py:767
 #, 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:752
+#: ../bin/kolab_smtp_access_policy.py:770
 #, python-format
 msgid ""
 "Verifying unauthenticated sender '%(sender)s' for recipient '%(recipient)s'"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:768
+#: ../bin/kolab_smtp_access_policy.py:786
 #, python-format
 msgid "Reproducing verify_recipient(%s, %s) from cache"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:805
+#: ../bin/kolab_smtp_access_policy.py:823
 #, python-format
 msgid "Using authentication domain %s instead of %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:815
+#: ../bin/kolab_smtp_access_policy.py:833
 #, python-format
 msgid "Domain %s is a primary domain"
 msgstr "El dominio %s es el dominio principal"
 
-#: ../bin/kolab_smtp_access_policy.py:823
+#: ../bin/kolab_smtp_access_policy.py:841
 #, 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:838
+#: ../bin/kolab_smtp_access_policy.py:856
 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:855
+#: ../bin/kolab_smtp_access_policy.py:873
 #, 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:891
+#: ../bin/kolab_smtp_access_policy.py:909
 msgid "Invalid recipient"
 msgstr "Destinatario no válido"
 
-#: ../bin/kolab_smtp_access_policy.py:902
+#: ../bin/kolab_smtp_access_policy.py:920
 msgid "Could not find this user, accepting"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:975
-#: ../bin/kolab_smtp_access_policy.py:1051
+#: ../bin/kolab_smtp_access_policy.py:993
+#: ../bin/kolab_smtp_access_policy.py:1070
 #, python-format
 msgid "Sender %s is not allowed to send to recipient %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1039
+#: ../bin/kolab_smtp_access_policy.py:1057
 #, python-format
 msgid "Reproducing verify_sender(%r) from cache"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1056
+#: ../bin/kolab_smtp_access_policy.py:1077
 msgid "Unverifiable sender."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1061
+#: ../bin/kolab_smtp_access_policy.py:1082
 msgid "Sender is not using an alias"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1069
+#: ../bin/kolab_smtp_access_policy.py:1090
 msgid "Sender uses unauthorized envelope sender address"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1086
+#: ../bin/kolab_smtp_access_policy.py:1107
 msgid "Could not verify sender"
 msgstr "No es posible verificar el remitente"
 
-#: ../bin/kolab_smtp_access_policy.py:1093
+#: ../bin/kolab_smtp_access_policy.py:1114
 msgid ""
 "Verifying whether sender is allowed to send to recipient using sender policy"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1106
+#: ../bin/kolab_smtp_access_policy.py:1127
 #, python-format
 msgid "Result is %r"
 msgstr "El resultado es %r"
 
-#: ../bin/kolab_smtp_access_policy.py:1111
+#: ../bin/kolab_smtp_access_policy.py:1132
 msgid "No recipient policy restrictions exist for this sender"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1120
+#: ../bin/kolab_smtp_access_policy.py:1141
 msgid "Found a recipient policy to apply for this sender."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1135
+#: ../bin/kolab_smtp_access_policy.py:1156
 #, python-format
 msgid "Sender %s not allowed to send to recipient %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1156
+#: ../bin/kolab_smtp_access_policy.py:1184
 msgid "Cleaning up the cache"
 msgstr "Limpiando la caché"
 
-#: ../bin/kolab_smtp_access_policy.py:1179
+#: ../bin/kolab_smtp_access_policy.py:1207
 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:1195
+#: ../bin/kolab_smtp_access_policy.py:1223
 #, python-format
 msgid "Operational Error in caching: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1247
+#: ../bin/kolab_smtp_access_policy.py:1276
 #, python-format
 msgid "Caching the policy result with timestamp %d"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1321
+#: ../bin/kolab_smtp_access_policy.py:1353
 #, python-format
 msgid "Returning action DEFER_IF_PERMIT: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1326
+#: ../bin/kolab_smtp_access_policy.py:1358
 #, python-format
 msgid "Returning action DUNNO: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1331
+#: ../bin/kolab_smtp_access_policy.py:1363
 #, python-format
 msgid "Returning action HOLD: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1336
+#: ../bin/kolab_smtp_access_policy.py:1368
 #, python-format
 msgid "Returning action PERMIT: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1461
+#: ../bin/kolab_smtp_access_policy.py:1496
 #, python-format
 msgid "Returning action REJECT: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1507
+#: ../bin/kolab_smtp_access_policy.py:1542
 msgid "Starting to loop for new request"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1514
+#: ../bin/kolab_smtp_access_policy.py:1549
 msgid "Timeout for policy request reading exceeded"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1520
+#: ../bin/kolab_smtp_access_policy.py:1555
 msgid "End of current request"
 msgstr "Finalizada la petición actual"
 
-#: ../bin/kolab_smtp_access_policy.py:1524
+#: ../bin/kolab_smtp_access_policy.py:1559
 #, python-format
 msgid "Getting line: %s"
 msgstr "Obteniendo la línea: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1528
+#: ../bin/kolab_smtp_access_policy.py:1563
 msgid "Returning request"
 msgstr "Returning request"
 
-#: ../bin/kolab_smtp_access_policy.py:1557
+#: ../bin/kolab_smtp_access_policy.py:1592
 msgid "Access Policy Options"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1564
+#: ../bin/kolab_smtp_access_policy.py:1599
 msgid "SMTP Policy request timeout."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1570
+#: ../bin/kolab_smtp_access_policy.py:1605
 msgid "Verify the recipient access policy."
 msgstr "Verificar la política de acceso para los destinatarios"
 
-#: ../bin/kolab_smtp_access_policy.py:1576
+#: ../bin/kolab_smtp_access_policy.py:1611
 msgid "Verify the sender access policy."
 msgstr "Verificar la política de acceso para los remitentes"
 
-#: ../bin/kolab_smtp_access_policy.py:1582
+#: ../bin/kolab_smtp_access_policy.py:1617
 msgid "Allow unauthenticated senders."
 msgstr "Permitir remitentes no autenticados."
 
-#: ../bin/kolab_smtp_access_policy.py:1596
+#: ../bin/kolab_smtp_access_policy.py:1631
 #, python-format
 msgid "Got request instance %s"
 msgstr "Hay una solicitud de instancia %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1605
+#: ../bin/kolab_smtp_access_policy.py:1640
 #, 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:1613
-#, 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:1625
-#, python-format
-msgid "Request instance %s reached DATA state"
-msgstr "La instancia solicitada %s, alcanzó el estado DATA"
-
-#: ../bin/kolab_smtp_access_policy.py:1645
+#: ../bin/kolab_smtp_access_policy.py:1672
 #, python-format
 msgid "Unhandled exception caught: %r"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1649
+#: ../bin/kolab_smtp_access_policy.py:1676
 msgid "Sender access denied"
 msgstr "Acceso denegado al destinatario"
 
-#: ../bin/kolab_smtp_access_policy.py:1651
+#: ../bin/kolab_smtp_access_policy.py:1678
 msgid "Recipient access denied"
 msgstr "Acceso denegado al destinatario"
 
-#: ../bin/kolab_smtp_access_policy.py:1653
+#: ../bin/kolab_smtp_access_policy.py:1680
 msgid "No objections"
 msgstr "No hay objeciones"
 
-#: ../conf.py:37 ../kolab-cli.py:34 ../saslauthd.py:33
+#: ../conf.py:36 ../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:51
-#: ../wallace/__init__.py:107
+#: ../kolabd/__init__.py:50 ../saslauthd/__init__.py:52
+#: ../wallace/__init__.py:108
 msgid "Daemon Options"
 msgstr "Opciones del demonio"
 
-#: ../kolabd/__init__.py:56 ../saslauthd/__init__.py:58
-#: ../wallace/__init__.py:114
+#: ../kolabd/__init__.py:57 ../saslauthd/__init__.py:59
+#: ../wallace/__init__.py:115
 msgid "Fork to the background."
 msgstr ""
 
-#: ../kolabd/__init__.py:65 ../saslauthd/__init__.py:67
-#: ../wallace/__init__.py:148
+#: ../kolabd/__init__.py:66 ../saslauthd/__init__.py:68
+#: ../wallace/__init__.py:150
 msgid "Path to the PID file to use."
 msgstr "Ruta del archivo de PID a utilizar."
 
-#: ../kolabd/__init__.py:74 ../saslauthd/__init__.py:85
-#: ../wallace/__init__.py:165
+#: ../kolabd/__init__.py:75 ../saslauthd/__init__.py:86
+#: ../wallace/__init__.py:168
 msgid "Run as user USERNAME"
 msgstr "Ejecutar el usuario USERNAME"
 
-#: ../kolabd/__init__.py:84 ../saslauthd/__init__.py:95
-#: ../wallace/__init__.py:131
+#: ../kolabd/__init__.py:85 ../saslauthd/__init__.py:96
+#: ../wallace/__init__.py:132
 msgid "Run as group GROUPNAME"
 msgstr "Ejecutar el grupo GROUPNAME"
 
-#: ../kolabd/__init__.py:122 ../pykolab/utils.py:234
-#: ../saslauthd/__init__.py:301 ../wallace/__init__.py:365
+#: ../kolabd/__init__.py:123 ../pykolab/utils.py:254
+#: ../saslauthd/__init__.py:327 ../wallace/__init__.py:373
 #, python-format
 msgid "Group %s does not exist"
 msgstr "El grupo %s no existe"
 
-#: ../kolabd/__init__.py:131 ../saslauthd/__init__.py:310
-#: ../wallace/__init__.py:374
+#: ../kolabd/__init__.py:132 ../saslauthd/__init__.py:336
+#: ../wallace/__init__.py:382
 #, 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:258
-#: ../saslauthd/__init__.py:332 ../wallace/__init__.py:396
+#: ../kolabd/__init__.py:154 ../pykolab/utils.py:278
+#: ../saslauthd/__init__.py:358 ../wallace/__init__.py:404
 #, python-format
 msgid "User %s does not exist"
 msgstr " El usuario %s no existe"
 
-#: ../kolabd/__init__.py:163 ../saslauthd/__init__.py:342
-#: ../wallace/__init__.py:406
+#: ../kolabd/__init__.py:163 ../saslauthd/__init__.py:367
+#: ../wallace/__init__.py:414
 #, python-format
 msgid "Switching real and effective user id to %d"
 msgstr ""
 
-#: ../kolabd/__init__.py:172 ../saslauthd/__init__.py:351
-#: ../wallace/__init__.py:415
+#: ../kolabd/__init__.py:172 ../saslauthd/__init__.py:376
+#: ../wallace/__init__.py:423
 msgid "Could not change real and effective uid and/or gid"
 msgstr ""
 
-#: ../kolabd/__init__.py:192 ../saslauthd/__init__.py:142
-#: ../wallace/__init__.py:435
+#: ../kolabd/__init__.py:215 ../saslauthd/__init__.py:166
+#: ../wallace/__init__.py:465
 msgid "Interrupted by user"
 msgstr "Interrumpido por el usuario"
 
-#: ../kolabd/__init__.py:197 ../kolabd/__init__.py:208
-msgid "Traceback occurred, please report a "
+#: ../kolabd/__init__.py:220 ../kolabd/__init__.py:231
+#: ../saslauthd/__init__.py:170 ../saslauthd/__init__.py:179
+#: ../wallace/__init__.py:469 ../wallace/__init__.py:478
+msgid "Traceback occurred, please report a bug at https://issues.kolab.org"
 msgstr ""
 
-#: ../kolabd/__init__.py:203 ../saslauthd/__init__.py:150
-#: ../wallace/__init__.py:444
+#: ../kolabd/__init__.py:226 ../saslauthd/__init__.py:175
+#: ../wallace/__init__.py:474
 #, python-format
 msgid "Type Error: %s"
 msgstr "Tipo de error: %s"
 
-#: ../kolabd/__init__.py:230
+#: ../kolabd/__init__.py:253
 msgid "Could not connect to LDAP, is it running?"
 msgstr ""
 
-#: ../kolabd/__init__.py:233 ../pykolab/auth/ldap/__init__.py:2242
-#: ../pykolab/cli/cmd_sync.py:67
+#: ../kolabd/__init__.py:256 ../pykolab/auth/ldap/__init__.py:2524
+#: ../pykolab/cli/cmd_sync.py:77
 msgid "Listing domains..."
 msgstr "Listando dominios..."
 
-#: ../kolabd/__init__.py:244
+#: ../kolabd/__init__.py:267
 msgid "No domains. Not syncing"
 msgstr ""
 
-#: ../kolabd/__init__.py:279
+#: ../kolabd/__init__.py:290
+#, python-format
+msgid "Domain %r naming context: %r, root dn: %r"
+msgstr ""
+
+#: ../kolabd/__init__.py:302
+#, python-format
+msgid "Naming contexts to synchronize: %r"
+msgstr ""
+
+#: ../kolabd/__init__.py:320
+#, python-format
+msgid "Result set of domains: %r"
+msgstr ""
+
+#: ../kolabd/__init__.py:323
+#, python-format
+msgid "Checking for domain %s"
+msgstr ""
+
+#: ../kolabd/__init__.py:327
+#, python-format
+msgid "Domain %s isn't alive anymore."
+msgstr ""
+
+#: ../kolabd/__init__.py:331
+#, python-format
+msgid "Domain %s already there and alive."
+msgstr ""
+
+#: ../kolabd/__init__.py:335
+#, python-format
+msgid "Domain %s should not exist any longer."
+msgstr ""
+
+#: ../kolabd/__init__.py:338
+#, python-format
+msgid "Domain %s does not have a process yet."
+msgstr ""
+
+#: ../kolabd/__init__.py:349
 #, python-format
 msgid "added domains: %r, removed domains: %r"
 msgstr "dominios añadidos: %r, dominios eliminados: %r"
 
-#: ../kolabd/process.py:33
+#: ../kolabd/process.py:34
 #, python-format
 msgid "Process created for domain %s"
 msgstr ""
 
-#: ../kolabd/process.py:42
+#: ../kolabd/process.py:43
 #, python-format
 msgid "Synchronizing for domain %s"
 msgstr ""
 
-#: ../kolabd/process.py:59
+#: ../kolabd/process.py:60
 #, python-format
 msgid ""
 "Error in process %r, terminating:\n"
 "\t%r"
 msgstr ""
 
-#: ../kolabd.py:31 ../setup-kolab.py:36 ../wallace.py:31
+#: ../kolabd.py:31 ../setup-kolab.py:37 ../wallace.py:31
 msgid "Cannot load pykolab/constants.py:"
 msgstr "No se puede cargar pykolab/constants.py:"
 
@@ -449,323 +482,428 @@
 msgid "Updating result_attribute for cache entry %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:52
+#: ../pykolab/auth/ldap/__init__.py:54
 msgid "Python LDAP library does not support persistent search"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:143
+#: ../pykolab/auth/ldap/__init__.py:147
 #, python-format
 msgid "Attempting to authenticate user %s in realm %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:175 ../pykolab/auth/ldap/__init__.py:226
+#: ../pykolab/auth/ldap/__init__.py:165 ../pykolab/auth/ldap/__init__.py:180
+#: ../pykolab/auth/ldap/__init__.py:207 ../pykolab/auth/ldap/__init__.py:324
 #, python-format
 msgid "Authentication cache failed: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:216 ../pykolab/auth/ldap/__init__.py:240
+#: ../pykolab/auth/ldap/__init__.py:229 ../pykolab/auth/ldap/__init__.py:1441
+#: ../pykolab/auth/ldap/__init__.py:1467 ../pykolab/auth/ldap/__init__.py:3066
+#, python-format
+msgid "LDAP server unavailable: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:230 ../pykolab/auth/ldap/__init__.py:237
+#: ../pykolab/auth/ldap/__init__.py:1316 ../pykolab/auth/ldap/__init__.py:1442
+#: ../pykolab/auth/ldap/__init__.py:1468 ../pykolab/auth/ldap/__init__.py:1756
+#: ../pykolab/auth/ldap/__init__.py:3067 ../pykolab/auth/ldap/__init__.py:3077
+#, python-format
+msgid "%s"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:236
+#, python-format
+msgid "Exception occurred: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:243
+#, python-format
+msgid "Length of entries found: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:255
+#, python-format
+msgid "Authentication for %r failed (multiple entries)"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:269
+#, python-format
+msgid "Authentication for %r failed (no entry)"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:282
+#, python-format
+msgid "Authentication for %r failed (LDAP error?)"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:300 ../pykolab/auth/ldap/__init__.py:354
+#, python-format
+msgid "Authentication for %r succeeded"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:311
+#, python-format
+msgid "Authentication for %r failed (error)"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:328
+msgid "Authentication failed, LDAP server unavailable"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:336 ../pykolab/auth/ldap/__init__.py:391
 #, python-format
-msgid "Binding with user_dn %s and password %s"
+msgid "Failed to authenticate as user %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:231 ../pykolab/auth/ldap/__init__.py:263
+#: ../pykolab/auth/ldap/__init__.py:357
 #, python-format
-msgid "Failed to authenticate as user %s"
+msgid "Authentication for %r failed (password)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:249
+#: ../pykolab/auth/ldap/__init__.py:369
 #, python-format
 msgid "Error occured, there is no such object: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:254
+#: ../pykolab/auth/ldap/__init__.py:381
 msgid "Authentication cache failed to clear entry"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:260
+#: ../pykolab/auth/ldap/__init__.py:387
 #, python-format
 msgid "Exception occured: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:280
+#: ../pykolab/auth/ldap/__init__.py:419
 msgid "Connecting to LDAP..."
 msgstr "Conectado a LDAP..."
 
-#: ../pykolab/auth/ldap/__init__.py:284
+#: ../pykolab/auth/ldap/__init__.py:423
 #, python-format
 msgid "Attempting to use LDAP URI %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:371
+#: ../pykolab/auth/ldap/__init__.py:524
 #, python-format
 msgid "Entry ID: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:373
+#: ../pykolab/auth/ldap/__init__.py:526
 #, python-format
 msgid "Entry DN: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:376
+#: ../pykolab/auth/ldap/__init__.py:529
 #, python-format
 msgid ""
 "ldap search: (%r, %r, filterstr='(objectclass=*)', attrlist=[ 'dn' ] + %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:481
+#: ../pykolab/auth/ldap/__init__.py:648 ../pykolab/auth/ldap/__init__.py:801
 #, python-format
-msgid "Finding recipient with filter %r"
+msgid "Finding resource with filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:557
+#: ../pykolab/auth/ldap/__init__.py:725
 #, python-format
-msgid "Finding resource with filter %r"
+msgid "Finding recipient with filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:588
+#: ../pykolab/auth/ldap/__init__.py:832
 #, python-format
 msgid "Using timestamp %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:625
+#: ../pykolab/auth/ldap/__init__.py:869
 #, python-format
-msgid "Not applying recipient policy for %s "
+msgid "Not applying recipient policy for %s (disabled through configuration)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:635
+#: ../pykolab/auth/ldap/__init__.py:879
 #, python-format
 msgid "Applying recipient policy to %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:652
+#: ../pykolab/auth/ldap/__init__.py:896
 #, 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:663
+#: ../pykolab/auth/ldap/__init__.py:907
 #, python-format
 msgid "key %r not in entry"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:665
+#: ../pykolab/auth/ldap/__init__.py:909
 #, python-format
 msgid "key %r is the prim. mail attr."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:667
+#: ../pykolab/auth/ldap/__init__.py:911
 msgid "prim. mail pol. is not empty"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:670
+#: ../pykolab/auth/ldap/__init__.py:914
 #, python-format
 msgid "key %r is the sec. mail attr."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:672
+#: ../pykolab/auth/ldap/__init__.py:916
 msgid "sec. mail pol. is not empty"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:676 ../pykolab/auth/ldap/__init__.py:690
+#: ../pykolab/auth/ldap/__init__.py:920 ../pykolab/auth/ldap/__init__.py:934
 #, python-format
 msgid "Attributes %r are not yet available for entry %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:729
+#: ../pykolab/auth/ldap/__init__.py:973
 #, python-format
 msgid "No results for mail address %s found"
 msgstr "No se han encontrado resultados para la dirección de correo %s"
 
-#: ../pykolab/auth/ldap/__init__.py:740
+#: ../pykolab/auth/ldap/__init__.py:984
 #, python-format
 msgid "1 result for address %s found, verifying"
 msgstr "Encontrado 1 resultado para la dirección %s, verificando"
 
-#: ../pykolab/auth/ldap/__init__.py:750
+#: ../pykolab/auth/ldap/__init__.py:994
 #, 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:761 ../pykolab/auth/ldap/__init__.py:850
+#: ../pykolab/auth/ldap/__init__.py:1005 ../pykolab/auth/ldap/__init__.py:1094
 msgid "Address assigned to us"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:816
+#: ../pykolab/auth/ldap/__init__.py:1060
 #, python-format
 msgid "No results for address %s found"
 msgstr "No se han encontrado resultados para la dirección %s"
 
-#: ../pykolab/auth/ldap/__init__.py:827
+#: ../pykolab/auth/ldap/__init__.py:1071
 #, python-format
-msgid "1 result for address %s found, "
-msgstr "Encontrado 1 resultado para la dirección %s"
+msgid "1 result for address %s found, verifying..."
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:838
-msgid "Too bad, secondary email "
+#: ../pykolab/auth/ldap/__init__.py:1082
+#, python-format
+msgid "Too bad, secondary email address %s already in use for %s (we are %s)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:865
-msgid "Recipient policy composed the following set of secondary "
+#: ../pykolab/auth/ldap/__init__.py:1109
+#, python-format
+msgid ""
+"Recipient policy composed the following set of secondary email addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:876
+#: ../pykolab/auth/ldap/__init__.py:1120
 #, python-format
 msgid "Secondary mail addresses that we want is not None: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:887
-msgid "Avoiding the duplication of the primary mail "
+#: ../pykolab/auth/ldap/__init__.py:1131
+#, 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:898
+#: ../pykolab/auth/ldap/__init__.py:1142
 #, python-format
 msgid "Entry is getting secondary mail addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:906
-msgid "Entry did not have any secondary mail "
+#: ../pykolab/auth/ldap/__init__.py:1150
+#, python-format
+msgid "Entry did not have any secondary mail addresses in %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:923 ../pykolab/auth/ldap/__init__.py:929
+#: ../pykolab/auth/ldap/__init__.py:1167 ../pykolab/auth/ldap/__init__.py:1173
 #, python-format
 msgid "secondary_mail_addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:924 ../pykolab/auth/ldap/__init__.py:930
+#: ../pykolab/auth/ldap/__init__.py:1168 ../pykolab/auth/ldap/__init__.py:1174
 #, python-format
 msgid "entry[%s]: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:941
+#: ../pykolab/auth/ldap/__init__.py:1185
 #, python-format
 msgid "Entry modifications list: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:969
+#: ../pykolab/auth/ldap/__init__.py:1219
 #, python-format
 msgid "Setting entry attribute %r to %r for %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1005
+#: ../pykolab/auth/ldap/__init__.py:1255
 #, python-format
 msgid ""
 "Could not update dn %r:\n"
 "%r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1031
+#: ../pykolab/auth/ldap/__init__.py:1281
 #, python-format
 msgid "Using filter %r"
 msgstr "Utilizando el filtro %r"
 
-#: ../pykolab/auth/ldap/__init__.py:1046
+#: ../pykolab/auth/ldap/__init__.py:1296
 #, python-format
 msgid "Synchronization is searching against base DN: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1095
+#: ../pykolab/auth/ldap/__init__.py:1343
+#, python-format
+msgid ""
+"About to consider the user quota for %r (used: %r, imap: %r, ldap: %r, "
+"default: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1406
+msgid "Attempting to bind without a DN but with a password"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1411
+msgid "Attempting to bind with a DN but without a password"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1429
 #, python-format
-msgid "About to consider the user quota for %r (used: %r, "
+msgid "Binding with bind_dn: %s and password: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1166
+#: ../pykolab/auth/ldap/__init__.py:1447 ../pykolab/auth/ldap/__init__.py:1471
 msgid "Invalid DN, username and/or password."
 msgstr "DN inválido, usuario y/o contraseña"
 
-#: ../pykolab/auth/ldap/__init__.py:1291 ../pykolab/auth/ldap/__init__.py:1308
-#: ../pykolab/auth/ldap/__init__.py:1682 ../pykolab/auth/ldap/__init__.py:1699
-#, python-format
-msgid "Found a subject %r with access %r"
+#: ../pykolab/auth/ldap/__init__.py:1452
+msgid "bind() called but already bound"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1410
+#: ../pykolab/auth/ldap/__init__.py:1474
+msgid "bind_priv() called but already bound"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1686
 #, python-format
 msgid "Entry %s attribute value: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1418
+#: ../pykolab/auth/ldap/__init__.py:1694
 #, python-format
 msgid "imap.user_mailbox_server(%r) result: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1481 ../pykolab/auth/ldap/__init__.py:2809
+#: ../pykolab/auth/ldap/__init__.py:1755
 #, python-format
-msgid "%s"
+msgid "An error occured: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1748 ../pykolab/auth/ldap/__init__.py:1948
+#: ../pykolab/auth/ldap/__init__.py:1993 ../pykolab/auth/ldap/__init__.py:2187
 #, python-format
 msgid "Result from recipient policy: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2003
+#: ../pykolab/auth/ldap/__init__.py:2242
 #, python-format
 msgid "Kolab user %s does not have a result attribute %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2162
+#: ../pykolab/auth/ldap/__init__.py:2267
+#, python-format
+msgid "Naming contexts found: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:2274
+#, python-format
+msgid "Domains/Root DNs found: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:2434
+#, python-format
+msgid "Searching root dn for domain %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:2439
+#, python-format
+msgid "Returning from cache: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:2444
 #, python-format
 msgid "Finding domain root dn for domain %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2269
-msgid "Authentication database DOWN"
+#: ../pykolab/auth/ldap/__init__.py:2474
+#, python-format
+msgid "Setting domain root dn from LDAP for domain %r: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2353 ../pykolab/auth/ldap/__init__.py:2401
+#: ../pykolab/auth/ldap/__init__.py:2620 ../pykolab/auth/ldap/__init__.py:2668
 #, python-format
 msgid "Entry type: %s"
 msgstr "Tipo de entrada: %s"
 
-#: ../pykolab/auth/ldap/__init__.py:2490
+#: ../pykolab/auth/ldap/__init__.py:2746
 msgid "LDAP Search Result Data Entry:"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2506
+#: ../pykolab/auth/ldap/__init__.py:2762
 msgid "Entry Change Notification attributes:"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2511
+#: ../pykolab/auth/ldap/__init__.py:2767
 #, python-format
 msgid "Change Type: %r (%r)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2519
+#: ../pykolab/auth/ldap/__init__.py:2775
 #, python-format
 msgid "Previous DN: %r"
 msgstr "DN anterior: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:2574
+#: ../pykolab/auth/ldap/__init__.py:2830
 #, python-format
 msgid "Object %s searched no longer exists"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2584
+#: ../pykolab/auth/ldap/__init__.py:2840
 #, python-format
 msgid "%d results..."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2687
+#: ../pykolab/auth/ldap/__init__.py:2943
 #, python-format
 msgid "Searching with filter %r"
 msgstr "Buscando con el filtro %r"
 
-#: ../pykolab/auth/ldap/__init__.py:2739
+#: ../pykolab/auth/ldap/__init__.py:2995
 #, python-format
 msgid "Checking for support for %s on %s"
 msgstr "Comprobando el soporte para %s en %s"
 
-#: ../pykolab/auth/ldap/__init__.py:2758
+#: ../pykolab/auth/ldap/__init__.py:3014
 #, python-format
 msgid "Found support for %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2803
+#: ../pykolab/auth/ldap/__init__.py:3068
+msgid "-- reconnecting in 10 seconds."
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:3076
 #, python-format
 msgid "An error occured using %s: %r"
 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 +944,8 @@
 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
@@ -814,12 +953,13 @@
 msgid "Recipient %r is not the primary recipient for address %r"
 msgstr ""
 
-#: ../pykolab/cli/cmd_add_domain.py:36
+#: ../pykolab/cli/cmd_add_domain.py:36 ../pykolab/cli/cmd_check_quota.py:37
 #: ../pykolab/cli/cmd_count_domain_mailboxes.py:38
 #: ../pykolab/cli/cmd_create_mailbox.py:36
+#: ../pykolab/cli/cmd_delete_domain.py:39
 #: ../pykolab/cli/cmd_export_mailbox.py:33
 #: ../pykolab/cli/cmd_list_deleted_mailboxes.py:38
-#: ../pykolab/cli/cmd_list_domain_mailboxes.py:36
+#: ../pykolab/cli/cmd_list_domain_mailboxes.py:37
 #: ../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
@@ -840,12 +980,14 @@
 msgid "Add a new domain."
 msgstr ""
 
-#: ../pykolab/cli/cmd_add_domain.py:55 ../pykolab/cli/cmd_delete_domain.py:44
+#: ../pykolab/cli/cmd_add_domain.py:55 ../pykolab/cli/cmd_delete_domain.py:55
 #: ../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
+#: ../pykolab/cli/cmd_add_domain.py:67 ../pykolab/cli/cmd_delete_domain.py:67
 #: ../pykolab/cli/cmd_find_domain.py:56
 msgid "Domain name"
 msgstr ""
@@ -875,20 +1017,45 @@
 
 #: ../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_list_messages.py:100
 #: ../pykolab/cli/cmd_remove_user_subscription.py:73
 msgid "No such folder"
 msgstr "La carpeta no existe"
 
+#: ../pykolab/cli/cmd_check_quota.py:44
+msgid "Do not apply any changes."
+msgstr ""
+
+#: ../pykolab/cli/cmd_check_quota.py:53
 #: ../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_list_domain_mailboxes.py:49
+#: ../pykolab/cli/cmd_list_mailboxes.py:52
+#: ../pykolab/cli/cmd_list_messages.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_check_quota.py:57
+msgid "Compare existing IMAP quota with LDAP quota."
+msgstr ""
+
+#: ../pykolab/cli/cmd_check_quota.py:84 ../pykolab/cli/cmd_user_info.py:51
+#, python-format
+msgid "No such user %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_check_quota.py:98
+#, python-format
+msgid "No quota for user %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_check_quota.py:105
+#, python-format
+msgid "user quota does not match for %s (IMAP: %d, LDAP: %d)"
+msgstr ""
+
 #: ../pykolab/cli/cmd_create_mailbox.py:42
 msgid "Set metadata for folder to ANNOTATION=VALUE"
 msgstr ""
@@ -909,6 +1076,10 @@
 msgid "Delete a domain."
 msgstr ""
 
+#: ../pykolab/cli/cmd_delete_domain.py:46
+msgid "Force deleting the domain even if it contains user accounts"
+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
@@ -921,10 +1092,8 @@
 #: ../pykolab/cli/cmd_list_mailbox_metadata.py:54
 #: ../pykolab/cli/cmd_set_mailbox_acl.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
+#: ../pykolab/cli/cmd_set_quota.py:48 ../tests/unit/test-015-translate.py:15
+#: ../tests/unit/test-015-translate.py:19
 msgid "Folder name"
 msgstr "Folder name"
 
@@ -933,7 +1102,7 @@
 #: ../pykolab/cli/cmd_list_mailbox_metadata.py:80
 #: ../pykolab/cli/cmd_set_mailbox_acl.py:67
 #: ../pykolab/cli/cmd_set_mailbox_metadata.py:94
-#: ../pykolab/cli/cmd_set_quota.py:58
+#: ../pykolab/cli/cmd_set_quota.py:60
 #, python-format
 msgid "No such folder %r"
 msgstr ""
@@ -965,7 +1134,7 @@
 msgstr ""
 
 #: ../pykolab/cli/cmd_delete_message.py:52
-#: ../pykolab/cli/cmd_list_messages.py:58
+#: ../pykolab/cli/cmd_list_messages.py:76
 msgid "Specify a folder"
 msgstr ""
 
@@ -993,13 +1162,13 @@
 msgstr ""
 
 #: ../pykolab/cli/cmd_list_deleted_mailboxes.py:43
-#: ../pykolab/cli/cmd_list_domain_mailboxes.py:41
+#: ../pykolab/cli/cmd_list_domain_mailboxes.py:42
 #: ../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_domain_mailboxes.py:58
+#: ../pykolab/cli/cmd_list_domain_mailboxes.py:59
 msgid "Domain"
 msgstr "Dominio"
 
@@ -1016,7 +1185,11 @@
 msgid "Include messages flagged as \\Deleted"
 msgstr ""
 
-#: ../pykolab/cli/cmd_list_messages.py:47
+#: ../pykolab/cli/cmd_list_messages.py:61
+msgid "List messages as user USER"
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_messages.py:65
 msgid "List messages in a folder"
 msgstr ""
 
@@ -1179,7 +1352,7 @@
 msgid "Metadata path"
 msgstr ""
 
-#: ../pykolab/cli/cmd_set_quota.py:43 ../pykolab/cli/cmd_set_quota.py:47
+#: ../pykolab/cli/cmd_set_quota.py:45 ../pykolab/cli/cmd_set_quota.py:49
 msgid "New quota"
 msgstr ""
 
@@ -1196,39 +1369,39 @@
 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
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:105
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:153
 #, 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
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:110
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:158
 #, 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
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:114
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:162
 #, 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
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:116
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:164
 #, 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
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:118
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:166
 #, python-format
 msgid "No recipients for '%s' (use --delete to delete)!"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:136
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:147
 #, python-format
 msgid "Multiple recipients for '%s'!"
 msgstr ""
@@ -1241,22 +1414,26 @@
 msgid "Resync from the beginning"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync.py:72
+#: ../pykolab/cli/cmd_sync.py:68
+msgid "Only sync the specified domain"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:82
 #, python-format
 msgid "Found %d domains in %d seconds"
 msgstr "Encontrados %d dominios en %d segundos"
 
-#: ../pykolab/cli/cmd_sync.py:85
+#: ../pykolab/cli/cmd_sync.py:98
 #, python-format
 msgid "Running for domain %s"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync.py:92
+#: ../pykolab/cli/cmd_sync.py:105
 #, python-format
 msgid "Synchronizing users for %s took %d seconds"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync.py:109
+#: ../pykolab/cli/cmd_sync.py:123
 #, python-format
 msgid "Worker process %s handling %s"
 msgstr ""
@@ -1273,11 +1450,6 @@
 msgid "Email address"
 msgstr ""
 
-#: ../pykolab/cli/cmd_user_info.py:51
-#, python-format
-msgid "No such user %s"
-msgstr ""
-
 #. This is a nested command
 #. This is a nested component
 #: ../pykolab/cli/commands.py:97 ../pykolab/setup/components.py:90
@@ -1295,7 +1467,7 @@
 msgstr ""
 
 #: ../pykolab/cli/commands.py:192 ../pykolab/setup/components.py:257
-#: ../wallace/modules.py:376
+#: ../wallace/modules.py:391
 #, python-format
 msgid "Alias for %s"
 msgstr "Alias para %s"
@@ -1304,7 +1476,7 @@
 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_list.py:49 ../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 ""
@@ -1421,7 +1593,8 @@
 #: ../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
@@ -1503,100 +1676,106 @@
 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 "Use the default answer to all questions."
+msgstr ""
 
-#: ../pykolab/conf/__init__.py:294
+#: ../pykolab/conf/__init__.py:292
+msgid "Set the logging level. One of info, warn, error, critical or debug"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:300
 msgid "Log file to use"
 msgstr "Archivo de registro a utilizar"
 
-#: ../pykolab/conf/__init__.py:300
+#: ../pykolab/conf/__init__.py:306
 msgid "Be quiet."
 msgstr "Mantente en silencio"
 
-#: ../pykolab/conf/__init__.py:306
+#: ../pykolab/conf/__init__.py:312
 msgid "Answer yes to all questions."
 msgstr "Responde Sí a todas las preguntas."
 
-#: ../pykolab/conf/__init__.py:328
+#: ../pykolab/conf/__init__.py:334
 msgid "No command supplied"
 msgstr "No se ha proporcionado ningún comando"
 
-#: ../pykolab/conf/__init__.py:416
+#: ../pykolab/conf/__init__.py:422
 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:419
+#: ../pykolab/conf/__init__.py:425
 #, python-format
 msgid "No section '%s' exists."
 msgstr "No existe la sección '%s'."
 
-#: ../pykolab/conf/__init__.py:461
+#: ../pykolab/conf/__init__.py:467
 #, python-format
 msgid "Setting %s to %r (from the default values for CLI options)"
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:534
+#: ../pykolab/conf/__init__.py:540
 #, python-format
 msgid "Could not execute configuration function: %s"
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:542
+#: ../pykolab/conf/__init__.py:548
 #, python-format
 msgid "Option %s/%s does not exist in config file %s, pulling from defaults"
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:550 ../pykolab/conf/__init__.py:553
+#: ../pykolab/conf/__init__.py:556 ../pykolab/conf/__init__.py:559
 msgid "Option does not exist in defaults."
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:563
+#: ../pykolab/conf/__init__.py:569
 #, python-format
 msgid "Configuration file %s not readable."
 msgstr "No se puede leer el archivo de configuración %s."
 
-#: ../pykolab/conf/__init__.py:566
+#: ../pykolab/conf/__init__.py:572
 #, python-format
 msgid "Configuration file %s does not exist."
 msgstr "El archivo de configuración %s no existe."
 
-#: ../pykolab/conf/__init__.py:571
+#: ../pykolab/conf/__init__.py:577
 msgid ""
 "WARNING: A negative debug level value does not make this program be any more"
 " silent."
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:577
+#: ../pykolab/conf/__init__.py:583
 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
+#: ../pykolab/conf/__init__.py:591 ../pykolab/conf/__init__.py:597
+#: ../pykolab/conf/__init__.py:601 ../pykolab/conf/__init__.py:607
 msgid "Cannot start SASL authentication daemon"
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:612
+#: ../pykolab/conf/__init__.py:618
 msgid "No imaplib library found."
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:622
+#: ../pykolab/conf/__init__.py:628
 msgid "No LMTP class found in the smtplib library."
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:632
+#: ../pykolab/conf/__init__.py:638
 msgid "No SMTP class found in the smtplib library."
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:646
+#: ../pykolab/conf/__init__.py:652
 #, python-format
 msgid "Found you specified a specific set of items to test: %s"
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:654
+#: ../pykolab/conf/__init__.py:660
 #, python-format
 msgid "Selectively selecting: %s"
 msgstr ""
@@ -1625,98 +1804,121 @@
 msgid "OpenLDAP or compatible"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:80
+#: ../pykolab/imap/cyrus.py:83
 #, python-format
 msgid "Could not connect to Cyrus IMAP server %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:138
+#: ../pykolab/imap/cyrus.py:150 ../pykolab/imap/dovecot.py:285
 #, python-format
 msgid "Continuing with separator: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:143
+#: ../pykolab/imap/cyrus.py:159
 msgid "Detected we are running in a Murder topology"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:147
+#: ../pykolab/imap/cyrus.py:167
 msgid "This system is not part of a murder topology"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:168
+#: ../pykolab/imap/cyrus.py:196
 #, python-format
 msgid "Checking actual backend server for folder %s through annotations"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:173
-msgid "Possibly reproducing the find "
+#: ../pykolab/imap/cyrus.py:206
+#, python-format
+msgid ""
+"Possibly reproducing the find mailfolder server answer from previously "
+"detected and stored annotation value: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:196
+#: ../pykolab/imap/cyrus.py:236
 #, python-format
 msgid "Could not get the annotations after %s tries."
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:200
+#: ../pykolab/imap/cyrus.py:250
 #, python-format
 msgid "No annotations for %s: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:207
+#: ../pykolab/imap/cyrus.py:262
 #, python-format
 msgid "Server for INBOX folder %s is %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:227
+#. Removed server reconnection for dovecot, we only have one server
+#: ../pykolab/imap/cyrus.py:294 ../pykolab/imap/dovecot.py:311
 #, python-format
 msgid "Setting quota for folder %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:231
+#: ../pykolab/imap/cyrus.py:305 ../pykolab/imap/dovecot.py:315
 #, python-format
 msgid "Could not set quota for mailfolder %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:241
+#: ../pykolab/imap/cyrus.py:319 ../pykolab/imap/dovecot.py:320
 #, python-format
 msgid "Moving INBOX folder %s to %s on partition %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:243
+#: ../pykolab/imap/cyrus.py:329 ../pykolab/imap/dovecot.py:322
 #, python-format
 msgid "Moving INBOX folder %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:259
+#: ../pykolab/imap/cyrus.py:355
 #, python-format
 msgid "Setting annotation %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:264
+#: ../pykolab/imap/cyrus.py:366
 #, python-format
 msgid "Could not set annotation %r on mail folder %r: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:268
+#: ../pykolab/imap/cyrus.py:376 ../pykolab/imap/dovecot.py:451
 #, python-format
 msgid "Transferring folder %s from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:328
+#: ../pykolab/imap/cyrus.py:464 ../pykolab/imap/dovecot.py:511
 #, python-format
 msgid "Undeleting %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:339
+#: ../pykolab/imap/cyrus.py:484
 #, python-format
-msgid "Would have transfered %s from %s to %s"
+msgid "Would have transferred %s from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:341
+#: ../pykolab/imap/cyrus.py:491 ../pykolab/imap/dovecot.py:524
 #, python-format
 msgid "Would have renamed %s to %s"
 msgstr ""
 
+#: ../pykolab/imap/dovecot.py:220
+#, python-format
+msgid "Could not connect to Dovecot IMAP server %r"
+msgstr ""
+
+#: ../pykolab/imap/dovecot.py:292
+msgid "Detected METADATA support"
+msgstr ""
+
+#: ../pykolab/imap/dovecot.py:295
+#, python-format
+msgid "This system does not support METADATA: '%s'"
+msgstr ""
+
+#: ../pykolab/imap/dovecot.py:522
+#, python-format
+msgid "Would have transfered %s from %s to %s"
+msgstr ""
+
 #: ../pykolab/imap/__init__.py:46
 #, python-format
 msgid "Cleaning up ACL entries for %s across all folders"
@@ -1786,180 +1988,191 @@
 msgid "%r has no attribute %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:393
+#: ../pykolab/imap/__init__.py:360
+#, python-format
+msgid "Invalid access identifier %r for subject %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:397
 #, python-format
 msgid "Could not set ACL for %s on folder %s: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:427 ../pykolab/imap/__init__.py:462
+#: ../pykolab/imap/__init__.py:431 ../pykolab/imap/__init__.py:467
 #, python-format
 msgid "Creating new shared folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:487 ../pykolab/imap/__init__.py:740
+#: ../pykolab/imap/__init__.py:496 ../pykolab/imap/__init__.py:776
 #, python-format
 msgid "Downcasing mailbox name %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:491
+#: ../pykolab/imap/__init__.py:500
 #, python-format
 msgid "Creating new mailbox for user %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:506 ../pykolab/imap/__init__.py:613
+#: ../pykolab/imap/__init__.py:515 ../pykolab/imap/__init__.py:644
 msgid "Waiting for the Cyrus IMAP Murder to settle..."
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:559
+#: ../pykolab/imap/__init__.py:590
 #, python-format
 msgid "Creating additional folders for user %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:587
+#: ../pykolab/imap/__init__.py:618
 #, python-format
 msgid "Waiting for the Cyrus murder to settle... %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:602
+#: ../pykolab/imap/__init__.py:633
 #, python-format
 msgid "Correcting additional folder name from %r to %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:618
+#: ../pykolab/imap/__init__.py:649
 #, python-format
 msgid "Mailbox already exists: %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:658
+#: ../pykolab/imap/__init__.py:689
 msgid "Subscribing user to the additional folders"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:672
+#: ../pykolab/imap/__init__.py:703
 msgid "Using the following tests for folder subscriptions:"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:674
+#: ../pykolab/imap/__init__.py:705
 #, python-format
 msgid "    %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:677
+#: ../pykolab/imap/__init__.py:708
 #, python-format
 msgid "Folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:689
+#: ../pykolab/imap/__init__.py:720
 #, python-format
 msgid "Subscribing %s to folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:693
+#: ../pykolab/imap/__init__.py:724
 #, python-format
 msgid "Subscribing %s to folder %s failed: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:723
+#: ../pykolab/imap/__init__.py:750
+#, python-format
+msgid "Could not set quota on %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:757
 #, python-format
 msgid "Could not rename %s to reside on partition %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:756
+#: ../pykolab/imap/__init__.py:794
 #, python-format
 msgid "INBOX folder to rename (%s) does not exist"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:759 ../pykolab/imap/__init__.py:835
+#: ../pykolab/imap/__init__.py:797 ../pykolab/imap/__init__.py:905
 #, python-format
 msgid "Renaming INBOX from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:763
+#: ../pykolab/imap/__init__.py:801
 #, python-format
 msgid "Could not rename INBOX folder %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:765 ../pykolab/imap/__init__.py:839
+#: ../pykolab/imap/__init__.py:803 ../pykolab/imap/__init__.py:909
 #, python-format
 msgid ""
 "Moving INBOX folder %s won't succeed as target folder %s already exists"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:769
+#: ../pykolab/imap/__init__.py:807
 #, python-format
 msgid "Server for mailbox %r is %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:777
+#: ../pykolab/imap/__init__.py:815
 #, python-format
 msgid "Looking for folder '%s', we found folders: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:800
+#: ../pykolab/imap/__init__.py:829 ../pykolab/imap/__init__.py:872
+#: ../pykolab/imap/__init__.py:886
 #, python-format
-msgid "Setting ACL rights %s for subject %s on folder "
+msgid "Removing ACL rights %s for subject %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:811
+#: ../pykolab/imap/__init__.py:861
 #, python-format
-msgid "Removing ACL rights %s for subject %s on folder "
+msgid "Setting ACL rights %s for subject %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:832
+#: ../pykolab/imap/__init__.py:902
 #, python-format
 msgid "Found old INBOX folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:841
+#: ../pykolab/imap/__init__.py:911
 #, python-format
 msgid "Did not find old folder user/%s to rename"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:843
+#: ../pykolab/imap/__init__.py:913
 msgid "Value for user is not a dictionary"
 msgstr ""
 
 #. TODO: Go in fact correct the quota.
-#: ../pykolab/imap/__init__.py:911
+#: ../pykolab/imap/__init__.py:981
 #, python-format
 msgid "Cannot get current IMAP quota for folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:924
+#: ../pykolab/imap/__init__.py:994
 #, python-format
 msgid "Quota for %s currently is %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:930
+#: ../pykolab/imap/__init__.py:1000
 #, python-format
 msgid "Adjusting authentication database quota for folder %s to %d"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:935
+#: ../pykolab/imap/__init__.py:1005
 #, python-format
 msgid "Correcting quota for %s to %s (currently %s)"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1012
+#: ../pykolab/imap/__init__.py:1082
 #, python-format
 msgid "Checking folder: %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1017
+#: ../pykolab/imap/__init__.py:1087
 #, python-format
 msgid "Folder has no corresponding user (1): %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1020
+#: ../pykolab/imap/__init__.py:1090
 #, python-format
 msgid "Folder has no corresponding user (2): %s"
 msgstr ""
 
 #. We got user identifier only
-#: ../pykolab/imap/__init__.py:1035
+#: ../pykolab/imap/__init__.py:1105
 msgid "Please don't give us just a user identifier"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1038
+#: ../pykolab/imap/__init__.py:1108
 #, python-format
 msgid "Deleting folder %s"
 msgstr "Borrando la carpeta %s"
@@ -1968,52 +2181,52 @@
 msgid "Returning thread local configuration"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:45
+#: ../pykolab/itip/__init__.py:46
 #, python-format
 msgid "Method %r not really interesting for us."
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:51
+#: ../pykolab/itip/__init__.py:52
 #, python-format
 msgid "Raw iTip payload (%r): %r"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:61
+#: ../pykolab/itip/__init__.py:62
 msgid "Could not read iTip from message."
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:69
+#: ../pykolab/itip/__init__.py:70
 #, python-format
 msgid "Duplicate iTip object: %s"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:93
+#: ../pykolab/itip/__init__.py:95
 msgid "iTip event without a start"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:138
+#: ../pykolab/itip/__init__.py:140
 msgid "Message is not an iTip message (non-multipart message)"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:221
+#: ../pykolab/itip/__init__.py:261
 #, python-format
 msgid "Send iTip reply %s for %s %r"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:237
+#: ../pykolab/itip/__init__.py:277
 #, 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:1082
-#: ../wallace/module_invitationpolicy.py:1144
-#: ../wallace/module_resources.py:1247
+#: ../pykolab/itip/__init__.py:288 ../pykolab/itip/__init__.py:332
+#: ../wallace/module_invitationpolicy.py:1253
+#: ../wallace/module_invitationpolicy.py:1328
+#: ../wallace/module_resources.py:1347
 #, python-format
 msgid "SMTP sendmail error: %r"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:280
+#: ../pykolab/itip/__init__.py:320
 #, python-format
 msgid "Failed to compose iTip request message: %r"
 msgstr ""
@@ -2158,7 +2371,7 @@
 msgstr ""
 
 #: ../pykolab/plugins/roundcubedb/__init__.py:55
-#: ../pykolab/setup/setup_roundcube.py:167
+#: ../pykolab/setup/setup_roundcube.py:106
 msgid "Roundcube installation path not found."
 msgstr ""
 
@@ -2178,14 +2391,40 @@
 msgid "No such component."
 msgstr ""
 
-#: ../pykolab/setup/setup_freebusy.py:46
+#: ../pykolab/setup/__init__.py:55
+msgid "SELinux currently enforcing. Read https://git.kolab.org/u/1"
+msgstr ""
+
+#: ../pykolab/setup/__init__.py:67
+msgid ""
+"SELinux configured to enforce a policy on startup. Read "
+"https://git.kolab.org/u/1"
+msgstr ""
+
+#: ../pykolab/setup/setup_freebusy.py:47
 msgid "Setup Free/Busy."
 msgstr ""
 
-#: ../pykolab/setup/setup_freebusy.py:50
+#: ../pykolab/setup/setup_freebusy.py:51
 msgid "Free/Busy is not installed on this system"
 msgstr ""
 
+#: ../pykolab/setup/setup_guam.py:41
+msgid "Setup Guam."
+msgstr ""
+
+#: ../pykolab/setup/setup_guam.py:45
+msgid "Guam is not installed on this system"
+msgstr ""
+
+#: ../pykolab/setup/setup_guam.py:58
+msgid "Could not start the guam service."
+msgstr ""
+
+#: ../pykolab/setup/setup_guam.py:63
+msgid "Could not configure the guam service to start on boot"
+msgstr ""
+
 #: ../pykolab/setup/setup_imap.py:45
 msgid "Setup IMAP."
 msgstr "Configurar IMAP."
@@ -2198,15 +2437,14 @@
 msgid "Could not write out Cyrus IMAP configuration file /etc/cyrus.conf"
 msgstr ""
 
-#: ../pykolab/setup/setup_imap.py:158
+#: ../pykolab/setup/setup_imap.py:162
 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:244
-#: ../pykolab/setup/setup_syncroton.py:105
-msgid "Could not configure to start on boot, the "
+#: ../pykolab/setup/setup_imap.py:177
+msgid ""
+"Could not configure to start on boot, the cyrus-imapd and kolab-saslauthd "
+"services."
 msgstr ""
 
 #: ../pykolab/setup/setup_kolabd.py:44
@@ -2222,10 +2460,14 @@
 "                        "
 msgstr ""
 
-#: ../pykolab/setup/setup_kolabd.py:81
+#: ../pykolab/setup/setup_kolabd.py:84
 msgid "Could not start the kolab server service."
 msgstr ""
 
+#: ../pykolab/setup/setup_kolabd.py:96
+msgid "Could not configure to start on boot, the kolab server service."
+msgstr ""
+
 #: ../pykolab/setup/setup_ldap.py:45
 msgid "LDAP Options"
 msgstr ""
@@ -2250,15 +2492,19 @@
 msgid "Setup configuration for Active Directory compatibility."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:88
+#: ../pykolab/setup/setup_ldap.py:92
+msgid "Specify password for the Domain Manager."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:96
 msgid "Setup LDAP."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:97
+#: ../pykolab/setup/setup_ldap.py:105
 msgid "Skipping setup of LDAP, as specified"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:126
+#: ../pykolab/setup/setup_ldap.py:134
 msgid ""
 "\n"
 "                        You can not configure Kolab to run against OpenLDAP\n"
@@ -2266,7 +2512,7 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:139
+#: ../pykolab/setup/setup_ldap.py:147
 msgid ""
 "\n"
 "                                It seems 389 Directory Server has an existing\n"
@@ -2277,7 +2523,7 @@
 "                            "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:154
+#: ../pykolab/setup/setup_ldap.py:162
 msgid ""
 "\n"
 "                        Please supply a password for the LDAP administrator user\n"
@@ -2286,11 +2532,11 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:162
+#: ../pykolab/setup/setup_ldap.py:170
 msgid "Administrator password"
 msgstr "Contraseña de administrador"
 
-#: ../pykolab/setup/setup_ldap.py:169
+#: ../pykolab/setup/setup_ldap.py:180
 msgid ""
 "\n"
 "                        Please supply a password for the LDAP Directory Manager\n"
@@ -2300,11 +2546,11 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:178
+#: ../pykolab/setup/setup_ldap.py:189
 msgid "Directory Manager password"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:185
+#: ../pykolab/setup/setup_ldap.py:196
 msgid ""
 "\n"
 "                        Please choose the system user and group the service\n"
@@ -2313,15 +2559,15 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:195 ../pykolab/setup/setup_ldap.py:198
+#: ../pykolab/setup/setup_ldap.py:206 ../pykolab/setup/setup_ldap.py:209
 msgid "User"
 msgstr "Usuario"
 
-#: ../pykolab/setup/setup_ldap.py:196 ../pykolab/setup/setup_ldap.py:199
+#: ../pykolab/setup/setup_ldap.py:207 ../pykolab/setup/setup_ldap.py:210
 msgid "Group"
 msgstr "Grupo"
 
-#: ../pykolab/setup/setup_ldap.py:234
+#: ../pykolab/setup/setup_ldap.py:245
 msgid ""
 "\n"
 "                        This setup procedure plans to set up Kolab Groupware for\n"
@@ -2332,18 +2578,18 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:248
+#: ../pykolab/setup/setup_ldap.py:259
 msgid "Domain name to use"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:253 ../pykolab/setup/setup_ldap.py:278
+#: ../pykolab/setup/setup_ldap.py:264 ../pykolab/setup/setup_ldap.py:289
 msgid ""
 "\n"
 "                                    Invalid input. Please try again.\n"
 "                                "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:262
+#: ../pykolab/setup/setup_ldap.py:273
 msgid ""
 "\n"
 "                        The standard root dn we composed for you follows. Please\n"
@@ -2351,15 +2597,15 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:273
+#: ../pykolab/setup/setup_ldap.py:284
 msgid "Root DN to use"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:325
+#: ../pykolab/setup/setup_ldap.py:336
 msgid "No directory server setup tool available."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:337
+#: ../pykolab/setup/setup_ldap.py:348
 msgid ""
 "\n"
 "                    Setup is now going to set up the 389 Directory Server. This\n"
@@ -2368,11 +2614,11 @@
 "                "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:344
+#: ../pykolab/setup/setup_ldap.py:355
 msgid "Setting up 389 Directory Server"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:356
+#: ../pykolab/setup/setup_ldap.py:367
 msgid ""
 "\n"
 "                        An error was detected in the setup procedure for 389\n"
@@ -2383,27 +2629,31 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:373
+#: ../pykolab/setup/setup_ldap.py:384
 msgid "Setup DS stdout:"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:376
+#: ../pykolab/setup/setup_ldap.py:387
 msgid "Setup DS stderr:"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:402
+#: ../pykolab/setup/setup_ldap.py:413
 msgid "Could not copy the LDAP extensions for Kolab"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:405
+#: ../pykolab/setup/setup_ldap.py:416
 msgid "Could not find the ldap Kolab schema file"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:417
+#: ../pykolab/setup/setup_ldap.py:429
 msgid "Could not start the directory server service."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:431
+#: ../pykolab/setup/setup_ldap.py:438
+msgid "Could not configure to start on boot, the directory server service."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:443
 msgid ""
 "\n"
 "                        Please supply a Cyrus Administrator password. This\n"
@@ -2414,11 +2664,11 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:441
+#: ../pykolab/setup/setup_ldap.py:453
 msgid "Cyrus Administrator password"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:448
+#: ../pykolab/setup/setup_ldap.py:460
 msgid ""
 "\n"
 "                        Please supply a Kolab Service account password. This\n"
@@ -2428,61 +2678,81 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:457
+#: ../pykolab/setup/setup_ldap.py:469
 msgid "Kolab Service password"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:467
+#: ../pykolab/setup/setup_ldap.py:479
 msgid "Writing out configuration to kolab.conf"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:481
+#: ../pykolab/setup/setup_ldap.py:493
 msgid "Inserting service users into LDAP."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:555
+#: ../pykolab/setup/setup_ldap.py:567
 msgid "Writing out cn=kolab,cn=config"
 msgstr ""
 
-#. TODO: Add kolab-admin role
-#. TODO: Assign kolab-admin admin ACLs
-#: ../pykolab/setup/setup_ldap.py:579
+#: ../pykolab/setup/setup_ldap.py:583
 #, python-format
 msgid "Adding domain %s to list of domains for this deployment"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:607
+#: ../pykolab/setup/setup_ldap.py:611
 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:615
+#: ../pykolab/setup/setup_ldap.py:619
 msgid "Enabling attribute uniqueness plugin"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:621
+#: ../pykolab/setup/setup_ldap.py:625
 msgid "Enabling referential integrity plugin"
 msgstr "Habilitar el plugin de integridad referencial"
 
-#: ../pykolab/setup/setup_ldap.py:627
+#: ../pykolab/setup/setup_ldap.py:631
 msgid "Enabling and configuring account policy plugin"
 msgstr ""
 
-#. TODO: Add kolab-admin role
-#: ../pykolab/setup/setup_ldap.py:642
+#. Add kolab-admin role
+#: ../pykolab/setup/setup_ldap.py:646
 msgid "Adding the kolab-admin role"
 msgstr "Añadir el rol kolab-admin"
 
-#. TODO: User writeable attributes on root_dn
-#: ../pykolab/setup/setup_ldap.py:653
+#. User writeable attributes on root_dn
+#: ../pykolab/setup/setup_ldap.py:657
 #, 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 "
+#: ../pykolab/setup/setup_ldap.py:677
+msgid "directory server admin service not available"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:685
+msgid ""
+"Could not start and configure to start on boot, the directory server admin "
+"service."
+msgstr ""
+
+#: ../pykolab/setup/setup_manticore.py:44
+msgid "Setup Manticore."
+msgstr ""
+
+#: ../pykolab/setup/setup_manticore.py:48
+msgid "Manticore is not installed on this system"
+msgstr ""
+
+#: ../pykolab/setup/setup_manticore.py:94
+msgid "Could not start the manticore service."
+msgstr ""
+
+#: ../pykolab/setup/setup_manticore.py:100
+msgid "Could not configure the manticore service to start on boot"
 msgstr ""
 
 #: ../pykolab/setup/setup_mta.py:41
@@ -2498,31 +2768,53 @@
 msgid "Could not write out Postfix configuration file /etc/postfix/master.cf"
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:399
+#: ../pykolab/setup/setup_mta.py:413
 msgid "Could not write out Amavis configuration file amavisd.conf"
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:407
+#: ../pykolab/setup/setup_mta.py:421
 msgid "Not writing out any configuration for Amavis."
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:447
+#: ../pykolab/setup/setup_mta.py:482
 msgid "Could not start the postfix, clamav and amavisd services services."
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:39
+#: ../pykolab/setup/setup_mta.py:500
+msgid ""
+"Could not configure to start on boot, the postfix, clamav and amavisd "
+"services."
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:40
+msgid "MySQL Options"
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:46
+msgid "Specify whether to use an (existing) or (new) MySQL server."
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:50
 msgid "Setup MySQL."
 msgstr "Configurar MySQL."
 
-#: ../pykolab/setup/setup_mysql.py:49
+#: ../pykolab/setup/setup_mysql.py:78
 msgid "Could not start the MySQL database service."
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:71
+#: ../pykolab/setup/setup_mysql.py:87
+msgid "Could not configure to start on boot, the MySQL database service."
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:90
+msgid "Waiting for at most 30 seconds for MySQL/MariaDB to settle..."
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:114
 msgid "What MySQL server are we setting up?"
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:75
+#: ../pykolab/setup/setup_mysql.py:118
 msgid ""
 "\n"
 "                        Please supply the root password for MySQL, so we can set\n"
@@ -2530,13 +2822,13 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:82 ../pykolab/setup/setup_mysql.py:99
-#: ../pykolab/setup/setup_roundcube.py:190
+#: ../pykolab/setup/setup_mysql.py:125 ../pykolab/setup/setup_mysql.py:142
+#: ../pykolab/setup/setup_roundcube.py:218
 #: ../pykolab/setup/setup_syncroton.py:66
 msgid "MySQL root password"
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:88
+#: ../pykolab/setup/setup_mysql.py:131
 msgid ""
 "\n"
 "                        Please supply a root password for MySQL. This password\n"
@@ -2548,7 +2840,7 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:143
+#: ../pykolab/setup/setup_mysql.py:186
 msgid ""
 "\n"
 "                        Please supply a password for the MySQL user 'kolab'.\n"
@@ -2557,11 +2849,11 @@
 "                    "
 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:151
+#: ../pykolab/setup/setup_mysql.py:194
 msgid "MySQL kolab password"
 msgstr "Contraseña de MySQL kolab"
 
-#: ../pykolab/setup/setup_mysql.py:170
+#: ../pykolab/setup/setup_mysql.py:213
 msgid "Could not find the MySQL Kolab schema file"
 msgstr ""
 
@@ -2603,11 +2895,11 @@
 msgid "Could not find PHP configuration file php.ini"
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:44
+#: ../pykolab/setup/setup_roundcube.py:45
 msgid "Setup Roundcube."
 msgstr "Configurar Roundcube."
 
-#: ../pykolab/setup/setup_roundcube.py:48
+#: ../pykolab/setup/setup_roundcube.py:49
 msgid ""
 "\n"
 "                    Please supply a password for the MySQL user 'roundcube'.\n"
@@ -2616,25 +2908,34 @@
 "                "
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:56
+#: ../pykolab/setup/setup_roundcube.py:57
 msgid "MySQL roundcube password"
 msgstr "Contraseña de MySql de roundcube"
 
-#: ../pykolab/setup/setup_roundcube.py:126
+#: ../pykolab/setup/setup_roundcube.py:144
 #, python-format
 msgid "Using template file %r"
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:133
+#: ../pykolab/setup/setup_roundcube.py:151
 #, python-format
 msgid "Successfully compiled template %r, writing out to %r"
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:235
-#: ../pykolab/setup/setup_syncroton.py:96
+#: ../pykolab/setup/setup_roundcube.py:263
+msgid "Cannot find the configuration directory for roundcube."
+msgstr ""
+
+#: ../pykolab/setup/setup_roundcube.py:291
+#: ../pykolab/setup/setup_syncroton.py:100
 msgid "Could not start the webserver server service."
 msgstr ""
 
+#: ../pykolab/setup/setup_roundcube.py:300
+#: ../pykolab/setup/setup_syncroton.py:109
+msgid "Could not configure to start on boot, the webserver server service."
+msgstr ""
+
 #: ../pykolab/setup/setup_syncroton.py:40
 msgid "Setup Syncroton."
 msgstr ""
@@ -2664,404 +2965,431 @@
 msgid "No database available"
 msgstr "Base de datos no disponible"
 
-#: ../pykolab/utils.py:62 ../pykolab/utils.py:64
+#: ../pykolab/utils.py:69 ../pykolab/utils.py:71
 #, python-format
 msgid "Confirm %s: "
 msgstr ""
 
-#: ../pykolab/utils.py:67
-msgid "Incorrect confirmation. "
+#: ../pykolab/utils.py:74
+msgid "Incorrect confirmation. Please try again."
 msgstr ""
 
-#: ../pykolab/utils.py:72 ../pykolab/utils.py:77
+#: ../pykolab/utils.py:79 ../pykolab/utils.py:84
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: ../pykolab/utils.py:74 ../pykolab/utils.py:79
+#: ../pykolab/utils.py:81 ../pykolab/utils.py:86
 #, python-format
 msgid "%s [%s]: "
 msgstr ""
 
-#: ../pykolab/utils.py:124
+#: ../pykolab/utils.py:139
 msgid "Please answer 'yes' or 'no'."
 msgstr ""
 
-#: ../pykolab/utils.py:164
+#: ../pykolab/utils.py:184
 msgid "Choice"
 msgstr ""
 
-#: ../pykolab/utils.py:167
+#: ../pykolab/utils.py:187
 msgid "Choice (type '?' for options)"
 msgstr ""
 
-#: ../pykolab/utils.py:268
+#: ../pykolab/utils.py:288
 #, python-format
 msgid "Could not change the permissions on %s"
 msgstr ""
 
-#: ../pykolab/utils.py:488
+#: ../pykolab/utils.py:526
 #, python-format
 msgid "Transliterating string %r with locale %r"
 msgstr ""
 
-#: ../pykolab/utils.py:496
+#: ../pykolab/utils.py:534
 msgid "Attempting to set locale"
 msgstr ""
 
-#: ../pykolab/utils.py:498
+#: ../pykolab/utils.py:536
 msgid "Success setting locale"
 msgstr ""
 
-#: ../pykolab/utils.py:500
+#: ../pykolab/utils.py:538
 msgid "Failure to set locale"
 msgstr ""
 
-#: ../pykolab/utils.py:508
+#: ../pykolab/utils.py:546
 #, python-format
 msgid "Executing '%s | %s'"
 msgstr ""
 
-#: ../pykolab/utils.py:519
+#: ../pykolab/utils.py:557
 #, python-format
 msgid "Could not translate %s using locale %s"
 msgstr ""
 
-#: ../pykolab/wap_client/__init__.py:399
+#: ../pykolab/wap_client/__init__.py:416
 #, python-format
 msgid "Requesting %r with params %r"
 msgstr ""
 
-#: ../pykolab/wap_client/__init__.py:407
+#: ../pykolab/wap_client/__init__.py:424
 #, python-format
 msgid "Got response: %r"
 msgstr ""
 
+#: ../pykolab/wap_client/__init__.py:429
+#, python-format
+msgid "Connection error: %r; re-connecting..."
+msgstr ""
+
 #. Some data is not JSON
-#: ../pykolab/wap_client/__init__.py:413
+#: ../pykolab/wap_client/__init__.py:441
 msgid "Response data is not JSON"
 msgstr ""
 
 #. support integer values, too
-#: ../pykolab/xml/attendee.py:9 ../pykolab/xml/attendee.py:17
+#: ../pykolab/xml/attendee.py:9 ../pykolab/xml/attendee.py:18
 msgid "Needs Action"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:10 ../pykolab/xml/attendee.py:18
+#: ../pykolab/xml/attendee.py:10 ../pykolab/xml/attendee.py:19
 msgid "Accepted"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:11 ../pykolab/xml/attendee.py:19
+#: ../pykolab/xml/attendee.py:11 ../pykolab/xml/attendee.py:20
 msgid "Declined"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:12 ../pykolab/xml/attendee.py:20
+#: ../pykolab/xml/attendee.py:12 ../pykolab/xml/attendee.py:21
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:13 ../pykolab/xml/attendee.py:21
+#: ../pykolab/xml/attendee.py:13 ../pykolab/xml/attendee.py:22
 msgid "Delegated"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:14 ../pykolab/xml/attendee.py:22
+#: ../pykolab/xml/attendee.py:14 ../pykolab/xml/attendee.py:23
+msgid "Started"
+msgstr ""
+
+#: ../pykolab/xml/attendee.py:15 ../pykolab/xml/attendee.py:24
 msgid "Completed"
 msgstr "Completed"
 
-#: ../pykolab/xml/attendee.py:15 ../pykolab/xml/attendee.py:23
-msgid "Started"
+#: ../pykolab/xml/attendee.py:16
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:914
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:926
+msgid "Pending"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:132 ../pykolab/xml/attendee.py:154
+#: ../pykolab/xml/attendee.py:133 ../pykolab/xml/attendee.py:155
 msgid "Not a valid attendee"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:139
+#: ../pykolab/xml/attendee.py:140
 msgid "No valid delegator references found"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:159
+#: ../pykolab/xml/attendee.py:160
 msgid "No valid delegatee references found"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:219
+#: ../pykolab/xml/attendee.py:220
 #, python-format
 msgid "Invalid cutype %r"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:231
+#: ../pykolab/xml/attendee.py:232
 #, python-format
 msgid "Invalid participant status %r"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:239
+#: ../pykolab/xml/attendee.py:240
 #, python-format
 msgid "Invalid role %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:163 ../pykolab/xml/event.py:802
-#: ../pykolab/xml/event.py:845
-msgid "Event start needs datetime.date or datetime.datetime instance"
+#: ../pykolab/xml/event.py:168
+#, python-format
+msgid "Rdate needs datetime.date or datetime.datetime instance, got %r"
+msgstr ""
+
+#: ../pykolab/xml/event.py:185
+#, python-format
+msgid "Exdate needs datetime.date or datetime.datetime instance, got %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:308
+#: ../pykolab/xml/event.py:403
 #, python-format
 msgid "No attendee with email or name %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:316
+#: ../pykolab/xml/event.py:411
 #, python-format
 msgid "Invalid argument value attendee %r, must be basestring or Attendee"
 msgstr ""
 
-#: ../pykolab/xml/event.py:328
+#: ../pykolab/xml/event.py:423
 #, python-format
 msgid "No attendee with email %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:334
+#: ../pykolab/xml/event.py:429
 #, python-format
 msgid "No attendee with name %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:384 ../pykolab/xml/utils.py:157
+#: ../pykolab/xml/event.py:479 ../pykolab/xml/utils.py:180
 msgid "%Y-%m-%d"
 msgstr ""
 
-#: ../pykolab/xml/event.py:386 ../pykolab/xml/utils.py:158
+#: ../pykolab/xml/event.py:481 ../pykolab/xml/utils.py:181
 msgid "%H:%M (%Z)"
 msgstr ""
 
-#: ../pykolab/xml/event.py:510
+#: ../pykolab/xml/event.py:614
 msgid "Invalid participant status"
 msgstr ""
 
-#: ../pykolab/xml/event.py:636
+#: ../pykolab/xml/event.py:820 ../pykolab/xml/note.py:94
 #, python-format
 msgid "Invalid classification %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:667
-msgid "Event end needs datetime.date or datetime.datetime instance"
+#: ../pykolab/xml/event.py:851
+#, python-format
+msgid "Event end needs datetime.date or datetime.datetime instance, got %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:677
+#: ../pykolab/xml/event.py:865
 #, python-format
 msgid "Invalid custom property name %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:855
+#: ../pykolab/xml/event.py:1017
+#, python-format
+msgid ""
+"Event last-modified needs datetime.date or datetime.datetime instance, got "
+"%r"
+msgstr ""
+
+#: ../pykolab/xml/event.py:1060
+#, python-format
+msgid "Event start needs datetime.date or datetime.datetime instance, got %r"
+msgstr ""
+
+#: ../pykolab/xml/event.py:1070
 #, python-format
 msgid "Invalid status set: %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:1094
+#: ../pykolab/xml/event.py:1093
+msgid "Event recurrence-id needs datetime.datetime instance"
+msgstr ""
+
+#: ../pykolab/xml/event.py:1330
 msgid "No sender specified"
 msgstr ""
 
-#: ../pykolab/xml/event.py:1103
+#: ../pykolab/xml/event.py:1339
 #, python-format
 msgid "Invitation for %s was %s"
 msgstr ""
 
-#: ../pykolab/xml/event.py:1108
+#: ../pykolab/xml/event.py:1344
 msgid "This is an automated response to one of your event requests."
 msgstr ""
 
-#: ../pykolab/xml/recurrence_rule.py:38
+#: ../pykolab/xml/recurrence_rule.py:41
 #, python-format
 msgid "Every %d year(s)"
 msgstr ""
 
-#: ../pykolab/xml/recurrence_rule.py:39
+#: ../pykolab/xml/recurrence_rule.py:42
 #, python-format
 msgid "Every %d month(s)"
 msgstr ""
 
-#: ../pykolab/xml/recurrence_rule.py:40
+#: ../pykolab/xml/recurrence_rule.py:43
 #, python-format
 msgid "Every %d week(s)"
 msgstr ""
 
-#: ../pykolab/xml/recurrence_rule.py:41
+#: ../pykolab/xml/recurrence_rule.py:44
 #, python-format
 msgid "Every %d day(s)"
 msgstr ""
 
-#: ../pykolab/xml/recurrence_rule.py:42
+#: ../pykolab/xml/recurrence_rule.py:45
 #, python-format
 msgid "Every %d hours"
 msgstr ""
 
-#: ../pykolab/xml/recurrence_rule.py:43
+#: ../pykolab/xml/recurrence_rule.py:46
 #, python-format
 msgid "Every %d minutes"
 msgstr ""
 
-#: ../pykolab/xml/recurrence_rule.py:44
+#: ../pykolab/xml/recurrence_rule.py:47
 #, python-format
 msgid "Every %d seconds"
 msgstr ""
 
-#: ../pykolab/xml/todo.py:110
+#: ../pykolab/xml/todo.py:162
 msgid "Todo due needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:126
+#: ../pykolab/xml/utils.py:149
 msgid "Name"
 msgstr "Nombre"
 
-#: ../pykolab/xml/utils.py:127
+#: ../pykolab/xml/utils.py:150
 msgid "Summary"
 msgstr "Summary"
 
-#: ../pykolab/xml/utils.py:128
+#: ../pykolab/xml/utils.py:151
 msgid "Location"
 msgstr "Location"
 
-#: ../pykolab/xml/utils.py:129
+#: ../pykolab/xml/utils.py:152
 msgid "Description"
 msgstr "Descripción"
 
-#: ../pykolab/xml/utils.py:130
+#: ../pykolab/xml/utils.py:153
 msgid "URL"
 msgstr "URL"
 
-#: ../pykolab/xml/utils.py:131
+#: ../pykolab/xml/utils.py:154
 msgid "Status"
 msgstr "Status"
 
-#: ../pykolab/xml/utils.py:132
+#: ../pykolab/xml/utils.py:155
 msgid "Priority"
 msgstr "Priority"
 
-#: ../pykolab/xml/utils.py:133
+#: ../pykolab/xml/utils.py:156
 msgid "Attendee"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:134
+#: ../pykolab/xml/utils.py:157
 msgid "Start"
 msgstr "Start"
 
-#: ../pykolab/xml/utils.py:135
+#: ../pykolab/xml/utils.py:158
 msgid "End"
 msgstr "End"
 
-#: ../pykolab/xml/utils.py:136
+#: ../pykolab/xml/utils.py:159
 msgid "Due"
 msgstr "Due"
 
-#: ../pykolab/xml/utils.py:137
+#: ../pykolab/xml/utils.py:160
 msgid "Repeat"
 msgstr "Repeat"
 
-#: ../pykolab/xml/utils.py:138
+#: ../pykolab/xml/utils.py:161
 msgid "Repeat Exception"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:139
+#: ../pykolab/xml/utils.py:162
 msgid "Organizer"
 msgstr "Organizer"
 
-#: ../pykolab/xml/utils.py:140
+#: ../pykolab/xml/utils.py:163
 msgid "Attachment"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:141
+#: ../pykolab/xml/utils.py:164
 msgid "Alarm"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:142
+#: ../pykolab/xml/utils.py:165
 msgid "Classification"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:143
+#: ../pykolab/xml/utils.py:166
 msgid "Progress"
 msgstr "Progress"
 
-#: ../pykolab/xml/utils.py:188
+#: ../pykolab/xml/utils.py:211
 #, python-format
 msgid "for %d times"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:190
+#: ../pykolab/xml/utils.py:213
 #, python-format
 msgid "until %s"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:195
+#: ../pykolab/xml/utils.py:218
 msgid "Display message"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:196
+#: ../pykolab/xml/utils.py:219
 msgid "Send email"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:197
+#: ../pykolab/xml/utils.py:220
 msgid "Play sound"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:203
+#: ../pykolab/xml/utils.py:226
 #, python-format
 msgid "%s after"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:203
+#: ../pykolab/xml/utils.py:226
 #, python-format
 msgid "%s before"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:212
+#: ../pykolab/xml/utils.py:235
 #, python-format
 msgid "%d day(s)"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:218
+#: ../pykolab/xml/utils.py:241
 #, python-format
 msgid "%d hour(s)"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:220
+#: ../pykolab/xml/utils.py:243
 #, python-format
 msgid "%d minute(s)"
 msgstr ""
 
-#: ../saslauthd/__init__.py:76
+#: ../saslauthd/__init__.py:77
 msgid "Socket file to bind to."
 msgstr ""
 
-#: ../saslauthd/__init__.py:108
+#: ../saslauthd/__init__.py:109
 #, python-format
 msgid "Could not create %r: %r"
 msgstr ""
 
-#: ../saslauthd/__init__.py:146 ../saslauthd/__init__.py:154
-#: ../wallace/__init__.py:439 ../wallace/__init__.py:448
-msgid ""
-"Traceback occurred, please report a bug at http://bugzilla.kolabsys.com"
-msgstr ""
-
-#: ../saslauthd/__init__.py:194
-msgid "kolab-saslauthd could not accept "
+#: ../saslauthd/__init__.py:220
+#, python-format
+msgid "kolab-saslauthd could not accept connections on socket: %r"
 msgstr ""
 
-#: ../saslauthd/__init__.py:199
+#: ../saslauthd/__init__.py:225
 msgid "Maximum tries exceeded, exiting"
 msgstr ""
 
-#: ../tests/functional/test_wallace/test_005_resource_invitation.py:195
-#: ../wallace/module_resources.py:1151
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:196
+#: ../wallace/module_resources.py:1251
 #, 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:1235
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:641
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:657
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:715
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:771
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:785
+#: ../wallace/module_resources.py:1335
 #, python-format
 msgid "Booking for %s has been %s"
 msgstr ""
@@ -3070,52 +3398,52 @@
 #. 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:1333
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:677
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:704
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:742
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:759
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:814
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:968
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:984
+#: ../wallace/module_resources.py:1433
 #, python-format
 msgid "Booking request for %s requires confirmation"
 msgstr ""
 
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:240
-#: ../wallace/module_invitationpolicy.py:448
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:242
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1267
+#: ../wallace/module_invitationpolicy.py:479
 #, python-format
 msgid "\"%(summary)s\" has been %(status)s"
 msgstr ""
 
+#. this should trigger a notification message
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:886
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1251
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1396
+#: ../wallace/module_invitationpolicy.py:1316
+#, python-format
+msgid "\"%s\" has been cancelled"
+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:802
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:808
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:821
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:839
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:942
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:947
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1008
-#: ../wallace/module_invitationpolicy.py:1071
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:903
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:909
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:922
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:939
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1039
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1044
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1377
+#: ../wallace/module_invitationpolicy.py:1234
 #, python-format
 msgid "\"%s\" has been updated"
 msgstr ""
 
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:813
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:825
-msgid "PENDING"
-msgstr ""
-
-#. this should trigger a notification message
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1028
-#: ../wallace/module_invitationpolicy.py:1133
-#, python-format
-msgid "\"%s\" has been cancelled"
-msgstr ""
-
-#: ../tests/unit/test-011-itip.py:465
+#: ../tests/unit/test-011-itip.py:529
 #, python-format
 msgid "Invitation for %(summary)s was %(status)s"
 msgstr ""
@@ -3140,370 +3468,423 @@
 msgid "Worker process %s initializing"
 msgstr ""
 
-#: ../wallace/__init__.py:122
+#: ../wallace/__init__.py:123
 msgid "Bind address for Wallace."
 msgstr ""
 
-#: ../wallace/__init__.py:140
+#: ../wallace/__init__.py:142
 msgid "Number of threads to use."
 msgstr ""
 
-#: ../wallace/__init__.py:156
+#: ../wallace/__init__.py:159
 msgid "Port that Wallace is supposed to use."
 msgstr ""
 
-#: ../wallace/__init__.py:205
+#: ../wallace/__init__.py:208
 #, 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:217
+#: ../wallace/__init__.py:220
 msgid "Could not shut down socket"
 msgstr ""
 
-#: ../wallace/__init__.py:286
+#: ../wallace/__init__.py:289
 msgid "Accepted connection"
 msgstr ""
 
-#: ../wallace/__init__.py:464
+#: ../wallace/__init__.py:494
 #, python-format
 msgid "Could not write pid file %s"
 msgstr ""
 
-#: ../wallace/module_footer.py:60 ../wallace/module_gpgencrypt.py:60
-#: ../wallace/module_invitationpolicy.py:210 ../wallace/module_optout.py:61
-#: ../wallace/module_resources.py:126
+#: ../wallace/module_footer.py:63 ../wallace/module_gpgencrypt.py:100
+#: ../wallace/module_invitationpolicy.py:227 ../wallace/module_optout.py:61
+#: ../wallace/module_resources.py:127
 #, python-format
 msgid "Issuing callback after processing to stage %s"
 msgstr ""
 
-#: ../wallace/module_footer.py:61 ../wallace/module_gpgencrypt.py:61
-#: ../wallace/module_invitationpolicy.py:212 ../wallace/module_optout.py:62
-#: ../wallace/module_resources.py:132
+#: ../wallace/module_footer.py:64 ../wallace/module_gpgencrypt.py:101
+#: ../wallace/module_invitationpolicy.py:229 ../wallace/module_optout.py:62
+#: ../wallace/module_resources.py:133
 #, python-format
 msgid "Testing cb_action_%s()"
 msgstr ""
 
-#: ../wallace/module_footer.py:63 ../wallace/module_gpgencrypt.py:63
-#: ../wallace/module_invitationpolicy.py:214 ../wallace/module_optout.py:64
-#: ../wallace/module_resources.py:135
+#: ../wallace/module_footer.py:66 ../wallace/module_gpgencrypt.py:103
+#: ../wallace/module_invitationpolicy.py:231 ../wallace/module_optout.py:64
+#: ../wallace/module_resources.py:136
 #, python-format
 msgid "Attempting to execute cb_action_%s()"
 msgstr ""
 
-#: ../wallace/module_footer.py:67
+#: ../wallace/module_footer.py:70
 #, python-format
 msgid "Executing module footer for %r, %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:66
+#: ../wallace/module_footer.py:88
+msgid "No contents configured for footer module"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:106
 #, python-format
 msgid "Executing module gpgencrypt for %r, %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:98
+#: ../wallace/module_gpgencrypt.py:138
 msgid "Message is already encrypted (app/pgp-enc content-type)"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:102
+#: ../wallace/module_gpgencrypt.py:142
 msgid "Message already encrypted by main content-type header"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:131
+#: ../wallace/module_gpgencrypt.py:171
 msgid ""
 "Configured to encrypt to a key not configured, and strict policy enabled. "
 "Bailing out."
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:134
+#: ../wallace/module_gpgencrypt.py:174
 msgid ""
 "Configured to encrypt to a key not configured, but continuing anyway (see "
 "'gpgencrypt_strict')."
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:171
+#: ../wallace/module_gpgencrypt.py:211
 #, python-format
 msgid "Recipients: %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:183
+#: ../wallace/module_gpgencrypt.py:222
 #, python-format
 msgid "Current keys: %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:188
+#: ../wallace/module_gpgencrypt.py:227
 #, python-format
 msgid "Retrieving key for recipient: %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:192 ../wallace/module_gpgencrypt.py:208
+#: ../wallace/module_gpgencrypt.py:231 ../wallace/module_gpgencrypt.py:247
 #, python-format
 msgid "Found matching address %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:200
+#: ../wallace/module_gpgencrypt.py:239
 #, python-format
 msgid "Found matching address %r in remote keys"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:232
+#: ../wallace/module_gpgencrypt.py:259
+msgid "Mime Message - we need to build multipart/encrypted structure"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:268
+msgid "No Mime Message - encypt plain"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:284
 #, python-format
 msgid "An error occurred: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:196
+#: ../wallace/module_invitationpolicy.py:213
 #, python-format
 msgid "Invitation policy called for %r, %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:258
+#: ../wallace/module_invitationpolicy.py:275
 #, python-format
 msgid "Failed to parse iTip objects from message: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:262
+#: ../wallace/module_invitationpolicy.py:279
 msgid ""
 "Message is not an iTip message or does not contain any (valid) iTip objects."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:266
+#: ../wallace/module_invitationpolicy.py:283
 #, python-format
 msgid ""
 "iTip objects attached to this message contain the following information: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:278
+#: ../wallace/module_invitationpolicy.py:306
 #, python-format
 msgid "Recipient emails for %s: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:282
+#: ../wallace/module_invitationpolicy.py:310
 #, python-format
 msgid "No itips, no users, pass along %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:285
+#: ../wallace/module_invitationpolicy.py:313
 #, python-format
 msgid "iTips, but no users, pass along %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:306
+#: ../wallace/module_invitationpolicy.py:331
 #, python-format
 msgid "No user attendee matching envelope recipient %s, skip message"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:309
+#: ../wallace/module_invitationpolicy.py:334
 #, python-format
 msgid "Receiving user: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:337
+#: ../wallace/module_invitationpolicy.py:362
 #, python-format
 msgid "Apply invitation policy %r for sender %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:348
+#: ../wallace/module_invitationpolicy.py:373
 #, python-format
 msgid "Ignoring '%s' iTip method"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:352
+#: ../wallace/module_invitationpolicy.py:377
 #, python-format
 msgid "iTip message %r consumed by the invitationpolicy module"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:368
+#: ../wallace/module_invitationpolicy.py:393
 msgid "Pass invitation for manual processing"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:373
+#: ../wallace/module_invitationpolicy.py:398
 #, python-format
 msgid "Receiving Attendee: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:393
+#: ../wallace/module_invitationpolicy.py:418
 #, python-format
 msgid "Existing %s: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:404
+#: ../wallace/module_invitationpolicy.py:429
 #, python-format
 msgid "Precondition for object %r fulfilled: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:422
+#: ../wallace/module_invitationpolicy.py:449
 #, python-format
 msgid ""
 "The iTip request sequence (%r) doesn't match the referred object version "
 "(%r). Ignoring."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:427
+#: ../wallace/module_invitationpolicy.py:454
 #, python-format
 msgid "Auto-updating %s %r on iTip REQUEST (no re-scheduling)"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:482
+#: ../wallace/module_invitationpolicy.py:505
+msgid "Forward invitation for notification"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:520
 msgid "Pass reply for manual processing"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:489
+#: ../wallace/module_invitationpolicy.py:527
 #, python-format
 msgid "Sender Attendee: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:501
+#: ../wallace/module_invitationpolicy.py:539
 #, python-format
 msgid ""
 "The iTip reply sequence (%r) doesn't match the referred object version (%r)."
 " Forwarding to Inbox."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:507
+#: ../wallace/module_invitationpolicy.py:545
 #, python-format
 msgid "Auto-updating %s %r on iTip REPLY"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:532
+#: ../wallace/module_invitationpolicy.py:572
 #, python-format
 msgid "Add delegatee: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:535
+#: ../wallace/module_invitationpolicy.py:575
 #, python-format
 msgid "Update existing delegatee: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:540
+#: ../wallace/module_invitationpolicy.py:582
 #, python-format
 msgid "Update delegator: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:557
-#: ../wallace/module_invitationpolicy.py:589
+#: ../wallace/module_invitationpolicy.py:600
 msgid ""
 "The object referred by this reply was not found in the user's folders. "
 "Forwarding to Inbox."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:570
+#: ../wallace/module_invitationpolicy.py:613
 msgid "Pass cancellation for manual processing"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:618
+#: ../wallace/module_invitationpolicy.py:636
+#, python-format
+msgid "Remove cancelled %s instance %s from %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:647
+#, python-format
+msgid "Update cancelled %s %r with STATUS=CANCELLED"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:662
+msgid ""
+"The object referred by this cancel request was not found in the user's "
+"folders. Forwarding to Inbox."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:691
 #, python-format
 msgid "Checking if email address %r belongs to a local user"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:623
+#: ../wallace/module_invitationpolicy.py:696
 #, python-format
 msgid "User DN: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:625
+#: ../wallace/module_invitationpolicy.py:698
 #, python-format
 msgid "No user record(s) found for %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:681
+#: ../wallace/module_invitationpolicy.py:754
 #, python-format
 msgid "User record doesn't have the mailbox attribute %r set"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:694
+#: ../wallace/module_invitationpolicy.py:767
 #, python-format
 msgid "IMAP proxy authentication failed: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:716
+#: ../wallace/module_invitationpolicy.py:789
 #, python-format
 msgid "List %r folders for user %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:732
+#: ../wallace/module_invitationpolicy.py:804
 #, python-format
 msgid "IMAP metadata for %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:767
+#: ../wallace/module_invitationpolicy.py:842
 #, python-format
 msgid "Searching folder %r for %s %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:783
+#: ../wallace/module_invitationpolicy.py:852
+#: ../wallace/module_resources.py:675 ../wallace/module_resources.py:736
+#, python-format
+msgid "No UID found in IMAP response: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:878
 #, python-format
 msgid "Failed to parse %s from message %s/%s: %s"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:809
+#: ../wallace/module_invitationpolicy.py:906
 #, python-format
 msgid "Listing events from folder %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:822
-#: ../wallace/module_resources.py:474 ../wallace/module_resources.py:665
-#: ../wallace/module_resources.py:713
+#: ../wallace/module_invitationpolicy.py:919
+#: ../wallace/module_resources.py:482 ../wallace/module_resources.py:683
+#: ../wallace/module_resources.py:763
 #, python-format
 msgid "Failed to parse event from message %s/%s: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:828
+#: ../wallace/module_invitationpolicy.py:925
 #, python-format
 msgid "Existing event %r conflicts with invitation %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:835
-#: ../wallace/module_resources.py:518
+#: ../wallace/module_invitationpolicy.py:932
+#: ../wallace/module_resources.py:526
 #, python-format
 msgid "start: %r, end: %r, total: %r, messages: %d"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:861
+#: ../wallace/module_invitationpolicy.py:960
 #, python-format
 msgid "%r is locked, waiting..."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:928
+#: ../wallace/module_invitationpolicy.py:1040
 #, python-format
 msgid "Failed to save %s: no target folder found for user %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:931
+#: ../wallace/module_invitationpolicy.py:1051
 #, python-format
 msgid "Save %s %r to user folder %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:944
+#: ../wallace/module_invitationpolicy.py:1064
 #, python-format
 msgid "Failed to save %s to user folder at %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:960
+#: ../wallace/module_invitationpolicy.py:1083
+#, python-format
+msgid "Delete %s %r in %r by UID: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1091
 #, python-format
 msgid "Delete %s %r in %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:989
+#: ../wallace/module_invitationpolicy.py:1102
+#, python-format
+msgid "Failed to delete %s from folder %r: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1130
+#: ../wallace/module_invitationpolicy.py:1304
+#, python-format
+msgid "%s commented: %s"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1133
 #, python-format
 msgid "Compose participation status summary for %s %r to user %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1022
+#: ../wallace/module_invitationpolicy.py:1171
 #, python-format
 msgid ""
 "Waiting for more automated replies (got %d of %d); skipping notification"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1032
+#: ../wallace/module_invitationpolicy.py:1192
 #, python-format
 msgid "Changes submitted by %s have been automatically applied."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1041
+#: ../wallace/module_invitationpolicy.py:1201
 msgid "(removed)"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1047
+#: ../wallace/module_invitationpolicy.py:1207
 #, python-format
 msgid ""
 "\n"
@@ -3512,7 +3893,7 @@
 "        "
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1055
+#: ../wallace/module_invitationpolicy.py:1215
 #, python-format
 msgid ""
 "\n"
@@ -3521,56 +3902,78 @@
 "        "
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1064
-#: ../wallace/module_invitationpolicy.py:1126
-#: ../wallace/module_invitationpolicy.py:1216
+#: ../wallace/module_invitationpolicy.py:1225
+msgid "NOTE: This update only refers to this single occurrence!"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1227
+#: ../wallace/module_invitationpolicy.py:1309
+#: ../wallace/module_invitationpolicy.py:1411
 msgid "*** This is an automated message. Please do not reply. ***"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1099
+#: ../wallace/module_invitationpolicy.py:1249
+#, python-format
+msgid "Sent update notification to %r: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1274
 #, python-format
 msgid "Send cancellation notification for %s %r to user %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1109
+#: ../wallace/module_invitationpolicy.py:1284
 #, python-format
-msgid ""
-"\n"
-"            The assignment for '%(summary)s' has been cancelled by %(organizer)s.\n"
-"            The copy in your tasklist as been marked as cancelled accordingly.\n"
-"        "
+msgid "The assignment for '%(summary)s' has been cancelled by %(organizer)s."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1289
+msgid "The copy in your tasklist has been removed accordingly."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1291
+msgid "The copy in your tasklist has been marked as cancelled accordingly."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1117
+#: ../wallace/module_invitationpolicy.py:1293
 #, python-format
 msgid ""
-"\n"
-"            The event '%(summary)s' at %(start)s has been cancelled by %(organizer)s.\n"
-"            The copy in your calendar as been marked as cancelled accordingly.\n"
-"        "
+"The event '%(summary)s' at %(start)s has been cancelled by %(organizer)s."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1299
+msgid "The copy in your calendar has been removed accordingly."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1301
+msgid "The copy in your calendar has been marked as cancelled accordingly."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1307
+msgid "NOTE: This cancellation only refers to this single occurrence!"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1206
+#: ../wallace/module_invitationpolicy.py:1401
 #, python-format
 msgid "Updated %s's copy of %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1209
+#: ../wallace/module_invitationpolicy.py:1404
 #, python-format
 msgid "Attendee %s's copy of %r not found"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1212
+#: ../wallace/module_invitationpolicy.py:1407
 #, python-format
 msgid "Attendee %r not found in LDAP"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1219
+#: ../wallace/module_invitationpolicy.py:1414
 #, python-format
 msgid "%(name)s has %(status)s your assignment for %(summary)s."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1221
+#: ../wallace/module_invitationpolicy.py:1416
 #, python-format
 msgid "%(name)s has %(status)s your invitation for %(summary)s."
 msgstr ""
@@ -3583,7 +3986,8 @@
 
 #: ../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
@@ -3596,255 +4000,308 @@
 msgid "Could not send request to optout_url %s"
 msgstr ""
 
-#: ../wallace/module_resources.py:116
+#: ../wallace/module_resources.py:117
 #, python-format
 msgid "Resource Management called for %r, %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:181
+#: ../wallace/module_resources.py:182
 #, python-format
 msgid "Failed to parse iTip events from message: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:186
-msgid "Message is not an iTip message or does not contain any "
+#: ../wallace/module_resources.py:187
+msgid "Message is not an iTip message or does not contain any (valid) iTip."
 msgstr ""
 
-#: ../wallace/module_resources.py:194
-msgid "iTip events attached to this message contain the "
+#: ../wallace/module_resources.py:195
+#, python-format
+msgid ""
+"iTip events attached to this message contain the following information: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:225
+#: ../wallace/module_resources.py:226
 msgid "Not an iTip message, but sent to resource nonetheless. Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:233
+#: ../wallace/module_resources.py:234
 #, python-format
 msgid "No itips, no resources, pass along %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:236
+#: ../wallace/module_resources.py:237
 #, python-format
 msgid "iTips, but no resources, pass along %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:245
+#: ../wallace/module_resources.py:246
 #, python-format
 msgid "No resource attendees matching envelope recipient %s, Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:255
+#: ../wallace/module_resources.py:256
 #, python-format
 msgid "Resources: %r; %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:273
+#: ../wallace/module_resources.py:270
+#, python-format
+msgid "iTip REPLY to %r, %r; matches %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:276
 #, python-format
 msgid "Sender Attendee: %r => %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:280
+#: ../wallace/module_resources.py:278
+#, python-format
+msgid "Could not find envelope sender attendee: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:283
 #, python-format
 msgid ""
 "The iTip reply sequence (%r) doesn't match the referred event version (%r). "
 "Ignoring."
 msgstr ""
 
-#: ../wallace/module_resources.py:305
+#: ../wallace/module_resources.py:302
+#, python-format
+msgid "Invalid response (%r) received from resource owner for event %r"
+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:308
+#: ../wallace/module_resources.py:309
 msgid "No event reference found in this REPLY. Ignoring."
 msgstr ""
 
-#: ../wallace/module_resources.py:317
+#: ../wallace/module_resources.py:318
 #, python-format
 msgid "Receiving Resource: %r; %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:325
+#: ../wallace/module_resources.py:320
+#, python-format
+msgid "Could not find envelope attendee: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:326
 #, python-format
 msgid "Recipient %r is non-participant, ignoring message"
 msgstr ""
 
-#: ../wallace/module_resources.py:353
+#: ../wallace/module_resources.py:336
+#, python-format
+msgid "Cancellation for entire event %r: deleting"
+msgstr ""
+
+#: ../wallace/module_resources.py:340
+#, python-format
+msgid "Cancellation for a single occurrence %r of %r: updating..."
+msgstr ""
+
+#: ../wallace/module_resources.py:361
 #, python-format
 msgid "Accept invitation for individual resource %r / %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:382
+#: ../wallace/module_resources.py:390
 #, python-format
 msgid "Delegate invitation for resource collection %r to %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:403
+#: ../wallace/module_resources.py:411
 #, python-format
 msgid "module_resources.heartbeat(%d)"
 msgstr ""
 
-#: ../wallace/module_resources.py:426
+#: ../wallace/module_resources.py:434
 #, python-format
 msgid "Expunge resource calendar for %s (%s) failed: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:450
+#: ../wallace/module_resources.py:458
 #, python-format
 msgid "Expunge events in resource folder %r older than %d days"
 msgstr ""
 
-#: ../wallace/module_resources.py:463
+#: ../wallace/module_resources.py:471
 #, python-format
 msgid "Fetching message ID %r from folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:489
+#: ../wallace/module_resources.py:497
 #, python-format
 msgid "Flag event %s from message %s/%s as deleted (age = %d days)"
 msgstr ""
 
-#: ../wallace/module_resources.py:514
+#: ../wallace/module_resources.py:522
 #, python-format
 msgid "Failed to read resource calendar for %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:524
+#: ../wallace/module_resources.py:532
 #, python-format
 msgid "Polling for resource %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:527
+#: ../wallace/module_resources.py:535
 #, python-format
 msgid "Resource %r has been popped from the list"
 msgstr ""
 
-#: ../wallace/module_resources.py:531
+#: ../wallace/module_resources.py:539
 msgid "Resource is a collection"
 msgstr "El recurso es una colección"
 
-#: ../wallace/module_resources.py:542
+#: ../wallace/module_resources.py:550
 #, python-format
 msgid "Removed conflicting resources from %r: (%r) => %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:554
+#: ../wallace/module_resources.py:562
 #, python-format
 msgid "Conflicting events: %r for resource %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:573
+#: ../wallace/module_resources.py:585
 #, python-format
 msgid "Delegate to another resource collection member: %r to %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:635
+#: ../wallace/module_resources.py:647
 #, python-format
 msgid "Checking events in resource folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:654
+#: ../wallace/module_resources.py:666
 #, python-format
 msgid "Fetching message UID %r from folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:677
+#: ../wallace/module_resources.py:699
 #, python-format
 msgid "Event %r conflicts with event %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:698
+#: ../wallace/module_resources.py:721
 #, python-format
 msgid "Searching %r for event %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:704
+#: ../wallace/module_resources.py:727
 #, python-format
 msgid "Failed to access resource calendar:: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:733
+#: ../wallace/module_resources.py:754
+#, python-format
+msgid "Recurrence-ID not matching on message %s, skipping: %r != %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:785
 #, python-format
 msgid "Apply invitation policies %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:752
+#: ../wallace/module_resources.py:804
 #, python-format
 msgid "Adding event to %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:806
+#: ../wallace/module_resources.py:888
 #, python-format
 msgid "Failed to save event to resource calendar at %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:823
+#: ../wallace/module_resources.py:907
+#, python-format
+msgid "Delete resource calendar object from %r by UID %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:915
 #, python-format
 msgid "Delete resource calendar object %r in %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:866
+#: ../wallace/module_resources.py:926
+#, python-format
+msgid "Failed to delete calendar object %r from folder %r: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:966
 #, python-format
 msgid "Checking if email address %r belongs to a resource (collection)"
 msgstr ""
 
-#: ../wallace/module_resources.py:874 ../wallace/module_resources.py:946
-#: ../wallace/module_resources.py:980
+#: ../wallace/module_resources.py:974 ../wallace/module_resources.py:1046
+#: ../wallace/module_resources.py:1080
 #, python-format
 msgid "Resource record(s): %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:876 ../wallace/module_resources.py:948
-#: ../wallace/module_resources.py:983
+#: ../wallace/module_resources.py:976 ../wallace/module_resources.py:1048
+#: ../wallace/module_resources.py:1083
 #, python-format
 msgid "No resource (collection) records found for %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:880 ../wallace/module_resources.py:952
-#: ../wallace/module_resources.py:987
+#: ../wallace/module_resources.py:980 ../wallace/module_resources.py:1052
+#: ../wallace/module_resources.py:1087
 #, python-format
 msgid "Resource record: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:898
+#: ../wallace/module_resources.py:998
 #, python-format
 msgid "Raw itip_events: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:906
+#: ../wallace/module_resources.py:1006
 #, python-format
 msgid "Raw set of attendees: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:914
+#: ../wallace/module_resources.py:1014
 #, python-format
 msgid "Raw set of resources: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:919
+#: ../wallace/module_resources.py:1019
 #, python-format
 msgid "Raw set of organizers: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:939
+#: ../wallace/module_resources.py:1039
 #, python-format
 msgid "Checking if attendee %r is a resource (collection)"
 msgstr ""
 
-#: ../wallace/module_resources.py:955 ../wallace/module_resources.py:989
+#: ../wallace/module_resources.py:1055 ../wallace/module_resources.py:1089
 msgid "Resource reservation made but no resource records found"
 msgstr ""
 
-#: ../wallace/module_resources.py:974
+#: ../wallace/module_resources.py:1074
 #, python-format
 msgid "Checking if resource %r is a resource (collection)"
 msgstr ""
 
-#: ../wallace/module_resources.py:992
-msgid "The following resources are being referred to in the "
+#: ../wallace/module_resources.py:1092
+#, python-format
+msgid "The following resources are being referred to in the iTip: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:1219
+#, python-format
+msgid "Check collections %r for kolabinvitationpolicy attributes"
 msgstr ""
 
-#: ../wallace/module_resources.py:1157
+#: ../wallace/module_resources.py:1257
 #, python-format
 msgid ""
 "\n"
@@ -3854,7 +4311,7 @@
 "            "
 msgstr ""
 
-#: ../wallace/module_resources.py:1176
+#: ../wallace/module_resources.py:1276
 #, python-format
 msgid ""
 "\n"
@@ -3864,7 +4321,7 @@
 "    "
 msgstr ""
 
-#: ../wallace/module_resources.py:1183
+#: ../wallace/module_resources.py:1283
 #, python-format
 msgid ""
 "\n"
@@ -3873,16 +4330,16 @@
 "        "
 msgstr ""
 
-#: ../wallace/module_resources.py:1218
+#: ../wallace/module_resources.py:1318
 #, python-format
 msgid "Sending booking notification for event %r to %r from %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1236
+#: ../wallace/module_resources.py:1336
 msgid "failed"
 msgstr ""
 
-#: ../wallace/module_resources.py:1256
+#: ../wallace/module_resources.py:1356
 #, python-format
 msgid ""
 "\n"
@@ -3892,7 +4349,7 @@
 "        "
 msgstr ""
 
-#: ../wallace/module_resources.py:1262
+#: ../wallace/module_resources.py:1362
 #, python-format
 msgid ""
 "\n"
@@ -3903,12 +4360,12 @@
 "        "
 msgstr ""
 
-#: ../wallace/module_resources.py:1306
+#: ../wallace/module_resources.py:1393
 #, python-format
 msgid "Clone invitation for owner confirmation: %r from %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1312
+#: ../wallace/module_resources.py:1412
 #, python-format
 msgid ""
 "\n"
@@ -3926,58 +4383,63 @@
 msgstr ""
 
 #. This is a nested module
-#: ../wallace/modules.py:97
+#: ../wallace/modules.py:98
 #, python-format
 msgid "Module Group: %s"
 msgstr ""
 
-#: ../wallace/modules.py:108 ../wallace/modules.py:120
+#: ../wallace/modules.py:109 ../wallace/modules.py:125
 #, python-format
 msgid "No such module %r in modules %r (1)."
 msgstr ""
 
-#: ../wallace/modules.py:113
+#: ../wallace/modules.py:114
 #, python-format
 msgid "No such module %r in modules %r (2)."
 msgstr ""
 
-#: ../wallace/modules.py:126
+#: ../wallace/modules.py:120 ../wallace/modules.py:172
+#, python-format
+msgid "Unknown error occurred; %r"
+msgstr ""
+
+#: ../wallace/modules.py:178
 #, python-format
 msgid "Holding message in queue for manual review (%s by %s)"
 msgstr ""
 
-#: ../wallace/modules.py:129
+#: ../wallace/modules.py:181
 #, python-format
 msgid "Deferring message in %s (by module %s)"
 msgstr ""
 
-#: ../wallace/modules.py:141
+#: ../wallace/modules.py:193
 #, python-format
 msgid "The time when the message was sent: %r"
 msgstr ""
 
-#: ../wallace/modules.py:142
+#: ../wallace/modules.py:194
 #, python-format
 msgid "The time now: %r"
 msgstr ""
 
-#: ../wallace/modules.py:143
+#: ../wallace/modules.py:195
 #, python-format
 msgid "The time delta: %r"
 msgstr ""
 
 #. TODO: Send NDR back to user
-#: ../wallace/modules.py:147
+#: ../wallace/modules.py:199
 #, python-format
 msgid "Message in file %s older then 5 days, deleting"
 msgstr ""
 
-#: ../wallace/modules.py:172
+#: ../wallace/modules.py:224
 #, python-format
 msgid "Rejecting message in %s (by module %s)"
 msgstr ""
 
-#: ../wallace/modules.py:193
+#: ../wallace/modules.py:245
 #, python-format
 msgid ""
 "This is the email system Wallace at %s.\n"
@@ -3992,29 +4454,29 @@
 "recipients.\n"
 msgstr ""
 
-#: ../wallace/modules.py:208
+#: ../wallace/modules.py:260
 #, python-format
 msgid ""
 "X-Wallace-Module: %s\n"
 "X-Wallace-Result: REJECT\n"
 msgstr ""
 
-#: ../wallace/modules.py:267
+#: ../wallace/modules.py:304
 #, python-format
 msgid "Accepting message in %s (by module %s)"
 msgstr ""
 
-#: ../wallace/modules.py:269
+#: ../wallace/modules.py:306
 #, python-format
 msgid "Accepting message in: %r"
 msgstr ""
 
-#: ../wallace/modules.py:276
+#: ../wallace/modules.py:313
 #, python-format
 msgid "recipients: %r"
 msgstr ""
 
-#: ../wallace/modules.py:354
+#: ../wallace/modules.py:369
 #, python-format
 msgid "Module '%s' already registered"
 msgstr ""

pykolab-0.8.1.tar.gz/po/fr.po -> pykolab-0.8.3.tar.gz/po/fr.po Changed

@@ -12,400 +12,433 @@
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-14 01:36+0100\n"
-"PO-Revision-Date: 2015-01-21 16:41+0000\n"
-"Last-Translator: Thomas Brüderli <roundcube@gmail.com>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/kolab/language/fr/)\n"
+"POT-Creation-Date: 2016-07-22 15:31+0200\n"
+"PO-Revision-Date: 2016-07-22 13:31+0000\n"
+"Last-Translator: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>\n"
+"Language-Team: French (http://www.transifex.com/kolab/kolab/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../bin/kolab_smtp_access_policy.py:210
+#: ../bin/kolab_smtp_access_policy.py:214
 #, python-format
 msgid "Adding policy request to instance %s"
 msgstr "Ajoutant une demande politique au recours %s"
 
-#: ../bin/kolab_smtp_access_policy.py:480
+#: ../bin/kolab_smtp_access_policy.py:484
 msgid "Unauthorized access not allowed"
 msgstr "Accès non autorisé interdit"
 
-#: ../bin/kolab_smtp_access_policy.py:509
-#: ../bin/kolab_smtp_access_policy.py:690
+#: ../bin/kolab_smtp_access_policy.py:513
+#: ../bin/kolab_smtp_access_policy.py:711
 msgid "Could not find recipient"
 msgstr "Impossible de trouver le destinataire"
 
-#: ../bin/kolab_smtp_access_policy.py:528
+#: ../bin/kolab_smtp_access_policy.py:532
 #, python-format
 msgid "Could not find envelope sender user %s (511)"
 msgstr "L'expéditeur d'enveloppe d'utilisateur %s (511) pas trouvé\n\n l'adresse mail expéditeur"
 
-#: ../bin/kolab_smtp_access_policy.py:571
+#: ../bin/kolab_smtp_access_policy.py:575
 #, python-format
 msgid "Obtained authenticated user details for %r: %r"
 msgstr "Informations d'utilisateur authentifié obtenus pour %r: %r"
 
-#: ../bin/kolab_smtp_access_policy.py:628
+#: ../bin/kolab_smtp_access_policy.py:633
 #, python-format
 msgid "Could not find envelope sender user %s"
 msgstr " Impossible de trouver l'enveloppe d'utilisateur d'expéditeur %s "
 
-#: ../bin/kolab_smtp_access_policy.py:650
+#: ../bin/kolab_smtp_access_policy.py:666
+#: ../bin/kolab_smtp_access_policy.py:694
 #, python-format
 msgid "%s is unauthorized to send on behalf of %s"
 msgstr "%s n'est pas autorisé d'envoyer de la part de %s"
 
-#: ../bin/kolab_smtp_access_policy.py:660
+#: ../bin/kolab_smtp_access_policy.py:676
 #, python-format
 msgid ""
 "User %s attempted to use envelope sender address %s without authorization"
 msgstr "L'utilisateur %s a tenté d'utilisé l'adresse mail expéditeur %s sans autorisation"
 
-#: ../bin/kolab_smtp_access_policy.py:714
-#: ../bin/kolab_smtp_access_policy.py:725
+#: ../bin/kolab_smtp_access_policy.py:736
+#: ../bin/kolab_smtp_access_policy.py:747
 #, python-format
 msgid "Found user %s to be a delegate user of %s"
 msgstr "Utilisateur %s trouvé à être un utilisateur délégué de %s"
 
-#: ../bin/kolab_smtp_access_policy.py:749
+#: ../bin/kolab_smtp_access_policy.py:767
 #, python-format
 msgid ""
 "Verifying authenticated sender '%(sender)s' with sasl_username "
 "'%(sasl_username)s' for recipient '%(recipient)s'"
 msgstr "Vérification authentifié d'utilisateur '%(sender)s' avec sasl_username '%(sasl_username)s' pour destinateur '%(recipient)s'"
 
-#: ../bin/kolab_smtp_access_policy.py:752
+#: ../bin/kolab_smtp_access_policy.py:770
 #, python-format
 msgid ""
 "Verifying unauthenticated sender '%(sender)s' for recipient '%(recipient)s'"
 msgstr "Vérification non authentifié d'utilisateur '%(sender)s' pour destinateur '%(recipient)s'"
 
-#: ../bin/kolab_smtp_access_policy.py:768
+#: ../bin/kolab_smtp_access_policy.py:786
 #, python-format
 msgid "Reproducing verify_recipient(%s, %s) from cache"
 msgstr "Reproduction vérifier_destinateur(%s, %s)  de cache "
 
-#: ../bin/kolab_smtp_access_policy.py:805
+#: ../bin/kolab_smtp_access_policy.py:823
 #, python-format
 msgid "Using authentication domain %s instead of %s"
 msgstr "Utilisation d'un domaine authentifié  %s à la place de %s"
 
-#: ../bin/kolab_smtp_access_policy.py:815
+#: ../bin/kolab_smtp_access_policy.py:833
 #, python-format
 msgid "Domain %s is a primary domain"
 msgstr "Domaine %s est un domaine primaire"
 
-#: ../bin/kolab_smtp_access_policy.py:823
+#: ../bin/kolab_smtp_access_policy.py:841
 #, python-format
 msgid ""
 "Checking the recipient for domain %s that is not ours. This is probably a "
 "configuration error."
 msgstr "Vérification du destinateur de domaine %s qui nous appartient pas. Ceci est probablement une erreur de configuration."
 
-#: ../bin/kolab_smtp_access_policy.py:838
+#: ../bin/kolab_smtp_access_policy.py:856
 msgid ""
 "This recipient address is related to multiple object entries and the SMTP "
 "Access Policy can therefore not restrict message flow"
 msgstr "Cette adresse de destinateur est liée aux entrées d´ objet multiple et le Code d'Accès SMTP ne peut pas ainsi limiter le flux de message."
 
-#: ../bin/kolab_smtp_access_policy.py:855
+#: ../bin/kolab_smtp_access_policy.py:873
 #, python-format
 msgid ""
 "Recipient address %r not found. Allowing since the MTA was configured to "
 "accept the recipient."
 msgstr "Adresse de destinateur %r pas trouvée. Permettant depuis la configuration d'ATM pour accepter le destinateur."
 
-#: ../bin/kolab_smtp_access_policy.py:891
+#: ../bin/kolab_smtp_access_policy.py:909
 msgid "Invalid recipient"
 msgstr "Destinataire  non valide"
 
-#: ../bin/kolab_smtp_access_policy.py:902
+#: ../bin/kolab_smtp_access_policy.py:920
 msgid "Could not find this user, accepting"
 msgstr "Utilisateur pas troué, en acceptant"
 
-#: ../bin/kolab_smtp_access_policy.py:975
-#: ../bin/kolab_smtp_access_policy.py:1051
+#: ../bin/kolab_smtp_access_policy.py:993
+#: ../bin/kolab_smtp_access_policy.py:1070
 #, python-format
 msgid "Sender %s is not allowed to send to recipient %s"
 msgstr "Expéditeur %s n'est pas autorisé d'envoyer au destinateur %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1039
+#: ../bin/kolab_smtp_access_policy.py:1057
 #, python-format
 msgid "Reproducing verify_sender(%r) from cache"
 msgstr "Reproduction vérifier_expéditeur(%r) de cache "
 
-#: ../bin/kolab_smtp_access_policy.py:1056
+#: ../bin/kolab_smtp_access_policy.py:1077
 msgid "Unverifiable sender."
 msgstr "Expéditeur non vérifiables"
 
-#: ../bin/kolab_smtp_access_policy.py:1061
+#: ../bin/kolab_smtp_access_policy.py:1082
 msgid "Sender is not using an alias"
 msgstr "Expéditeur n'utilise pas un alias"
 
-#: ../bin/kolab_smtp_access_policy.py:1069
+#: ../bin/kolab_smtp_access_policy.py:1090
 msgid "Sender uses unauthorized envelope sender address"
 msgstr "Expéditeur utilise  une adresse mail expéditeur non autorisée"
 
-#: ../bin/kolab_smtp_access_policy.py:1086
+#: ../bin/kolab_smtp_access_policy.py:1107
 msgid "Could not verify sender"
 msgstr "Impossible de vérifier l'expéditeur"
 
-#: ../bin/kolab_smtp_access_policy.py:1093
+#: ../bin/kolab_smtp_access_policy.py:1114
 msgid ""
 "Verifying whether sender is allowed to send to recipient using sender policy"
 msgstr "Verifie si l'expéditeur est autorisé d'envoyer au destinateur utilisant politique d'expéditeur"
 
-#: ../bin/kolab_smtp_access_policy.py:1106
+#: ../bin/kolab_smtp_access_policy.py:1127
 #, python-format
 msgid "Result is %r"
 msgstr "Résultat est %r"
 
-#: ../bin/kolab_smtp_access_policy.py:1111
+#: ../bin/kolab_smtp_access_policy.py:1132
 msgid "No recipient policy restrictions exist for this sender"
 msgstr "Aucune restrictions politique de destinateur existe pour cet expéditeur"
 
-#: ../bin/kolab_smtp_access_policy.py:1120
+#: ../bin/kolab_smtp_access_policy.py:1141
 msgid "Found a recipient policy to apply for this sender."
 msgstr "Une politique de destinateur à appliquer à cet expéditeur trouvée"
 
-#: ../bin/kolab_smtp_access_policy.py:1135
+#: ../bin/kolab_smtp_access_policy.py:1156
 #, python-format
 msgid "Sender %s not allowed to send to recipient %s"
 msgstr "Expéditeur %s n'est pas autorisé d'envoyer au destinateur %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1156
+#: ../bin/kolab_smtp_access_policy.py:1184
 msgid "Cleaning up the cache"
 msgstr "Nettoyage de la mémoire cache "
 
-#: ../bin/kolab_smtp_access_policy.py:1179
+#: ../bin/kolab_smtp_access_policy.py:1207
 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:1195
+#: ../bin/kolab_smtp_access_policy.py:1223
 #, python-format
 msgid "Operational Error in caching: %s"
 msgstr "Erreur opérationnelle dans la mise en cache: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1247
+#: ../bin/kolab_smtp_access_policy.py:1276
 #, python-format
 msgid "Caching the policy result with timestamp %d"
 msgstr "La mise en cache du résultat politique avec horodatage %d"
 
-#: ../bin/kolab_smtp_access_policy.py:1321
+#: ../bin/kolab_smtp_access_policy.py:1353
 #, python-format
 msgid "Returning action DEFER_IF_PERMIT: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1326
+#: ../bin/kolab_smtp_access_policy.py:1358
 #, python-format
 msgid "Returning action DUNNO: %s"
 msgstr "Retourne action SAIS PAS: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1331
+#: ../bin/kolab_smtp_access_policy.py:1363
 #, python-format
 msgid "Returning action HOLD: %s"
 msgstr "Retourne action EN ATTENTE: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1336
+#: ../bin/kolab_smtp_access_policy.py:1368
 #, python-format
 msgid "Returning action PERMIT: %s"
 msgstr "Retourne action PERMIS: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1461
+#: ../bin/kolab_smtp_access_policy.py:1496
 #, python-format
 msgid "Returning action REJECT: %s"
 msgstr "Retourne action REJET: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1507
+#: ../bin/kolab_smtp_access_policy.py:1542
 msgid "Starting to loop for new request"
 msgstr "Démarrage en boucle pour une nouvelle demande"
 
-#: ../bin/kolab_smtp_access_policy.py:1514
+#: ../bin/kolab_smtp_access_policy.py:1549
 msgid "Timeout for policy request reading exceeded"
 msgstr "Délai pour la lecture de politique de demande est dépassé"
 
-#: ../bin/kolab_smtp_access_policy.py:1520
+#: ../bin/kolab_smtp_access_policy.py:1555
 msgid "End of current request"
 msgstr "Fin de requête actuelle"
 
-#: ../bin/kolab_smtp_access_policy.py:1524
+#: ../bin/kolab_smtp_access_policy.py:1559
 #, python-format
 msgid "Getting line: %s"
 msgstr "Reçoit ligne: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1528
+#: ../bin/kolab_smtp_access_policy.py:1563
 msgid "Returning request"
 msgstr "Demande retour"
 
-#: ../bin/kolab_smtp_access_policy.py:1557
+#: ../bin/kolab_smtp_access_policy.py:1592
 msgid "Access Policy Options"
 msgstr "Options de la stratégie d'accès"
 
-#: ../bin/kolab_smtp_access_policy.py:1564
+#: ../bin/kolab_smtp_access_policy.py:1599
 msgid "SMTP Policy request timeout."
 msgstr "Délai de demande de Politique SMTP"
 
-#: ../bin/kolab_smtp_access_policy.py:1570
+#: ../bin/kolab_smtp_access_policy.py:1605
 msgid "Verify the recipient access policy."
 msgstr "Vérification de la stratégie d'accès du destinataire."
 
-#: ../bin/kolab_smtp_access_policy.py:1576
+#: ../bin/kolab_smtp_access_policy.py:1611
 msgid "Verify the sender access policy."
 msgstr "Vérification de la stratégie d'accès de l'expéditeur."
 
-#: ../bin/kolab_smtp_access_policy.py:1582
+#: ../bin/kolab_smtp_access_policy.py:1617
 msgid "Allow unauthenticated senders."
 msgstr "Autorise les expéditeurs non authentifiés."
 
-#: ../bin/kolab_smtp_access_policy.py:1596
+#: ../bin/kolab_smtp_access_policy.py:1631
 #, python-format
 msgid "Got request instance %s"
 msgstr "Demande d'instance obtenue %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1605
+#: ../bin/kolab_smtp_access_policy.py:1640
 #, python-format
 msgid "Request instance %s is in state %s"
 msgstr "Demande d'instance %s est en état %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1613
-#, python-format
-msgid "Request instance %s is not yet in DATA state"
-msgstr "Demande d'instance %s n'est pas encore en état de DONNÉES"
-
-#: ../bin/kolab_smtp_access_policy.py:1625
-#, python-format
-msgid "Request instance %s reached DATA state"
-msgstr "Instance de requête %s a atteint l' état de DONNÉES"
-
-#: ../bin/kolab_smtp_access_policy.py:1645
+#: ../bin/kolab_smtp_access_policy.py:1672
 #, python-format
 msgid "Unhandled exception caught: %r"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1649
+#: ../bin/kolab_smtp_access_policy.py:1676
 msgid "Sender access denied"
 msgstr "Accès d'expéditeur refus"
 
-#: ../bin/kolab_smtp_access_policy.py:1651
+#: ../bin/kolab_smtp_access_policy.py:1678
 msgid "Recipient access denied"
 msgstr "Accès de destinateur "
 
-#: ../bin/kolab_smtp_access_policy.py:1653
+#: ../bin/kolab_smtp_access_policy.py:1680
 msgid "No objections"
 msgstr "Pas d'objections"
 
-#: ../conf.py:37 ../kolab-cli.py:34 ../saslauthd.py:33
+#: ../conf.py:36 ../kolab-cli.py:34 ../saslauthd.py:33
 msgid "Cannot load pykolab/logger.py:"
 msgstr "Impossible de charger pykolab/logger.py :"
 
-#: ../kolabd/__init__.py:49 ../saslauthd/__init__.py:51
-#: ../wallace/__init__.py:107
+#: ../kolabd/__init__.py:50 ../saslauthd/__init__.py:52
+#: ../wallace/__init__.py:108
 msgid "Daemon Options"
 msgstr "Options du service"
 
-#: ../kolabd/__init__.py:56 ../saslauthd/__init__.py:58
-#: ../wallace/__init__.py:114
+#: ../kolabd/__init__.py:57 ../saslauthd/__init__.py:59
+#: ../wallace/__init__.py:115
 msgid "Fork to the background."
 msgstr "Exécution en tâche de fond."
 
-#: ../kolabd/__init__.py:65 ../saslauthd/__init__.py:67
-#: ../wallace/__init__.py:148
+#: ../kolabd/__init__.py:66 ../saslauthd/__init__.py:68
+#: ../wallace/__init__.py:150
 msgid "Path to the PID file to use."
 msgstr "Chemin absolu du fichier PID à utiliser."
 
-#: ../kolabd/__init__.py:74 ../saslauthd/__init__.py:85
-#: ../wallace/__init__.py:165
+#: ../kolabd/__init__.py:75 ../saslauthd/__init__.py:86
+#: ../wallace/__init__.py:168
 msgid "Run as user USERNAME"
 msgstr "Exécuter comme IDENTIFIANT d'utilisateur"
 
-#: ../kolabd/__init__.py:84 ../saslauthd/__init__.py:95
-#: ../wallace/__init__.py:131
+#: ../kolabd/__init__.py:85 ../saslauthd/__init__.py:96
+#: ../wallace/__init__.py:132
 msgid "Run as group GROUPNAME"
 msgstr "Exécuter comme NOM de GROUPE de groupe"
 
-#: ../kolabd/__init__.py:122 ../pykolab/utils.py:234
-#: ../saslauthd/__init__.py:301 ../wallace/__init__.py:365
+#: ../kolabd/__init__.py:123 ../pykolab/utils.py:254
+#: ../saslauthd/__init__.py:327 ../wallace/__init__.py:373
 #, python-format
 msgid "Group %s does not exist"
 msgstr "Groupe %s n'est existe pas"
 
-#: ../kolabd/__init__.py:131 ../saslauthd/__init__.py:310
-#: ../wallace/__init__.py:374
+#: ../kolabd/__init__.py:132 ../saslauthd/__init__.py:336
+#: ../wallace/__init__.py:382
 #, python-format
 msgid "Switching real and effective group id to %d"
 msgstr "La commutation réelle et effective de groupe id à %d "
 
-#: ../kolabd/__init__.py:153 ../pykolab/utils.py:258
-#: ../saslauthd/__init__.py:332 ../wallace/__init__.py:396
+#: ../kolabd/__init__.py:154 ../pykolab/utils.py:278
+#: ../saslauthd/__init__.py:358 ../wallace/__init__.py:404
 #, python-format
 msgid "User %s does not exist"
 msgstr "Utilisateur %s  n'existe pas"
 
-#: ../kolabd/__init__.py:163 ../saslauthd/__init__.py:342
-#: ../wallace/__init__.py:406
+#: ../kolabd/__init__.py:163 ../saslauthd/__init__.py:367
+#: ../wallace/__init__.py:414
 #, python-format
 msgid "Switching real and effective user id to %d"
 msgstr "La commutation réelle et effective de utilisateur id à %d "
 
-#: ../kolabd/__init__.py:172 ../saslauthd/__init__.py:351
-#: ../wallace/__init__.py:415
+#: ../kolabd/__init__.py:172 ../saslauthd/__init__.py:376
+#: ../wallace/__init__.py:423
 msgid "Could not change real and effective uid and/or gid"
 msgstr "Le changement réel et effectif d' uid et/ou gid pas possible"
 
-#: ../kolabd/__init__.py:192 ../saslauthd/__init__.py:142
-#: ../wallace/__init__.py:435
+#: ../kolabd/__init__.py:215 ../saslauthd/__init__.py:166
+#: ../wallace/__init__.py:465
 msgid "Interrupted by user"
 msgstr "Interrompu par l'utilisateur"
 
-#: ../kolabd/__init__.py:197 ../kolabd/__init__.py:208
-msgid "Traceback occurred, please report a "
-msgstr "Une erreur s'est produite, vous pouvez reporter le problème"
+#: ../kolabd/__init__.py:220 ../kolabd/__init__.py:231
+#: ../saslauthd/__init__.py:170 ../saslauthd/__init__.py:179
+#: ../wallace/__init__.py:469 ../wallace/__init__.py:478
+msgid "Traceback occurred, please report a bug at https://issues.kolab.org"
+msgstr ""
 
-#: ../kolabd/__init__.py:203 ../saslauthd/__init__.py:150
-#: ../wallace/__init__.py:444
+#: ../kolabd/__init__.py:226 ../saslauthd/__init__.py:175
+#: ../wallace/__init__.py:474
 #, python-format
 msgid "Type Error: %s"
 msgstr "Type d'erreur : %s"
 
-#: ../kolabd/__init__.py:230
+#: ../kolabd/__init__.py:253
 msgid "Could not connect to LDAP, is it running?"
 msgstr " Impossible de se connecter au LDAP, est-il en cours d'exécution?"
 
-#: ../kolabd/__init__.py:233 ../pykolab/auth/ldap/__init__.py:2242
-#: ../pykolab/cli/cmd_sync.py:67
+#: ../kolabd/__init__.py:256 ../pykolab/auth/ldap/__init__.py:2524
+#: ../pykolab/cli/cmd_sync.py:77
 msgid "Listing domains..."
 msgstr "Liste des domaines ..."
 
-#: ../kolabd/__init__.py:244
+#: ../kolabd/__init__.py:267
 msgid "No domains. Not syncing"
 msgstr "Aucune domaines. Pas de synchronisation"
 
-#: ../kolabd/__init__.py:279
+#: ../kolabd/__init__.py:290
+#, python-format
+msgid "Domain %r naming context: %r, root dn: %r"
+msgstr ""
+
+#: ../kolabd/__init__.py:302
+#, python-format
+msgid "Naming contexts to synchronize: %r"
+msgstr ""
+
+#: ../kolabd/__init__.py:320
+#, python-format
+msgid "Result set of domains: %r"
+msgstr ""
+
+#: ../kolabd/__init__.py:323
+#, python-format
+msgid "Checking for domain %s"
+msgstr ""
+
+#: ../kolabd/__init__.py:327
+#, python-format
+msgid "Domain %s isn't alive anymore."
+msgstr ""
+
+#: ../kolabd/__init__.py:331
+#, python-format
+msgid "Domain %s already there and alive."
+msgstr ""
+
+#: ../kolabd/__init__.py:335
+#, python-format
+msgid "Domain %s should not exist any longer."
+msgstr ""
+
+#: ../kolabd/__init__.py:338
+#, python-format
+msgid "Domain %s does not have a process yet."
+msgstr ""
+
+#: ../kolabd/__init__.py:349
 #, python-format
 msgid "added domains: %r, removed domains: %r"
 msgstr "domaines ajoutés : %r, domaines supprimés : %r"
 
-#: ../kolabd/process.py:33
+#: ../kolabd/process.py:34
 #, python-format
 msgid "Process created for domain %s"
 msgstr "Processus crié pour domaine %s"
 
-#: ../kolabd/process.py:42
+#: ../kolabd/process.py:43
 #, python-format
 msgid "Synchronizing for domain %s"
 msgstr "Synchronisation pour domaine %s"
 
-#: ../kolabd/process.py:59
+#: ../kolabd/process.py:60
 #, python-format
 msgid ""
 "Error in process %r, terminating:\n"
 "\t%r"
 msgstr "Erreur en processus %r, en terminaison:\n⇥%r"
 
-#: ../kolabd.py:31 ../setup-kolab.py:36 ../wallace.py:31
+#: ../kolabd.py:31 ../setup-kolab.py:37 ../wallace.py:31
 msgid "Cannot load pykolab/constants.py:"
 msgstr "Impossible de charger pykolab/constants.py :"
 
@@ -453,323 +486,428 @@
 msgid "Updating result_attribute for cache entry %r"
 msgstr "Mise a jour de result_attribute pour l'entrée %r dans le cache"
 
-#: ../pykolab/auth/ldap/__init__.py:52
+#: ../pykolab/auth/ldap/__init__.py:54
 msgid "Python LDAP library does not support persistent search"
 msgstr "La librairie Python LDAP ne supporte pas de recherche persistante."
 
-#: ../pykolab/auth/ldap/__init__.py:143
+#: ../pykolab/auth/ldap/__init__.py:147
 #, 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
+#: ../pykolab/auth/ldap/__init__.py:165 ../pykolab/auth/ldap/__init__.py:180
+#: ../pykolab/auth/ldap/__init__.py:207 ../pykolab/auth/ldap/__init__.py:324
 #, python-format
 msgid "Authentication cache failed: %r"
 msgstr "Cache d'authentification a échoué: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:216 ../pykolab/auth/ldap/__init__.py:240
+#: ../pykolab/auth/ldap/__init__.py:229 ../pykolab/auth/ldap/__init__.py:1441
+#: ../pykolab/auth/ldap/__init__.py:1467 ../pykolab/auth/ldap/__init__.py:3066
 #, python-format
-msgid "Binding with user_dn %s and password %s"
-msgstr "Connexion avec le nom distinctif %s et le mot de passe %s "
+msgid "LDAP server unavailable: %r"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:231 ../pykolab/auth/ldap/__init__.py:263
+#: ../pykolab/auth/ldap/__init__.py:230 ../pykolab/auth/ldap/__init__.py:237
+#: ../pykolab/auth/ldap/__init__.py:1316 ../pykolab/auth/ldap/__init__.py:1442
+#: ../pykolab/auth/ldap/__init__.py:1468 ../pykolab/auth/ldap/__init__.py:1756
+#: ../pykolab/auth/ldap/__init__.py:3067 ../pykolab/auth/ldap/__init__.py:3077
 #, python-format
-msgid "Failed to authenticate as user %s"
-msgstr "L'authentification de l'utilisateur %s a échoué"
+msgid "%s"
+msgstr "%s"
 
-#: ../pykolab/auth/ldap/__init__.py:249
+#: ../pykolab/auth/ldap/__init__.py:236
+#, python-format
+msgid "Exception occurred: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:243
+#, python-format
+msgid "Length of entries found: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:255
+#, python-format
+msgid "Authentication for %r failed (multiple entries)"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:269
+#, python-format
+msgid "Authentication for %r failed (no entry)"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:282
+#, python-format
+msgid "Authentication for %r failed (LDAP error?)"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:300 ../pykolab/auth/ldap/__init__.py:354
+#, python-format
+msgid "Authentication for %r succeeded"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:311
+#, python-format
+msgid "Authentication for %r failed (error)"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:328
+msgid "Authentication failed, LDAP server unavailable"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:336 ../pykolab/auth/ldap/__init__.py:391
+#, python-format
+msgid "Failed to authenticate as user %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:357
+#, python-format
+msgid "Authentication for %r failed (password)"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:369
 #, python-format
 msgid "Error occured, there is no such object: %r"
 msgstr "Erreur survenu, cet objet n'existe pas: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:254
+#: ../pykolab/auth/ldap/__init__.py:381
 msgid "Authentication cache failed to clear entry"
 msgstr "Cache d'authentification n'a pas réussi à effacer l'entrée"
 
-#: ../pykolab/auth/ldap/__init__.py:260
+#: ../pykolab/auth/ldap/__init__.py:387
 #, python-format
 msgid "Exception occured: %r"
 msgstr "Une exception s'est produite: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:280
+#: ../pykolab/auth/ldap/__init__.py:419
 msgid "Connecting to LDAP..."
 msgstr "Connexion à la base LDAP ..."
 
-#: ../pykolab/auth/ldap/__init__.py:284
+#: ../pykolab/auth/ldap/__init__.py:423
 #, python-format
 msgid "Attempting to use LDAP URI %s"
 msgstr "Tentative d'utilisation de l'URI LDAP %s"
 
-#: ../pykolab/auth/ldap/__init__.py:371
+#: ../pykolab/auth/ldap/__init__.py:524
 #, python-format
 msgid "Entry ID: %r"
 msgstr "ID d'entré: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:373
+#: ../pykolab/auth/ldap/__init__.py:526
 #, python-format
 msgid "Entry DN: %r"
 msgstr "DN d'entré: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:376
+#: ../pykolab/auth/ldap/__init__.py:529
 #, python-format
 msgid ""
 "ldap search: (%r, %r, filterstr='(objectclass=*)', attrlist=[ 'dn' ] + %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:481
-#, python-format
-msgid "Finding recipient with filter %r"
-msgstr "Recherche de destinataire à partir du filtre %r"
-
-#: ../pykolab/auth/ldap/__init__.py:557
+#: ../pykolab/auth/ldap/__init__.py:648 ../pykolab/auth/ldap/__init__.py:801
 #, python-format
 msgid "Finding resource with filter %r"
 msgstr "Recherche de ressource à partir du filtre %r"
 
-#: ../pykolab/auth/ldap/__init__.py:588
+#: ../pykolab/auth/ldap/__init__.py:725
+#, python-format
+msgid "Finding recipient with filter %r"
+msgstr "Recherche de destinataire à partir du filtre %r"
+
+#: ../pykolab/auth/ldap/__init__.py:832
 #, python-format
 msgid "Using timestamp %r"
 msgstr "Utilisation de horodatage %r"
 
-#: ../pykolab/auth/ldap/__init__.py:625
+#: ../pykolab/auth/ldap/__init__.py:869
 #, python-format
-msgid "Not applying recipient policy for %s "
+msgid "Not applying recipient policy for %s (disabled through configuration)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:635
+#: ../pykolab/auth/ldap/__init__.py:879
 #, python-format
 msgid "Applying recipient policy to %r"
 msgstr "Application de la stratégie destinataire pour %r"
 
-#: ../pykolab/auth/ldap/__init__.py:652
+#: ../pykolab/auth/ldap/__init__.py:896
 #, python-format
-msgid "Using mail attributes: %r, with primary %r and "
-msgstr "Utilisation des attributs mail : %r, avec le primaire %r et"
+msgid "Using mail attributes: %r, with primary %r and secondary %r"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:663
+#: ../pykolab/auth/ldap/__init__.py:907
 #, python-format
 msgid "key %r not in entry"
 msgstr "la clé %r n'est pas dans l'entrée"
 
-#: ../pykolab/auth/ldap/__init__.py:665
+#: ../pykolab/auth/ldap/__init__.py:909
 #, python-format
 msgid "key %r is the prim. mail attr."
 msgstr "la clé %r est l'attribut mail primaire"
 
-#: ../pykolab/auth/ldap/__init__.py:667
+#: ../pykolab/auth/ldap/__init__.py:911
 msgid "prim. mail pol. is not empty"
 msgstr "le pol. mail primaire n'est pas vide"
 
-#: ../pykolab/auth/ldap/__init__.py:670
+#: ../pykolab/auth/ldap/__init__.py:914
 #, python-format
 msgid "key %r is the sec. mail attr."
 msgstr "la clé %r est l'attribut mail secondaire"
 
-#: ../pykolab/auth/ldap/__init__.py:672
+#: ../pykolab/auth/ldap/__init__.py:916
 msgid "sec. mail pol. is not empty"
 msgstr "le pol. mail secondaire n'est pas vide"
 
-#: ../pykolab/auth/ldap/__init__.py:676 ../pykolab/auth/ldap/__init__.py:690
+#: ../pykolab/auth/ldap/__init__.py:920 ../pykolab/auth/ldap/__init__.py:934
 #, python-format
 msgid "Attributes %r are not yet available for entry %r"
 msgstr "Les attributs %r n'existent pas pour le moment dans l'entrée %r"
 
-#: ../pykolab/auth/ldap/__init__.py:729
+#: ../pykolab/auth/ldap/__init__.py:973
 #, python-format
 msgid "No results for mail address %s found"
 msgstr "Aucun résultat pour l'adresse mail %s"
 
-#: ../pykolab/auth/ldap/__init__.py:740
+#: ../pykolab/auth/ldap/__init__.py:984
 #, python-format
 msgid "1 result for address %s found, verifying"
 msgstr "1 résultat trouvé pour l'adresse %s, vérification en cours"
 
-#: ../pykolab/auth/ldap/__init__.py:750
+#: ../pykolab/auth/ldap/__init__.py:994
 #, python-format
-msgid "Too bad, primary email address %s "
-msgstr "L'adresse mail primaire %s n'est pas valide"
+msgid "Too bad, primary email address %s already in use for %s (we are %s)"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:761 ../pykolab/auth/ldap/__init__.py:850
+#: ../pykolab/auth/ldap/__init__.py:1005 ../pykolab/auth/ldap/__init__.py:1094
 msgid "Address assigned to us"
 msgstr "Cette adresse vous est assignée"
 
-#: ../pykolab/auth/ldap/__init__.py:816
+#: ../pykolab/auth/ldap/__init__.py:1060
 #, python-format
 msgid "No results for address %s found"
 msgstr "Aucun résultat pour l'adresse %s"
 
-#: ../pykolab/auth/ldap/__init__.py:827
+#: ../pykolab/auth/ldap/__init__.py:1071
 #, python-format
-msgid "1 result for address %s found, "
-msgstr "1 résultat trouvé pour l'adresse %s,"
+msgid "1 result for address %s found, verifying..."
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:838
-msgid "Too bad, secondary email "
-msgstr "L'adresse mail secondaire est invalide"
+#: ../pykolab/auth/ldap/__init__.py:1082
+#, python-format
+msgid "Too bad, secondary email address %s already in use for %s (we are %s)"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:865
-msgid "Recipient policy composed the following set of secondary "
+#: ../pykolab/auth/ldap/__init__.py:1109
+#, python-format
+msgid ""
+"Recipient policy composed the following set of secondary email addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:876
+#: ../pykolab/auth/ldap/__init__.py:1120
 #, python-format
 msgid "Secondary mail addresses that we want is not None: %r"
 msgstr "Les adresses e-mail secondaire que nous avons besoin n'est aucune: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:887
-msgid "Avoiding the duplication of the primary mail "
+#: ../pykolab/auth/ldap/__init__.py:1131
+#, 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:898
+#: ../pykolab/auth/ldap/__init__.py:1142
 #, python-format
 msgid "Entry is getting secondary mail addresses: %r"
 msgstr "L'entré reçois des adresses mail secondaire:"
 
-#: ../pykolab/auth/ldap/__init__.py:906
-msgid "Entry did not have any secondary mail "
+#: ../pykolab/auth/ldap/__init__.py:1150
+#, python-format
+msgid "Entry did not have any secondary mail addresses in %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:923 ../pykolab/auth/ldap/__init__.py:929
+#: ../pykolab/auth/ldap/__init__.py:1167 ../pykolab/auth/ldap/__init__.py:1173
 #, python-format
 msgid "secondary_mail_addresses: %r"
 msgstr "Adresses_mail_secondaire: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:924 ../pykolab/auth/ldap/__init__.py:930
+#: ../pykolab/auth/ldap/__init__.py:1168 ../pykolab/auth/ldap/__init__.py:1174
 #, python-format
 msgid "entry[%s]: %r"
 msgstr "Entré[%s]: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:941
+#: ../pykolab/auth/ldap/__init__.py:1185
 #, python-format
 msgid "Entry modifications list: %r"
 msgstr "Entrée : liste des modifications : %r"
 
-#: ../pykolab/auth/ldap/__init__.py:969
+#: ../pykolab/auth/ldap/__init__.py:1219
 #, python-format
 msgid "Setting entry attribute %r to %r for %r"
 msgstr "La mise en place d'entrée attribue %r à %r pour %r"
 
-#: ../pykolab/auth/ldap/__init__.py:1005
+#: ../pykolab/auth/ldap/__init__.py:1255
 #, python-format
 msgid ""
 "Could not update dn %r:\n"
 "%r"
 msgstr "N'a pas pu mettre à jour dn %r:\n%r"
 
-#: ../pykolab/auth/ldap/__init__.py:1031
+#: ../pykolab/auth/ldap/__init__.py:1281
 #, python-format
 msgid "Using filter %r"
 msgstr "Utilisation du filtre %r"
 
-#: ../pykolab/auth/ldap/__init__.py:1046
+#: ../pykolab/auth/ldap/__init__.py:1296
 #, python-format
 msgid "Synchronization is searching against base DN: %s"
 msgstr "La synchronisation cherche contre la base DN: %s"
 
-#: ../pykolab/auth/ldap/__init__.py:1095
+#: ../pykolab/auth/ldap/__init__.py:1343
 #, 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:1166
+#: ../pykolab/auth/ldap/__init__.py:1406
+msgid "Attempting to bind without a DN but with a password"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1411
+msgid "Attempting to bind with a DN but without a password"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1429
+#, python-format
+msgid "Binding with bind_dn: %s and password: %s"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1447 ../pykolab/auth/ldap/__init__.py:1471
 msgid "Invalid DN, username and/or password."
 msgstr "DN invalide, nom d'utilisateur et/ou mot de passe."
 
-#: ../pykolab/auth/ldap/__init__.py:1291 ../pykolab/auth/ldap/__init__.py:1308
-#: ../pykolab/auth/ldap/__init__.py:1682 ../pykolab/auth/ldap/__init__.py:1699
-#, python-format
-msgid "Found a subject %r with access %r"
-msgstr "Un sujet %r avec accès %r trouvé"
+#: ../pykolab/auth/ldap/__init__.py:1452
+msgid "bind() called but already bound"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1410
+#: ../pykolab/auth/ldap/__init__.py:1474
+msgid "bind_priv() called but already bound"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1686
 #, python-format
 msgid "Entry %s attribute value: %r"
 msgstr "Entré %s valeur attribue: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:1418
+#: ../pykolab/auth/ldap/__init__.py:1694
 #, python-format
 msgid "imap.user_mailbox_server(%r) result: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1481 ../pykolab/auth/ldap/__init__.py:2809
+#: ../pykolab/auth/ldap/__init__.py:1755
 #, python-format
-msgid "%s"
-msgstr "%s"
+msgid "An error occured: %r"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1748 ../pykolab/auth/ldap/__init__.py:1948
+#: ../pykolab/auth/ldap/__init__.py:1993 ../pykolab/auth/ldap/__init__.py:2187
 #, python-format
 msgid "Result from recipient policy: %r"
 msgstr "Résultat de la stratégie de destinataire : %r"
 
-#: ../pykolab/auth/ldap/__init__.py:2003
+#: ../pykolab/auth/ldap/__init__.py:2242
 #, python-format
 msgid "Kolab user %s does not have a result attribute %r"
 msgstr "Utilisateur de Kolab %s n'a pas  un attribut de résultat %r"
 
-#: ../pykolab/auth/ldap/__init__.py:2162
+#: ../pykolab/auth/ldap/__init__.py:2267
+#, python-format
+msgid "Naming contexts found: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:2274
+#, python-format
+msgid "Domains/Root DNs found: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:2434
+#, python-format
+msgid "Searching root dn for domain %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:2439
+#, python-format
+msgid "Returning from cache: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:2444
 #, python-format
 msgid "Finding domain root dn for domain %s"
 msgstr "Recherche du nom distinctif racine pour le domaine %s"
 
-#: ../pykolab/auth/ldap/__init__.py:2269
-msgid "Authentication database DOWN"
-msgstr "Le système d'authentification est INACTIF"
+#: ../pykolab/auth/ldap/__init__.py:2474
+#, python-format
+msgid "Setting domain root dn from LDAP for domain %r: %r"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2353 ../pykolab/auth/ldap/__init__.py:2401
+#: ../pykolab/auth/ldap/__init__.py:2620 ../pykolab/auth/ldap/__init__.py:2668
 #, python-format
 msgid "Entry type: %s"
 msgstr "Type de l'enregistrement : %s"
 
-#: ../pykolab/auth/ldap/__init__.py:2490
+#: ../pykolab/auth/ldap/__init__.py:2746
 msgid "LDAP Search Result Data Entry:"
 msgstr "Résultat de la recherche LDAP :"
 
-#: ../pykolab/auth/ldap/__init__.py:2506
+#: ../pykolab/auth/ldap/__init__.py:2762
 msgid "Entry Change Notification attributes:"
 msgstr "Notification de modification des attributs de l'enregistrement :"
 
-#: ../pykolab/auth/ldap/__init__.py:2511
+#: ../pykolab/auth/ldap/__init__.py:2767
 #, python-format
 msgid "Change Type: %r (%r)"
 msgstr "Changement de type : %r(%r)"
 
-#: ../pykolab/auth/ldap/__init__.py:2519
+#: ../pykolab/auth/ldap/__init__.py:2775
 #, python-format
 msgid "Previous DN: %r"
 msgstr "Non distinctif précédent : %r"
 
-#: ../pykolab/auth/ldap/__init__.py:2574
+#: ../pykolab/auth/ldap/__init__.py:2830
 #, python-format
 msgid "Object %s searched no longer exists"
 msgstr "L'objet %s recherché n'existe pas"
 
-#: ../pykolab/auth/ldap/__init__.py:2584
+#: ../pykolab/auth/ldap/__init__.py:2840
 #, python-format
 msgid "%d results..."
 msgstr "%d résultats ..."
 
-#: ../pykolab/auth/ldap/__init__.py:2687
+#: ../pykolab/auth/ldap/__init__.py:2943
 #, python-format
 msgid "Searching with filter %r"
 msgstr "Recherche avec le filtre %r"
 
-#: ../pykolab/auth/ldap/__init__.py:2739
+#: ../pykolab/auth/ldap/__init__.py:2995
 #, python-format
 msgid "Checking for support for %s on %s"
 msgstr "Vérification du support de %s pour %s"
 
-#: ../pykolab/auth/ldap/__init__.py:2758
+#: ../pykolab/auth/ldap/__init__.py:3014
 #, python-format
 msgid "Found support for %s"
 msgstr "Soutien trouvé pour %s"
 
-#: ../pykolab/auth/ldap/__init__.py:2803
+#: ../pykolab/auth/ldap/__init__.py:3068
+msgid "-- reconnecting in 10 seconds."
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:3076
 #, python-format
 msgid "An error occured using %s: %r"
 msgstr "Une erreur est survenu en utilisant %s: %r"
 
 #: ../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 +948,8 @@
 msgstr "Destinateur pour alias %r existe déjà"
 
 #: ../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
@@ -818,12 +957,13 @@
 msgid "Recipient %r is not the primary recipient for address %r"
 msgstr "Destinateur %r n'est pas le destinateur principal pour l'adresse %r"
 
-#: ../pykolab/cli/cmd_add_domain.py:36
+#: ../pykolab/cli/cmd_add_domain.py:36 ../pykolab/cli/cmd_check_quota.py:37
 #: ../pykolab/cli/cmd_count_domain_mailboxes.py:38
 #: ../pykolab/cli/cmd_create_mailbox.py:36
+#: ../pykolab/cli/cmd_delete_domain.py:39
 #: ../pykolab/cli/cmd_export_mailbox.py:33
 #: ../pykolab/cli/cmd_list_deleted_mailboxes.py:38
-#: ../pykolab/cli/cmd_list_domain_mailboxes.py:36
+#: ../pykolab/cli/cmd_list_domain_mailboxes.py:37
 #: ../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
@@ -844,12 +984,14 @@
 msgid "Add a new domain."
 msgstr "Ajouter un nouvel domaine"
 
-#: ../pykolab/cli/cmd_add_domain.py:55 ../pykolab/cli/cmd_delete_domain.py:44
+#: ../pykolab/cli/cmd_add_domain.py:55 ../pykolab/cli/cmd_delete_domain.py:55
 #: ../pykolab/cli/cmd_find_domain.py:44
-msgid "Could not find credentials with sufficient permissions"
-msgstr "Impossible de trouver des identifiants avec des permissions suffisantes."
+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
+#: ../pykolab/cli/cmd_add_domain.py:67 ../pykolab/cli/cmd_delete_domain.py:67
 #: ../pykolab/cli/cmd_find_domain.py:56
 msgid "Domain name"
 msgstr "Nom de domaine"
@@ -879,20 +1021,45 @@
 
 #: ../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_list_messages.py:100
 #: ../pykolab/cli/cmd_remove_user_subscription.py:73
 msgid "No such folder"
 msgstr "Aucun dossier"
 
+#: ../pykolab/cli/cmd_check_quota.py:44
+msgid "Do not apply any changes."
+msgstr ""
+
+#: ../pykolab/cli/cmd_check_quota.py:53
 #: ../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_list_domain_mailboxes.py:49
+#: ../pykolab/cli/cmd_list_mailboxes.py:52
+#: ../pykolab/cli/cmd_list_messages.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 "Lister boites de messagerie sur serveur SERVEUR uniquement"
 
+#: ../pykolab/cli/cmd_check_quota.py:57
+msgid "Compare existing IMAP quota with LDAP quota."
+msgstr ""
+
+#: ../pykolab/cli/cmd_check_quota.py:84 ../pykolab/cli/cmd_user_info.py:51
+#, python-format
+msgid "No such user %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_check_quota.py:98
+#, python-format
+msgid "No quota for user %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_check_quota.py:105
+#, python-format
+msgid "user quota does not match for %s (IMAP: %d, LDAP: %d)"
+msgstr ""
+
 #: ../pykolab/cli/cmd_create_mailbox.py:42
 msgid "Set metadata for folder to ANNOTATION=VALUE"
 msgstr "Établir les métadonnées pour  dossier à une ANNOTATION=VALEUR"
@@ -913,6 +1080,10 @@
 msgid "Delete a domain."
 msgstr "Supprimer un domaine"
 
+#: ../pykolab/cli/cmd_delete_domain.py:46
+msgid "Force deleting the domain even if it contains user accounts"
+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
@@ -925,10 +1096,8 @@
 #: ../pykolab/cli/cmd_list_mailbox_metadata.py:54
 #: ../pykolab/cli/cmd_set_mailbox_acl.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
+#: ../pykolab/cli/cmd_set_quota.py:48 ../tests/unit/test-015-translate.py:15
+#: ../tests/unit/test-015-translate.py:19
 msgid "Folder name"
 msgstr "Nom du répertoire"
 
@@ -937,7 +1106,7 @@
 #: ../pykolab/cli/cmd_list_mailbox_metadata.py:80
 #: ../pykolab/cli/cmd_set_mailbox_acl.py:67
 #: ../pykolab/cli/cmd_set_mailbox_metadata.py:94
-#: ../pykolab/cli/cmd_set_quota.py:58
+#: ../pykolab/cli/cmd_set_quota.py:60
 #, python-format
 msgid "No such folder %r"
 msgstr "Aucun dossier %r"
@@ -969,7 +1138,7 @@
 msgstr "Spécifiez un UID"
 
 #: ../pykolab/cli/cmd_delete_message.py:52
-#: ../pykolab/cli/cmd_list_messages.py:58
+#: ../pykolab/cli/cmd_list_messages.py:76
 msgid "Specify a folder"
 msgstr "Spécifier un domaine"
 
@@ -997,13 +1166,13 @@
 msgstr "Trouver un domaine"
 
 #: ../pykolab/cli/cmd_list_deleted_mailboxes.py:43
-#: ../pykolab/cli/cmd_list_domain_mailboxes.py:41
+#: ../pykolab/cli/cmd_list_domain_mailboxes.py:42
 #: ../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_domain_mailboxes.py:58
+#: ../pykolab/cli/cmd_list_domain_mailboxes.py:59
 msgid "Domain"
 msgstr "Domaine"
 
@@ -1020,7 +1189,11 @@
 msgid "Include messages flagged as \\Deleted"
 msgstr "Inclure des messages marqués comme \\Supprimés"
 
-#: ../pykolab/cli/cmd_list_messages.py:47
+#: ../pykolab/cli/cmd_list_messages.py:61
+msgid "List messages as user USER"
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_messages.py:65
 msgid "List messages in a folder"
 msgstr "Lister des messages dans un dossier"
 
@@ -1183,7 +1356,7 @@
 msgid "Metadata path"
 msgstr "Chemin métadonnées"
 
-#: ../pykolab/cli/cmd_set_quota.py:43 ../pykolab/cli/cmd_set_quota.py:47
+#: ../pykolab/cli/cmd_set_quota.py:45 ../pykolab/cli/cmd_set_quota.py:49
 msgid "New quota"
 msgstr "Nouvel quota"
 
@@ -1200,39 +1373,39 @@
 msgid "Domains in IMAP not in LDAP: %r"
 msgstr "Domaines dans IMAP pas dans LDAP: %r"
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:101
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:142
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:105
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:153
 #, 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
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:110
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:158
 #, python-format
 msgid "Deleting mailbox '%s' because it has no recipients"
 msgstr "Efface boite de messagerie '%s' car elle a aucun destinateurs"
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:110
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:151
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:114
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:162
 #, python-format
 msgid "An error occurred removing mailbox %r: %r"
 msgstr "Une erreur est survenue en effaçant la boite de messagerie %r: %r"
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:112
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:153
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:116
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:164
 #, python-format
 msgid "Not automatically deleting shared folder '%s'"
 msgstr "N’efface pas automatiquement le dossier partagé '%s'"
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:114
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:155
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:118
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:166
 #, python-format
 msgid "No recipients for '%s' (use --delete to delete)!"
 msgstr "Aucun destinateurs pour '%s' (utilisé -supprimer pour supprimer)!"
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:136
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:147
 #, python-format
 msgid "Multiple recipients for '%s'!"
 msgstr "Destinateurs multiples pour '%s'!"
@@ -1245,22 +1418,26 @@
 msgid "Resync from the beginning"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync.py:72
+#: ../pykolab/cli/cmd_sync.py:68
+msgid "Only sync the specified domain"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:82
 #, python-format
 msgid "Found %d domains in %d seconds"
 msgstr "%d domaines trouvés en %d secondes"
 
-#: ../pykolab/cli/cmd_sync.py:85
+#: ../pykolab/cli/cmd_sync.py:98
 #, python-format
 msgid "Running for domain %s"
 msgstr "Exécution pour le domaine %s"
 
-#: ../pykolab/cli/cmd_sync.py:92
+#: ../pykolab/cli/cmd_sync.py:105
 #, python-format
 msgid "Synchronizing users for %s took %d seconds"
 msgstr "Synchronisation des utilisateurs pour %s dans %d secondes"
 
-#: ../pykolab/cli/cmd_sync.py:109
+#: ../pykolab/cli/cmd_sync.py:123
 #, python-format
 msgid "Worker process %s handling %s"
 msgstr ""
@@ -1277,11 +1454,6 @@
 msgid "Email address"
 msgstr "Adresse mail."
 
-#: ../pykolab/cli/cmd_user_info.py:51
-#, python-format
-msgid "No such user %s"
-msgstr ""
-
 #. This is a nested command
 #. This is a nested component
 #: ../pykolab/cli/commands.py:97 ../pykolab/setup/components.py:90
@@ -1299,7 +1471,7 @@
 msgstr "La commande '%s' est déjà enregistrée"
 
 #: ../pykolab/cli/commands.py:192 ../pykolab/setup/components.py:257
-#: ../wallace/modules.py:376
+#: ../wallace/modules.py:391
 #, python-format
 msgid "Alias for %s"
 msgstr "Alias pour %s"
@@ -1308,7 +1480,7 @@
 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_list.py:49 ../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"
@@ -1425,8 +1597,9 @@
 #: ../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 "
-msgstr "certificat invalide après vérification"
+#, python-format
+msgid "Invalid entitlement verification certificate at %s"
+msgstr ""
 
 #: ../pykolab/conf/entitlement.py:120 ../pykolab/conf/entitlement.py:123
 msgid "Invalid entitlement certificate"
@@ -1507,100 +1680,106 @@
 msgstr "Fichier  de configuration à utiliser"
 
 #: ../pykolab/conf/__init__.py:278
-msgid "Set the debugging "
-msgstr "Activer mode debug"
+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 "Fixer le niveau de verbosité."
+msgid "Use the default answer to all questions."
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:292
+msgid "Set the logging level. One of info, warn, error, critical or debug"
+msgstr ""
 
-#: ../pykolab/conf/__init__.py:294
+#: ../pykolab/conf/__init__.py:300
 msgid "Log file to use"
 msgstr "Fichier de log à utiliser"
 
-#: ../pykolab/conf/__init__.py:300
+#: ../pykolab/conf/__init__.py:306
 msgid "Be quiet."
 msgstr "Mode silencieux."
 
-#: ../pykolab/conf/__init__.py:306
+#: ../pykolab/conf/__init__.py:312
 msgid "Answer yes to all questions."
 msgstr "Répondre oui à toutes les questions."
 
-#: ../pykolab/conf/__init__.py:328
+#: ../pykolab/conf/__init__.py:334
 msgid "No command supplied"
 msgstr "Aucune commande fournie"
 
-#: ../pykolab/conf/__init__.py:416
+#: ../pykolab/conf/__init__.py:422
 msgid "Insufficient options. Need section, key and value -in that order."
 msgstr "Il manque des options. Il manque au moins une section, clé, valeur en respectant cet ordre."
 
-#: ../pykolab/conf/__init__.py:419
+#: ../pykolab/conf/__init__.py:425
 #, python-format
 msgid "No section '%s' exists."
 msgstr "La section '%s' n'existe pas."
 
-#: ../pykolab/conf/__init__.py:461
+#: ../pykolab/conf/__init__.py:467
 #, python-format
 msgid "Setting %s to %r (from the default values for CLI options)"
 msgstr "Initialisation de %s à %r (valeur par défaut à partir des options CLI)"
 
-#: ../pykolab/conf/__init__.py:534
+#: ../pykolab/conf/__init__.py:540
 #, python-format
 msgid "Could not execute configuration function: %s"
 msgstr "Impossible d'exécuter la fonction de configuration : %s"
 
-#: ../pykolab/conf/__init__.py:542
+#: ../pykolab/conf/__init__.py:548
 #, python-format
 msgid "Option %s/%s does not exist in config file %s, pulling from defaults"
 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:550 ../pykolab/conf/__init__.py:553
+#: ../pykolab/conf/__init__.py:556 ../pykolab/conf/__init__.py:559
 msgid "Option does not exist in defaults."
 msgstr "Cette option n'existe pas par défaut."
 
-#: ../pykolab/conf/__init__.py:563
+#: ../pykolab/conf/__init__.py:569
 #, python-format
 msgid "Configuration file %s not readable."
 msgstr "Impossible de lire le fichier de configuration : %s."
 
-#: ../pykolab/conf/__init__.py:566
+#: ../pykolab/conf/__init__.py:572
 #, python-format
 msgid "Configuration file %s does not exist."
 msgstr "Le fichier de configuration %s n'existe pas."
 
-#: ../pykolab/conf/__init__.py:571
+#: ../pykolab/conf/__init__.py:577
 msgid ""
 "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:577
+#: ../pykolab/conf/__init__.py:583
 msgid "This program has 9 levels of verbosity. Using the maximum of 9."
 msgstr "Ce programme dispose de 9 nivaux de verbosité. Le nombre maximum est donc 9."
 
-#: ../pykolab/conf/__init__.py:585 ../pykolab/conf/__init__.py:591
-#: ../pykolab/conf/__init__.py:595 ../pykolab/conf/__init__.py:601
+#: ../pykolab/conf/__init__.py:591 ../pykolab/conf/__init__.py:597
+#: ../pykolab/conf/__init__.py:601 ../pykolab/conf/__init__.py:607
 msgid "Cannot start SASL authentication daemon"
 msgstr "Impossible de démarrer le service d'authentification SASL"
 
-#: ../pykolab/conf/__init__.py:612
+#: ../pykolab/conf/__init__.py:618
 msgid "No imaplib library found."
 msgstr "Impossible de trouver la librairie imaplib."
 
-#: ../pykolab/conf/__init__.py:622
+#: ../pykolab/conf/__init__.py:628
 msgid "No LMTP class found in the smtplib library."
 msgstr "Impossible de trouver la classe LMTP dans la librairie smtplib."
 
-#: ../pykolab/conf/__init__.py:632
+#: ../pykolab/conf/__init__.py:638
 msgid "No SMTP class found in the smtplib library."
 msgstr "Impossible de trouver la classe SMTP dans la librairie smtplib."
 
-#: ../pykolab/conf/__init__.py:646
+#: ../pykolab/conf/__init__.py:652
 #, python-format
 msgid "Found you specified a specific set of items to test: %s"
 msgstr "Il semble que vous ayez défini un ensemble spécifique d'éléments pour tester : %s"
 
-#: ../pykolab/conf/__init__.py:654
+#: ../pykolab/conf/__init__.py:660
 #, python-format
 msgid "Selectively selecting: %s"
 msgstr "Sélection sélective : %s"
@@ -1629,98 +1808,121 @@
 msgid "OpenLDAP or compatible"
 msgstr "serveur OpenLDAP ou compatible"
 
-#: ../pykolab/imap/cyrus.py:80
+#: ../pykolab/imap/cyrus.py:83
 #, python-format
 msgid "Could not connect to Cyrus IMAP server %r"
 msgstr "Impossible de se connecter au serveur Cyrus IMAP %r"
 
-#: ../pykolab/imap/cyrus.py:138
+#: ../pykolab/imap/cyrus.py:150 ../pykolab/imap/dovecot.py:285
 #, python-format
 msgid "Continuing with separator: %r"
 msgstr "Continuation avec séparateur: %r"
 
-#: ../pykolab/imap/cyrus.py:143
+#: ../pykolab/imap/cyrus.py:159
 msgid "Detected we are running in a Murder topology"
 msgstr "Nous avons détecté que nous courrons dans un topologie de Meurtre"
 
-#: ../pykolab/imap/cyrus.py:147
+#: ../pykolab/imap/cyrus.py:167
 msgid "This system is not part of a murder topology"
 msgstr "Ce système ne fait pas partie d'un topologie de meurtre"
 
-#: ../pykolab/imap/cyrus.py:168
+#: ../pykolab/imap/cyrus.py:196
 #, python-format
 msgid "Checking actual backend server for folder %s through annotations"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:173
-msgid "Possibly reproducing the find "
+#: ../pykolab/imap/cyrus.py:206
+#, python-format
+msgid ""
+"Possibly reproducing the find mailfolder server answer from previously "
+"detected and stored annotation value: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:196
+#: ../pykolab/imap/cyrus.py:236
 #, python-format
 msgid "Could not get the annotations after %s tries."
 msgstr "Impossible  d'obtenir les annotations après %s tentatives"
 
-#: ../pykolab/imap/cyrus.py:200
+#: ../pykolab/imap/cyrus.py:250
 #, python-format
 msgid "No annotations for %s: %r"
 msgstr "Aucune annotations pour %s: %r"
 
-#: ../pykolab/imap/cyrus.py:207
+#: ../pykolab/imap/cyrus.py:262
 #, python-format
 msgid "Server for INBOX folder %s is %s"
 msgstr "Serveur pour dossier de BOITE DE RÉCEPTION %s est %s"
 
-#: ../pykolab/imap/cyrus.py:227
+#. Removed server reconnection for dovecot, we only have one server
+#: ../pykolab/imap/cyrus.py:294 ../pykolab/imap/dovecot.py:311
 #, python-format
 msgid "Setting quota for folder %s to %s"
 msgstr " Fixation de quota pour dossier %s à %s"
 
-#: ../pykolab/imap/cyrus.py:231
+#: ../pykolab/imap/cyrus.py:305 ../pykolab/imap/dovecot.py:315
 #, 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
+#: ../pykolab/imap/cyrus.py:319 ../pykolab/imap/dovecot.py:320
 #, python-format
 msgid "Moving INBOX folder %s to %s on partition %s"
 msgstr "Déplacement de dossier de BOITE DE RÉCEPTION  %s au %s sur la partition %s"
 
-#: ../pykolab/imap/cyrus.py:243
+#: ../pykolab/imap/cyrus.py:329 ../pykolab/imap/dovecot.py:322
 #, python-format
 msgid "Moving INBOX folder %s to %s"
 msgstr "Déplacement de dossier de BOITE DE RÉCEPTION  %s au %s "
 
-#: ../pykolab/imap/cyrus.py:259
+#: ../pykolab/imap/cyrus.py:355
 #, python-format
 msgid "Setting annotation %s on folder %s"
 msgstr "Fixation d'annotation %s sur dossier %s"
 
-#: ../pykolab/imap/cyrus.py:264
+#: ../pykolab/imap/cyrus.py:366
 #, python-format
 msgid "Could not set annotation %r on mail folder %r: %r"
 msgstr "Impossible de définir une annotation %r sur dossier de courrier %r: %r"
 
-#: ../pykolab/imap/cyrus.py:268
+#: ../pykolab/imap/cyrus.py:376 ../pykolab/imap/dovecot.py:451
 #, python-format
 msgid "Transferring folder %s from %s to %s"
 msgstr " Transfert de dossier %s de %s au %s"
 
-#: ../pykolab/imap/cyrus.py:328
+#: ../pykolab/imap/cyrus.py:464 ../pykolab/imap/dovecot.py:511
 #, python-format
 msgid "Undeleting %s to %s"
 msgstr "Reconstitution %s au %s"
 
-#: ../pykolab/imap/cyrus.py:339
+#: ../pykolab/imap/cyrus.py:484
 #, python-format
-msgid "Would have transfered %s from %s to %s"
-msgstr "Aurait transféré %s de %s au %s"
+msgid "Would have transferred %s from %s to %s"
+msgstr ""
 
-#: ../pykolab/imap/cyrus.py:341
+#: ../pykolab/imap/cyrus.py:491 ../pykolab/imap/dovecot.py:524
 #, python-format
 msgid "Would have renamed %s to %s"
 msgstr "Aurait renommé %s à %s"
 
+#: ../pykolab/imap/dovecot.py:220
+#, python-format
+msgid "Could not connect to Dovecot IMAP server %r"
+msgstr ""
+
+#: ../pykolab/imap/dovecot.py:292
+msgid "Detected METADATA support"
+msgstr ""
+
+#: ../pykolab/imap/dovecot.py:295
+#, python-format
+msgid "This system does not support METADATA: '%s'"
+msgstr ""
+
+#: ../pykolab/imap/dovecot.py:522
+#, python-format
+msgid "Would have transfered %s from %s to %s"
+msgstr "Aurait transféré %s de %s au %s"
+
 #: ../pykolab/imap/__init__.py:46
 #, python-format
 msgid "Cleaning up ACL entries for %s across all folders"
@@ -1790,180 +1992,191 @@
 msgid "%r has no attribute %s"
 msgstr "%r n'a pas d'attribut %s"
 
-#: ../pykolab/imap/__init__.py:393
+#: ../pykolab/imap/__init__.py:360
+#, python-format
+msgid "Invalid access identifier %r for subject %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:397
 #, python-format
 msgid "Could not set ACL for %s on folder %s: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:427 ../pykolab/imap/__init__.py:462
+#: ../pykolab/imap/__init__.py:431 ../pykolab/imap/__init__.py:467
 #, python-format
 msgid "Creating new shared folder %s"
 msgstr "Création d'un nouvel dossier partagé %s"
 
-#: ../pykolab/imap/__init__.py:487 ../pykolab/imap/__init__.py:740
+#: ../pykolab/imap/__init__.py:496 ../pykolab/imap/__init__.py:776
 #, python-format
 msgid "Downcasing mailbox name %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:491
+#: ../pykolab/imap/__init__.py:500
 #, 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:506 ../pykolab/imap/__init__.py:613
+#: ../pykolab/imap/__init__.py:515 ../pykolab/imap/__init__.py:644
 msgid "Waiting for the Cyrus IMAP Murder to settle..."
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:559
+#: ../pykolab/imap/__init__.py:590
 #, python-format
 msgid "Creating additional folders for user %s"
 msgstr "Création de dossiers additionnels pour l'utilisateur %s"
 
-#: ../pykolab/imap/__init__.py:587
+#: ../pykolab/imap/__init__.py:618
 #, python-format
 msgid "Waiting for the Cyrus murder to settle... %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:602
+#: ../pykolab/imap/__init__.py:633
 #, python-format
 msgid "Correcting additional folder name from %r to %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:618
+#: ../pykolab/imap/__init__.py:649
 #, python-format
 msgid "Mailbox already exists: %s"
 msgstr "La boîte aux lettres existe déjà : %s "
 
-#: ../pykolab/imap/__init__.py:658
+#: ../pykolab/imap/__init__.py:689
 msgid "Subscribing user to the additional folders"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:672
+#: ../pykolab/imap/__init__.py:703
 msgid "Using the following tests for folder subscriptions:"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:674
+#: ../pykolab/imap/__init__.py:705
 #, python-format
 msgid "    %r"
 msgstr "%r"
 
-#: ../pykolab/imap/__init__.py:677
+#: ../pykolab/imap/__init__.py:708
 #, python-format
 msgid "Folder %s"
 msgstr "Dossier %s"
 
-#: ../pykolab/imap/__init__.py:689
+#: ../pykolab/imap/__init__.py:720
 #, python-format
 msgid "Subscribing %s to folder %s"
 msgstr "Souscription %s au fichier %s"
 
-#: ../pykolab/imap/__init__.py:693
+#: ../pykolab/imap/__init__.py:724
 #, python-format
 msgid "Subscribing %s to folder %s failed: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:723
+#: ../pykolab/imap/__init__.py:750
+#, python-format
+msgid "Could not set quota on %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:757
 #, python-format
 msgid "Could not rename %s to reside on partition %s"
 msgstr "Impossible de renommer %s pour résider sur la partition %s"
 
-#: ../pykolab/imap/__init__.py:756
+#: ../pykolab/imap/__init__.py:794
 #, python-format
 msgid "INBOX folder to rename (%s) does not exist"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:759 ../pykolab/imap/__init__.py:835
+#: ../pykolab/imap/__init__.py:797 ../pykolab/imap/__init__.py:905
 #, python-format
 msgid "Renaming INBOX from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:763
+#: ../pykolab/imap/__init__.py:801
 #, python-format
 msgid "Could not rename INBOX folder %s to %s"
 msgstr "Impossible de renommer le dossier INBOX %s en %s"
 
-#: ../pykolab/imap/__init__.py:765 ../pykolab/imap/__init__.py:839
+#: ../pykolab/imap/__init__.py:803 ../pykolab/imap/__init__.py:909
 #, 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:769
+#: ../pykolab/imap/__init__.py:807
 #, python-format
 msgid "Server for mailbox %r is %r"
 msgstr "Serveur pour boite de courrier %r est %r"
 
-#: ../pykolab/imap/__init__.py:777
+#: ../pykolab/imap/__init__.py:815
 #, python-format
 msgid "Looking for folder '%s', we found folders: %r"
 msgstr "Recherche du répertoire '%s', les répertoires trouvés sont : %r"
 
-#: ../pykolab/imap/__init__.py:800
+#: ../pykolab/imap/__init__.py:829 ../pykolab/imap/__init__.py:872
+#: ../pykolab/imap/__init__.py:886
 #, python-format
-msgid "Setting ACL rights %s for subject %s on folder "
+msgid "Removing ACL rights %s for subject %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:811
+#: ../pykolab/imap/__init__.py:861
 #, python-format
-msgid "Removing ACL rights %s for subject %s on folder "
+msgid "Setting ACL rights %s for subject %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:832
+#: ../pykolab/imap/__init__.py:902
 #, python-format
 msgid "Found old INBOX folder %s"
 msgstr "Ancienne boite de réception %s trouvée"
 
-#: ../pykolab/imap/__init__.py:841
+#: ../pykolab/imap/__init__.py:911
 #, python-format
 msgid "Did not find old folder user/%s to rename"
 msgstr "Impossible de trouver l'ancien répertoire user/%s pour le renommer"
 
-#: ../pykolab/imap/__init__.py:843
+#: ../pykolab/imap/__init__.py:913
 msgid "Value for user is not a dictionary"
 msgstr "La valeur pour l'utilisateur n'est pas un dictionnaire"
 
 #. TODO: Go in fact correct the quota.
-#: ../pykolab/imap/__init__.py:911
+#: ../pykolab/imap/__init__.py:981
 #, python-format
 msgid "Cannot get current IMAP quota for folder %s"
 msgstr "Impossible de récupérer le quota IMAP du répertoire %s"
 
-#: ../pykolab/imap/__init__.py:924
+#: ../pykolab/imap/__init__.py:994
 #, python-format
 msgid "Quota for %s currently is %s"
 msgstr "Le quota pour %s est actuellement %s"
 
-#: ../pykolab/imap/__init__.py:930
+#: ../pykolab/imap/__init__.py:1000
 #, python-format
 msgid "Adjusting authentication database quota for folder %s to %d"
 msgstr "Ajustement du quota de la base d'authentification pour le répertoire %s à %d"
 
-#: ../pykolab/imap/__init__.py:935
+#: ../pykolab/imap/__init__.py:1005
 #, python-format
 msgid "Correcting quota for %s to %s (currently %s)"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1012
+#: ../pykolab/imap/__init__.py:1082
 #, python-format
 msgid "Checking folder: %s"
 msgstr "Vérification du répertoire : %s"
 
-#: ../pykolab/imap/__init__.py:1017
+#: ../pykolab/imap/__init__.py:1087
 #, python-format
 msgid "Folder has no corresponding user (1): %s"
 msgstr "Le répertoire ne dispose pas d'utilisateur (1) correspondant : %s"
 
-#: ../pykolab/imap/__init__.py:1020
+#: ../pykolab/imap/__init__.py:1090
 #, python-format
 msgid "Folder has no corresponding user (2): %s"
 msgstr "Le répertoire ne dispose pas d'utilisateur (2) correspondant : %s"
 
 #. We got user identifier only
-#: ../pykolab/imap/__init__.py:1035
+#: ../pykolab/imap/__init__.py:1105
 msgid "Please don't give us just a user identifier"
 msgstr "Veuillez ne pas nous fournir un nom d'utilisateur simplement"
 
-#: ../pykolab/imap/__init__.py:1038
+#: ../pykolab/imap/__init__.py:1108
 #, python-format
 msgid "Deleting folder %s"
 msgstr "Suppression de dossier %s"
@@ -1972,52 +2185,52 @@
 msgid "Returning thread local configuration"
 msgstr "retourne le fil d’exécution : configuration locale "
 
-#: ../pykolab/itip/__init__.py:45
+#: ../pykolab/itip/__init__.py:46
 #, python-format
 msgid "Method %r not really interesting for us."
 msgstr "Méthode %r pas vraiment intéressant pour nous"
 
-#: ../pykolab/itip/__init__.py:51
+#: ../pykolab/itip/__init__.py:52
 #, python-format
 msgid "Raw iTip payload (%r): %r"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:61
+#: ../pykolab/itip/__init__.py:62
 msgid "Could not read iTip from message."
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:69
+#: ../pykolab/itip/__init__.py:70
 #, python-format
 msgid "Duplicate iTip object: %s"
 msgstr "Dupliquez l'objet iTip: %s"
 
-#: ../pykolab/itip/__init__.py:93
+#: ../pykolab/itip/__init__.py:95
 msgid "iTip event without a start"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:138
+#: ../pykolab/itip/__init__.py:140
 msgid "Message is not an iTip message (non-multipart message)"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:221
+#: ../pykolab/itip/__init__.py:261
 #, python-format
 msgid "Send iTip reply %s for %s %r"
 msgstr "Envoi une réponse iTip %s pour %s %r"
 
-#: ../pykolab/itip/__init__.py:237
+#: ../pykolab/itip/__init__.py:277
 #, python-format
 msgid "Failed to compose iTip reply message: %r: %s"
 msgstr "Impossible de composer une réponse de messagerie iTip: %r: %s"
 
-#: ../pykolab/itip/__init__.py:248 ../pykolab/itip/__init__.py:292
-#: ../wallace/module_invitationpolicy.py:1082
-#: ../wallace/module_invitationpolicy.py:1144
-#: ../wallace/module_resources.py:1247
+#: ../pykolab/itip/__init__.py:288 ../pykolab/itip/__init__.py:332
+#: ../wallace/module_invitationpolicy.py:1253
+#: ../wallace/module_invitationpolicy.py:1328
+#: ../wallace/module_resources.py:1347
 #, python-format
 msgid "SMTP sendmail error: %r"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:280
+#: ../pykolab/itip/__init__.py:320
 #, python-format
 msgid "Failed to compose iTip request message: %r"
 msgstr ""
@@ -2162,7 +2375,7 @@
 msgstr "utilisateur_supprime: %r"
 
 #: ../pykolab/plugins/roundcubedb/__init__.py:55
-#: ../pykolab/setup/setup_roundcube.py:167
+#: ../pykolab/setup/setup_roundcube.py:106
 msgid "Roundcube installation path not found."
 msgstr ""
 
@@ -2182,14 +2395,40 @@
 msgid "No such component."
 msgstr "Aucun composant"
 
-#: ../pykolab/setup/setup_freebusy.py:46
+#: ../pykolab/setup/__init__.py:55
+msgid "SELinux currently enforcing. Read https://git.kolab.org/u/1"
+msgstr ""
+
+#: ../pykolab/setup/__init__.py:67
+msgid ""
+"SELinux configured to enforce a policy on startup. Read "
+"https://git.kolab.org/u/1"
+msgstr ""
+
+#: ../pykolab/setup/setup_freebusy.py:47
 msgid "Setup Free/Busy."
 msgstr "Configurer Free/Busy."
 
-#: ../pykolab/setup/setup_freebusy.py:50
+#: ../pykolab/setup/setup_freebusy.py:51
 msgid "Free/Busy is not installed on this system"
 msgstr "Free/Busy n'est pas installé sur ce système"
 
+#: ../pykolab/setup/setup_guam.py:41
+msgid "Setup Guam."
+msgstr ""
+
+#: ../pykolab/setup/setup_guam.py:45
+msgid "Guam is not installed on this system"
+msgstr ""
+
+#: ../pykolab/setup/setup_guam.py:58
+msgid "Could not start the guam service."
+msgstr ""
+
+#: ../pykolab/setup/setup_guam.py:63
+msgid "Could not configure the guam service to start on boot"
+msgstr ""
+
 #: ../pykolab/setup/setup_imap.py:45
 msgid "Setup IMAP."
 msgstr "Configurer IMAP"
@@ -2202,15 +2441,14 @@
 msgid "Could not write out Cyrus IMAP configuration file /etc/cyrus.conf"
 msgstr ""
 
-#: ../pykolab/setup/setup_imap.py:158
+#: ../pykolab/setup/setup_imap.py:162
 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:244
-#: ../pykolab/setup/setup_syncroton.py:105
-msgid "Could not configure to start on boot, the "
+#: ../pykolab/setup/setup_imap.py:177
+msgid ""
+"Could not configure to start on boot, the cyrus-imapd and kolab-saslauthd "
+"services."
 msgstr ""
 
 #: ../pykolab/setup/setup_kolabd.py:44
@@ -2226,10 +2464,14 @@
 "                        "
 msgstr ""
 
-#: ../pykolab/setup/setup_kolabd.py:81
+#: ../pykolab/setup/setup_kolabd.py:84
 msgid "Could not start the kolab server service."
 msgstr ""
 
+#: ../pykolab/setup/setup_kolabd.py:96
+msgid "Could not configure to start on boot, the kolab server service."
+msgstr ""
+
 #: ../pykolab/setup/setup_ldap.py:45
 msgid "LDAP Options"
 msgstr "Options LDAP"
@@ -2254,15 +2496,19 @@
 msgid "Setup configuration for Active Directory compatibility."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:88
+#: ../pykolab/setup/setup_ldap.py:92
+msgid "Specify password for the Domain Manager."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:96
 msgid "Setup LDAP."
 msgstr "Configurer LDAP."
 
-#: ../pykolab/setup/setup_ldap.py:97
+#: ../pykolab/setup/setup_ldap.py:105
 msgid "Skipping setup of LDAP, as specified"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:126
+#: ../pykolab/setup/setup_ldap.py:134
 msgid ""
 "\n"
 "                        You can not configure Kolab to run against OpenLDAP\n"
@@ -2270,7 +2516,7 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:139
+#: ../pykolab/setup/setup_ldap.py:147
 msgid ""
 "\n"
 "                                It seems 389 Directory Server has an existing\n"
@@ -2281,7 +2527,7 @@
 "                            "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:154
+#: ../pykolab/setup/setup_ldap.py:162
 msgid ""
 "\n"
 "                        Please supply a password for the LDAP administrator user\n"
@@ -2290,11 +2536,11 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:162
+#: ../pykolab/setup/setup_ldap.py:170
 msgid "Administrator password"
 msgstr "Mot de passe administrateur"
 
-#: ../pykolab/setup/setup_ldap.py:169
+#: ../pykolab/setup/setup_ldap.py:180
 msgid ""
 "\n"
 "                        Please supply a password for the LDAP Directory Manager\n"
@@ -2304,11 +2550,11 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:178
+#: ../pykolab/setup/setup_ldap.py:189
 msgid "Directory Manager password"
 msgstr "Mot de passe du Directory Manager"
 
-#: ../pykolab/setup/setup_ldap.py:185
+#: ../pykolab/setup/setup_ldap.py:196
 msgid ""
 "\n"
 "                        Please choose the system user and group the service\n"
@@ -2317,15 +2563,15 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:195 ../pykolab/setup/setup_ldap.py:198
+#: ../pykolab/setup/setup_ldap.py:206 ../pykolab/setup/setup_ldap.py:209
 msgid "User"
 msgstr "Utilisateur"
 
-#: ../pykolab/setup/setup_ldap.py:196 ../pykolab/setup/setup_ldap.py:199
+#: ../pykolab/setup/setup_ldap.py:207 ../pykolab/setup/setup_ldap.py:210
 msgid "Group"
 msgstr "Groupe"
 
-#: ../pykolab/setup/setup_ldap.py:234
+#: ../pykolab/setup/setup_ldap.py:245
 msgid ""
 "\n"
 "                        This setup procedure plans to set up Kolab Groupware for\n"
@@ -2336,18 +2582,18 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:248
+#: ../pykolab/setup/setup_ldap.py:259
 msgid "Domain name to use"
 msgstr "Nom de domaine à utiliser"
 
-#: ../pykolab/setup/setup_ldap.py:253 ../pykolab/setup/setup_ldap.py:278
+#: ../pykolab/setup/setup_ldap.py:264 ../pykolab/setup/setup_ldap.py:289
 msgid ""
 "\n"
 "                                    Invalid input. Please try again.\n"
 "                                "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:262
+#: ../pykolab/setup/setup_ldap.py:273
 msgid ""
 "\n"
 "                        The standard root dn we composed for you follows. Please\n"
@@ -2355,15 +2601,15 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:273
+#: ../pykolab/setup/setup_ldap.py:284
 msgid "Root DN to use"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:325
+#: ../pykolab/setup/setup_ldap.py:336
 msgid "No directory server setup tool available."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:337
+#: ../pykolab/setup/setup_ldap.py:348
 msgid ""
 "\n"
 "                    Setup is now going to set up the 389 Directory Server. This\n"
@@ -2372,11 +2618,11 @@
 "                "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:344
+#: ../pykolab/setup/setup_ldap.py:355
 msgid "Setting up 389 Directory Server"
 msgstr "Configuration de 389 Directory Server"
 
-#: ../pykolab/setup/setup_ldap.py:356
+#: ../pykolab/setup/setup_ldap.py:367
 msgid ""
 "\n"
 "                        An error was detected in the setup procedure for 389\n"
@@ -2387,27 +2633,31 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:373
+#: ../pykolab/setup/setup_ldap.py:384
 msgid "Setup DS stdout:"
 msgstr "Configuration DS sortie standard:"
 
-#: ../pykolab/setup/setup_ldap.py:376
+#: ../pykolab/setup/setup_ldap.py:387
 msgid "Setup DS stderr:"
 msgstr "Configuration DS sortie d'erreur :"
 
-#: ../pykolab/setup/setup_ldap.py:402
+#: ../pykolab/setup/setup_ldap.py:413
 msgid "Could not copy the LDAP extensions for Kolab"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:405
+#: ../pykolab/setup/setup_ldap.py:416
 msgid "Could not find the ldap Kolab schema file"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:417
+#: ../pykolab/setup/setup_ldap.py:429
 msgid "Could not start the directory server service."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:431
+#: ../pykolab/setup/setup_ldap.py:438
+msgid "Could not configure to start on boot, the directory server service."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:443
 msgid ""
 "\n"
 "                        Please supply a Cyrus Administrator password. This\n"
@@ -2418,11 +2668,11 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:441
+#: ../pykolab/setup/setup_ldap.py:453
 msgid "Cyrus Administrator password"
 msgstr "Mot de passe pour l'administrateur Cyrus"
 
-#: ../pykolab/setup/setup_ldap.py:448
+#: ../pykolab/setup/setup_ldap.py:460
 msgid ""
 "\n"
 "                        Please supply a Kolab Service account password. This\n"
@@ -2432,62 +2682,82 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:457
+#: ../pykolab/setup/setup_ldap.py:469
 msgid "Kolab Service password"
 msgstr "Mot de passe pour le service Kolab"
 
-#: ../pykolab/setup/setup_ldap.py:467
+#: ../pykolab/setup/setup_ldap.py:479
 msgid "Writing out configuration to kolab.conf"
 msgstr "Ecriture de la configuration dans kolab.conf"
 
-#: ../pykolab/setup/setup_ldap.py:481
+#: ../pykolab/setup/setup_ldap.py:493
 msgid "Inserting service users into LDAP."
 msgstr "Insertion du service des utilisateurs dans la base LDAP."
 
-#: ../pykolab/setup/setup_ldap.py:555
+#: ../pykolab/setup/setup_ldap.py:567
 msgid "Writing out cn=kolab,cn=config"
 msgstr "Affichage cn=kolab,cn=config"
 
-#. TODO: Add kolab-admin role
-#. TODO: Assign kolab-admin admin ACLs
-#: ../pykolab/setup/setup_ldap.py:579
+#: ../pykolab/setup/setup_ldap.py:583
 #, python-format
 msgid "Adding domain %s to list of domains for this deployment"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:607
+#: ../pykolab/setup/setup_ldap.py:611
 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:615
+#: ../pykolab/setup/setup_ldap.py:619
 msgid "Enabling attribute uniqueness plugin"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:621
+#: ../pykolab/setup/setup_ldap.py:625
 msgid "Enabling referential integrity plugin"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:627
+#: ../pykolab/setup/setup_ldap.py:631
 msgid "Enabling and configuring account policy plugin"
 msgstr ""
 
-#. TODO: Add kolab-admin role
-#: ../pykolab/setup/setup_ldap.py:642
+#. Add kolab-admin role
+#: ../pykolab/setup/setup_ldap.py:646
 msgid "Adding the kolab-admin role"
 msgstr ""
 
-#. TODO: User writeable attributes on root_dn
-#: ../pykolab/setup/setup_ldap.py:653
+#. User writeable attributes on root_dn
+#: ../pykolab/setup/setup_ldap.py:657
 #, python-format
 msgid "Setting access control to %s"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:679
-msgid "Could not start and configure to start on boot, the "
-msgstr "Impossible de démarrer et de configurer le système pour un démarrage au boot pour le service "
+#: ../pykolab/setup/setup_ldap.py:677
+msgid "directory server admin service not available"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:685
+msgid ""
+"Could not start and configure to start on boot, the directory server admin "
+"service."
+msgstr ""
+
+#: ../pykolab/setup/setup_manticore.py:44
+msgid "Setup Manticore."
+msgstr ""
+
+#: ../pykolab/setup/setup_manticore.py:48
+msgid "Manticore is not installed on this system"
+msgstr ""
+
+#: ../pykolab/setup/setup_manticore.py:94
+msgid "Could not start the manticore service."
+msgstr ""
+
+#: ../pykolab/setup/setup_manticore.py:100
+msgid "Could not configure the manticore service to start on boot"
+msgstr ""
 
 #: ../pykolab/setup/setup_mta.py:41
 msgid "Setup MTA."
@@ -2502,31 +2772,53 @@
 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
+#: ../pykolab/setup/setup_mta.py:413
 msgid "Could not write out Amavis configuration file amavisd.conf"
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:407
+#: ../pykolab/setup/setup_mta.py:421
 msgid "Not writing out any configuration for Amavis."
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:447
+#: ../pykolab/setup/setup_mta.py:482
 msgid "Could not start the postfix, clamav and amavisd services services."
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:39
+#: ../pykolab/setup/setup_mta.py:500
+msgid ""
+"Could not configure to start on boot, the postfix, clamav and amavisd "
+"services."
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:40
+msgid "MySQL Options"
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:46
+msgid "Specify whether to use an (existing) or (new) MySQL server."
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:50
 msgid "Setup MySQL."
 msgstr "Configurer MySQL."
 
-#: ../pykolab/setup/setup_mysql.py:49
+#: ../pykolab/setup/setup_mysql.py:78
 msgid "Could not start the MySQL database service."
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:71
+#: ../pykolab/setup/setup_mysql.py:87
+msgid "Could not configure to start on boot, the MySQL database service."
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:90
+msgid "Waiting for at most 30 seconds for MySQL/MariaDB to settle..."
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:114
 msgid "What MySQL server are we setting up?"
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:75
+#: ../pykolab/setup/setup_mysql.py:118
 msgid ""
 "\n"
 "                        Please supply the root password for MySQL, so we can set\n"
@@ -2534,13 +2826,13 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:82 ../pykolab/setup/setup_mysql.py:99
-#: ../pykolab/setup/setup_roundcube.py:190
+#: ../pykolab/setup/setup_mysql.py:125 ../pykolab/setup/setup_mysql.py:142
+#: ../pykolab/setup/setup_roundcube.py:218
 #: ../pykolab/setup/setup_syncroton.py:66
 msgid "MySQL root password"
 msgstr "Mot de passe de root pour MySQL"
 
-#: ../pykolab/setup/setup_mysql.py:88
+#: ../pykolab/setup/setup_mysql.py:131
 msgid ""
 "\n"
 "                        Please supply a root password for MySQL. This password\n"
@@ -2552,7 +2844,7 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:143
+#: ../pykolab/setup/setup_mysql.py:186
 msgid ""
 "\n"
 "                        Please supply a password for the MySQL user 'kolab'.\n"
@@ -2561,11 +2853,11 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:151
+#: ../pykolab/setup/setup_mysql.py:194
 msgid "MySQL kolab password"
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:170
+#: ../pykolab/setup/setup_mysql.py:213
 msgid "Could not find the MySQL Kolab schema file"
 msgstr ""
 
@@ -2607,11 +2899,11 @@
 msgid "Could not find PHP configuration file php.ini"
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:44
+#: ../pykolab/setup/setup_roundcube.py:45
 msgid "Setup Roundcube."
 msgstr "Configurer Roundcube."
 
-#: ../pykolab/setup/setup_roundcube.py:48
+#: ../pykolab/setup/setup_roundcube.py:49
 msgid ""
 "\n"
 "                    Please supply a password for the MySQL user 'roundcube'.\n"
@@ -2620,25 +2912,34 @@
 "                "
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:56
+#: ../pykolab/setup/setup_roundcube.py:57
 msgid "MySQL roundcube password"
 msgstr "Mot de passe pour la base MySQL de Roundcube"
 
-#: ../pykolab/setup/setup_roundcube.py:126
+#: ../pykolab/setup/setup_roundcube.py:144
 #, python-format
 msgid "Using template file %r"
 msgstr "Utilisation du fichier modèle %r "
 
-#: ../pykolab/setup/setup_roundcube.py:133
+#: ../pykolab/setup/setup_roundcube.py:151
 #, 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:235
-#: ../pykolab/setup/setup_syncroton.py:96
+#: ../pykolab/setup/setup_roundcube.py:263
+msgid "Cannot find the configuration directory for roundcube."
+msgstr ""
+
+#: ../pykolab/setup/setup_roundcube.py:291
+#: ../pykolab/setup/setup_syncroton.py:100
 msgid "Could not start the webserver server service."
 msgstr ""
 
+#: ../pykolab/setup/setup_roundcube.py:300
+#: ../pykolab/setup/setup_syncroton.py:109
+msgid "Could not configure to start on boot, the webserver server service."
+msgstr ""
+
 #: ../pykolab/setup/setup_syncroton.py:40
 msgid "Setup Syncroton."
 msgstr "Configuration Syncroton."
@@ -2668,404 +2969,431 @@
 msgid "No database available"
 msgstr "La base de données n'existe pas"
 
-#: ../pykolab/utils.py:62 ../pykolab/utils.py:64
+#: ../pykolab/utils.py:69 ../pykolab/utils.py:71
 #, python-format
 msgid "Confirm %s: "
 msgstr "Confirmer %s:"
 
-#: ../pykolab/utils.py:67
-msgid "Incorrect confirmation. "
+#: ../pykolab/utils.py:74
+msgid "Incorrect confirmation. Please try again."
 msgstr ""
 
-#: ../pykolab/utils.py:72 ../pykolab/utils.py:77
+#: ../pykolab/utils.py:79 ../pykolab/utils.py:84
 #, python-format
 msgid "%s: "
 msgstr "%s:"
 
-#: ../pykolab/utils.py:74 ../pykolab/utils.py:79
+#: ../pykolab/utils.py:81 ../pykolab/utils.py:86
 #, python-format
 msgid "%s [%s]: "
 msgstr "%s [%s]: "
 
-#: ../pykolab/utils.py:124
+#: ../pykolab/utils.py:139
 msgid "Please answer 'yes' or 'no'."
 msgstr "Vous devez répondre par 'oui' ou 'non'."
 
-#: ../pykolab/utils.py:164
+#: ../pykolab/utils.py:184
 msgid "Choice"
 msgstr "Choix"
 
-#: ../pykolab/utils.py:167
+#: ../pykolab/utils.py:187
 msgid "Choice (type '?' for options)"
 msgstr ""
 
-#: ../pykolab/utils.py:268
+#: ../pykolab/utils.py:288
 #, python-format
 msgid "Could not change the permissions on %s"
 msgstr "Impossible de modifier les permissions sur %s"
 
-#: ../pykolab/utils.py:488
+#: ../pykolab/utils.py:526
 #, python-format
 msgid "Transliterating string %r with locale %r"
 msgstr ""
 
-#: ../pykolab/utils.py:496
+#: ../pykolab/utils.py:534
 msgid "Attempting to set locale"
 msgstr ""
 
-#: ../pykolab/utils.py:498
+#: ../pykolab/utils.py:536
 msgid "Success setting locale"
 msgstr ""
 
-#: ../pykolab/utils.py:500
+#: ../pykolab/utils.py:538
 msgid "Failure to set locale"
 msgstr ""
 
-#: ../pykolab/utils.py:508
+#: ../pykolab/utils.py:546
 #, python-format
 msgid "Executing '%s | %s'"
 msgstr "Exécution de '%s | %s'"
 
-#: ../pykolab/utils.py:519
+#: ../pykolab/utils.py:557
 #, python-format
 msgid "Could not translate %s using locale %s"
 msgstr ""
 
-#: ../pykolab/wap_client/__init__.py:399
+#: ../pykolab/wap_client/__init__.py:416
 #, python-format
 msgid "Requesting %r with params %r"
 msgstr ""
 
-#: ../pykolab/wap_client/__init__.py:407
+#: ../pykolab/wap_client/__init__.py:424
 #, python-format
 msgid "Got response: %r"
 msgstr ""
 
+#: ../pykolab/wap_client/__init__.py:429
+#, python-format
+msgid "Connection error: %r; re-connecting..."
+msgstr ""
+
 #. Some data is not JSON
-#: ../pykolab/wap_client/__init__.py:413
+#: ../pykolab/wap_client/__init__.py:441
 msgid "Response data is not JSON"
 msgstr ""
 
 #. support integer values, too
-#: ../pykolab/xml/attendee.py:9 ../pykolab/xml/attendee.py:17
+#: ../pykolab/xml/attendee.py:9 ../pykolab/xml/attendee.py:18
 msgid "Needs Action"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:10 ../pykolab/xml/attendee.py:18
+#: ../pykolab/xml/attendee.py:10 ../pykolab/xml/attendee.py:19
 msgid "Accepted"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:11 ../pykolab/xml/attendee.py:19
+#: ../pykolab/xml/attendee.py:11 ../pykolab/xml/attendee.py:20
 msgid "Declined"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:12 ../pykolab/xml/attendee.py:20
+#: ../pykolab/xml/attendee.py:12 ../pykolab/xml/attendee.py:21
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:13 ../pykolab/xml/attendee.py:21
+#: ../pykolab/xml/attendee.py:13 ../pykolab/xml/attendee.py:22
 msgid "Delegated"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:14 ../pykolab/xml/attendee.py:22
+#: ../pykolab/xml/attendee.py:14 ../pykolab/xml/attendee.py:23
+msgid "Started"
+msgstr ""
+
+#: ../pykolab/xml/attendee.py:15 ../pykolab/xml/attendee.py:24
 msgid "Completed"
 msgstr "terminé"
 
-#: ../pykolab/xml/attendee.py:15 ../pykolab/xml/attendee.py:23
-msgid "Started"
+#: ../pykolab/xml/attendee.py:16
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:914
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:926
+msgid "Pending"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:132 ../pykolab/xml/attendee.py:154
+#: ../pykolab/xml/attendee.py:133 ../pykolab/xml/attendee.py:155
 msgid "Not a valid attendee"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:139
+#: ../pykolab/xml/attendee.py:140
 msgid "No valid delegator references found"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:159
+#: ../pykolab/xml/attendee.py:160
 msgid "No valid delegatee references found"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:219
+#: ../pykolab/xml/attendee.py:220
 #, python-format
 msgid "Invalid cutype %r"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:231
+#: ../pykolab/xml/attendee.py:232
 #, python-format
 msgid "Invalid participant status %r"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:239
+#: ../pykolab/xml/attendee.py:240
 #, python-format
 msgid "Invalid role %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:163 ../pykolab/xml/event.py:802
-#: ../pykolab/xml/event.py:845
-msgid "Event start needs datetime.date or datetime.datetime instance"
+#: ../pykolab/xml/event.py:168
+#, python-format
+msgid "Rdate needs datetime.date or datetime.datetime instance, got %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:308
+#: ../pykolab/xml/event.py:185
+#, python-format
+msgid "Exdate needs datetime.date or datetime.datetime instance, got %r"
+msgstr ""
+
+#: ../pykolab/xml/event.py:403
 #, python-format
 msgid "No attendee with email or name %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:316
+#: ../pykolab/xml/event.py:411
 #, python-format
 msgid "Invalid argument value attendee %r, must be basestring or Attendee"
 msgstr ""
 
-#: ../pykolab/xml/event.py:328
+#: ../pykolab/xml/event.py:423
 #, python-format
 msgid "No attendee with email %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:334
+#: ../pykolab/xml/event.py:429
 #, python-format
 msgid "No attendee with name %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:384 ../pykolab/xml/utils.py:157
+#: ../pykolab/xml/event.py:479 ../pykolab/xml/utils.py:180
 msgid "%Y-%m-%d"
 msgstr ""
 
-#: ../pykolab/xml/event.py:386 ../pykolab/xml/utils.py:158
+#: ../pykolab/xml/event.py:481 ../pykolab/xml/utils.py:181
 msgid "%H:%M (%Z)"
 msgstr ""
 
-#: ../pykolab/xml/event.py:510
+#: ../pykolab/xml/event.py:614
 msgid "Invalid participant status"
 msgstr ""
 
-#: ../pykolab/xml/event.py:636
+#: ../pykolab/xml/event.py:820 ../pykolab/xml/note.py:94
 #, python-format
 msgid "Invalid classification %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:667
-msgid "Event end needs datetime.date or datetime.datetime instance"
+#: ../pykolab/xml/event.py:851
+#, python-format
+msgid "Event end needs datetime.date or datetime.datetime instance, got %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:677
+#: ../pykolab/xml/event.py:865
 #, python-format
 msgid "Invalid custom property name %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:855
+#: ../pykolab/xml/event.py:1017
+#, python-format
+msgid ""
+"Event last-modified needs datetime.date or datetime.datetime instance, got "
+"%r"
+msgstr ""
+
+#: ../pykolab/xml/event.py:1060
+#, python-format
+msgid "Event start needs datetime.date or datetime.datetime instance, got %r"
+msgstr ""
+
+#: ../pykolab/xml/event.py:1070
 #, python-format
 msgid "Invalid status set: %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:1094
+#: ../pykolab/xml/event.py:1093
+msgid "Event recurrence-id needs datetime.datetime instance"
+msgstr ""
+
+#: ../pykolab/xml/event.py:1330
 msgid "No sender specified"
 msgstr ""
 
-#: ../pykolab/xml/event.py:1103
+#: ../pykolab/xml/event.py:1339
 #, python-format
 msgid "Invitation for %s was %s"
 msgstr ""
 
-#: ../pykolab/xml/event.py:1108
+#: ../pykolab/xml/event.py:1344
 msgid "This is an automated response to one of your event requests."
 msgstr ""
 
-#: ../pykolab/xml/recurrence_rule.py:38
+#: ../pykolab/xml/recurrence_rule.py:41
 #, python-format
 msgid "Every %d year(s)"
 msgstr ""
 
-#: ../pykolab/xml/recurrence_rule.py:39
+#: ../pykolab/xml/recurrence_rule.py:42
 #, python-format
 msgid "Every %d month(s)"
 msgstr ""
 
-#: ../pykolab/xml/recurrence_rule.py:40
+#: ../pykolab/xml/recurrence_rule.py:43
 #, python-format
 msgid "Every %d week(s)"
 msgstr ""
 
-#: ../pykolab/xml/recurrence_rule.py:41
+#: ../pykolab/xml/recurrence_rule.py:44
 #, python-format
 msgid "Every %d day(s)"
 msgstr ""
 
-#: ../pykolab/xml/recurrence_rule.py:42
+#: ../pykolab/xml/recurrence_rule.py:45
 #, python-format
 msgid "Every %d hours"
 msgstr ""
 
-#: ../pykolab/xml/recurrence_rule.py:43
+#: ../pykolab/xml/recurrence_rule.py:46
 #, python-format
 msgid "Every %d minutes"
 msgstr ""
 
-#: ../pykolab/xml/recurrence_rule.py:44
+#: ../pykolab/xml/recurrence_rule.py:47
 #, python-format
 msgid "Every %d seconds"
 msgstr ""
 
-#: ../pykolab/xml/todo.py:110
+#: ../pykolab/xml/todo.py:162
 msgid "Todo due needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:126
+#: ../pykolab/xml/utils.py:149
 msgid "Name"
 msgstr "Nom"
 
-#: ../pykolab/xml/utils.py:127
+#: ../pykolab/xml/utils.py:150
 msgid "Summary"
 msgstr "Résumé"
 
-#: ../pykolab/xml/utils.py:128
+#: ../pykolab/xml/utils.py:151
 msgid "Location"
 msgstr "Lieu"
 
-#: ../pykolab/xml/utils.py:129
+#: ../pykolab/xml/utils.py:152
 msgid "Description"
 msgstr "Description"
 
-#: ../pykolab/xml/utils.py:130
+#: ../pykolab/xml/utils.py:153
 msgid "URL"
 msgstr "URL"
 
-#: ../pykolab/xml/utils.py:131
+#: ../pykolab/xml/utils.py:154
 msgid "Status"
 msgstr "Statut"
 
-#: ../pykolab/xml/utils.py:132
+#: ../pykolab/xml/utils.py:155
 msgid "Priority"
 msgstr "Priorité"
 
-#: ../pykolab/xml/utils.py:133
+#: ../pykolab/xml/utils.py:156
 msgid "Attendee"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:134
+#: ../pykolab/xml/utils.py:157
 msgid "Start"
 msgstr "Début"
 
-#: ../pykolab/xml/utils.py:135
+#: ../pykolab/xml/utils.py:158
 msgid "End"
 msgstr "Fin"
 
-#: ../pykolab/xml/utils.py:136
+#: ../pykolab/xml/utils.py:159
 msgid "Due"
 msgstr "Fin"
 
-#: ../pykolab/xml/utils.py:137
+#: ../pykolab/xml/utils.py:160
 msgid "Repeat"
 msgstr "Répéter"
 
-#: ../pykolab/xml/utils.py:138
+#: ../pykolab/xml/utils.py:161
 msgid "Repeat Exception"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:139
+#: ../pykolab/xml/utils.py:162
 msgid "Organizer"
 msgstr "Organisateur"
 
-#: ../pykolab/xml/utils.py:140
+#: ../pykolab/xml/utils.py:163
 msgid "Attachment"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:141
+#: ../pykolab/xml/utils.py:164
 msgid "Alarm"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:142
+#: ../pykolab/xml/utils.py:165
 msgid "Classification"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:143
+#: ../pykolab/xml/utils.py:166
 msgid "Progress"
 msgstr "Progression"
 
-#: ../pykolab/xml/utils.py:188
+#: ../pykolab/xml/utils.py:211
 #, python-format
 msgid "for %d times"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:190
+#: ../pykolab/xml/utils.py:213
 #, python-format
 msgid "until %s"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:195
+#: ../pykolab/xml/utils.py:218
 msgid "Display message"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:196
+#: ../pykolab/xml/utils.py:219
 msgid "Send email"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:197
+#: ../pykolab/xml/utils.py:220
 msgid "Play sound"
 msgstr "Alerte sonore"
 
-#: ../pykolab/xml/utils.py:203
+#: ../pykolab/xml/utils.py:226
 #, python-format
 msgid "%s after"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:203
+#: ../pykolab/xml/utils.py:226
 #, python-format
 msgid "%s before"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:212
+#: ../pykolab/xml/utils.py:235
 #, python-format
 msgid "%d day(s)"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:218
+#: ../pykolab/xml/utils.py:241
 #, python-format
 msgid "%d hour(s)"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:220
+#: ../pykolab/xml/utils.py:243
 #, python-format
 msgid "%d minute(s)"
 msgstr ""
 
-#: ../saslauthd/__init__.py:76
+#: ../saslauthd/__init__.py:77
 msgid "Socket file to bind to."
 msgstr ""
 
-#: ../saslauthd/__init__.py:108
+#: ../saslauthd/__init__.py:109
 #, python-format
 msgid "Could not create %r: %r"
 msgstr ""
 
-#: ../saslauthd/__init__.py:146 ../saslauthd/__init__.py:154
-#: ../wallace/__init__.py:439 ../wallace/__init__.py:448
-msgid ""
-"Traceback occurred, please report a bug at http://bugzilla.kolabsys.com"
-msgstr "Une erreur s'est produite, vous pouvez reporter le problème sur http://bugzilla.kolabsys.com"
-
-#: ../saslauthd/__init__.py:194
-msgid "kolab-saslauthd could not accept "
+#: ../saslauthd/__init__.py:220
+#, python-format
+msgid "kolab-saslauthd could not accept connections on socket: %r"
 msgstr ""
 
-#: ../saslauthd/__init__.py:199
+#: ../saslauthd/__init__.py:225
 msgid "Maximum tries exceeded, exiting"
 msgstr ""
 
-#: ../tests/functional/test_wallace/test_005_resource_invitation.py:195
-#: ../wallace/module_resources.py:1151
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:196
+#: ../wallace/module_resources.py:1251
 #, 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:1235
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:641
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:657
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:715
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:771
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:785
+#: ../wallace/module_resources.py:1335
 #, python-format
 msgid "Booking for %s has been %s"
 msgstr ""
@@ -3074,52 +3402,52 @@
 #. 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:1333
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:677
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:704
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:742
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:759
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:814
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:968
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:984
+#: ../wallace/module_resources.py:1433
 #, python-format
 msgid "Booking request for %s requires confirmation"
 msgstr ""
 
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:240
-#: ../wallace/module_invitationpolicy.py:448
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:242
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1267
+#: ../wallace/module_invitationpolicy.py:479
 #, python-format
 msgid "\"%(summary)s\" has been %(status)s"
 msgstr ""
 
+#. this should trigger a notification message
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:886
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1251
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1396
+#: ../wallace/module_invitationpolicy.py:1316
+#, python-format
+msgid "\"%s\" has been cancelled"
+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:802
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:808
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:821
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:839
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:942
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:947
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1008
-#: ../wallace/module_invitationpolicy.py:1071
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:903
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:909
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:922
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:939
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1039
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1044
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1377
+#: ../wallace/module_invitationpolicy.py:1234
 #, python-format
 msgid "\"%s\" has been updated"
 msgstr ""
 
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:813
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:825
-msgid "PENDING"
-msgstr ""
-
-#. this should trigger a notification message
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1028
-#: ../wallace/module_invitationpolicy.py:1133
-#, python-format
-msgid "\"%s\" has been cancelled"
-msgstr ""
-
-#: ../tests/unit/test-011-itip.py:465
+#: ../tests/unit/test-011-itip.py:529
 #, python-format
 msgid "Invitation for %(summary)s was %(status)s"
 msgstr ""
@@ -3144,370 +3472,423 @@
 msgid "Worker process %s initializing"
 msgstr ""
 
-#: ../wallace/__init__.py:122
+#: ../wallace/__init__.py:123
 msgid "Bind address for Wallace."
 msgstr "Adresse de connexion pour Wallace."
 
-#: ../wallace/__init__.py:140
+#: ../wallace/__init__.py:142
 msgid "Number of threads to use."
 msgstr ""
 
-#: ../wallace/__init__.py:156
+#: ../wallace/__init__.py:159
 msgid "Port that Wallace is supposed to use."
 msgstr "Numéro de port que le service Wallace est supposé utilisé."
 
-#: ../wallace/__init__.py:205
+#: ../wallace/__init__.py:208
 #, python-format
-msgid "Could not bind to socket on port %d on bind "
-msgstr "Impossible d'ouvrir la socket sur le port %d à la connexion"
+msgid "Could not bind to socket on port %d on bind address %s"
+msgstr ""
 
-#: ../wallace/__init__.py:217
+#: ../wallace/__init__.py:220
 msgid "Could not shut down socket"
 msgstr "Impossible de supprimer la socket"
 
-#: ../wallace/__init__.py:286
+#: ../wallace/__init__.py:289
 msgid "Accepted connection"
 msgstr "La connexion est acceptée"
 
-#: ../wallace/__init__.py:464
+#: ../wallace/__init__.py:494
 #, python-format
 msgid "Could not write pid file %s"
 msgstr ""
 
-#: ../wallace/module_footer.py:60 ../wallace/module_gpgencrypt.py:60
-#: ../wallace/module_invitationpolicy.py:210 ../wallace/module_optout.py:61
-#: ../wallace/module_resources.py:126
+#: ../wallace/module_footer.py:63 ../wallace/module_gpgencrypt.py:100
+#: ../wallace/module_invitationpolicy.py:227 ../wallace/module_optout.py:61
+#: ../wallace/module_resources.py:127
 #, python-format
 msgid "Issuing callback after processing to stage %s"
 msgstr "Appel de la fonction callback après traitement de la procédure %s"
 
-#: ../wallace/module_footer.py:61 ../wallace/module_gpgencrypt.py:61
-#: ../wallace/module_invitationpolicy.py:212 ../wallace/module_optout.py:62
-#: ../wallace/module_resources.py:132
+#: ../wallace/module_footer.py:64 ../wallace/module_gpgencrypt.py:101
+#: ../wallace/module_invitationpolicy.py:229 ../wallace/module_optout.py:62
+#: ../wallace/module_resources.py:133
 #, python-format
 msgid "Testing cb_action_%s()"
 msgstr "Test de cb_action_%s()"
 
-#: ../wallace/module_footer.py:63 ../wallace/module_gpgencrypt.py:63
-#: ../wallace/module_invitationpolicy.py:214 ../wallace/module_optout.py:64
-#: ../wallace/module_resources.py:135
+#: ../wallace/module_footer.py:66 ../wallace/module_gpgencrypt.py:103
+#: ../wallace/module_invitationpolicy.py:231 ../wallace/module_optout.py:64
+#: ../wallace/module_resources.py:136
 #, python-format
 msgid "Attempting to execute cb_action_%s()"
 msgstr "Tentative d'exécution de cb_action_%s()"
 
-#: ../wallace/module_footer.py:67
+#: ../wallace/module_footer.py:70
 #, python-format
 msgid "Executing module footer for %r, %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:66
+#: ../wallace/module_footer.py:88
+msgid "No contents configured for footer module"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:106
 #, python-format
 msgid "Executing module gpgencrypt for %r, %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:98
+#: ../wallace/module_gpgencrypt.py:138
 msgid "Message is already encrypted (app/pgp-enc content-type)"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:102
+#: ../wallace/module_gpgencrypt.py:142
 msgid "Message already encrypted by main content-type header"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:131
+#: ../wallace/module_gpgencrypt.py:171
 msgid ""
 "Configured to encrypt to a key not configured, and strict policy enabled. "
 "Bailing out."
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:134
+#: ../wallace/module_gpgencrypt.py:174
 msgid ""
 "Configured to encrypt to a key not configured, but continuing anyway (see "
 "'gpgencrypt_strict')."
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:171
+#: ../wallace/module_gpgencrypt.py:211
 #, python-format
 msgid "Recipients: %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:183
+#: ../wallace/module_gpgencrypt.py:222
 #, python-format
 msgid "Current keys: %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:188
+#: ../wallace/module_gpgencrypt.py:227
 #, python-format
 msgid "Retrieving key for recipient: %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:192 ../wallace/module_gpgencrypt.py:208
+#: ../wallace/module_gpgencrypt.py:231 ../wallace/module_gpgencrypt.py:247
 #, python-format
 msgid "Found matching address %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:200
+#: ../wallace/module_gpgencrypt.py:239
 #, python-format
 msgid "Found matching address %r in remote keys"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:232
+#: ../wallace/module_gpgencrypt.py:259
+msgid "Mime Message - we need to build multipart/encrypted structure"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:268
+msgid "No Mime Message - encypt plain"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:284
 #, python-format
 msgid "An error occurred: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:196
+#: ../wallace/module_invitationpolicy.py:213
 #, python-format
 msgid "Invitation policy called for %r, %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:258
+#: ../wallace/module_invitationpolicy.py:275
 #, python-format
 msgid "Failed to parse iTip objects from message: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:262
+#: ../wallace/module_invitationpolicy.py:279
 msgid ""
 "Message is not an iTip message or does not contain any (valid) iTip objects."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:266
+#: ../wallace/module_invitationpolicy.py:283
 #, python-format
 msgid ""
 "iTip objects attached to this message contain the following information: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:278
+#: ../wallace/module_invitationpolicy.py:306
 #, python-format
 msgid "Recipient emails for %s: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:282
+#: ../wallace/module_invitationpolicy.py:310
 #, python-format
 msgid "No itips, no users, pass along %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:285
+#: ../wallace/module_invitationpolicy.py:313
 #, python-format
 msgid "iTips, but no users, pass along %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:306
+#: ../wallace/module_invitationpolicy.py:331
 #, python-format
 msgid "No user attendee matching envelope recipient %s, skip message"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:309
+#: ../wallace/module_invitationpolicy.py:334
 #, python-format
 msgid "Receiving user: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:337
+#: ../wallace/module_invitationpolicy.py:362
 #, python-format
 msgid "Apply invitation policy %r for sender %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:348
+#: ../wallace/module_invitationpolicy.py:373
 #, python-format
 msgid "Ignoring '%s' iTip method"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:352
+#: ../wallace/module_invitationpolicy.py:377
 #, python-format
 msgid "iTip message %r consumed by the invitationpolicy module"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:368
+#: ../wallace/module_invitationpolicy.py:393
 msgid "Pass invitation for manual processing"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:373
+#: ../wallace/module_invitationpolicy.py:398
 #, python-format
 msgid "Receiving Attendee: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:393
+#: ../wallace/module_invitationpolicy.py:418
 #, python-format
 msgid "Existing %s: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:404
+#: ../wallace/module_invitationpolicy.py:429
 #, python-format
 msgid "Precondition for object %r fulfilled: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:422
+#: ../wallace/module_invitationpolicy.py:449
 #, python-format
 msgid ""
 "The iTip request sequence (%r) doesn't match the referred object version "
 "(%r). Ignoring."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:427
+#: ../wallace/module_invitationpolicy.py:454
 #, python-format
 msgid "Auto-updating %s %r on iTip REQUEST (no re-scheduling)"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:482
+#: ../wallace/module_invitationpolicy.py:505
+msgid "Forward invitation for notification"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:520
 msgid "Pass reply for manual processing"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:489
+#: ../wallace/module_invitationpolicy.py:527
 #, python-format
 msgid "Sender Attendee: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:501
+#: ../wallace/module_invitationpolicy.py:539
 #, python-format
 msgid ""
 "The iTip reply sequence (%r) doesn't match the referred object version (%r)."
 " Forwarding to Inbox."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:507
+#: ../wallace/module_invitationpolicy.py:545
 #, python-format
 msgid "Auto-updating %s %r on iTip REPLY"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:532
+#: ../wallace/module_invitationpolicy.py:572
 #, python-format
 msgid "Add delegatee: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:535
+#: ../wallace/module_invitationpolicy.py:575
 #, python-format
 msgid "Update existing delegatee: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:540
+#: ../wallace/module_invitationpolicy.py:582
 #, python-format
 msgid "Update delegator: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:557
-#: ../wallace/module_invitationpolicy.py:589
+#: ../wallace/module_invitationpolicy.py:600
 msgid ""
 "The object referred by this reply was not found in the user's folders. "
 "Forwarding to Inbox."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:570
+#: ../wallace/module_invitationpolicy.py:613
 msgid "Pass cancellation for manual processing"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:618
+#: ../wallace/module_invitationpolicy.py:636
+#, python-format
+msgid "Remove cancelled %s instance %s from %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:647
+#, python-format
+msgid "Update cancelled %s %r with STATUS=CANCELLED"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:662
+msgid ""
+"The object referred by this cancel request was not found in the user's "
+"folders. Forwarding to Inbox."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:691
 #, python-format
 msgid "Checking if email address %r belongs to a local user"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:623
+#: ../wallace/module_invitationpolicy.py:696
 #, python-format
 msgid "User DN: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:625
+#: ../wallace/module_invitationpolicy.py:698
 #, python-format
 msgid "No user record(s) found for %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:681
+#: ../wallace/module_invitationpolicy.py:754
 #, python-format
 msgid "User record doesn't have the mailbox attribute %r set"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:694
+#: ../wallace/module_invitationpolicy.py:767
 #, python-format
 msgid "IMAP proxy authentication failed: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:716
+#: ../wallace/module_invitationpolicy.py:789
 #, python-format
 msgid "List %r folders for user %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:732
+#: ../wallace/module_invitationpolicy.py:804
 #, python-format
 msgid "IMAP metadata for %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:767
+#: ../wallace/module_invitationpolicy.py:842
 #, python-format
 msgid "Searching folder %r for %s %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:783
+#: ../wallace/module_invitationpolicy.py:852
+#: ../wallace/module_resources.py:675 ../wallace/module_resources.py:736
+#, python-format
+msgid "No UID found in IMAP response: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:878
 #, python-format
 msgid "Failed to parse %s from message %s/%s: %s"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:809
+#: ../wallace/module_invitationpolicy.py:906
 #, python-format
 msgid "Listing events from folder %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:822
-#: ../wallace/module_resources.py:474 ../wallace/module_resources.py:665
-#: ../wallace/module_resources.py:713
+#: ../wallace/module_invitationpolicy.py:919
+#: ../wallace/module_resources.py:482 ../wallace/module_resources.py:683
+#: ../wallace/module_resources.py:763
 #, python-format
 msgid "Failed to parse event from message %s/%s: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:828
+#: ../wallace/module_invitationpolicy.py:925
 #, python-format
 msgid "Existing event %r conflicts with invitation %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:835
-#: ../wallace/module_resources.py:518
+#: ../wallace/module_invitationpolicy.py:932
+#: ../wallace/module_resources.py:526
 #, python-format
 msgid "start: %r, end: %r, total: %r, messages: %d"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:861
+#: ../wallace/module_invitationpolicy.py:960
 #, python-format
 msgid "%r is locked, waiting..."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:928
+#: ../wallace/module_invitationpolicy.py:1040
 #, python-format
 msgid "Failed to save %s: no target folder found for user %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:931
+#: ../wallace/module_invitationpolicy.py:1051
 #, python-format
 msgid "Save %s %r to user folder %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:944
+#: ../wallace/module_invitationpolicy.py:1064
 #, python-format
 msgid "Failed to save %s to user folder at %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:960
+#: ../wallace/module_invitationpolicy.py:1083
+#, python-format
+msgid "Delete %s %r in %r by UID: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1091
 #, python-format
 msgid "Delete %s %r in %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:989
+#: ../wallace/module_invitationpolicy.py:1102
+#, python-format
+msgid "Failed to delete %s from folder %r: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1130
+#: ../wallace/module_invitationpolicy.py:1304
+#, python-format
+msgid "%s commented: %s"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1133
 #, python-format
 msgid "Compose participation status summary for %s %r to user %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1022
+#: ../wallace/module_invitationpolicy.py:1171
 #, python-format
 msgid ""
 "Waiting for more automated replies (got %d of %d); skipping notification"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1032
+#: ../wallace/module_invitationpolicy.py:1192
 #, python-format
 msgid "Changes submitted by %s have been automatically applied."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1041
+#: ../wallace/module_invitationpolicy.py:1201
 msgid "(removed)"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1047
+#: ../wallace/module_invitationpolicy.py:1207
 #, python-format
 msgid ""
 "\n"
@@ -3516,7 +3897,7 @@
 "        "
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1055
+#: ../wallace/module_invitationpolicy.py:1215
 #, python-format
 msgid ""
 "\n"
@@ -3525,56 +3906,78 @@
 "        "
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1064
-#: ../wallace/module_invitationpolicy.py:1126
-#: ../wallace/module_invitationpolicy.py:1216
+#: ../wallace/module_invitationpolicy.py:1225
+msgid "NOTE: This update only refers to this single occurrence!"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1227
+#: ../wallace/module_invitationpolicy.py:1309
+#: ../wallace/module_invitationpolicy.py:1411
 msgid "*** This is an automated message. Please do not reply. ***"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1099
+#: ../wallace/module_invitationpolicy.py:1249
+#, python-format
+msgid "Sent update notification to %r: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1274
 #, python-format
 msgid "Send cancellation notification for %s %r to user %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1109
+#: ../wallace/module_invitationpolicy.py:1284
 #, python-format
-msgid ""
-"\n"
-"            The assignment for '%(summary)s' has been cancelled by %(organizer)s.\n"
-"            The copy in your tasklist as been marked as cancelled accordingly.\n"
-"        "
+msgid "The assignment for '%(summary)s' has been cancelled by %(organizer)s."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1289
+msgid "The copy in your tasklist has been removed accordingly."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1117
+#: ../wallace/module_invitationpolicy.py:1291
+msgid "The copy in your tasklist has been marked as cancelled accordingly."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1293
 #, python-format
 msgid ""
-"\n"
-"            The event '%(summary)s' at %(start)s has been cancelled by %(organizer)s.\n"
-"            The copy in your calendar as been marked as cancelled accordingly.\n"
-"        "
+"The event '%(summary)s' at %(start)s has been cancelled by %(organizer)s."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1206
+#: ../wallace/module_invitationpolicy.py:1299
+msgid "The copy in your calendar has been removed accordingly."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1301
+msgid "The copy in your calendar has been marked as cancelled accordingly."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1307
+msgid "NOTE: This cancellation only refers to this single occurrence!"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1401
 #, python-format
 msgid "Updated %s's copy of %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1209
+#: ../wallace/module_invitationpolicy.py:1404
 #, python-format
 msgid "Attendee %s's copy of %r not found"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1212
+#: ../wallace/module_invitationpolicy.py:1407
 #, python-format
 msgid "Attendee %r not found in LDAP"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1219
+#: ../wallace/module_invitationpolicy.py:1414
 #, python-format
 msgid "%(name)s has %(status)s your assignment for %(summary)s."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1221
+#: ../wallace/module_invitationpolicy.py:1416
 #, python-format
 msgid "%(name)s has %(status)s your invitation for %(summary)s."
 msgstr ""
@@ -3587,8 +3990,9 @@
 
 #: ../wallace/module_optout.py:96
 #, python-format
-msgid "Running opt-out consult from envelope sender '%s "
-msgstr "Exécution de opt-out consult à partir de l'enveloppe de l'expéditeur '%s'"
+msgid ""
+"Running opt-out consult from envelope sender '%s <%s>' to recipient %s <%s>"
+msgstr ""
 
 #: ../wallace/module_optout.py:160
 #, python-format
@@ -3600,255 +4004,308 @@
 msgid "Could not send request to optout_url %s"
 msgstr "Impossible d'envoyer la requête opt-out via l'URL %s"
 
-#: ../wallace/module_resources.py:116
+#: ../wallace/module_resources.py:117
 #, python-format
 msgid "Resource Management called for %r, %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:181
+#: ../wallace/module_resources.py:182
 #, python-format
 msgid "Failed to parse iTip events from message: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:186
-msgid "Message is not an iTip message or does not contain any "
+#: ../wallace/module_resources.py:187
+msgid "Message is not an iTip message or does not contain any (valid) iTip."
 msgstr ""
 
-#: ../wallace/module_resources.py:194
-msgid "iTip events attached to this message contain the "
+#: ../wallace/module_resources.py:195
+#, python-format
+msgid ""
+"iTip events attached to this message contain the following information: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:225
+#: ../wallace/module_resources.py:226
 msgid "Not an iTip message, but sent to resource nonetheless. Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:233
+#: ../wallace/module_resources.py:234
 #, python-format
 msgid "No itips, no resources, pass along %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:236
+#: ../wallace/module_resources.py:237
 #, python-format
 msgid "iTips, but no resources, pass along %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:245
+#: ../wallace/module_resources.py:246
 #, python-format
 msgid "No resource attendees matching envelope recipient %s, Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:255
+#: ../wallace/module_resources.py:256
 #, python-format
 msgid "Resources: %r; %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:273
+#: ../wallace/module_resources.py:270
+#, python-format
+msgid "iTip REPLY to %r, %r; matches %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:276
 #, python-format
 msgid "Sender Attendee: %r => %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:280
+#: ../wallace/module_resources.py:278
+#, python-format
+msgid "Could not find envelope sender attendee: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:283
 #, python-format
 msgid ""
 "The iTip reply sequence (%r) doesn't match the referred event version (%r). "
 "Ignoring."
 msgstr ""
 
-#: ../wallace/module_resources.py:305
+#: ../wallace/module_resources.py:302
+#, python-format
+msgid "Invalid response (%r) received from resource owner for event %r"
+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:308
+#: ../wallace/module_resources.py:309
 msgid "No event reference found in this REPLY. Ignoring."
 msgstr ""
 
-#: ../wallace/module_resources.py:317
+#: ../wallace/module_resources.py:318
 #, python-format
 msgid "Receiving Resource: %r; %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:325
+#: ../wallace/module_resources.py:320
+#, python-format
+msgid "Could not find envelope attendee: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:326
 #, python-format
 msgid "Recipient %r is non-participant, ignoring message"
 msgstr ""
 
-#: ../wallace/module_resources.py:353
+#: ../wallace/module_resources.py:336
+#, python-format
+msgid "Cancellation for entire event %r: deleting"
+msgstr ""
+
+#: ../wallace/module_resources.py:340
+#, python-format
+msgid "Cancellation for a single occurrence %r of %r: updating..."
+msgstr ""
+
+#: ../wallace/module_resources.py:361
 #, python-format
 msgid "Accept invitation for individual resource %r / %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:382
+#: ../wallace/module_resources.py:390
 #, python-format
 msgid "Delegate invitation for resource collection %r to %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:403
+#: ../wallace/module_resources.py:411
 #, python-format
 msgid "module_resources.heartbeat(%d)"
 msgstr ""
 
-#: ../wallace/module_resources.py:426
+#: ../wallace/module_resources.py:434
 #, python-format
 msgid "Expunge resource calendar for %s (%s) failed: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:450
+#: ../wallace/module_resources.py:458
 #, python-format
 msgid "Expunge events in resource folder %r older than %d days"
 msgstr ""
 
-#: ../wallace/module_resources.py:463
+#: ../wallace/module_resources.py:471
 #, python-format
 msgid "Fetching message ID %r from folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:489
+#: ../wallace/module_resources.py:497
 #, python-format
 msgid "Flag event %s from message %s/%s as deleted (age = %d days)"
 msgstr ""
 
-#: ../wallace/module_resources.py:514
+#: ../wallace/module_resources.py:522
 #, python-format
 msgid "Failed to read resource calendar for %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:524
+#: ../wallace/module_resources.py:532
 #, python-format
 msgid "Polling for resource %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:527
+#: ../wallace/module_resources.py:535
 #, python-format
 msgid "Resource %r has been popped from the list"
 msgstr ""
 
-#: ../wallace/module_resources.py:531
+#: ../wallace/module_resources.py:539
 msgid "Resource is a collection"
 msgstr ""
 
-#: ../wallace/module_resources.py:542
+#: ../wallace/module_resources.py:550
 #, python-format
 msgid "Removed conflicting resources from %r: (%r) => %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:554
+#: ../wallace/module_resources.py:562
 #, python-format
 msgid "Conflicting events: %r for resource %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:573
+#: ../wallace/module_resources.py:585
 #, python-format
 msgid "Delegate to another resource collection member: %r to %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:635
+#: ../wallace/module_resources.py:647
 #, python-format
 msgid "Checking events in resource folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:654
+#: ../wallace/module_resources.py:666
 #, python-format
 msgid "Fetching message UID %r from folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:677
+#: ../wallace/module_resources.py:699
 #, python-format
 msgid "Event %r conflicts with event %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:698
+#: ../wallace/module_resources.py:721
 #, python-format
 msgid "Searching %r for event %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:704
+#: ../wallace/module_resources.py:727
 #, python-format
 msgid "Failed to access resource calendar:: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:733
+#: ../wallace/module_resources.py:754
+#, python-format
+msgid "Recurrence-ID not matching on message %s, skipping: %r != %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:785
 #, python-format
 msgid "Apply invitation policies %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:752
+#: ../wallace/module_resources.py:804
 #, python-format
 msgid "Adding event to %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:806
+#: ../wallace/module_resources.py:888
 #, python-format
 msgid "Failed to save event to resource calendar at %r: %r"
 msgstr "Echec d'enregistrer l'événement à la ressource de calandrier au "
 
-#: ../wallace/module_resources.py:823
+#: ../wallace/module_resources.py:907
+#, python-format
+msgid "Delete resource calendar object from %r by UID %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:915
 #, python-format
 msgid "Delete resource calendar object %r in %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:866
+#: ../wallace/module_resources.py:926
+#, python-format
+msgid "Failed to delete calendar object %r from folder %r: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:966
 #, python-format
 msgid "Checking if email address %r belongs to a resource (collection)"
 msgstr "Contrôle si l'adresse émail %r appartient à une ressource (collection)"
 
-#: ../wallace/module_resources.py:874 ../wallace/module_resources.py:946
-#: ../wallace/module_resources.py:980
+#: ../wallace/module_resources.py:974 ../wallace/module_resources.py:1046
+#: ../wallace/module_resources.py:1080
 #, python-format
 msgid "Resource record(s): %r"
 msgstr "Registre(s) de ressource: %r"
 
-#: ../wallace/module_resources.py:876 ../wallace/module_resources.py:948
-#: ../wallace/module_resources.py:983
+#: ../wallace/module_resources.py:976 ../wallace/module_resources.py:1048
+#: ../wallace/module_resources.py:1083
 #, python-format
 msgid "No resource (collection) records found for %r"
 msgstr "Aucun registres (collection) de ressource trouvé pour %r"
 
-#: ../wallace/module_resources.py:880 ../wallace/module_resources.py:952
-#: ../wallace/module_resources.py:987
+#: ../wallace/module_resources.py:980 ../wallace/module_resources.py:1052
+#: ../wallace/module_resources.py:1087
 #, python-format
 msgid "Resource record: %r"
 msgstr "Registre de ressource: %r"
 
-#: ../wallace/module_resources.py:898
+#: ../wallace/module_resources.py:998
 #, python-format
 msgid "Raw itip_events: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:906
+#: ../wallace/module_resources.py:1006
 #, python-format
 msgid "Raw set of attendees: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:914
+#: ../wallace/module_resources.py:1014
 #, python-format
 msgid "Raw set of resources: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:919
+#: ../wallace/module_resources.py:1019
 #, python-format
 msgid "Raw set of organizers: %r"
 msgstr "Forme brute d'organisateurs: %r"
 
-#: ../wallace/module_resources.py:939
+#: ../wallace/module_resources.py:1039
 #, python-format
 msgid "Checking if attendee %r is a resource (collection)"
 msgstr "Contrôle si le participant %r est une ressource (collection)"
 
-#: ../wallace/module_resources.py:955 ../wallace/module_resources.py:989
+#: ../wallace/module_resources.py:1055 ../wallace/module_resources.py:1089
 msgid "Resource reservation made but no resource records found"
 msgstr "Réservation de ressource faite mais aucun enregistrement de ressource trouvé"
 
-#: ../wallace/module_resources.py:974
+#: ../wallace/module_resources.py:1074
 #, python-format
 msgid "Checking if resource %r is a resource (collection)"
 msgstr "Contrôle si la ressource %r est une ressource (collection)"
 
-#: ../wallace/module_resources.py:992
-msgid "The following resources are being referred to in the "
+#: ../wallace/module_resources.py:1092
+#, python-format
+msgid "The following resources are being referred to in the iTip: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:1219
+#, python-format
+msgid "Check collections %r for kolabinvitationpolicy attributes"
 msgstr ""
 
-#: ../wallace/module_resources.py:1157
+#: ../wallace/module_resources.py:1257
 #, python-format
 msgid ""
 "\n"
@@ -3858,7 +4315,7 @@
 "            "
 msgstr "\n*** Ceci est une réponse automatique, merci de ne pas répondre! ***\n\nVotre réservation a été délégué au \"%s\" qui est disponible pour la durée demandée."
 
-#: ../wallace/module_resources.py:1176
+#: ../wallace/module_resources.py:1276
 #, python-format
 msgid ""
 "\n"
@@ -3868,7 +4325,7 @@
 "    "
 msgstr "\n*** Ceci est une réponse automatique, merci de ne pas répondre! ***\n\nNous vous informons ainsi que votre réservation était %s.\n "
 
-#: ../wallace/module_resources.py:1183
+#: ../wallace/module_resources.py:1283
 #, python-format
 msgid ""
 "\n"
@@ -3877,16 +4334,16 @@
 "        "
 msgstr "\nAu cas où vous auriez des questions concernant cette réservation, veuillez contacter \n%s <%s> %s"
 
-#: ../wallace/module_resources.py:1218
+#: ../wallace/module_resources.py:1318
 #, python-format
 msgid "Sending booking notification for event %r to %r from %r"
 msgstr "L'envoie de la notification de réservation pour événement %r à %r de %r"
 
-#: ../wallace/module_resources.py:1236
+#: ../wallace/module_resources.py:1336
 msgid "failed"
 msgstr "échoué"
 
-#: ../wallace/module_resources.py:1256
+#: ../wallace/module_resources.py:1356
 #, python-format
 msgid ""
 "\n"
@@ -3896,7 +4353,7 @@
 "        "
 msgstr "\nLa ressource de réservation pour %(resource)s par %(orgname)s <%(orgemail)s> a été %(status)s pour %(date)s. \n\n*** Ceci est un message automatique, envoyé à vous en tant que propriétaire de la ressource. ***\n "
 
-#: ../wallace/module_resources.py:1262
+#: ../wallace/module_resources.py:1362
 #, python-format
 msgid ""
 "\n"
@@ -3907,12 +4364,12 @@
 "        "
 msgstr "\nUne requête de réservation pour %(resource)s n'a pas pu être procédé. \nVeuillez  contacter %(orgname)s <%(orgemail)s> qui a demandé la ressource %(date)s. Suject: %(summary)s. \n\n***Ceci est un message automatique, envoyé à vous en tant que propriétaire de la ressource. ***"
 
-#: ../wallace/module_resources.py:1306
+#: ../wallace/module_resources.py:1393
 #, python-format
 msgid "Clone invitation for owner confirmation: %r from %r"
 msgstr "Cloner l'invitation pour la confirmation de propriétaire: %r de %r"
 
-#: ../wallace/module_resources.py:1312
+#: ../wallace/module_resources.py:1412
 #, python-format
 msgid ""
 "\n"
@@ -3930,58 +4387,63 @@
 msgstr "\nUne requête de réservation pour %(resource)s demande votre consentement. \nVeuillez soit accepter ou décliner cette invitation sans l'enregistrer dans votre calendrier. \n\nLa requête de réservation était envoyé de %(orgname)s\n<%(orgemail)s>. \n\nSujet: %(summary)s. \nDate: %(date)s \nParticipants: %(attendees)s \n\n***Ceci est une réponse automatique, merci de ne pas répondre. ***\n "
 
 #. This is a nested module
-#: ../wallace/modules.py:97
+#: ../wallace/modules.py:98
 #, python-format
 msgid "Module Group: %s"
 msgstr "Groupe de modules : %s"
 
-#: ../wallace/modules.py:108 ../wallace/modules.py:120
+#: ../wallace/modules.py:109 ../wallace/modules.py:125
 #, python-format
 msgid "No such module %r in modules %r (1)."
 msgstr "Aucune module %r dans les modules %r (1)."
 
-#: ../wallace/modules.py:113
+#: ../wallace/modules.py:114
 #, python-format
 msgid "No such module %r in modules %r (2)."
 msgstr "Aucune module %r dans les modules %r (2)."
 
-#: ../wallace/modules.py:126
+#: ../wallace/modules.py:120 ../wallace/modules.py:172
+#, python-format
+msgid "Unknown error occurred; %r"
+msgstr ""
+
+#: ../wallace/modules.py:178
 #, python-format
 msgid "Holding message in queue for manual review (%s by %s)"
 msgstr "Conservation du message dans la file d'attente pour consultation manuelle (%s par %s)"
 
-#: ../wallace/modules.py:129
+#: ../wallace/modules.py:181
 #, python-format
 msgid "Deferring message in %s (by module %s)"
 msgstr "Différer le message dans %s (par le module %s)"
 
-#: ../wallace/modules.py:141
+#: ../wallace/modules.py:193
 #, python-format
 msgid "The time when the message was sent: %r"
 msgstr "Le message a été envoyé le : %r"
 
-#: ../wallace/modules.py:142
+#: ../wallace/modules.py:194
 #, python-format
 msgid "The time now: %r"
 msgstr "Le temps actuel : %r"
 
-#: ../wallace/modules.py:143
+#: ../wallace/modules.py:195
 #, python-format
 msgid "The time delta: %r"
 msgstr "L'écart de temps : %r"
 
 #. TODO: Send NDR back to user
-#: ../wallace/modules.py:147
+#: ../wallace/modules.py:199
 #, python-format
 msgid "Message in file %s older then 5 days, deleting"
 msgstr "Le message dans le file d'attente %s a plus de 5 jours, on le supprime"
 
-#: ../wallace/modules.py:172
+#: ../wallace/modules.py:224
 #, python-format
 msgid "Rejecting message in %s (by module %s)"
 msgstr "Rejet du message dans %s (par le module %s)"
 
-#: ../wallace/modules.py:193
+#: ../wallace/modules.py:245
 #, python-format
 msgid ""
 "This is the email system Wallace at %s.\n"
@@ -3996,29 +4458,29 @@
 "recipients.\n"
 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:208
+#: ../wallace/modules.py:260
 #, python-format
 msgid ""
 "X-Wallace-Module: %s\n"
 "X-Wallace-Result: REJECT\n"
 msgstr ""
 
-#: ../wallace/modules.py:267
+#: ../wallace/modules.py:304
 #, python-format
 msgid "Accepting message in %s (by module %s)"
 msgstr "Le message est accepté dans %s (par le module %s)"
 
-#: ../wallace/modules.py:269
+#: ../wallace/modules.py:306
 #, python-format
 msgid "Accepting message in: %r"
 msgstr "Accepte le message dans: %r"
 
-#: ../wallace/modules.py:276
+#: ../wallace/modules.py:313
 #, python-format
 msgid "recipients: %r"
 msgstr "destinateurs: %r"
 
-#: ../wallace/modules.py:354
+#: ../wallace/modules.py:369
 #, python-format
 msgid "Module '%s' already registered"
 msgstr "Le module '%s' est déjà enregistré"

pykolab-0.8.1.tar.gz/po/nl.po -> pykolab-0.8.3.tar.gz/po/nl.po Changed

@@ -4,405 +4,438 @@
 # 
 # Translators:
 # Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>, 2012
-# Lazlo <transifex@lazlo.me>, 2013
+# Lazlo, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-14 01:36+0100\n"
-"PO-Revision-Date: 2015-01-21 16:41+0000\n"
-"Last-Translator: Thomas Brüderli <roundcube@gmail.com>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/kolab/language/nl/)\n"
+"POT-Creation-Date: 2016-07-22 15:31+0200\n"
+"PO-Revision-Date: 2016-07-22 13:31+0000\n"
+"Last-Translator: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>\n"
+"Language-Team: Dutch (http://www.transifex.com/kolab/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"
 
-#: ../bin/kolab_smtp_access_policy.py:210
+#: ../bin/kolab_smtp_access_policy.py:214
 #, python-format
 msgid "Adding policy request to instance %s"
 msgstr "Bezig policy verzoek toe te voegen aan %s"
 
-#: ../bin/kolab_smtp_access_policy.py:480
+#: ../bin/kolab_smtp_access_policy.py:484
 msgid "Unauthorized access not allowed"
 msgstr "Niet geautoriseerde toegang niet toegestaan"
 
-#: ../bin/kolab_smtp_access_policy.py:509
-#: ../bin/kolab_smtp_access_policy.py:690
+#: ../bin/kolab_smtp_access_policy.py:513
+#: ../bin/kolab_smtp_access_policy.py:711
 msgid "Could not find recipient"
 msgstr "Kan ontvanger niet vinden"
 
-#: ../bin/kolab_smtp_access_policy.py:528
+#: ../bin/kolab_smtp_access_policy.py:532
 #, python-format
 msgid "Could not find envelope sender user %s (511)"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:571
+#: ../bin/kolab_smtp_access_policy.py:575
 #, 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:628
+#: ../bin/kolab_smtp_access_policy.py:633
 #, python-format
 msgid "Could not find envelope sender user %s"
 msgstr "Kan envelope zender gebruiker %s niet vinden"
 
-#: ../bin/kolab_smtp_access_policy.py:650
+#: ../bin/kolab_smtp_access_policy.py:666
+#: ../bin/kolab_smtp_access_policy.py:694
 #, 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:660
+#: ../bin/kolab_smtp_access_policy.py:676
 #, 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:714
-#: ../bin/kolab_smtp_access_policy.py:725
+#: ../bin/kolab_smtp_access_policy.py:736
+#: ../bin/kolab_smtp_access_policy.py:747
 #, 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:749
+#: ../bin/kolab_smtp_access_policy.py:767
 #, 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:752
+#: ../bin/kolab_smtp_access_policy.py:770
 #, python-format
 msgid ""
 "Verifying unauthenticated sender '%(sender)s' for recipient '%(recipient)s'"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:768
+#: ../bin/kolab_smtp_access_policy.py:786
 #, python-format
 msgid "Reproducing verify_recipient(%s, %s) from cache"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:805
+#: ../bin/kolab_smtp_access_policy.py:823
 #, 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:815
+#: ../bin/kolab_smtp_access_policy.py:833
 #, python-format
 msgid "Domain %s is a primary domain"
 msgstr "Domein %s is een primair domein"
 
-#: ../bin/kolab_smtp_access_policy.py:823
+#: ../bin/kolab_smtp_access_policy.py:841
 #, 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:838
+#: ../bin/kolab_smtp_access_policy.py:856
 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:855
+#: ../bin/kolab_smtp_access_policy.py:873
 #, 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:891
+#: ../bin/kolab_smtp_access_policy.py:909
 msgid "Invalid recipient"
 msgstr "Ongeldige ontvanger"
 
-#: ../bin/kolab_smtp_access_policy.py:902
+#: ../bin/kolab_smtp_access_policy.py:920
 msgid "Could not find this user, accepting"
 msgstr "Kan deze gebruiker niet vinden, accepteren"
 
-#: ../bin/kolab_smtp_access_policy.py:975
-#: ../bin/kolab_smtp_access_policy.py:1051
+#: ../bin/kolab_smtp_access_policy.py:993
+#: ../bin/kolab_smtp_access_policy.py:1070
 #, 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:1039
+#: ../bin/kolab_smtp_access_policy.py:1057
 #, python-format
 msgid "Reproducing verify_sender(%r) from cache"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1056
+#: ../bin/kolab_smtp_access_policy.py:1077
 msgid "Unverifiable sender."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1061
+#: ../bin/kolab_smtp_access_policy.py:1082
 msgid "Sender is not using an alias"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1069
+#: ../bin/kolab_smtp_access_policy.py:1090
 msgid "Sender uses unauthorized envelope sender address"
 msgstr "Verstuurder gebruikt een niet geauthorizeerd envelope zender adres"
 
-#: ../bin/kolab_smtp_access_policy.py:1086
+#: ../bin/kolab_smtp_access_policy.py:1107
 msgid "Could not verify sender"
 msgstr "Kan de verstuurder niet verifieren"
 
-#: ../bin/kolab_smtp_access_policy.py:1093
+#: ../bin/kolab_smtp_access_policy.py:1114
 msgid ""
 "Verifying whether sender is allowed to send to recipient using sender policy"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1106
+#: ../bin/kolab_smtp_access_policy.py:1127
 #, python-format
 msgid "Result is %r"
 msgstr "Het resultaat is %r"
 
-#: ../bin/kolab_smtp_access_policy.py:1111
+#: ../bin/kolab_smtp_access_policy.py:1132
 msgid "No recipient policy restrictions exist for this sender"
 msgstr "Er zijn geen ontvanger restricties voor deze afzender"
 
-#: ../bin/kolab_smtp_access_policy.py:1120
+#: ../bin/kolab_smtp_access_policy.py:1141
 msgid "Found a recipient policy to apply for this sender."
 msgstr "Ontvanger-beleid gevonden voor deze afzender"
 
-#: ../bin/kolab_smtp_access_policy.py:1135
+#: ../bin/kolab_smtp_access_policy.py:1156
 #, python-format
 msgid "Sender %s not allowed to send to recipient %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1156
+#: ../bin/kolab_smtp_access_policy.py:1184
 msgid "Cleaning up the cache"
 msgstr "Cache aan het schoonmaken"
 
-#: ../bin/kolab_smtp_access_policy.py:1179
+#: ../bin/kolab_smtp_access_policy.py:1207
 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:1195
+#: ../bin/kolab_smtp_access_policy.py:1223
 #, python-format
 msgid "Operational Error in caching: %s"
 msgstr "Operationele fout in caching: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1247
+#: ../bin/kolab_smtp_access_policy.py:1276
 #, 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:1321
+#: ../bin/kolab_smtp_access_policy.py:1353
 #, python-format
 msgid "Returning action DEFER_IF_PERMIT: %s"
 msgstr "Actie DEFER_IF_PERMIT retourneren: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1326
+#: ../bin/kolab_smtp_access_policy.py:1358
 #, python-format
 msgid "Returning action DUNNO: %s"
 msgstr "Actie DUNNO retourneren: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1331
+#: ../bin/kolab_smtp_access_policy.py:1363
 #, python-format
 msgid "Returning action HOLD: %s"
 msgstr "Actie HOLD retourneren: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1336
+#: ../bin/kolab_smtp_access_policy.py:1368
 #, python-format
 msgid "Returning action PERMIT: %s"
 msgstr "Actie PERMIT retourneren: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1461
+#: ../bin/kolab_smtp_access_policy.py:1496
 #, python-format
 msgid "Returning action REJECT: %s"
 msgstr "Actie REJECT retourneren: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1507
+#: ../bin/kolab_smtp_access_policy.py:1542
 msgid "Starting to loop for new request"
 msgstr "Loop aan het starten in afwachting van nieuw verzoek"
 
-#: ../bin/kolab_smtp_access_policy.py:1514
+#: ../bin/kolab_smtp_access_policy.py:1549
 msgid "Timeout for policy request reading exceeded"
 msgstr "Maximale tijd voor het lezen van een policy verzoek verstreken"
 
-#: ../bin/kolab_smtp_access_policy.py:1520
+#: ../bin/kolab_smtp_access_policy.py:1555
 msgid "End of current request"
 msgstr "Einde van huidige verzoek"
 
-#: ../bin/kolab_smtp_access_policy.py:1524
+#: ../bin/kolab_smtp_access_policy.py:1559
 #, python-format
 msgid "Getting line: %s"
 msgstr "Gegeven regel: %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1528
+#: ../bin/kolab_smtp_access_policy.py:1563
 msgid "Returning request"
 msgstr "Verzoek aan het retourneren"
 
-#: ../bin/kolab_smtp_access_policy.py:1557
+#: ../bin/kolab_smtp_access_policy.py:1592
 msgid "Access Policy Options"
 msgstr "Opties voor Toegangs-beleid"
 
-#: ../bin/kolab_smtp_access_policy.py:1564
+#: ../bin/kolab_smtp_access_policy.py:1599
 msgid "SMTP Policy request timeout."
 msgstr "Maximale tijd voor SMTP Toegangs-beleid verzoek verstreken"
 
-#: ../bin/kolab_smtp_access_policy.py:1570
+#: ../bin/kolab_smtp_access_policy.py:1605
 msgid "Verify the recipient access policy."
 msgstr "Verifieer het toegangs-beleid voor de ontvanger."
 
-#: ../bin/kolab_smtp_access_policy.py:1576
+#: ../bin/kolab_smtp_access_policy.py:1611
 msgid "Verify the sender access policy."
 msgstr "Verifieer het toegangs-beleid voor de afzender."
 
-#: ../bin/kolab_smtp_access_policy.py:1582
+#: ../bin/kolab_smtp_access_policy.py:1617
 msgid "Allow unauthenticated senders."
 msgstr "Sta niet geauthentificeerde afzenders toe."
 
-#: ../bin/kolab_smtp_access_policy.py:1596
+#: ../bin/kolab_smtp_access_policy.py:1631
 #, python-format
 msgid "Got request instance %s"
 msgstr "Verzoek %s verkregen"
 
-#: ../bin/kolab_smtp_access_policy.py:1605
+#: ../bin/kolab_smtp_access_policy.py:1640
 #, python-format
 msgid "Request instance %s is in state %s"
 msgstr "Verzoek %s is in staat %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1613
-#, 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:1625
-#, python-format
-msgid "Request instance %s reached DATA state"
-msgstr "Verzoek %s heeft DATA staat bereikt"
-
-#: ../bin/kolab_smtp_access_policy.py:1645
+#: ../bin/kolab_smtp_access_policy.py:1672
 #, python-format
 msgid "Unhandled exception caught: %r"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1649
+#: ../bin/kolab_smtp_access_policy.py:1676
 msgid "Sender access denied"
 msgstr "Toegang voor afzender geweigerd"
 
-#: ../bin/kolab_smtp_access_policy.py:1651
+#: ../bin/kolab_smtp_access_policy.py:1678
 msgid "Recipient access denied"
 msgstr "Toegang voor ontvanger geweigerd"
 
-#: ../bin/kolab_smtp_access_policy.py:1653
+#: ../bin/kolab_smtp_access_policy.py:1680
 msgid "No objections"
 msgstr "Geen bezwaren"
 
-#: ../conf.py:37 ../kolab-cli.py:34 ../saslauthd.py:33
+#: ../conf.py:36 ../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:51
-#: ../wallace/__init__.py:107
+#: ../kolabd/__init__.py:50 ../saslauthd/__init__.py:52
+#: ../wallace/__init__.py:108
 msgid "Daemon Options"
 msgstr "Opties voor Daemon"
 
-#: ../kolabd/__init__.py:56 ../saslauthd/__init__.py:58
-#: ../wallace/__init__.py:114
+#: ../kolabd/__init__.py:57 ../saslauthd/__init__.py:59
+#: ../wallace/__init__.py:115
 msgid "Fork to the background."
 msgstr "Draai op de achtergrond"
 
-#: ../kolabd/__init__.py:65 ../saslauthd/__init__.py:67
-#: ../wallace/__init__.py:148
+#: ../kolabd/__init__.py:66 ../saslauthd/__init__.py:68
+#: ../wallace/__init__.py:150
 msgid "Path to the PID file to use."
 msgstr "Te gebruiken locatie voor PID bestand"
 
-#: ../kolabd/__init__.py:74 ../saslauthd/__init__.py:85
-#: ../wallace/__init__.py:165
+#: ../kolabd/__init__.py:75 ../saslauthd/__init__.py:86
+#: ../wallace/__init__.py:168
 msgid "Run as user USERNAME"
 msgstr "Draai proces als gebruiker USERNAME"
 
-#: ../kolabd/__init__.py:84 ../saslauthd/__init__.py:95
-#: ../wallace/__init__.py:131
+#: ../kolabd/__init__.py:85 ../saslauthd/__init__.py:96
+#: ../wallace/__init__.py:132
 msgid "Run as group GROUPNAME"
 msgstr "Draai proces als group GROUPNAME"
 
-#: ../kolabd/__init__.py:122 ../pykolab/utils.py:234
-#: ../saslauthd/__init__.py:301 ../wallace/__init__.py:365
+#: ../kolabd/__init__.py:123 ../pykolab/utils.py:254
+#: ../saslauthd/__init__.py:327 ../wallace/__init__.py:373
 #, python-format
 msgid "Group %s does not exist"
 msgstr "Groep %s bestaat niet"
 
-#: ../kolabd/__init__.py:131 ../saslauthd/__init__.py:310
-#: ../wallace/__init__.py:374
+#: ../kolabd/__init__.py:132 ../saslauthd/__init__.py:336
+#: ../wallace/__init__.py:382
 #, python-format
 msgid "Switching real and effective group id to %d"
 msgstr ""
 
-#: ../kolabd/__init__.py:153 ../pykolab/utils.py:258
-#: ../saslauthd/__init__.py:332 ../wallace/__init__.py:396
+#: ../kolabd/__init__.py:154 ../pykolab/utils.py:278
+#: ../saslauthd/__init__.py:358 ../wallace/__init__.py:404
 #, python-format
 msgid "User %s does not exist"
 msgstr "Gebruiker %s bestaat niet"
 
-#: ../kolabd/__init__.py:163 ../saslauthd/__init__.py:342
-#: ../wallace/__init__.py:406
+#: ../kolabd/__init__.py:163 ../saslauthd/__init__.py:367
+#: ../wallace/__init__.py:414
 #, python-format
 msgid "Switching real and effective user id to %d"
 msgstr ""
 
-#: ../kolabd/__init__.py:172 ../saslauthd/__init__.py:351
-#: ../wallace/__init__.py:415
+#: ../kolabd/__init__.py:172 ../saslauthd/__init__.py:376
+#: ../wallace/__init__.py:423
 msgid "Could not change real and effective uid and/or gid"
 msgstr ""
 
-#: ../kolabd/__init__.py:192 ../saslauthd/__init__.py:142
-#: ../wallace/__init__.py:435
+#: ../kolabd/__init__.py:215 ../saslauthd/__init__.py:166
+#: ../wallace/__init__.py:465
 msgid "Interrupted by user"
 msgstr "Onderbroken door gebruiker"
 
-#: ../kolabd/__init__.py:197 ../kolabd/__init__.py:208
-msgid "Traceback occurred, please report a "
+#: ../kolabd/__init__.py:220 ../kolabd/__init__.py:231
+#: ../saslauthd/__init__.py:170 ../saslauthd/__init__.py:179
+#: ../wallace/__init__.py:469 ../wallace/__init__.py:478
+msgid "Traceback occurred, please report a bug at https://issues.kolab.org"
 msgstr ""
 
-#: ../kolabd/__init__.py:203 ../saslauthd/__init__.py:150
-#: ../wallace/__init__.py:444
+#: ../kolabd/__init__.py:226 ../saslauthd/__init__.py:175
+#: ../wallace/__init__.py:474
 #, python-format
 msgid "Type Error: %s"
 msgstr "Type Fout: %s"
 
-#: ../kolabd/__init__.py:230
+#: ../kolabd/__init__.py:253
 msgid "Could not connect to LDAP, is it running?"
 msgstr ""
 
-#: ../kolabd/__init__.py:233 ../pykolab/auth/ldap/__init__.py:2242
-#: ../pykolab/cli/cmd_sync.py:67
+#: ../kolabd/__init__.py:256 ../pykolab/auth/ldap/__init__.py:2524
+#: ../pykolab/cli/cmd_sync.py:77
 msgid "Listing domains..."
 msgstr "Lijst van domeinen verkrijgen..."
 
-#: ../kolabd/__init__.py:244
+#: ../kolabd/__init__.py:267
 msgid "No domains. Not syncing"
 msgstr ""
 
-#: ../kolabd/__init__.py:279
+#: ../kolabd/__init__.py:290
+#, python-format
+msgid "Domain %r naming context: %r, root dn: %r"
+msgstr ""
+
+#: ../kolabd/__init__.py:302
+#, python-format
+msgid "Naming contexts to synchronize: %r"
+msgstr ""
+
+#: ../kolabd/__init__.py:320
+#, python-format
+msgid "Result set of domains: %r"
+msgstr ""
+
+#: ../kolabd/__init__.py:323
+#, python-format
+msgid "Checking for domain %s"
+msgstr ""
+
+#: ../kolabd/__init__.py:327
+#, python-format
+msgid "Domain %s isn't alive anymore."
+msgstr ""
+
+#: ../kolabd/__init__.py:331
+#, python-format
+msgid "Domain %s already there and alive."
+msgstr ""
+
+#: ../kolabd/__init__.py:335
+#, python-format
+msgid "Domain %s should not exist any longer."
+msgstr ""
+
+#: ../kolabd/__init__.py:338
+#, python-format
+msgid "Domain %s does not have a process yet."
+msgstr ""
+
+#: ../kolabd/__init__.py:349
 #, python-format
 msgid "added domains: %r, removed domains: %r"
 msgstr "Domeinen toegevoegd: %r, domeinen verwijderd: %r"
 
-#: ../kolabd/process.py:33
+#: ../kolabd/process.py:34
 #, python-format
 msgid "Process created for domain %s"
 msgstr ""
 
-#: ../kolabd/process.py:42
+#: ../kolabd/process.py:43
 #, python-format
 msgid "Synchronizing for domain %s"
 msgstr ""
 
-#: ../kolabd/process.py:59
+#: ../kolabd/process.py:60
 #, python-format
 msgid ""
 "Error in process %r, terminating:\n"
 "\t%r"
 msgstr ""
 
-#: ../kolabd.py:31 ../setup-kolab.py:36 ../wallace.py:31
+#: ../kolabd.py:31 ../setup-kolab.py:37 ../wallace.py:31
 msgid "Cannot load pykolab/constants.py:"
 msgstr "Kan pykolab/constants.py niet laden:"
 
@@ -450,323 +483,428 @@
 msgid "Updating result_attribute for cache entry %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:52
+#: ../pykolab/auth/ldap/__init__.py:54
 msgid "Python LDAP library does not support persistent search"
 msgstr "Python LDAP library ondersteund geen persistent search"
 
-#: ../pykolab/auth/ldap/__init__.py:143
+#: ../pykolab/auth/ldap/__init__.py:147
 #, python-format
 msgid "Attempting to authenticate user %s in realm %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:175 ../pykolab/auth/ldap/__init__.py:226
+#: ../pykolab/auth/ldap/__init__.py:165 ../pykolab/auth/ldap/__init__.py:180
+#: ../pykolab/auth/ldap/__init__.py:207 ../pykolab/auth/ldap/__init__.py:324
 #, python-format
 msgid "Authentication cache failed: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:216 ../pykolab/auth/ldap/__init__.py:240
+#: ../pykolab/auth/ldap/__init__.py:229 ../pykolab/auth/ldap/__init__.py:1441
+#: ../pykolab/auth/ldap/__init__.py:1467 ../pykolab/auth/ldap/__init__.py:3066
+#, python-format
+msgid "LDAP server unavailable: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:230 ../pykolab/auth/ldap/__init__.py:237
+#: ../pykolab/auth/ldap/__init__.py:1316 ../pykolab/auth/ldap/__init__.py:1442
+#: ../pykolab/auth/ldap/__init__.py:1468 ../pykolab/auth/ldap/__init__.py:1756
+#: ../pykolab/auth/ldap/__init__.py:3067 ../pykolab/auth/ldap/__init__.py:3077
+#, python-format
+msgid "%s"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:236
+#, python-format
+msgid "Exception occurred: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:243
+#, python-format
+msgid "Length of entries found: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:255
+#, python-format
+msgid "Authentication for %r failed (multiple entries)"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:269
+#, python-format
+msgid "Authentication for %r failed (no entry)"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:282
+#, python-format
+msgid "Authentication for %r failed (LDAP error?)"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:300 ../pykolab/auth/ldap/__init__.py:354
 #, python-format
-msgid "Binding with user_dn %s and password %s"
-msgstr "Bezig met binden als user dn %s en wachtwoord %s"
+msgid "Authentication for %r succeeded"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:311
+#, python-format
+msgid "Authentication for %r failed (error)"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:328
+msgid "Authentication failed, LDAP server unavailable"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:231 ../pykolab/auth/ldap/__init__.py:263
+#: ../pykolab/auth/ldap/__init__.py:336 ../pykolab/auth/ldap/__init__.py:391
 #, python-format
-msgid "Failed to authenticate as user %s"
+msgid "Failed to authenticate as user %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:249
+#: ../pykolab/auth/ldap/__init__.py:357
+#, python-format
+msgid "Authentication for %r failed (password)"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:369
 #, python-format
 msgid "Error occured, there is no such object: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:254
+#: ../pykolab/auth/ldap/__init__.py:381
 msgid "Authentication cache failed to clear entry"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:260
+#: ../pykolab/auth/ldap/__init__.py:387
 #, python-format
 msgid "Exception occured: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:280
+#: ../pykolab/auth/ldap/__init__.py:419
 msgid "Connecting to LDAP..."
 msgstr "Bezig verbinding te maken met LDAP..."
 
-#: ../pykolab/auth/ldap/__init__.py:284
+#: ../pykolab/auth/ldap/__init__.py:423
 #, python-format
 msgid "Attempting to use LDAP URI %s"
 msgstr "Bezig LDAP URI %s te gebruiken..."
 
-#: ../pykolab/auth/ldap/__init__.py:371
+#: ../pykolab/auth/ldap/__init__.py:524
 #, python-format
 msgid "Entry ID: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:373
+#: ../pykolab/auth/ldap/__init__.py:526
 #, python-format
 msgid "Entry DN: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:376
+#: ../pykolab/auth/ldap/__init__.py:529
 #, python-format
 msgid ""
 "ldap search: (%r, %r, filterstr='(objectclass=*)', attrlist=[ 'dn' ] + %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:481
-#, python-format
-msgid "Finding recipient with filter %r"
-msgstr "Ontvanger vinden met filter %r"
-
-#: ../pykolab/auth/ldap/__init__.py:557
+#: ../pykolab/auth/ldap/__init__.py:648 ../pykolab/auth/ldap/__init__.py:801
 #, python-format
 msgid "Finding resource with filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:588
+#: ../pykolab/auth/ldap/__init__.py:725
+#, python-format
+msgid "Finding recipient with filter %r"
+msgstr "Ontvanger vinden met filter %r"
+
+#: ../pykolab/auth/ldap/__init__.py:832
 #, python-format
 msgid "Using timestamp %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:625
+#: ../pykolab/auth/ldap/__init__.py:869
 #, python-format
-msgid "Not applying recipient policy for %s "
+msgid "Not applying recipient policy for %s (disabled through configuration)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:635
+#: ../pykolab/auth/ldap/__init__.py:879
 #, python-format
 msgid "Applying recipient policy to %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:652
+#: ../pykolab/auth/ldap/__init__.py:896
 #, 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:663
+#: ../pykolab/auth/ldap/__init__.py:907
 #, python-format
 msgid "key %r not in entry"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:665
+#: ../pykolab/auth/ldap/__init__.py:909
 #, python-format
 msgid "key %r is the prim. mail attr."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:667
+#: ../pykolab/auth/ldap/__init__.py:911
 msgid "prim. mail pol. is not empty"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:670
+#: ../pykolab/auth/ldap/__init__.py:914
 #, python-format
 msgid "key %r is the sec. mail attr."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:672
+#: ../pykolab/auth/ldap/__init__.py:916
 msgid "sec. mail pol. is not empty"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:676 ../pykolab/auth/ldap/__init__.py:690
+#: ../pykolab/auth/ldap/__init__.py:920 ../pykolab/auth/ldap/__init__.py:934
 #, 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:729
+#: ../pykolab/auth/ldap/__init__.py:973
 #, python-format
 msgid "No results for mail address %s found"
 msgstr "Geen resultaten voor email adres %s gevonden"
 
-#: ../pykolab/auth/ldap/__init__.py:740
+#: ../pykolab/auth/ldap/__init__.py:984
 #, 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:750
+#: ../pykolab/auth/ldap/__init__.py:994
 #, 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:761 ../pykolab/auth/ldap/__init__.py:850
+#: ../pykolab/auth/ldap/__init__.py:1005 ../pykolab/auth/ldap/__init__.py:1094
 msgid "Address assigned to us"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:816
+#: ../pykolab/auth/ldap/__init__.py:1060
 #, python-format
 msgid "No results for address %s found"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:827
+#: ../pykolab/auth/ldap/__init__.py:1071
 #, 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:838
-msgid "Too bad, secondary email "
+#: ../pykolab/auth/ldap/__init__.py:1082
+#, python-format
+msgid "Too bad, secondary email address %s already in use for %s (we are %s)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:865
-msgid "Recipient policy composed the following set of secondary "
+#: ../pykolab/auth/ldap/__init__.py:1109
+#, python-format
+msgid ""
+"Recipient policy composed the following set of secondary email addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:876
+#: ../pykolab/auth/ldap/__init__.py:1120
 #, python-format
 msgid "Secondary mail addresses that we want is not None: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:887
-msgid "Avoiding the duplication of the primary mail "
-msgstr "Duplicaat van primair email adres aan het voorkomen"
+#: ../pykolab/auth/ldap/__init__.py:1131
+#, 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:898
+#: ../pykolab/auth/ldap/__init__.py:1142
 #, python-format
 msgid "Entry is getting secondary mail addresses: %r"
 msgstr "Entry verkrijgt secundaire email adressen: %r"
 
-#: ../pykolab/auth/ldap/__init__.py:906
-msgid "Entry did not have any secondary mail "
-msgstr "Entry had niet reeds enige secundaire email adressen"
+#: ../pykolab/auth/ldap/__init__.py:1150
+#, python-format
+msgid "Entry did not have any secondary mail addresses in %r"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:923 ../pykolab/auth/ldap/__init__.py:929
+#: ../pykolab/auth/ldap/__init__.py:1167 ../pykolab/auth/ldap/__init__.py:1173
 #, python-format
 msgid "secondary_mail_addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:924 ../pykolab/auth/ldap/__init__.py:930
+#: ../pykolab/auth/ldap/__init__.py:1168 ../pykolab/auth/ldap/__init__.py:1174
 #, python-format
 msgid "entry[%s]: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:941
+#: ../pykolab/auth/ldap/__init__.py:1185
 #, python-format
 msgid "Entry modifications list: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:969
+#: ../pykolab/auth/ldap/__init__.py:1219
 #, python-format
 msgid "Setting entry attribute %r to %r for %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1005
+#: ../pykolab/auth/ldap/__init__.py:1255
 #, python-format
 msgid ""
 "Could not update dn %r:\n"
 "%r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1031
+#: ../pykolab/auth/ldap/__init__.py:1281
 #, python-format
 msgid "Using filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1046
+#: ../pykolab/auth/ldap/__init__.py:1296
 #, python-format
 msgid "Synchronization is searching against base DN: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1095
+#: ../pykolab/auth/ldap/__init__.py:1343
 #, 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:1166
-msgid "Invalid DN, username and/or password."
+#: ../pykolab/auth/ldap/__init__.py:1406
+msgid "Attempting to bind without a DN but with a password"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1411
+msgid "Attempting to bind with a DN but without a password"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1291 ../pykolab/auth/ldap/__init__.py:1308
-#: ../pykolab/auth/ldap/__init__.py:1682 ../pykolab/auth/ldap/__init__.py:1699
+#: ../pykolab/auth/ldap/__init__.py:1429
 #, python-format
-msgid "Found a subject %r with access %r"
+msgid "Binding with bind_dn: %s and password: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1410
+#: ../pykolab/auth/ldap/__init__.py:1447 ../pykolab/auth/ldap/__init__.py:1471
+msgid "Invalid DN, username and/or password."
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1452
+msgid "bind() called but already bound"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1474
+msgid "bind_priv() called but already bound"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1686
 #, python-format
 msgid "Entry %s attribute value: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1418
+#: ../pykolab/auth/ldap/__init__.py:1694
 #, python-format
 msgid "imap.user_mailbox_server(%r) result: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1481 ../pykolab/auth/ldap/__init__.py:2809
+#: ../pykolab/auth/ldap/__init__.py:1755
 #, python-format
-msgid "%s"
+msgid "An error occured: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1748 ../pykolab/auth/ldap/__init__.py:1948
+#: ../pykolab/auth/ldap/__init__.py:1993 ../pykolab/auth/ldap/__init__.py:2187
 #, python-format
 msgid "Result from recipient policy: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2003
+#: ../pykolab/auth/ldap/__init__.py:2242
 #, 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:2162
+#: ../pykolab/auth/ldap/__init__.py:2267
+#, python-format
+msgid "Naming contexts found: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:2274
+#, python-format
+msgid "Domains/Root DNs found: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:2434
+#, python-format
+msgid "Searching root dn for domain %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:2439
+#, python-format
+msgid "Returning from cache: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:2444
 #, python-format
 msgid "Finding domain root dn for domain %s"
 msgstr "Root DN voor domein %s aan het vinden"
 
-#: ../pykolab/auth/ldap/__init__.py:2269
-msgid "Authentication database DOWN"
-msgstr "Authenticatie database NIET beschikbaar"
+#: ../pykolab/auth/ldap/__init__.py:2474
+#, python-format
+msgid "Setting domain root dn from LDAP for domain %r: %r"
+msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2353 ../pykolab/auth/ldap/__init__.py:2401
+#: ../pykolab/auth/ldap/__init__.py:2620 ../pykolab/auth/ldap/__init__.py:2668
 #, python-format
 msgid "Entry type: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2490
+#: ../pykolab/auth/ldap/__init__.py:2746
 msgid "LDAP Search Result Data Entry:"
 msgstr "LDAP Zoek Resultaat:"
 
-#: ../pykolab/auth/ldap/__init__.py:2506
+#: ../pykolab/auth/ldap/__init__.py:2762
 msgid "Entry Change Notification attributes:"
 msgstr "Wijzigingsnotificatie attributen:"
 
-#: ../pykolab/auth/ldap/__init__.py:2511
+#: ../pykolab/auth/ldap/__init__.py:2767
 #, python-format
 msgid "Change Type: %r (%r)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2519
+#: ../pykolab/auth/ldap/__init__.py:2775
 #, python-format
 msgid "Previous DN: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2574
+#: ../pykolab/auth/ldap/__init__.py:2830
 #, python-format
 msgid "Object %s searched no longer exists"
 msgstr "Gezocht object %s bestaat niet meer"
 
-#: ../pykolab/auth/ldap/__init__.py:2584
+#: ../pykolab/auth/ldap/__init__.py:2840
 #, python-format
 msgid "%d results..."
 msgstr "%d resultaten..."
 
-#: ../pykolab/auth/ldap/__init__.py:2687
+#: ../pykolab/auth/ldap/__init__.py:2943
 #, python-format
 msgid "Searching with filter %r"
 msgstr "Zoeken met filter %r"
 
-#: ../pykolab/auth/ldap/__init__.py:2739
+#: ../pykolab/auth/ldap/__init__.py:2995
 #, python-format
 msgid "Checking for support for %s on %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2758
+#: ../pykolab/auth/ldap/__init__.py:3014
 #, python-format
 msgid "Found support for %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2803
+#: ../pykolab/auth/ldap/__init__.py:3068
+msgid "-- reconnecting in 10 seconds."
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:3076
 #, python-format
 msgid "An error occured using %s: %r"
 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
@@ -807,7 +945,8 @@
 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
@@ -815,12 +954,13 @@
 msgid "Recipient %r is not the primary recipient for address %r"
 msgstr ""
 
-#: ../pykolab/cli/cmd_add_domain.py:36
+#: ../pykolab/cli/cmd_add_domain.py:36 ../pykolab/cli/cmd_check_quota.py:37
 #: ../pykolab/cli/cmd_count_domain_mailboxes.py:38
 #: ../pykolab/cli/cmd_create_mailbox.py:36
+#: ../pykolab/cli/cmd_delete_domain.py:39
 #: ../pykolab/cli/cmd_export_mailbox.py:33
 #: ../pykolab/cli/cmd_list_deleted_mailboxes.py:38
-#: ../pykolab/cli/cmd_list_domain_mailboxes.py:36
+#: ../pykolab/cli/cmd_list_domain_mailboxes.py:37
 #: ../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
@@ -841,12 +981,14 @@
 msgid "Add a new domain."
 msgstr ""
 
-#: ../pykolab/cli/cmd_add_domain.py:55 ../pykolab/cli/cmd_delete_domain.py:44
+#: ../pykolab/cli/cmd_add_domain.py:55 ../pykolab/cli/cmd_delete_domain.py:55
 #: ../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
+#: ../pykolab/cli/cmd_add_domain.py:67 ../pykolab/cli/cmd_delete_domain.py:67
 #: ../pykolab/cli/cmd_find_domain.py:56
 msgid "Domain name"
 msgstr "Domein naam"
@@ -876,20 +1018,45 @@
 
 #: ../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_list_messages.py:100
 #: ../pykolab/cli/cmd_remove_user_subscription.py:73
 msgid "No such folder"
 msgstr ""
 
+#: ../pykolab/cli/cmd_check_quota.py:44
+msgid "Do not apply any changes."
+msgstr ""
+
+#: ../pykolab/cli/cmd_check_quota.py:53
 #: ../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_list_domain_mailboxes.py:49
+#: ../pykolab/cli/cmd_list_mailboxes.py:52
+#: ../pykolab/cli/cmd_list_messages.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_check_quota.py:57
+msgid "Compare existing IMAP quota with LDAP quota."
+msgstr ""
+
+#: ../pykolab/cli/cmd_check_quota.py:84 ../pykolab/cli/cmd_user_info.py:51
+#, python-format
+msgid "No such user %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_check_quota.py:98
+#, python-format
+msgid "No quota for user %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_check_quota.py:105
+#, python-format
+msgid "user quota does not match for %s (IMAP: %d, LDAP: %d)"
+msgstr ""
+
 #: ../pykolab/cli/cmd_create_mailbox.py:42
 msgid "Set metadata for folder to ANNOTATION=VALUE"
 msgstr ""
@@ -910,6 +1077,10 @@
 msgid "Delete a domain."
 msgstr ""
 
+#: ../pykolab/cli/cmd_delete_domain.py:46
+msgid "Force deleting the domain even if it contains user accounts"
+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
@@ -922,10 +1093,8 @@
 #: ../pykolab/cli/cmd_list_mailbox_metadata.py:54
 #: ../pykolab/cli/cmd_set_mailbox_acl.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
+#: ../pykolab/cli/cmd_set_quota.py:48 ../tests/unit/test-015-translate.py:15
+#: ../tests/unit/test-015-translate.py:19
 msgid "Folder name"
 msgstr "Folder naam"
 
@@ -934,7 +1103,7 @@
 #: ../pykolab/cli/cmd_list_mailbox_metadata.py:80
 #: ../pykolab/cli/cmd_set_mailbox_acl.py:67
 #: ../pykolab/cli/cmd_set_mailbox_metadata.py:94
-#: ../pykolab/cli/cmd_set_quota.py:58
+#: ../pykolab/cli/cmd_set_quota.py:60
 #, python-format
 msgid "No such folder %r"
 msgstr "Folder %r bestaat niet"
@@ -966,7 +1135,7 @@
 msgstr ""
 
 #: ../pykolab/cli/cmd_delete_message.py:52
-#: ../pykolab/cli/cmd_list_messages.py:58
+#: ../pykolab/cli/cmd_list_messages.py:76
 msgid "Specify a folder"
 msgstr ""
 
@@ -994,13 +1163,13 @@
 msgstr ""
 
 #: ../pykolab/cli/cmd_list_deleted_mailboxes.py:43
-#: ../pykolab/cli/cmd_list_domain_mailboxes.py:41
+#: ../pykolab/cli/cmd_list_domain_mailboxes.py:42
 #: ../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_domain_mailboxes.py:58
+#: ../pykolab/cli/cmd_list_domain_mailboxes.py:59
 msgid "Domain"
 msgstr "Domein"
 
@@ -1017,7 +1186,11 @@
 msgid "Include messages flagged as \\Deleted"
 msgstr ""
 
-#: ../pykolab/cli/cmd_list_messages.py:47
+#: ../pykolab/cli/cmd_list_messages.py:61
+msgid "List messages as user USER"
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_messages.py:65
 msgid "List messages in a folder"
 msgstr ""
 
@@ -1180,7 +1353,7 @@
 msgid "Metadata path"
 msgstr "Metadata pad"
 
-#: ../pykolab/cli/cmd_set_quota.py:43 ../pykolab/cli/cmd_set_quota.py:47
+#: ../pykolab/cli/cmd_set_quota.py:45 ../pykolab/cli/cmd_set_quota.py:49
 msgid "New quota"
 msgstr ""
 
@@ -1197,39 +1370,39 @@
 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
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:105
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:153
 #, 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
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:110
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:158
 #, 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
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:114
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:162
 #, 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
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:116
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:164
 #, 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
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:118
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:166
 #, python-format
 msgid "No recipients for '%s' (use --delete to delete)!"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:136
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:147
 #, python-format
 msgid "Multiple recipients for '%s'!"
 msgstr ""
@@ -1242,22 +1415,26 @@
 msgid "Resync from the beginning"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync.py:72
+#: ../pykolab/cli/cmd_sync.py:68
+msgid "Only sync the specified domain"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:82
 #, python-format
 msgid "Found %d domains in %d seconds"
 msgstr "%d domeinen gevonden in %d seconden"
 
-#: ../pykolab/cli/cmd_sync.py:85
+#: ../pykolab/cli/cmd_sync.py:98
 #, python-format
 msgid "Running for domain %s"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync.py:92
+#: ../pykolab/cli/cmd_sync.py:105
 #, python-format
 msgid "Synchronizing users for %s took %d seconds"
 msgstr "Synchronizeren van gebruikers voor %s duurde %d seconden"
 
-#: ../pykolab/cli/cmd_sync.py:109
+#: ../pykolab/cli/cmd_sync.py:123
 #, python-format
 msgid "Worker process %s handling %s"
 msgstr ""
@@ -1274,11 +1451,6 @@
 msgid "Email address"
 msgstr ""
 
-#: ../pykolab/cli/cmd_user_info.py:51
-#, python-format
-msgid "No such user %s"
-msgstr ""
-
 #. This is a nested command
 #. This is a nested component
 #: ../pykolab/cli/commands.py:97 ../pykolab/setup/components.py:90
@@ -1296,7 +1468,7 @@
 msgstr "Commando '%s' is reeds geregistreerd"
 
 #: ../pykolab/cli/commands.py:192 ../pykolab/setup/components.py:257
-#: ../wallace/modules.py:376
+#: ../wallace/modules.py:391
 #, python-format
 msgid "Alias for %s"
 msgstr "Alias voor %s"
@@ -1305,7 +1477,7 @@
 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_list.py:49 ../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"
@@ -1422,7 +1594,8 @@
 #: ../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
@@ -1504,100 +1677,106 @@
 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 "Use the default answer to all questions."
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:292
+msgid "Set the logging level. One of info, warn, error, critical or debug"
+msgstr ""
 
-#: ../pykolab/conf/__init__.py:294
+#: ../pykolab/conf/__init__.py:300
 msgid "Log file to use"
 msgstr "Te gebruiken log bestand"
 
-#: ../pykolab/conf/__init__.py:300
+#: ../pykolab/conf/__init__.py:306
 msgid "Be quiet."
 msgstr "Wees stil."
 
-#: ../pykolab/conf/__init__.py:306
+#: ../pykolab/conf/__init__.py:312
 msgid "Answer yes to all questions."
 msgstr "Beantwoord alle vragen met ja."
 
-#: ../pykolab/conf/__init__.py:328
+#: ../pykolab/conf/__init__.py:334
 msgid "No command supplied"
 msgstr "Geen commando gegeven"
 
-#: ../pykolab/conf/__init__.py:416
+#: ../pykolab/conf/__init__.py:422
 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:419
+#: ../pykolab/conf/__init__.py:425
 #, python-format
 msgid "No section '%s' exists."
 msgstr "Sectie '%s' bestaat niet"
 
-#: ../pykolab/conf/__init__.py:461
+#: ../pykolab/conf/__init__.py:467
 #, 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:534
+#: ../pykolab/conf/__init__.py:540
 #, python-format
 msgid "Could not execute configuration function: %s"
 msgstr "Heb configuratie functie niet uit kunnen voeren: %s"
 
-#: ../pykolab/conf/__init__.py:542
+#: ../pykolab/conf/__init__.py:548
 #, 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:550 ../pykolab/conf/__init__.py:553
+#: ../pykolab/conf/__init__.py:556 ../pykolab/conf/__init__.py:559
 msgid "Option does not exist in defaults."
 msgstr "Optie bestaat niet in standaard configuratie waarden."
 
-#: ../pykolab/conf/__init__.py:563
+#: ../pykolab/conf/__init__.py:569
 #, python-format
 msgid "Configuration file %s not readable."
 msgstr "Kan configuratie bestand %s niet lezen."
 
-#: ../pykolab/conf/__init__.py:566
+#: ../pykolab/conf/__init__.py:572
 #, python-format
 msgid "Configuration file %s does not exist."
 msgstr "Configuratie bestand %s bestaat niet."
 
-#: ../pykolab/conf/__init__.py:571
+#: ../pykolab/conf/__init__.py:577
 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:577
+#: ../pykolab/conf/__init__.py:583
 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:585 ../pykolab/conf/__init__.py:591
-#: ../pykolab/conf/__init__.py:595 ../pykolab/conf/__init__.py:601
+#: ../pykolab/conf/__init__.py:591 ../pykolab/conf/__init__.py:597
+#: ../pykolab/conf/__init__.py:601 ../pykolab/conf/__init__.py:607
 msgid "Cannot start SASL authentication daemon"
 msgstr "Kan de SASL authenticatie daemon niet starten"
 
-#: ../pykolab/conf/__init__.py:612
+#: ../pykolab/conf/__init__.py:618
 msgid "No imaplib library found."
 msgstr "Geen imaplib module gevonden"
 
-#: ../pykolab/conf/__init__.py:622
+#: ../pykolab/conf/__init__.py:628
 msgid "No LMTP class found in the smtplib library."
 msgstr "Geen LMTP klasse gevonden in de smtplib module."
 
-#: ../pykolab/conf/__init__.py:632
+#: ../pykolab/conf/__init__.py:638
 msgid "No SMTP class found in the smtplib library."
 msgstr "Geen SMTP klasse gevonden in de smtplib module."
 
-#: ../pykolab/conf/__init__.py:646
+#: ../pykolab/conf/__init__.py:652
 #, 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:654
+#: ../pykolab/conf/__init__.py:660
 #, python-format
 msgid "Selectively selecting: %s"
 msgstr "Bezig selectief te selecteren: %s"
@@ -1626,98 +1805,121 @@
 msgid "OpenLDAP or compatible"
 msgstr "OpenLDAP of compatible"
 
-#: ../pykolab/imap/cyrus.py:80
+#: ../pykolab/imap/cyrus.py:83
 #, python-format
 msgid "Could not connect to Cyrus IMAP server %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:138
+#: ../pykolab/imap/cyrus.py:150 ../pykolab/imap/dovecot.py:285
 #, python-format
 msgid "Continuing with separator: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:143
+#: ../pykolab/imap/cyrus.py:159
 msgid "Detected we are running in a Murder topology"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:147
+#: ../pykolab/imap/cyrus.py:167
 msgid "This system is not part of a murder topology"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:168
+#: ../pykolab/imap/cyrus.py:196
 #, python-format
 msgid "Checking actual backend server for folder %s through annotations"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:173
-msgid "Possibly reproducing the find "
+#: ../pykolab/imap/cyrus.py:206
+#, python-format
+msgid ""
+"Possibly reproducing the find mailfolder server answer from previously "
+"detected and stored annotation value: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:196
+#: ../pykolab/imap/cyrus.py:236
 #, python-format
 msgid "Could not get the annotations after %s tries."
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:200
+#: ../pykolab/imap/cyrus.py:250
 #, python-format
 msgid "No annotations for %s: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:207
+#: ../pykolab/imap/cyrus.py:262
 #, python-format
 msgid "Server for INBOX folder %s is %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:227
+#. Removed server reconnection for dovecot, we only have one server
+#: ../pykolab/imap/cyrus.py:294 ../pykolab/imap/dovecot.py:311
 #, python-format
 msgid "Setting quota for folder %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:231
+#: ../pykolab/imap/cyrus.py:305 ../pykolab/imap/dovecot.py:315
 #, python-format
 msgid "Could not set quota for mailfolder %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:241
+#: ../pykolab/imap/cyrus.py:319 ../pykolab/imap/dovecot.py:320
 #, python-format
 msgid "Moving INBOX folder %s to %s on partition %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:243
+#: ../pykolab/imap/cyrus.py:329 ../pykolab/imap/dovecot.py:322
 #, python-format
 msgid "Moving INBOX folder %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:259
+#: ../pykolab/imap/cyrus.py:355
 #, python-format
 msgid "Setting annotation %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:264
+#: ../pykolab/imap/cyrus.py:366
 #, python-format
 msgid "Could not set annotation %r on mail folder %r: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:268
+#: ../pykolab/imap/cyrus.py:376 ../pykolab/imap/dovecot.py:451
 #, python-format
 msgid "Transferring folder %s from %s to %s"
 msgstr "Map %s van %s naar %s aan het verhuizen"
 
-#: ../pykolab/imap/cyrus.py:328
+#: ../pykolab/imap/cyrus.py:464 ../pykolab/imap/dovecot.py:511
 #, python-format
 msgid "Undeleting %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:339
+#: ../pykolab/imap/cyrus.py:484
 #, python-format
-msgid "Would have transfered %s from %s to %s"
+msgid "Would have transferred %s from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:341
+#: ../pykolab/imap/cyrus.py:491 ../pykolab/imap/dovecot.py:524
 #, python-format
 msgid "Would have renamed %s to %s"
 msgstr ""
 
+#: ../pykolab/imap/dovecot.py:220
+#, python-format
+msgid "Could not connect to Dovecot IMAP server %r"
+msgstr ""
+
+#: ../pykolab/imap/dovecot.py:292
+msgid "Detected METADATA support"
+msgstr ""
+
+#: ../pykolab/imap/dovecot.py:295
+#, python-format
+msgid "This system does not support METADATA: '%s'"
+msgstr ""
+
+#: ../pykolab/imap/dovecot.py:522
+#, python-format
+msgid "Would have transfered %s from %s to %s"
+msgstr ""
+
 #: ../pykolab/imap/__init__.py:46
 #, python-format
 msgid "Cleaning up ACL entries for %s across all folders"
@@ -1787,180 +1989,191 @@
 msgid "%r has no attribute %s"
 msgstr "%r heeft geen attribuut %s"
 
-#: ../pykolab/imap/__init__.py:393
+#: ../pykolab/imap/__init__.py:360
+#, python-format
+msgid "Invalid access identifier %r for subject %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:397
 #, python-format
 msgid "Could not set ACL for %s on folder %s: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:427 ../pykolab/imap/__init__.py:462
+#: ../pykolab/imap/__init__.py:431 ../pykolab/imap/__init__.py:467
 #, python-format
 msgid "Creating new shared folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:487 ../pykolab/imap/__init__.py:740
+#: ../pykolab/imap/__init__.py:496 ../pykolab/imap/__init__.py:776
 #, python-format
 msgid "Downcasing mailbox name %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:491
+#: ../pykolab/imap/__init__.py:500
 #, python-format
 msgid "Creating new mailbox for user %s"
 msgstr "Nieuwe mailbox voor gebruiker %s aan het creeren"
 
-#: ../pykolab/imap/__init__.py:506 ../pykolab/imap/__init__.py:613
+#: ../pykolab/imap/__init__.py:515 ../pykolab/imap/__init__.py:644
 msgid "Waiting for the Cyrus IMAP Murder to settle..."
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:559
+#: ../pykolab/imap/__init__.py:590
 #, python-format
 msgid "Creating additional folders for user %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:587
+#: ../pykolab/imap/__init__.py:618
 #, python-format
 msgid "Waiting for the Cyrus murder to settle... %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:602
+#: ../pykolab/imap/__init__.py:633
 #, python-format
 msgid "Correcting additional folder name from %r to %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:618
+#: ../pykolab/imap/__init__.py:649
 #, python-format
 msgid "Mailbox already exists: %s"
 msgstr "Mailbox bestaat reeds: %s"
 
-#: ../pykolab/imap/__init__.py:658
+#: ../pykolab/imap/__init__.py:689
 msgid "Subscribing user to the additional folders"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:672
+#: ../pykolab/imap/__init__.py:703
 msgid "Using the following tests for folder subscriptions:"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:674
+#: ../pykolab/imap/__init__.py:705
 #, python-format
 msgid "    %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:677
+#: ../pykolab/imap/__init__.py:708
 #, python-format
 msgid "Folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:689
+#: ../pykolab/imap/__init__.py:720
 #, python-format
 msgid "Subscribing %s to folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:693
+#: ../pykolab/imap/__init__.py:724
 #, python-format
 msgid "Subscribing %s to folder %s failed: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:723
+#: ../pykolab/imap/__init__.py:750
+#, python-format
+msgid "Could not set quota on %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:757
 #, python-format
 msgid "Could not rename %s to reside on partition %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:756
+#: ../pykolab/imap/__init__.py:794
 #, python-format
 msgid "INBOX folder to rename (%s) does not exist"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:759 ../pykolab/imap/__init__.py:835
+#: ../pykolab/imap/__init__.py:797 ../pykolab/imap/__init__.py:905
 #, python-format
 msgid "Renaming INBOX from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:763
+#: ../pykolab/imap/__init__.py:801
 #, python-format
 msgid "Could not rename INBOX folder %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:765 ../pykolab/imap/__init__.py:839
+#: ../pykolab/imap/__init__.py:803 ../pykolab/imap/__init__.py:909
 #, 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:769
+#: ../pykolab/imap/__init__.py:807
 #, python-format
 msgid "Server for mailbox %r is %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:777
+#: ../pykolab/imap/__init__.py:815
 #, 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:800
+#: ../pykolab/imap/__init__.py:829 ../pykolab/imap/__init__.py:872
+#: ../pykolab/imap/__init__.py:886
 #, python-format
-msgid "Setting ACL rights %s for subject %s on folder "
+msgid "Removing ACL rights %s for subject %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:811
+#: ../pykolab/imap/__init__.py:861
 #, python-format
-msgid "Removing ACL rights %s for subject %s on folder "
+msgid "Setting ACL rights %s for subject %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:832
+#: ../pykolab/imap/__init__.py:902
 #, python-format
 msgid "Found old INBOX folder %s"
 msgstr "Oude INBOX map %s gevonden"
 
-#: ../pykolab/imap/__init__.py:841
+#: ../pykolab/imap/__init__.py:911
 #, 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:843
+#: ../pykolab/imap/__init__.py:913
 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:911
+#: ../pykolab/imap/__init__.py:981
 #, 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:924
+#: ../pykolab/imap/__init__.py:994
 #, python-format
 msgid "Quota for %s currently is %s"
 msgstr "Quota voor %s is op dit moment %s"
 
-#: ../pykolab/imap/__init__.py:930
+#: ../pykolab/imap/__init__.py:1000
 #, 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:935
+#: ../pykolab/imap/__init__.py:1005
 #, python-format
 msgid "Correcting quota for %s to %s (currently %s)"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1012
+#: ../pykolab/imap/__init__.py:1082
 #, python-format
 msgid "Checking folder: %s"
 msgstr "Bezig met controleren van map: %s"
 
-#: ../pykolab/imap/__init__.py:1017
+#: ../pykolab/imap/__init__.py:1087
 #, python-format
 msgid "Folder has no corresponding user (1): %s"
 msgstr "Map heeft geen corresponderende gebruiker (1): %s"
 
-#: ../pykolab/imap/__init__.py:1020
+#: ../pykolab/imap/__init__.py:1090
 #, 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:1035
+#: ../pykolab/imap/__init__.py:1105
 msgid "Please don't give us just a user identifier"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1038
+#: ../pykolab/imap/__init__.py:1108
 #, python-format
 msgid "Deleting folder %s"
 msgstr "Map %s aan het verwijderen"
@@ -1969,52 +2182,52 @@
 msgid "Returning thread local configuration"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:45
+#: ../pykolab/itip/__init__.py:46
 #, python-format
 msgid "Method %r not really interesting for us."
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:51
+#: ../pykolab/itip/__init__.py:52
 #, python-format
 msgid "Raw iTip payload (%r): %r"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:61
+#: ../pykolab/itip/__init__.py:62
 msgid "Could not read iTip from message."
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:69
+#: ../pykolab/itip/__init__.py:70
 #, python-format
 msgid "Duplicate iTip object: %s"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:93
+#: ../pykolab/itip/__init__.py:95
 msgid "iTip event without a start"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:138
+#: ../pykolab/itip/__init__.py:140
 msgid "Message is not an iTip message (non-multipart message)"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:221
+#: ../pykolab/itip/__init__.py:261
 #, python-format
 msgid "Send iTip reply %s for %s %r"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:237
+#: ../pykolab/itip/__init__.py:277
 #, 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:1082
-#: ../wallace/module_invitationpolicy.py:1144
-#: ../wallace/module_resources.py:1247
+#: ../pykolab/itip/__init__.py:288 ../pykolab/itip/__init__.py:332
+#: ../wallace/module_invitationpolicy.py:1253
+#: ../wallace/module_invitationpolicy.py:1328
+#: ../wallace/module_resources.py:1347
 #, python-format
 msgid "SMTP sendmail error: %r"
 msgstr ""
 
-#: ../pykolab/itip/__init__.py:280
+#: ../pykolab/itip/__init__.py:320
 #, python-format
 msgid "Failed to compose iTip request message: %r"
 msgstr ""
@@ -2159,7 +2372,7 @@
 msgstr ""
 
 #: ../pykolab/plugins/roundcubedb/__init__.py:55
-#: ../pykolab/setup/setup_roundcube.py:167
+#: ../pykolab/setup/setup_roundcube.py:106
 msgid "Roundcube installation path not found."
 msgstr ""
 
@@ -2179,14 +2392,40 @@
 msgid "No such component."
 msgstr ""
 
-#: ../pykolab/setup/setup_freebusy.py:46
+#: ../pykolab/setup/__init__.py:55
+msgid "SELinux currently enforcing. Read https://git.kolab.org/u/1"
+msgstr ""
+
+#: ../pykolab/setup/__init__.py:67
+msgid ""
+"SELinux configured to enforce a policy on startup. Read "
+"https://git.kolab.org/u/1"
+msgstr ""
+
+#: ../pykolab/setup/setup_freebusy.py:47
 msgid "Setup Free/Busy."
 msgstr ""
 
-#: ../pykolab/setup/setup_freebusy.py:50
+#: ../pykolab/setup/setup_freebusy.py:51
 msgid "Free/Busy is not installed on this system"
 msgstr ""
 
+#: ../pykolab/setup/setup_guam.py:41
+msgid "Setup Guam."
+msgstr ""
+
+#: ../pykolab/setup/setup_guam.py:45
+msgid "Guam is not installed on this system"
+msgstr ""
+
+#: ../pykolab/setup/setup_guam.py:58
+msgid "Could not start the guam service."
+msgstr ""
+
+#: ../pykolab/setup/setup_guam.py:63
+msgid "Could not configure the guam service to start on boot"
+msgstr ""
+
 #: ../pykolab/setup/setup_imap.py:45
 msgid "Setup IMAP."
 msgstr ""
@@ -2199,15 +2438,14 @@
 msgid "Could not write out Cyrus IMAP configuration file /etc/cyrus.conf"
 msgstr ""
 
-#: ../pykolab/setup/setup_imap.py:158
+#: ../pykolab/setup/setup_imap.py:162
 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:244
-#: ../pykolab/setup/setup_syncroton.py:105
-msgid "Could not configure to start on boot, the "
+#: ../pykolab/setup/setup_imap.py:177
+msgid ""
+"Could not configure to start on boot, the cyrus-imapd and kolab-saslauthd "
+"services."
 msgstr ""
 
 #: ../pykolab/setup/setup_kolabd.py:44
@@ -2223,10 +2461,14 @@
 "                        "
 msgstr ""
 
-#: ../pykolab/setup/setup_kolabd.py:81
+#: ../pykolab/setup/setup_kolabd.py:84
 msgid "Could not start the kolab server service."
 msgstr ""
 
+#: ../pykolab/setup/setup_kolabd.py:96
+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"
@@ -2251,15 +2493,19 @@
 msgid "Setup configuration for Active Directory compatibility."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:88
+#: ../pykolab/setup/setup_ldap.py:92
+msgid "Specify password for the Domain Manager."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:96
 msgid "Setup LDAP."
 msgstr "Zet LDAP op."
 
-#: ../pykolab/setup/setup_ldap.py:97
+#: ../pykolab/setup/setup_ldap.py:105
 msgid "Skipping setup of LDAP, as specified"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:126
+#: ../pykolab/setup/setup_ldap.py:134
 msgid ""
 "\n"
 "                        You can not configure Kolab to run against OpenLDAP\n"
@@ -2267,7 +2513,7 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:139
+#: ../pykolab/setup/setup_ldap.py:147
 msgid ""
 "\n"
 "                                It seems 389 Directory Server has an existing\n"
@@ -2278,7 +2524,7 @@
 "                            "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:154
+#: ../pykolab/setup/setup_ldap.py:162
 msgid ""
 "\n"
 "                        Please supply a password for the LDAP administrator user\n"
@@ -2287,11 +2533,11 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:162
+#: ../pykolab/setup/setup_ldap.py:170
 msgid "Administrator password"
 msgstr "Wachtwoord voor administrator"
 
-#: ../pykolab/setup/setup_ldap.py:169
+#: ../pykolab/setup/setup_ldap.py:180
 msgid ""
 "\n"
 "                        Please supply a password for the LDAP Directory Manager\n"
@@ -2301,11 +2547,11 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:178
+#: ../pykolab/setup/setup_ldap.py:189
 msgid "Directory Manager password"
 msgstr "Wachtwoord voor Directory Manager"
 
-#: ../pykolab/setup/setup_ldap.py:185
+#: ../pykolab/setup/setup_ldap.py:196
 msgid ""
 "\n"
 "                        Please choose the system user and group the service\n"
@@ -2314,15 +2560,15 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:195 ../pykolab/setup/setup_ldap.py:198
+#: ../pykolab/setup/setup_ldap.py:206 ../pykolab/setup/setup_ldap.py:209
 msgid "User"
 msgstr "Gebruiker"
 
-#: ../pykolab/setup/setup_ldap.py:196 ../pykolab/setup/setup_ldap.py:199
+#: ../pykolab/setup/setup_ldap.py:207 ../pykolab/setup/setup_ldap.py:210
 msgid "Group"
 msgstr "Groep"
 
-#: ../pykolab/setup/setup_ldap.py:234
+#: ../pykolab/setup/setup_ldap.py:245
 msgid ""
 "\n"
 "                        This setup procedure plans to set up Kolab Groupware for\n"
@@ -2333,18 +2579,18 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:248
+#: ../pykolab/setup/setup_ldap.py:259
 msgid "Domain name to use"
 msgstr "Domein naam te gebruiken"
 
-#: ../pykolab/setup/setup_ldap.py:253 ../pykolab/setup/setup_ldap.py:278
+#: ../pykolab/setup/setup_ldap.py:264 ../pykolab/setup/setup_ldap.py:289
 msgid ""
 "\n"
 "                                    Invalid input. Please try again.\n"
 "                                "
 msgstr "\nOngeldig antwoord. Probeer opnieuw alstublieft."
 
-#: ../pykolab/setup/setup_ldap.py:262
+#: ../pykolab/setup/setup_ldap.py:273
 msgid ""
 "\n"
 "                        The standard root dn we composed for you follows. Please\n"
@@ -2352,15 +2598,15 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:273
+#: ../pykolab/setup/setup_ldap.py:284
 msgid "Root DN to use"
 msgstr "Te gebruiken Root DN"
 
-#: ../pykolab/setup/setup_ldap.py:325
+#: ../pykolab/setup/setup_ldap.py:336
 msgid "No directory server setup tool available."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:337
+#: ../pykolab/setup/setup_ldap.py:348
 msgid ""
 "\n"
 "                    Setup is now going to set up the 389 Directory Server. This\n"
@@ -2369,11 +2615,11 @@
 "                "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:344
+#: ../pykolab/setup/setup_ldap.py:355
 msgid "Setting up 389 Directory Server"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:356
+#: ../pykolab/setup/setup_ldap.py:367
 msgid ""
 "\n"
 "                        An error was detected in the setup procedure for 389\n"
@@ -2384,27 +2630,31 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:373
+#: ../pykolab/setup/setup_ldap.py:384
 msgid "Setup DS stdout:"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:376
+#: ../pykolab/setup/setup_ldap.py:387
 msgid "Setup DS stderr:"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:402
+#: ../pykolab/setup/setup_ldap.py:413
 msgid "Could not copy the LDAP extensions for Kolab"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:405
+#: ../pykolab/setup/setup_ldap.py:416
 msgid "Could not find the ldap Kolab schema file"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:417
+#: ../pykolab/setup/setup_ldap.py:429
 msgid "Could not start the directory server service."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:431
+#: ../pykolab/setup/setup_ldap.py:438
+msgid "Could not configure to start on boot, the directory server service."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:443
 msgid ""
 "\n"
 "                        Please supply a Cyrus Administrator password. This\n"
@@ -2415,11 +2665,11 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:441
+#: ../pykolab/setup/setup_ldap.py:453
 msgid "Cyrus Administrator password"
 msgstr "Wachtwoord voor Cyrus administrator"
 
-#: ../pykolab/setup/setup_ldap.py:448
+#: ../pykolab/setup/setup_ldap.py:460
 msgid ""
 "\n"
 "                        Please supply a Kolab Service account password. This\n"
@@ -2429,61 +2679,81 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:457
+#: ../pykolab/setup/setup_ldap.py:469
 msgid "Kolab Service password"
 msgstr "Wachtwoord voor Kolab service"
 
-#: ../pykolab/setup/setup_ldap.py:467
+#: ../pykolab/setup/setup_ldap.py:479
 msgid "Writing out configuration to kolab.conf"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:481
+#: ../pykolab/setup/setup_ldap.py:493
 msgid "Inserting service users into LDAP."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:555
+#: ../pykolab/setup/setup_ldap.py:567
 msgid "Writing out cn=kolab,cn=config"
 msgstr ""
 
-#. TODO: Add kolab-admin role
-#. TODO: Assign kolab-admin admin ACLs
-#: ../pykolab/setup/setup_ldap.py:579
+#: ../pykolab/setup/setup_ldap.py:583
 #, python-format
 msgid "Adding domain %s to list of domains for this deployment"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:607
+#: ../pykolab/setup/setup_ldap.py:611
 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:615
+#: ../pykolab/setup/setup_ldap.py:619
 msgid "Enabling attribute uniqueness plugin"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:621
+#: ../pykolab/setup/setup_ldap.py:625
 msgid "Enabling referential integrity plugin"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:627
+#: ../pykolab/setup/setup_ldap.py:631
 msgid "Enabling and configuring account policy plugin"
 msgstr ""
 
-#. TODO: Add kolab-admin role
-#: ../pykolab/setup/setup_ldap.py:642
+#. Add kolab-admin role
+#: ../pykolab/setup/setup_ldap.py:646
 msgid "Adding the kolab-admin role"
 msgstr ""
 
-#. TODO: User writeable attributes on root_dn
-#: ../pykolab/setup/setup_ldap.py:653
+#. User writeable attributes on root_dn
+#: ../pykolab/setup/setup_ldap.py:657
 #, python-format
 msgid "Setting access control to %s"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:679
-msgid "Could not start and configure to start on boot, the "
+#: ../pykolab/setup/setup_ldap.py:677
+msgid "directory server admin service not available"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:685
+msgid ""
+"Could not start and configure to start on boot, the directory server admin "
+"service."
+msgstr ""
+
+#: ../pykolab/setup/setup_manticore.py:44
+msgid "Setup Manticore."
+msgstr ""
+
+#: ../pykolab/setup/setup_manticore.py:48
+msgid "Manticore is not installed on this system"
+msgstr ""
+
+#: ../pykolab/setup/setup_manticore.py:94
+msgid "Could not start the manticore service."
+msgstr ""
+
+#: ../pykolab/setup/setup_manticore.py:100
+msgid "Could not configure the manticore service to start on boot"
 msgstr ""
 
 #: ../pykolab/setup/setup_mta.py:41
@@ -2499,31 +2769,53 @@
 msgid "Could not write out Postfix configuration file /etc/postfix/master.cf"
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:399
+#: ../pykolab/setup/setup_mta.py:413
 msgid "Could not write out Amavis configuration file amavisd.conf"
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:407
+#: ../pykolab/setup/setup_mta.py:421
 msgid "Not writing out any configuration for Amavis."
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:447
+#: ../pykolab/setup/setup_mta.py:482
 msgid "Could not start the postfix, clamav and amavisd services services."
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:39
+#: ../pykolab/setup/setup_mta.py:500
+msgid ""
+"Could not configure to start on boot, the postfix, clamav and amavisd "
+"services."
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:40
+msgid "MySQL Options"
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:46
+msgid "Specify whether to use an (existing) or (new) MySQL server."
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:50
 msgid "Setup MySQL."
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:49
+#: ../pykolab/setup/setup_mysql.py:78
 msgid "Could not start the MySQL database service."
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:71
+#: ../pykolab/setup/setup_mysql.py:87
+msgid "Could not configure to start on boot, the MySQL database service."
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:90
+msgid "Waiting for at most 30 seconds for MySQL/MariaDB to settle..."
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:114
 msgid "What MySQL server are we setting up?"
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:75
+#: ../pykolab/setup/setup_mysql.py:118
 msgid ""
 "\n"
 "                        Please supply the root password for MySQL, so we can set\n"
@@ -2531,13 +2823,13 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:82 ../pykolab/setup/setup_mysql.py:99
-#: ../pykolab/setup/setup_roundcube.py:190
+#: ../pykolab/setup/setup_mysql.py:125 ../pykolab/setup/setup_mysql.py:142
+#: ../pykolab/setup/setup_roundcube.py:218
 #: ../pykolab/setup/setup_syncroton.py:66
 msgid "MySQL root password"
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:88
+#: ../pykolab/setup/setup_mysql.py:131
 msgid ""
 "\n"
 "                        Please supply a root password for MySQL. This password\n"
@@ -2549,7 +2841,7 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:143
+#: ../pykolab/setup/setup_mysql.py:186
 msgid ""
 "\n"
 "                        Please supply a password for the MySQL user 'kolab'.\n"
@@ -2558,11 +2850,11 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:151
+#: ../pykolab/setup/setup_mysql.py:194
 msgid "MySQL kolab password"
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:170
+#: ../pykolab/setup/setup_mysql.py:213
 msgid "Could not find the MySQL Kolab schema file"
 msgstr ""
 
@@ -2604,11 +2896,11 @@
 msgid "Could not find PHP configuration file php.ini"
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:44
+#: ../pykolab/setup/setup_roundcube.py:45
 msgid "Setup Roundcube."
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:48
+#: ../pykolab/setup/setup_roundcube.py:49
 msgid ""
 "\n"
 "                    Please supply a password for the MySQL user 'roundcube'.\n"
@@ -2617,25 +2909,34 @@
 "                "
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:56
+#: ../pykolab/setup/setup_roundcube.py:57
 msgid "MySQL roundcube password"
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:126
+#: ../pykolab/setup/setup_roundcube.py:144
 #, python-format
 msgid "Using template file %r"
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:133
+#: ../pykolab/setup/setup_roundcube.py:151
 #, python-format
 msgid "Successfully compiled template %r, writing out to %r"
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:235
-#: ../pykolab/setup/setup_syncroton.py:96
+#: ../pykolab/setup/setup_roundcube.py:263
+msgid "Cannot find the configuration directory for roundcube."
+msgstr ""
+
+#: ../pykolab/setup/setup_roundcube.py:291
+#: ../pykolab/setup/setup_syncroton.py:100
 msgid "Could not start the webserver server service."
 msgstr ""
 
+#: ../pykolab/setup/setup_roundcube.py:300
+#: ../pykolab/setup/setup_syncroton.py:109
+msgid "Could not configure to start on boot, the webserver server service."
+msgstr ""
+
 #: ../pykolab/setup/setup_syncroton.py:40
 msgid "Setup Syncroton."
 msgstr ""
@@ -2665,404 +2966,431 @@
 msgid "No database available"
 msgstr "Geen database beschikbaar"
 
-#: ../pykolab/utils.py:62 ../pykolab/utils.py:64
+#: ../pykolab/utils.py:69 ../pykolab/utils.py:71
 #, python-format
 msgid "Confirm %s: "
 msgstr "Bevestig %s:"
 
-#: ../pykolab/utils.py:67
-msgid "Incorrect confirmation. "
-msgstr "Incorrecte bevestiging."
+#: ../pykolab/utils.py:74
+msgid "Incorrect confirmation. Please try again."
+msgstr ""
 
-#: ../pykolab/utils.py:72 ../pykolab/utils.py:77
+#: ../pykolab/utils.py:79 ../pykolab/utils.py:84
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: ../pykolab/utils.py:74 ../pykolab/utils.py:79
+#: ../pykolab/utils.py:81 ../pykolab/utils.py:86
 #, python-format
 msgid "%s [%s]: "
 msgstr ""
 
-#: ../pykolab/utils.py:124
+#: ../pykolab/utils.py:139
 msgid "Please answer 'yes' or 'no'."
 msgstr "Antwoordt aub. 'yes' (ja) of 'no' (nee)."
 
-#: ../pykolab/utils.py:164
+#: ../pykolab/utils.py:184
 msgid "Choice"
 msgstr ""
 
-#: ../pykolab/utils.py:167
+#: ../pykolab/utils.py:187
 msgid "Choice (type '?' for options)"
 msgstr ""
 
-#: ../pykolab/utils.py:268
+#: ../pykolab/utils.py:288
 #, python-format
 msgid "Could not change the permissions on %s"
 msgstr ""
 
-#: ../pykolab/utils.py:488
+#: ../pykolab/utils.py:526
 #, python-format
 msgid "Transliterating string %r with locale %r"
 msgstr ""
 
-#: ../pykolab/utils.py:496
+#: ../pykolab/utils.py:534
 msgid "Attempting to set locale"
 msgstr ""
 
-#: ../pykolab/utils.py:498
+#: ../pykolab/utils.py:536
 msgid "Success setting locale"
 msgstr ""
 
-#: ../pykolab/utils.py:500
+#: ../pykolab/utils.py:538
 msgid "Failure to set locale"
 msgstr ""
 
-#: ../pykolab/utils.py:508
+#: ../pykolab/utils.py:546
 #, python-format
 msgid "Executing '%s | %s'"
 msgstr ""
 
-#: ../pykolab/utils.py:519
+#: ../pykolab/utils.py:557
 #, python-format
 msgid "Could not translate %s using locale %s"
 msgstr ""
 
-#: ../pykolab/wap_client/__init__.py:399
+#: ../pykolab/wap_client/__init__.py:416
 #, python-format
 msgid "Requesting %r with params %r"
 msgstr ""
 
-#: ../pykolab/wap_client/__init__.py:407
+#: ../pykolab/wap_client/__init__.py:424
 #, python-format
 msgid "Got response: %r"
 msgstr "Antwoord ontvangen: %r"
 
+#: ../pykolab/wap_client/__init__.py:429
+#, python-format
+msgid "Connection error: %r; re-connecting..."
+msgstr ""
+
 #. Some data is not JSON
-#: ../pykolab/wap_client/__init__.py:413
+#: ../pykolab/wap_client/__init__.py:441
 msgid "Response data is not JSON"
 msgstr ""
 
 #. support integer values, too
-#: ../pykolab/xml/attendee.py:9 ../pykolab/xml/attendee.py:17
+#: ../pykolab/xml/attendee.py:9 ../pykolab/xml/attendee.py:18
 msgid "Needs Action"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:10 ../pykolab/xml/attendee.py:18
+#: ../pykolab/xml/attendee.py:10 ../pykolab/xml/attendee.py:19
 msgid "Accepted"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:11 ../pykolab/xml/attendee.py:19
+#: ../pykolab/xml/attendee.py:11 ../pykolab/xml/attendee.py:20
 msgid "Declined"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:12 ../pykolab/xml/attendee.py:20
+#: ../pykolab/xml/attendee.py:12 ../pykolab/xml/attendee.py:21
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:13 ../pykolab/xml/attendee.py:21
+#: ../pykolab/xml/attendee.py:13 ../pykolab/xml/attendee.py:22
 msgid "Delegated"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:14 ../pykolab/xml/attendee.py:22
+#: ../pykolab/xml/attendee.py:14 ../pykolab/xml/attendee.py:23
+msgid "Started"
+msgstr ""
+
+#: ../pykolab/xml/attendee.py:15 ../pykolab/xml/attendee.py:24
 msgid "Completed"
 msgstr "Completed"
 
-#: ../pykolab/xml/attendee.py:15 ../pykolab/xml/attendee.py:23
-msgid "Started"
+#: ../pykolab/xml/attendee.py:16
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:914
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:926
+msgid "Pending"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:132 ../pykolab/xml/attendee.py:154
+#: ../pykolab/xml/attendee.py:133 ../pykolab/xml/attendee.py:155
 msgid "Not a valid attendee"
 msgstr "Ongeldige deelnemer"
 
-#: ../pykolab/xml/attendee.py:139
+#: ../pykolab/xml/attendee.py:140
 msgid "No valid delegator references found"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:159
+#: ../pykolab/xml/attendee.py:160
 msgid "No valid delegatee references found"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:219
+#: ../pykolab/xml/attendee.py:220
 #, python-format
 msgid "Invalid cutype %r"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:231
+#: ../pykolab/xml/attendee.py:232
 #, python-format
 msgid "Invalid participant status %r"
 msgstr "Ongeldige deelnemer status %r"
 
-#: ../pykolab/xml/attendee.py:239
+#: ../pykolab/xml/attendee.py:240
 #, python-format
 msgid "Invalid role %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:163 ../pykolab/xml/event.py:802
-#: ../pykolab/xml/event.py:845
-msgid "Event start needs datetime.date or datetime.datetime instance"
+#: ../pykolab/xml/event.py:168
+#, python-format
+msgid "Rdate needs datetime.date or datetime.datetime instance, got %r"
+msgstr ""
+
+#: ../pykolab/xml/event.py:185
+#, python-format
+msgid "Exdate needs datetime.date or datetime.datetime instance, got %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:308
+#: ../pykolab/xml/event.py:403
 #, python-format
 msgid "No attendee with email or name %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:316
+#: ../pykolab/xml/event.py:411
 #, python-format
 msgid "Invalid argument value attendee %r, must be basestring or Attendee"
 msgstr ""
 
-#: ../pykolab/xml/event.py:328
+#: ../pykolab/xml/event.py:423
 #, python-format
 msgid "No attendee with email %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:334
+#: ../pykolab/xml/event.py:429
 #, python-format
 msgid "No attendee with name %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:384 ../pykolab/xml/utils.py:157
+#: ../pykolab/xml/event.py:479 ../pykolab/xml/utils.py:180
 msgid "%Y-%m-%d"
 msgstr ""
 
-#: ../pykolab/xml/event.py:386 ../pykolab/xml/utils.py:158
+#: ../pykolab/xml/event.py:481 ../pykolab/xml/utils.py:181
 msgid "%H:%M (%Z)"
 msgstr ""
 
-#: ../pykolab/xml/event.py:510
+#: ../pykolab/xml/event.py:614
 msgid "Invalid participant status"
 msgstr "Ongeldige deelnemer status"
 
-#: ../pykolab/xml/event.py:636
+#: ../pykolab/xml/event.py:820 ../pykolab/xml/note.py:94
 #, python-format
 msgid "Invalid classification %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:667
-msgid "Event end needs datetime.date or datetime.datetime instance"
+#: ../pykolab/xml/event.py:851
+#, python-format
+msgid "Event end needs datetime.date or datetime.datetime instance, got %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:677
+#: ../pykolab/xml/event.py:865
 #, python-format
 msgid "Invalid custom property name %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:855
+#: ../pykolab/xml/event.py:1017
+#, python-format
+msgid ""
+"Event last-modified needs datetime.date or datetime.datetime instance, got "
+"%r"
+msgstr ""
+
+#: ../pykolab/xml/event.py:1060
+#, python-format
+msgid "Event start needs datetime.date or datetime.datetime instance, got %r"
+msgstr ""
+
+#: ../pykolab/xml/event.py:1070
 #, python-format
 msgid "Invalid status set: %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:1094
+#: ../pykolab/xml/event.py:1093
+msgid "Event recurrence-id needs datetime.datetime instance"
+msgstr ""
+
+#: ../pykolab/xml/event.py:1330
 msgid "No sender specified"
 msgstr "Geen afzender gespecificeerd"
 
-#: ../pykolab/xml/event.py:1103
+#: ../pykolab/xml/event.py:1339
 #, python-format
 msgid "Invitation for %s was %s"
 msgstr ""
 
-#: ../pykolab/xml/event.py:1108
+#: ../pykolab/xml/event.py:1344
 msgid "This is an automated response to one of your event requests."
 msgstr ""
 
-#: ../pykolab/xml/recurrence_rule.py:38
+#: ../pykolab/xml/recurrence_rule.py:41
 #, python-format
 msgid "Every %d year(s)"
 msgstr ""
 
-#: ../pykolab/xml/recurrence_rule.py:39
+#: ../pykolab/xml/recurrence_rule.py:42
 #, python-format
 msgid "Every %d month(s)"
 msgstr ""
 
-#: ../pykolab/xml/recurrence_rule.py:40
+#: ../pykolab/xml/recurrence_rule.py:43
 #, python-format
 msgid "Every %d week(s)"
 msgstr ""
 
-#: ../pykolab/xml/recurrence_rule.py:41
+#: ../pykolab/xml/recurrence_rule.py:44
 #, python-format
 msgid "Every %d day(s)"
 msgstr ""
 
-#: ../pykolab/xml/recurrence_rule.py:42
+#: ../pykolab/xml/recurrence_rule.py:45
 #, python-format
 msgid "Every %d hours"
 msgstr ""
 
-#: ../pykolab/xml/recurrence_rule.py:43
+#: ../pykolab/xml/recurrence_rule.py:46
 #, python-format
 msgid "Every %d minutes"
 msgstr ""
 
-#: ../pykolab/xml/recurrence_rule.py:44
+#: ../pykolab/xml/recurrence_rule.py:47
 #, python-format
 msgid "Every %d seconds"
 msgstr ""
 
-#: ../pykolab/xml/todo.py:110
+#: ../pykolab/xml/todo.py:162
 msgid "Todo due needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:126
+#: ../pykolab/xml/utils.py:149
 msgid "Name"
 msgstr "Naam"
 
-#: ../pykolab/xml/utils.py:127
+#: ../pykolab/xml/utils.py:150
 msgid "Summary"
 msgstr "Samenvatting"
 
-#: ../pykolab/xml/utils.py:128
+#: ../pykolab/xml/utils.py:151
 msgid "Location"
 msgstr "Locatie"
 
-#: ../pykolab/xml/utils.py:129
+#: ../pykolab/xml/utils.py:152
 msgid "Description"
 msgstr "Omschrijving"
 
-#: ../pykolab/xml/utils.py:130
+#: ../pykolab/xml/utils.py:153
 msgid "URL"
 msgstr "URL"
 
-#: ../pykolab/xml/utils.py:131
+#: ../pykolab/xml/utils.py:154
 msgid "Status"
 msgstr "Status"
 
-#: ../pykolab/xml/utils.py:132
+#: ../pykolab/xml/utils.py:155
 msgid "Priority"
 msgstr "Prioriteit"
 
-#: ../pykolab/xml/utils.py:133
+#: ../pykolab/xml/utils.py:156
 msgid "Attendee"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:134
+#: ../pykolab/xml/utils.py:157
 msgid "Start"
 msgstr "Begin"
 
-#: ../pykolab/xml/utils.py:135
+#: ../pykolab/xml/utils.py:158
 msgid "End"
 msgstr "Eind"
 
-#: ../pykolab/xml/utils.py:136
+#: ../pykolab/xml/utils.py:159
 msgid "Due"
 msgstr "Vóór"
 
-#: ../pykolab/xml/utils.py:137
+#: ../pykolab/xml/utils.py:160
 msgid "Repeat"
 msgstr "Herhaal"
 
-#: ../pykolab/xml/utils.py:138
+#: ../pykolab/xml/utils.py:161
 msgid "Repeat Exception"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:139
+#: ../pykolab/xml/utils.py:162
 msgid "Organizer"
 msgstr "Organisatie"
 
-#: ../pykolab/xml/utils.py:140
+#: ../pykolab/xml/utils.py:163
 msgid "Attachment"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:141
+#: ../pykolab/xml/utils.py:164
 msgid "Alarm"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:142
+#: ../pykolab/xml/utils.py:165
 msgid "Classification"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:143
+#: ../pykolab/xml/utils.py:166
 msgid "Progress"
 msgstr "Progress"
 
-#: ../pykolab/xml/utils.py:188
+#: ../pykolab/xml/utils.py:211
 #, python-format
 msgid "for %d times"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:190
+#: ../pykolab/xml/utils.py:213
 #, python-format
 msgid "until %s"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:195
+#: ../pykolab/xml/utils.py:218
 msgid "Display message"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:196
+#: ../pykolab/xml/utils.py:219
 msgid "Send email"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:197
+#: ../pykolab/xml/utils.py:220
 msgid "Play sound"
 msgstr "Play sound"
 
-#: ../pykolab/xml/utils.py:203
+#: ../pykolab/xml/utils.py:226
 #, python-format
 msgid "%s after"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:203
+#: ../pykolab/xml/utils.py:226
 #, python-format
 msgid "%s before"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:212
+#: ../pykolab/xml/utils.py:235
 #, python-format
 msgid "%d day(s)"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:218
+#: ../pykolab/xml/utils.py:241
 #, python-format
 msgid "%d hour(s)"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:220
+#: ../pykolab/xml/utils.py:243
 #, python-format
 msgid "%d minute(s)"
 msgstr ""
 
-#: ../saslauthd/__init__.py:76
+#: ../saslauthd/__init__.py:77
 msgid "Socket file to bind to."
 msgstr ""
 
-#: ../saslauthd/__init__.py:108
+#: ../saslauthd/__init__.py:109
 #, python-format
 msgid "Could not create %r: %r"
 msgstr ""
 
-#: ../saslauthd/__init__.py:146 ../saslauthd/__init__.py:154
-#: ../wallace/__init__.py:439 ../wallace/__init__.py:448
-msgid ""
-"Traceback occurred, please report a bug at http://bugzilla.kolabsys.com"
-msgstr "Traceback voorgekomen, rapporteer alstublieft een bug op http://bugzilla.kolabsys.com"
-
-#: ../saslauthd/__init__.py:194
-msgid "kolab-saslauthd could not accept "
+#: ../saslauthd/__init__.py:220
+#, python-format
+msgid "kolab-saslauthd could not accept connections on socket: %r"
 msgstr ""
 
-#: ../saslauthd/__init__.py:199
+#: ../saslauthd/__init__.py:225
 msgid "Maximum tries exceeded, exiting"
 msgstr ""
 
-#: ../tests/functional/test_wallace/test_005_resource_invitation.py:195
-#: ../wallace/module_resources.py:1151
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:196
+#: ../wallace/module_resources.py:1251
 #, 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:1235
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:641
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:657
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:715
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:771
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:785
+#: ../wallace/module_resources.py:1335
 #, python-format
 msgid "Booking for %s has been %s"
 msgstr ""
@@ -3071,52 +3399,52 @@
 #. 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:1333
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:677
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:704
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:742
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:759
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:814
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:968
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:984
+#: ../wallace/module_resources.py:1433
 #, python-format
 msgid "Booking request for %s requires confirmation"
 msgstr ""
 
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:240
-#: ../wallace/module_invitationpolicy.py:448
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:242
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1267
+#: ../wallace/module_invitationpolicy.py:479
 #, python-format
 msgid "\"%(summary)s\" has been %(status)s"
 msgstr ""
 
+#. this should trigger a notification message
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:886
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1251
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1396
+#: ../wallace/module_invitationpolicy.py:1316
+#, python-format
+msgid "\"%s\" has been cancelled"
+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:802
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:808
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:821
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:839
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:942
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:947
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1008
-#: ../wallace/module_invitationpolicy.py:1071
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:903
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:909
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:922
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:939
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1039
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1044
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1377
+#: ../wallace/module_invitationpolicy.py:1234
 #, python-format
 msgid "\"%s\" has been updated"
 msgstr ""
 
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:813
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:825
-msgid "PENDING"
-msgstr ""
-
-#. this should trigger a notification message
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1028
-#: ../wallace/module_invitationpolicy.py:1133
-#, python-format
-msgid "\"%s\" has been cancelled"
-msgstr ""
-
-#: ../tests/unit/test-011-itip.py:465
+#: ../tests/unit/test-011-itip.py:529
 #, python-format
 msgid "Invitation for %(summary)s was %(status)s"
 msgstr ""
@@ -3141,370 +3469,423 @@
 msgid "Worker process %s initializing"
 msgstr ""
 
-#: ../wallace/__init__.py:122
+#: ../wallace/__init__.py:123
 msgid "Bind address for Wallace."
 msgstr "IP adres voor Wallace."
 
-#: ../wallace/__init__.py:140
+#: ../wallace/__init__.py:142
 msgid "Number of threads to use."
 msgstr ""
 
-#: ../wallace/__init__.py:156
+#: ../wallace/__init__.py:159
 msgid "Port that Wallace is supposed to use."
 msgstr "Poort voor Wallace."
 
-#: ../wallace/__init__.py:205
+#: ../wallace/__init__.py:208
 #, 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:217
+#: ../wallace/__init__.py:220
 msgid "Could not shut down socket"
 msgstr "Kan de socket niet afsluiten"
 
-#: ../wallace/__init__.py:286
+#: ../wallace/__init__.py:289
 msgid "Accepted connection"
 msgstr "Connectie geaccepteerd"
 
-#: ../wallace/__init__.py:464
+#: ../wallace/__init__.py:494
 #, python-format
 msgid "Could not write pid file %s"
 msgstr ""
 
-#: ../wallace/module_footer.py:60 ../wallace/module_gpgencrypt.py:60
-#: ../wallace/module_invitationpolicy.py:210 ../wallace/module_optout.py:61
-#: ../wallace/module_resources.py:126
+#: ../wallace/module_footer.py:63 ../wallace/module_gpgencrypt.py:100
+#: ../wallace/module_invitationpolicy.py:227 ../wallace/module_optout.py:61
+#: ../wallace/module_resources.py:127
 #, python-format
 msgid "Issuing callback after processing to stage %s"
 msgstr ""
 
-#: ../wallace/module_footer.py:61 ../wallace/module_gpgencrypt.py:61
-#: ../wallace/module_invitationpolicy.py:212 ../wallace/module_optout.py:62
-#: ../wallace/module_resources.py:132
+#: ../wallace/module_footer.py:64 ../wallace/module_gpgencrypt.py:101
+#: ../wallace/module_invitationpolicy.py:229 ../wallace/module_optout.py:62
+#: ../wallace/module_resources.py:133
 #, python-format
 msgid "Testing cb_action_%s()"
 msgstr ""
 
-#: ../wallace/module_footer.py:63 ../wallace/module_gpgencrypt.py:63
-#: ../wallace/module_invitationpolicy.py:214 ../wallace/module_optout.py:64
-#: ../wallace/module_resources.py:135
+#: ../wallace/module_footer.py:66 ../wallace/module_gpgencrypt.py:103
+#: ../wallace/module_invitationpolicy.py:231 ../wallace/module_optout.py:64
+#: ../wallace/module_resources.py:136
 #, python-format
 msgid "Attempting to execute cb_action_%s()"
 msgstr ""
 
-#: ../wallace/module_footer.py:67
+#: ../wallace/module_footer.py:70
 #, python-format
 msgid "Executing module footer for %r, %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:66
+#: ../wallace/module_footer.py:88
+msgid "No contents configured for footer module"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:106
 #, python-format
 msgid "Executing module gpgencrypt for %r, %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:98
+#: ../wallace/module_gpgencrypt.py:138
 msgid "Message is already encrypted (app/pgp-enc content-type)"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:102
+#: ../wallace/module_gpgencrypt.py:142
 msgid "Message already encrypted by main content-type header"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:131
+#: ../wallace/module_gpgencrypt.py:171
 msgid ""
 "Configured to encrypt to a key not configured, and strict policy enabled. "
 "Bailing out."
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:134
+#: ../wallace/module_gpgencrypt.py:174
 msgid ""
 "Configured to encrypt to a key not configured, but continuing anyway (see "
 "'gpgencrypt_strict')."
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:171
+#: ../wallace/module_gpgencrypt.py:211
 #, python-format
 msgid "Recipients: %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:183
+#: ../wallace/module_gpgencrypt.py:222
 #, python-format
 msgid "Current keys: %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:188
+#: ../wallace/module_gpgencrypt.py:227
 #, python-format
 msgid "Retrieving key for recipient: %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:192 ../wallace/module_gpgencrypt.py:208
+#: ../wallace/module_gpgencrypt.py:231 ../wallace/module_gpgencrypt.py:247
 #, python-format
 msgid "Found matching address %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:200
+#: ../wallace/module_gpgencrypt.py:239
 #, python-format
 msgid "Found matching address %r in remote keys"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:232
+#: ../wallace/module_gpgencrypt.py:259
+msgid "Mime Message - we need to build multipart/encrypted structure"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:268
+msgid "No Mime Message - encypt plain"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:284
 #, python-format
 msgid "An error occurred: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:196
+#: ../wallace/module_invitationpolicy.py:213
 #, python-format
 msgid "Invitation policy called for %r, %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:258
+#: ../wallace/module_invitationpolicy.py:275
 #, python-format
 msgid "Failed to parse iTip objects from message: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:262
+#: ../wallace/module_invitationpolicy.py:279
 msgid ""
 "Message is not an iTip message or does not contain any (valid) iTip objects."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:266
+#: ../wallace/module_invitationpolicy.py:283
 #, python-format
 msgid ""
 "iTip objects attached to this message contain the following information: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:278
+#: ../wallace/module_invitationpolicy.py:306
 #, python-format
 msgid "Recipient emails for %s: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:282
+#: ../wallace/module_invitationpolicy.py:310
 #, python-format
 msgid "No itips, no users, pass along %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:285
+#: ../wallace/module_invitationpolicy.py:313
 #, python-format
 msgid "iTips, but no users, pass along %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:306
+#: ../wallace/module_invitationpolicy.py:331
 #, python-format
 msgid "No user attendee matching envelope recipient %s, skip message"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:309
+#: ../wallace/module_invitationpolicy.py:334
 #, python-format
 msgid "Receiving user: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:337
+#: ../wallace/module_invitationpolicy.py:362
 #, python-format
 msgid "Apply invitation policy %r for sender %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:348
+#: ../wallace/module_invitationpolicy.py:373
 #, python-format
 msgid "Ignoring '%s' iTip method"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:352
+#: ../wallace/module_invitationpolicy.py:377
 #, python-format
 msgid "iTip message %r consumed by the invitationpolicy module"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:368
+#: ../wallace/module_invitationpolicy.py:393
 msgid "Pass invitation for manual processing"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:373
+#: ../wallace/module_invitationpolicy.py:398
 #, python-format
 msgid "Receiving Attendee: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:393
+#: ../wallace/module_invitationpolicy.py:418
 #, python-format
 msgid "Existing %s: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:404
+#: ../wallace/module_invitationpolicy.py:429
 #, python-format
 msgid "Precondition for object %r fulfilled: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:422
+#: ../wallace/module_invitationpolicy.py:449
 #, python-format
 msgid ""
 "The iTip request sequence (%r) doesn't match the referred object version "
 "(%r). Ignoring."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:427
+#: ../wallace/module_invitationpolicy.py:454
 #, python-format
 msgid "Auto-updating %s %r on iTip REQUEST (no re-scheduling)"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:482
+#: ../wallace/module_invitationpolicy.py:505
+msgid "Forward invitation for notification"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:520
 msgid "Pass reply for manual processing"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:489
+#: ../wallace/module_invitationpolicy.py:527
 #, python-format
 msgid "Sender Attendee: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:501
+#: ../wallace/module_invitationpolicy.py:539
 #, python-format
 msgid ""
 "The iTip reply sequence (%r) doesn't match the referred object version (%r)."
 " Forwarding to Inbox."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:507
+#: ../wallace/module_invitationpolicy.py:545
 #, python-format
 msgid "Auto-updating %s %r on iTip REPLY"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:532
+#: ../wallace/module_invitationpolicy.py:572
 #, python-format
 msgid "Add delegatee: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:535
+#: ../wallace/module_invitationpolicy.py:575
 #, python-format
 msgid "Update existing delegatee: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:540
+#: ../wallace/module_invitationpolicy.py:582
 #, python-format
 msgid "Update delegator: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:557
-#: ../wallace/module_invitationpolicy.py:589
+#: ../wallace/module_invitationpolicy.py:600
 msgid ""
 "The object referred by this reply was not found in the user's folders. "
 "Forwarding to Inbox."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:570
+#: ../wallace/module_invitationpolicy.py:613
 msgid "Pass cancellation for manual processing"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:618
+#: ../wallace/module_invitationpolicy.py:636
+#, python-format
+msgid "Remove cancelled %s instance %s from %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:647
+#, python-format
+msgid "Update cancelled %s %r with STATUS=CANCELLED"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:662
+msgid ""
+"The object referred by this cancel request was not found in the user's "
+"folders. Forwarding to Inbox."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:691
 #, python-format
 msgid "Checking if email address %r belongs to a local user"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:623
+#: ../wallace/module_invitationpolicy.py:696
 #, python-format
 msgid "User DN: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:625
+#: ../wallace/module_invitationpolicy.py:698
 #, python-format
 msgid "No user record(s) found for %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:681
+#: ../wallace/module_invitationpolicy.py:754
 #, python-format
 msgid "User record doesn't have the mailbox attribute %r set"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:694
+#: ../wallace/module_invitationpolicy.py:767
 #, python-format
 msgid "IMAP proxy authentication failed: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:716
+#: ../wallace/module_invitationpolicy.py:789
 #, python-format
 msgid "List %r folders for user %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:732
+#: ../wallace/module_invitationpolicy.py:804
 #, python-format
 msgid "IMAP metadata for %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:767
+#: ../wallace/module_invitationpolicy.py:842
 #, python-format
 msgid "Searching folder %r for %s %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:783
+#: ../wallace/module_invitationpolicy.py:852
+#: ../wallace/module_resources.py:675 ../wallace/module_resources.py:736
+#, python-format
+msgid "No UID found in IMAP response: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:878
 #, python-format
 msgid "Failed to parse %s from message %s/%s: %s"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:809
+#: ../wallace/module_invitationpolicy.py:906
 #, python-format
 msgid "Listing events from folder %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:822
-#: ../wallace/module_resources.py:474 ../wallace/module_resources.py:665
-#: ../wallace/module_resources.py:713
+#: ../wallace/module_invitationpolicy.py:919
+#: ../wallace/module_resources.py:482 ../wallace/module_resources.py:683
+#: ../wallace/module_resources.py:763
 #, python-format
 msgid "Failed to parse event from message %s/%s: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:828
+#: ../wallace/module_invitationpolicy.py:925
 #, python-format
 msgid "Existing event %r conflicts with invitation %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:835
-#: ../wallace/module_resources.py:518
+#: ../wallace/module_invitationpolicy.py:932
+#: ../wallace/module_resources.py:526
 #, python-format
 msgid "start: %r, end: %r, total: %r, messages: %d"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:861
+#: ../wallace/module_invitationpolicy.py:960
 #, python-format
 msgid "%r is locked, waiting..."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:928
+#: ../wallace/module_invitationpolicy.py:1040
 #, python-format
 msgid "Failed to save %s: no target folder found for user %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:931
+#: ../wallace/module_invitationpolicy.py:1051
 #, python-format
 msgid "Save %s %r to user folder %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:944
+#: ../wallace/module_invitationpolicy.py:1064
 #, python-format
 msgid "Failed to save %s to user folder at %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:960
+#: ../wallace/module_invitationpolicy.py:1083
+#, python-format
+msgid "Delete %s %r in %r by UID: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1091
 #, python-format
 msgid "Delete %s %r in %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:989
+#: ../wallace/module_invitationpolicy.py:1102
+#, python-format
+msgid "Failed to delete %s from folder %r: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1130
+#: ../wallace/module_invitationpolicy.py:1304
+#, python-format
+msgid "%s commented: %s"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1133
 #, python-format
 msgid "Compose participation status summary for %s %r to user %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1022
+#: ../wallace/module_invitationpolicy.py:1171
 #, python-format
 msgid ""
 "Waiting for more automated replies (got %d of %d); skipping notification"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1032
+#: ../wallace/module_invitationpolicy.py:1192
 #, python-format
 msgid "Changes submitted by %s have been automatically applied."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1041
+#: ../wallace/module_invitationpolicy.py:1201
 msgid "(removed)"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1047
+#: ../wallace/module_invitationpolicy.py:1207
 #, python-format
 msgid ""
 "\n"
@@ -3513,7 +3894,7 @@
 "        "
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1055
+#: ../wallace/module_invitationpolicy.py:1215
 #, python-format
 msgid ""
 "\n"
@@ -3522,56 +3903,78 @@
 "        "
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1064
-#: ../wallace/module_invitationpolicy.py:1126
-#: ../wallace/module_invitationpolicy.py:1216
+#: ../wallace/module_invitationpolicy.py:1225
+msgid "NOTE: This update only refers to this single occurrence!"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1227
+#: ../wallace/module_invitationpolicy.py:1309
+#: ../wallace/module_invitationpolicy.py:1411
 msgid "*** This is an automated message. Please do not reply. ***"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1099
+#: ../wallace/module_invitationpolicy.py:1249
+#, python-format
+msgid "Sent update notification to %r: %r"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1274
 #, python-format
 msgid "Send cancellation notification for %s %r to user %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1109
+#: ../wallace/module_invitationpolicy.py:1284
 #, python-format
-msgid ""
-"\n"
-"            The assignment for '%(summary)s' has been cancelled by %(organizer)s.\n"
-"            The copy in your tasklist as been marked as cancelled accordingly.\n"
-"        "
+msgid "The assignment for '%(summary)s' has been cancelled by %(organizer)s."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1289
+msgid "The copy in your tasklist has been removed accordingly."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1117
+#: ../wallace/module_invitationpolicy.py:1291
+msgid "The copy in your tasklist has been marked as cancelled accordingly."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1293
 #, python-format
 msgid ""
-"\n"
-"            The event '%(summary)s' at %(start)s has been cancelled by %(organizer)s.\n"
-"            The copy in your calendar as been marked as cancelled accordingly.\n"
-"        "
+"The event '%(summary)s' at %(start)s has been cancelled by %(organizer)s."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1206
+#: ../wallace/module_invitationpolicy.py:1299
+msgid "The copy in your calendar has been removed accordingly."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1301
+msgid "The copy in your calendar has been marked as cancelled accordingly."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1307
+msgid "NOTE: This cancellation only refers to this single occurrence!"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1401
 #, python-format
 msgid "Updated %s's copy of %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1209
+#: ../wallace/module_invitationpolicy.py:1404
 #, python-format
 msgid "Attendee %s's copy of %r not found"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1212
+#: ../wallace/module_invitationpolicy.py:1407
 #, python-format
 msgid "Attendee %r not found in LDAP"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1219
+#: ../wallace/module_invitationpolicy.py:1414
 #, python-format
 msgid "%(name)s has %(status)s your assignment for %(summary)s."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1221
+#: ../wallace/module_invitationpolicy.py:1416
 #, python-format
 msgid "%(name)s has %(status)s your invitation for %(summary)s."
 msgstr ""
@@ -3584,7 +3987,8 @@
 
 #: ../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
@@ -3597,255 +4001,308 @@
 msgid "Could not send request to optout_url %s"
 msgstr ""
 
-#: ../wallace/module_resources.py:116
+#: ../wallace/module_resources.py:117
 #, python-format
 msgid "Resource Management called for %r, %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:181
+#: ../wallace/module_resources.py:182
 #, python-format
 msgid "Failed to parse iTip events from message: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:186
-msgid "Message is not an iTip message or does not contain any "
+#: ../wallace/module_resources.py:187
+msgid "Message is not an iTip message or does not contain any (valid) iTip."
 msgstr ""
 
-#: ../wallace/module_resources.py:194
-msgid "iTip events attached to this message contain the "
+#: ../wallace/module_resources.py:195
+#, python-format
+msgid ""
+"iTip events attached to this message contain the following information: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:225
+#: ../wallace/module_resources.py:226
 msgid "Not an iTip message, but sent to resource nonetheless. Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:233
+#: ../wallace/module_resources.py:234
 #, python-format
 msgid "No itips, no resources, pass along %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:236
+#: ../wallace/module_resources.py:237
 #, python-format
 msgid "iTips, but no resources, pass along %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:245
+#: ../wallace/module_resources.py:246
 #, python-format
 msgid "No resource attendees matching envelope recipient %s, Reject message"
 msgstr ""
 
-#: ../wallace/module_resources.py:255
+#: ../wallace/module_resources.py:256
 #, python-format
 msgid "Resources: %r; %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:273
+#: ../wallace/module_resources.py:270
+#, python-format
+msgid "iTip REPLY to %r, %r; matches %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:276
 #, python-format
 msgid "Sender Attendee: %r => %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:280
+#: ../wallace/module_resources.py:278
+#, python-format
+msgid "Could not find envelope sender attendee: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:283
 #, python-format
 msgid ""
 "The iTip reply sequence (%r) doesn't match the referred event version (%r). "
 "Ignoring."
 msgstr ""
 
-#: ../wallace/module_resources.py:305
+#: ../wallace/module_resources.py:302
+#, python-format
+msgid "Invalid response (%r) received from resource owner for event %r"
+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:308
+#: ../wallace/module_resources.py:309
 msgid "No event reference found in this REPLY. Ignoring."
 msgstr ""
 
-#: ../wallace/module_resources.py:317
+#: ../wallace/module_resources.py:318
 #, python-format
 msgid "Receiving Resource: %r; %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:325
+#: ../wallace/module_resources.py:320
+#, python-format
+msgid "Could not find envelope attendee: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:326
 #, python-format
 msgid "Recipient %r is non-participant, ignoring message"
 msgstr ""
 
-#: ../wallace/module_resources.py:353
+#: ../wallace/module_resources.py:336
+#, python-format
+msgid "Cancellation for entire event %r: deleting"
+msgstr ""
+
+#: ../wallace/module_resources.py:340
+#, python-format
+msgid "Cancellation for a single occurrence %r of %r: updating..."
+msgstr ""
+
+#: ../wallace/module_resources.py:361
 #, python-format
 msgid "Accept invitation for individual resource %r / %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:382
+#: ../wallace/module_resources.py:390
 #, python-format
 msgid "Delegate invitation for resource collection %r to %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:403
+#: ../wallace/module_resources.py:411
 #, python-format
 msgid "module_resources.heartbeat(%d)"
 msgstr ""
 
-#: ../wallace/module_resources.py:426
+#: ../wallace/module_resources.py:434
 #, python-format
 msgid "Expunge resource calendar for %s (%s) failed: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:450
+#: ../wallace/module_resources.py:458
 #, python-format
 msgid "Expunge events in resource folder %r older than %d days"
 msgstr ""
 
-#: ../wallace/module_resources.py:463
+#: ../wallace/module_resources.py:471
 #, python-format
 msgid "Fetching message ID %r from folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:489
+#: ../wallace/module_resources.py:497
 #, python-format
 msgid "Flag event %s from message %s/%s as deleted (age = %d days)"
 msgstr ""
 
-#: ../wallace/module_resources.py:514
+#: ../wallace/module_resources.py:522
 #, python-format
 msgid "Failed to read resource calendar for %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:524
+#: ../wallace/module_resources.py:532
 #, python-format
 msgid "Polling for resource %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:527
+#: ../wallace/module_resources.py:535
 #, python-format
 msgid "Resource %r has been popped from the list"
 msgstr ""
 
-#: ../wallace/module_resources.py:531
+#: ../wallace/module_resources.py:539
 msgid "Resource is a collection"
 msgstr ""
 
-#: ../wallace/module_resources.py:542
+#: ../wallace/module_resources.py:550
 #, python-format
 msgid "Removed conflicting resources from %r: (%r) => %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:554
+#: ../wallace/module_resources.py:562
 #, python-format
 msgid "Conflicting events: %r for resource %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:573
+#: ../wallace/module_resources.py:585
 #, python-format
 msgid "Delegate to another resource collection member: %r to %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:635
+#: ../wallace/module_resources.py:647
 #, python-format
 msgid "Checking events in resource folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:654
+#: ../wallace/module_resources.py:666
 #, python-format
 msgid "Fetching message UID %r from folder %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:677
+#: ../wallace/module_resources.py:699
 #, python-format
 msgid "Event %r conflicts with event %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:698
+#: ../wallace/module_resources.py:721
 #, python-format
 msgid "Searching %r for event %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:704
+#: ../wallace/module_resources.py:727
 #, python-format
 msgid "Failed to access resource calendar:: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:733
+#: ../wallace/module_resources.py:754
+#, python-format
+msgid "Recurrence-ID not matching on message %s, skipping: %r != %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:785
 #, python-format
 msgid "Apply invitation policies %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:752
+#: ../wallace/module_resources.py:804
 #, python-format
 msgid "Adding event to %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:806
+#: ../wallace/module_resources.py:888
 #, python-format
 msgid "Failed to save event to resource calendar at %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:823
+#: ../wallace/module_resources.py:907
+#, python-format
+msgid "Delete resource calendar object from %r by UID %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:915
 #, python-format
 msgid "Delete resource calendar object %r in %r: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:866
+#: ../wallace/module_resources.py:926
+#, python-format
+msgid "Failed to delete calendar object %r from folder %r: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:966
 #, python-format
 msgid "Checking if email address %r belongs to a resource (collection)"
 msgstr ""
 
-#: ../wallace/module_resources.py:874 ../wallace/module_resources.py:946
-#: ../wallace/module_resources.py:980
+#: ../wallace/module_resources.py:974 ../wallace/module_resources.py:1046
+#: ../wallace/module_resources.py:1080
 #, python-format
 msgid "Resource record(s): %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:876 ../wallace/module_resources.py:948
-#: ../wallace/module_resources.py:983
+#: ../wallace/module_resources.py:976 ../wallace/module_resources.py:1048
+#: ../wallace/module_resources.py:1083
 #, python-format
 msgid "No resource (collection) records found for %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:880 ../wallace/module_resources.py:952
-#: ../wallace/module_resources.py:987
+#: ../wallace/module_resources.py:980 ../wallace/module_resources.py:1052
+#: ../wallace/module_resources.py:1087
 #, python-format
 msgid "Resource record: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:898
+#: ../wallace/module_resources.py:998
 #, python-format
 msgid "Raw itip_events: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:906
+#: ../wallace/module_resources.py:1006
 #, python-format
 msgid "Raw set of attendees: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:914
+#: ../wallace/module_resources.py:1014
 #, python-format
 msgid "Raw set of resources: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:919
+#: ../wallace/module_resources.py:1019
 #, python-format
 msgid "Raw set of organizers: %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:939
+#: ../wallace/module_resources.py:1039
 #, python-format
 msgid "Checking if attendee %r is a resource (collection)"
 msgstr ""
 
-#: ../wallace/module_resources.py:955 ../wallace/module_resources.py:989
+#: ../wallace/module_resources.py:1055 ../wallace/module_resources.py:1089
 msgid "Resource reservation made but no resource records found"
 msgstr ""
 
-#: ../wallace/module_resources.py:974
+#: ../wallace/module_resources.py:1074
 #, python-format
 msgid "Checking if resource %r is a resource (collection)"
 msgstr ""
 
-#: ../wallace/module_resources.py:992
-msgid "The following resources are being referred to in the "
+#: ../wallace/module_resources.py:1092
+#, python-format
+msgid "The following resources are being referred to in the iTip: %r"
+msgstr ""
+
+#: ../wallace/module_resources.py:1219
+#, python-format
+msgid "Check collections %r for kolabinvitationpolicy attributes"
 msgstr ""
 
-#: ../wallace/module_resources.py:1157
+#: ../wallace/module_resources.py:1257
 #, python-format
 msgid ""
 "\n"
@@ -3855,7 +4312,7 @@
 "            "
 msgstr ""
 
-#: ../wallace/module_resources.py:1176
+#: ../wallace/module_resources.py:1276
 #, python-format
 msgid ""
 "\n"
@@ -3865,7 +4322,7 @@
 "    "
 msgstr ""
 
-#: ../wallace/module_resources.py:1183
+#: ../wallace/module_resources.py:1283
 #, python-format
 msgid ""
 "\n"
@@ -3874,16 +4331,16 @@
 "        "
 msgstr ""
 
-#: ../wallace/module_resources.py:1218
+#: ../wallace/module_resources.py:1318
 #, python-format
 msgid "Sending booking notification for event %r to %r from %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1236
+#: ../wallace/module_resources.py:1336
 msgid "failed"
 msgstr ""
 
-#: ../wallace/module_resources.py:1256
+#: ../wallace/module_resources.py:1356
 #, python-format
 msgid ""
 "\n"
@@ -3893,7 +4350,7 @@
 "        "
 msgstr ""
 
-#: ../wallace/module_resources.py:1262
+#: ../wallace/module_resources.py:1362
 #, python-format
 msgid ""
 "\n"
@@ -3904,12 +4361,12 @@
 "        "
 msgstr ""
 
-#: ../wallace/module_resources.py:1306
+#: ../wallace/module_resources.py:1393
 #, python-format
 msgid "Clone invitation for owner confirmation: %r from %r"
 msgstr ""
 
-#: ../wallace/module_resources.py:1312
+#: ../wallace/module_resources.py:1412
 #, python-format
 msgid ""
 "\n"
@@ -3927,58 +4384,63 @@
 msgstr ""
 
 #. This is a nested module
-#: ../wallace/modules.py:97
+#: ../wallace/modules.py:98
 #, python-format
 msgid "Module Group: %s"
 msgstr "Module Groep: %s"
 
-#: ../wallace/modules.py:108 ../wallace/modules.py:120
+#: ../wallace/modules.py:109 ../wallace/modules.py:125
 #, python-format
 msgid "No such module %r in modules %r (1)."
 msgstr ""
 
-#: ../wallace/modules.py:113
+#: ../wallace/modules.py:114
 #, python-format
 msgid "No such module %r in modules %r (2)."
 msgstr ""
 
-#: ../wallace/modules.py:126
+#: ../wallace/modules.py:120 ../wallace/modules.py:172
+#, python-format
+msgid "Unknown error occurred; %r"
+msgstr ""
+
+#: ../wallace/modules.py:178
 #, python-format
 msgid "Holding message in queue for manual review (%s by %s)"
 msgstr ""
 
-#: ../wallace/modules.py:129
+#: ../wallace/modules.py:181
 #, python-format
 msgid "Deferring message in %s (by module %s)"
 msgstr ""
 
-#: ../wallace/modules.py:141
+#: ../wallace/modules.py:193
 #, python-format
 msgid "The time when the message was sent: %r"
 msgstr ""
 
-#: ../wallace/modules.py:142
+#: ../wallace/modules.py:194
 #, python-format
 msgid "The time now: %r"
 msgstr "De huidige tijd: %r"
 
-#: ../wallace/modules.py:143
+#: ../wallace/modules.py:195
 #, python-format
 msgid "The time delta: %r"
 msgstr "Verschil in tijd: %r"
 
 #. TODO: Send NDR back to user
-#: ../wallace/modules.py:147
+#: ../wallace/modules.py:199
 #, 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:172
+#: ../wallace/modules.py:224
 #, python-format
 msgid "Rejecting message in %s (by module %s)"
 msgstr "Bericht %s geweigerd (door module %s)"
 
-#: ../wallace/modules.py:193
+#: ../wallace/modules.py:245
 #, python-format
 msgid ""
 "This is the email system Wallace at %s.\n"
@@ -3993,29 +4455,29 @@
 "recipients.\n"
 msgstr ""
 
-#: ../wallace/modules.py:208
+#: ../wallace/modules.py:260
 #, python-format
 msgid ""
 "X-Wallace-Module: %s\n"
 "X-Wallace-Result: REJECT\n"
 msgstr ""
 
-#: ../wallace/modules.py:267
+#: ../wallace/modules.py:304
 #, python-format
 msgid "Accepting message in %s (by module %s)"
 msgstr ""
 
-#: ../wallace/modules.py:269
+#: ../wallace/modules.py:306
 #, python-format
 msgid "Accepting message in: %r"
 msgstr ""
 
-#: ../wallace/modules.py:276
+#: ../wallace/modules.py:313
 #, python-format
 msgid "recipients: %r"
 msgstr ""
 
-#: ../wallace/modules.py:354
+#: ../wallace/modules.py:369
 #, python-format
 msgid "Module '%s' already registered"
 msgstr "Module '%s' reeds geregistreerd"

pykolab-0.8.1.tar.gz/po/pykolab.pot -> pykolab-0.8.3.tar.gz/po/pykolab.pot Changed

@@ -8,398 +8,432 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-11 11:46-0400\n"
+"POT-Creation-Date: 2016-07-22 15:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../bin/kolab_smtp_access_policy.py:210
+#: ../bin/kolab_smtp_access_policy.py:214
 #, python-format
 msgid "Adding policy request to instance %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:480
+#: ../bin/kolab_smtp_access_policy.py:484
 msgid "Unauthorized access not allowed"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:509
-#: ../bin/kolab_smtp_access_policy.py:690
+#: ../bin/kolab_smtp_access_policy.py:513
+#: ../bin/kolab_smtp_access_policy.py:711
 msgid "Could not find recipient"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:528
+#: ../bin/kolab_smtp_access_policy.py:532
 #, python-format
 msgid "Could not find envelope sender user %s (511)"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:571
+#: ../bin/kolab_smtp_access_policy.py:575
 #, python-format
 msgid "Obtained authenticated user details for %r: %r"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:628
+#: ../bin/kolab_smtp_access_policy.py:633
 #, python-format
 msgid "Could not find envelope sender user %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:650
+#: ../bin/kolab_smtp_access_policy.py:666
+#: ../bin/kolab_smtp_access_policy.py:694
 #, python-format
 msgid "%s is unauthorized to send on behalf of %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:660
+#: ../bin/kolab_smtp_access_policy.py:676
 #, python-format
 msgid ""
 "User %s attempted to use envelope sender address %s without authorization"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:714
-#: ../bin/kolab_smtp_access_policy.py:725
+#: ../bin/kolab_smtp_access_policy.py:736
+#: ../bin/kolab_smtp_access_policy.py:747
 #, python-format
 msgid "Found user %s to be a delegate user of %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:749
+#: ../bin/kolab_smtp_access_policy.py:767
 #, 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:752
+#: ../bin/kolab_smtp_access_policy.py:770
 #, python-format
 msgid ""
 "Verifying unauthenticated sender '%(sender)s' for recipient '%(recipient)s'"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:768
+#: ../bin/kolab_smtp_access_policy.py:786
 #, python-format
 msgid "Reproducing verify_recipient(%s, %s) from cache"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:805
+#: ../bin/kolab_smtp_access_policy.py:823
 #, python-format
 msgid "Using authentication domain %s instead of %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:815
+#: ../bin/kolab_smtp_access_policy.py:833
 #, python-format
 msgid "Domain %s is a primary domain"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:823
+#: ../bin/kolab_smtp_access_policy.py:841
 #, 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:838
+#: ../bin/kolab_smtp_access_policy.py:856
 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:855
+#: ../bin/kolab_smtp_access_policy.py:873
 #, 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:891
+#: ../bin/kolab_smtp_access_policy.py:909
 msgid "Invalid recipient"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:902
+#: ../bin/kolab_smtp_access_policy.py:920
 msgid "Could not find this user, accepting"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:975
-#: ../bin/kolab_smtp_access_policy.py:1051
+#: ../bin/kolab_smtp_access_policy.py:993
+#: ../bin/kolab_smtp_access_policy.py:1070
 #, python-format
 msgid "Sender %s is not allowed to send to recipient %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1039
+#: ../bin/kolab_smtp_access_policy.py:1057
 #, python-format
 msgid "Reproducing verify_sender(%r) from cache"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1056
+#: ../bin/kolab_smtp_access_policy.py:1077
 msgid "Unverifiable sender."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1061
+#: ../bin/kolab_smtp_access_policy.py:1082
 msgid "Sender is not using an alias"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1069
+#: ../bin/kolab_smtp_access_policy.py:1090
 msgid "Sender uses unauthorized envelope sender address"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1086
+#: ../bin/kolab_smtp_access_policy.py:1107
 msgid "Could not verify sender"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1093
+#: ../bin/kolab_smtp_access_policy.py:1114
 msgid ""
 "Verifying whether sender is allowed to send to recipient using sender policy"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1106
+#: ../bin/kolab_smtp_access_policy.py:1127
 #, python-format
 msgid "Result is %r"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1111
+#: ../bin/kolab_smtp_access_policy.py:1132
 msgid "No recipient policy restrictions exist for this sender"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1120
+#: ../bin/kolab_smtp_access_policy.py:1141
 msgid "Found a recipient policy to apply for this sender."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1135
+#: ../bin/kolab_smtp_access_policy.py:1156
 #, python-format
 msgid "Sender %s not allowed to send to recipient %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1156
+#: ../bin/kolab_smtp_access_policy.py:1184
 msgid "Cleaning up the cache"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1179
+#: ../bin/kolab_smtp_access_policy.py:1207
 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:1195
+#: ../bin/kolab_smtp_access_policy.py:1223
 #, python-format
 msgid "Operational Error in caching: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1247
+#: ../bin/kolab_smtp_access_policy.py:1276
 #, python-format
 msgid "Caching the policy result with timestamp %d"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1321
+#: ../bin/kolab_smtp_access_policy.py:1353
 #, python-format
 msgid "Returning action DEFER_IF_PERMIT: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1326
+#: ../bin/kolab_smtp_access_policy.py:1358
 #, python-format
 msgid "Returning action DUNNO: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1331
+#: ../bin/kolab_smtp_access_policy.py:1363
 #, python-format
 msgid "Returning action HOLD: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1336
+#: ../bin/kolab_smtp_access_policy.py:1368
 #, python-format
 msgid "Returning action PERMIT: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1461
+#: ../bin/kolab_smtp_access_policy.py:1496
 #, python-format
 msgid "Returning action REJECT: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1507
+#: ../bin/kolab_smtp_access_policy.py:1542
 msgid "Starting to loop for new request"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1514
+#: ../bin/kolab_smtp_access_policy.py:1549
 msgid "Timeout for policy request reading exceeded"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1520
+#: ../bin/kolab_smtp_access_policy.py:1555
 msgid "End of current request"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1524
+#: ../bin/kolab_smtp_access_policy.py:1559
 #, python-format
 msgid "Getting line: %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1528
+#: ../bin/kolab_smtp_access_policy.py:1563
 msgid "Returning request"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1557
+#: ../bin/kolab_smtp_access_policy.py:1592
 msgid "Access Policy Options"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1564
+#: ../bin/kolab_smtp_access_policy.py:1599
 msgid "SMTP Policy request timeout."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1570
+#: ../bin/kolab_smtp_access_policy.py:1605
 msgid "Verify the recipient access policy."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1576
+#: ../bin/kolab_smtp_access_policy.py:1611
 msgid "Verify the sender access policy."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1582
+#: ../bin/kolab_smtp_access_policy.py:1617
 msgid "Allow unauthenticated senders."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1596
+#: ../bin/kolab_smtp_access_policy.py:1631
 #, python-format
 msgid "Got request instance %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1605
+#: ../bin/kolab_smtp_access_policy.py:1640
 #, python-format
 msgid "Request instance %s is in state %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1613
-#, python-format
-msgid "Request instance %s is not yet in DATA state"
-msgstr ""
-
-#: ../bin/kolab_smtp_access_policy.py:1625
-#, python-format
-msgid "Request instance %s reached DATA state"
-msgstr ""
-
-#: ../bin/kolab_smtp_access_policy.py:1645
+#: ../bin/kolab_smtp_access_policy.py:1672
 #, python-format
 msgid "Unhandled exception caught: %r"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1649
+#: ../bin/kolab_smtp_access_policy.py:1676
 msgid "Sender access denied"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1651
+#: ../bin/kolab_smtp_access_policy.py:1678
 msgid "Recipient access denied"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1653
+#: ../bin/kolab_smtp_access_policy.py:1680
 msgid "No objections"
 msgstr ""
 
-#: ../conf.py:37 ../kolab-cli.py:34 ../saslauthd.py:33
+#: ../conf.py:36 ../kolab-cli.py:34 ../saslauthd.py:33
 msgid "Cannot load pykolab/logger.py:"
 msgstr ""
 
-#: ../kolabd/__init__.py:49 ../saslauthd/__init__.py:51
-#: ../wallace/__init__.py:107
+#: ../kolabd/__init__.py:50 ../saslauthd/__init__.py:52
+#: ../wallace/__init__.py:108
 msgid "Daemon Options"
 msgstr ""
 
-#: ../kolabd/__init__.py:56 ../saslauthd/__init__.py:58
-#: ../wallace/__init__.py:114
+#: ../kolabd/__init__.py:57 ../saslauthd/__init__.py:59
+#: ../wallace/__init__.py:115
 msgid "Fork to the background."
 msgstr ""
 
-#: ../kolabd/__init__.py:65 ../saslauthd/__init__.py:67
-#: ../wallace/__init__.py:148
+#: ../kolabd/__init__.py:66 ../saslauthd/__init__.py:68
+#: ../wallace/__init__.py:150
 msgid "Path to the PID file to use."
 msgstr ""
 
-#: ../kolabd/__init__.py:74 ../saslauthd/__init__.py:85
-#: ../wallace/__init__.py:165
+#: ../kolabd/__init__.py:75 ../saslauthd/__init__.py:86
+#: ../wallace/__init__.py:168
 msgid "Run as user USERNAME"
 msgstr ""
 
-#: ../kolabd/__init__.py:84 ../saslauthd/__init__.py:95
-#: ../wallace/__init__.py:131
+#: ../kolabd/__init__.py:85 ../saslauthd/__init__.py:96
+#: ../wallace/__init__.py:132
 msgid "Run as group GROUPNAME"
 msgstr ""
 
-#: ../kolabd/__init__.py:122 ../pykolab/utils.py:234
-#: ../saslauthd/__init__.py:301 ../wallace/__init__.py:365
+#: ../kolabd/__init__.py:123 ../pykolab/utils.py:254
+#: ../saslauthd/__init__.py:327 ../wallace/__init__.py:373
 #, python-format
 msgid "Group %s does not exist"
 msgstr ""
 
-#: ../kolabd/__init__.py:131 ../saslauthd/__init__.py:310
-#: ../wallace/__init__.py:374
+#: ../kolabd/__init__.py:132 ../saslauthd/__init__.py:336
+#: ../wallace/__init__.py:382
 #, python-format
 msgid "Switching real and effective group id to %d"
 msgstr ""
 
-#: ../kolabd/__init__.py:153 ../pykolab/utils.py:258
-#: ../saslauthd/__init__.py:332 ../wallace/__init__.py:396
+#: ../kolabd/__init__.py:154 ../pykolab/utils.py:278
+#: ../saslauthd/__init__.py:358 ../wallace/__init__.py:404
 #, python-format
 msgid "User %s does not exist"
 msgstr ""
 
-#: ../kolabd/__init__.py:163 ../saslauthd/__init__.py:342
-#: ../wallace/__init__.py:406
+#: ../kolabd/__init__.py:163 ../saslauthd/__init__.py:367
+#: ../wallace/__init__.py:414
 #, python-format
 msgid "Switching real and effective user id to %d"
 msgstr ""
 
-#: ../kolabd/__init__.py:172 ../saslauthd/__init__.py:351
-#: ../wallace/__init__.py:415
+#: ../kolabd/__init__.py:172 ../saslauthd/__init__.py:376
+#: ../wallace/__init__.py:423
 msgid "Could not change real and effective uid and/or gid"
 msgstr ""
 
-#: ../kolabd/__init__.py:192 ../saslauthd/__init__.py:142
-#: ../wallace/__init__.py:435
+#: ../kolabd/__init__.py:215 ../saslauthd/__init__.py:166
+#: ../wallace/__init__.py:465
 msgid "Interrupted by user"
 msgstr ""
 
-#: ../kolabd/__init__.py:197 ../kolabd/__init__.py:208
-msgid "Traceback occurred, please report a "
+#: ../kolabd/__init__.py:220 ../kolabd/__init__.py:231
+#: ../saslauthd/__init__.py:170 ../saslauthd/__init__.py:179
+#: ../wallace/__init__.py:469 ../wallace/__init__.py:478
+msgid "Traceback occurred, please report a bug at https://issues.kolab.org"
 msgstr ""
 
-#: ../kolabd/__init__.py:203 ../saslauthd/__init__.py:150
-#: ../wallace/__init__.py:444
+#: ../kolabd/__init__.py:226 ../saslauthd/__init__.py:175
+#: ../wallace/__init__.py:474
 #, python-format
 msgid "Type Error: %s"
 msgstr ""
 
-#: ../kolabd/__init__.py:230
+#: ../kolabd/__init__.py:253
 msgid "Could not connect to LDAP, is it running?"
 msgstr ""
 
-#: ../kolabd/__init__.py:233 ../pykolab/auth/ldap/__init__.py:2261
-#: ../pykolab/cli/cmd_sync.py:67
+#: ../kolabd/__init__.py:256 ../pykolab/auth/ldap/__init__.py:2524
+#: ../pykolab/cli/cmd_sync.py:77
 msgid "Listing domains..."
 msgstr ""
 
-#: ../kolabd/__init__.py:244
+#: ../kolabd/__init__.py:267
 msgid "No domains. Not syncing"
 msgstr ""
 
-#: ../kolabd/__init__.py:279
+#: ../kolabd/__init__.py:290
+#, python-format
+msgid "Domain %r naming context: %r, root dn: %r"
+msgstr ""
+
+#: ../kolabd/__init__.py:302
+#, python-format
+msgid "Naming contexts to synchronize: %r"
+msgstr ""
+
+#: ../kolabd/__init__.py:320
+#, python-format
+msgid "Result set of domains: %r"
+msgstr ""
+
+#: ../kolabd/__init__.py:323
+#, python-format
+msgid "Checking for domain %s"
+msgstr ""
+
+#: ../kolabd/__init__.py:327
+#, python-format
+msgid "Domain %s isn't alive anymore."
+msgstr ""
+
+#: ../kolabd/__init__.py:331
+#, python-format
+msgid "Domain %s already there and alive."
+msgstr ""
+
+#: ../kolabd/__init__.py:335
+#, python-format
+msgid "Domain %s should not exist any longer."
+msgstr ""
+
+#: ../kolabd/__init__.py:338
+#, python-format
+msgid "Domain %s does not have a process yet."
+msgstr ""
+
+#: ../kolabd/__init__.py:349
 #, python-format
 msgid "added domains: %r, removed domains: %r"
 msgstr ""
 
-#: ../kolabd/process.py:33
+#: ../kolabd/process.py:34
 #, python-format
 msgid "Process created for domain %s"
 msgstr ""
 
-#: ../kolabd/process.py:42
+#: ../kolabd/process.py:43
 #, python-format
 msgid "Synchronizing for domain %s"
 msgstr ""
 
-#: ../kolabd/process.py:59
+#: ../kolabd/process.py:60
 #, python-format
 msgid ""
 "Error in process %r, terminating:\n"
 "\t%r"
 msgstr ""
 
-#: ../kolabd.py:31 ../setup-kolab.py:36 ../wallace.py:31
+#: ../kolabd.py:31 ../setup-kolab.py:37 ../wallace.py:31
 msgid "Cannot load pykolab/constants.py:"
 msgstr ""
 
@@ -447,323 +481,428 @@
 msgid "Updating result_attribute for cache entry %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:52
+#: ../pykolab/auth/ldap/__init__.py:54
 msgid "Python LDAP library does not support persistent search"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:143
+#: ../pykolab/auth/ldap/__init__.py:147
 #, python-format
 msgid "Attempting to authenticate user %s in realm %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:175 ../pykolab/auth/ldap/__init__.py:226
+#: ../pykolab/auth/ldap/__init__.py:165 ../pykolab/auth/ldap/__init__.py:180
+#: ../pykolab/auth/ldap/__init__.py:207 ../pykolab/auth/ldap/__init__.py:324
 #, python-format
 msgid "Authentication cache failed: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:216 ../pykolab/auth/ldap/__init__.py:240
+#: ../pykolab/auth/ldap/__init__.py:229 ../pykolab/auth/ldap/__init__.py:1441
+#: ../pykolab/auth/ldap/__init__.py:1467 ../pykolab/auth/ldap/__init__.py:3066
+#, python-format
+msgid "LDAP server unavailable: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:230 ../pykolab/auth/ldap/__init__.py:237
+#: ../pykolab/auth/ldap/__init__.py:1316 ../pykolab/auth/ldap/__init__.py:1442
+#: ../pykolab/auth/ldap/__init__.py:1468 ../pykolab/auth/ldap/__init__.py:1756
+#: ../pykolab/auth/ldap/__init__.py:3067 ../pykolab/auth/ldap/__init__.py:3077
+#, python-format
+msgid "%s"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:236
+#, python-format
+msgid "Exception occurred: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:243
+#, python-format
+msgid "Length of entries found: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:255
+#, python-format
+msgid "Authentication for %r failed (multiple entries)"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:269
 #, python-format
-msgid "Binding with user_dn %s and password %s"
+msgid "Authentication for %r failed (no entry)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:231 ../pykolab/auth/ldap/__init__.py:263
+#: ../pykolab/auth/ldap/__init__.py:282
 #, python-format
-msgid "Failed to authenticate as user %s"
+msgid "Authentication for %r failed (LDAP error?)"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:300 ../pykolab/auth/ldap/__init__.py:354
+#, python-format
+msgid "Authentication for %r succeeded"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:311
+#, python-format
+msgid "Authentication for %r failed (error)"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:328
+msgid "Authentication failed, LDAP server unavailable"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:249
+#: ../pykolab/auth/ldap/__init__.py:336 ../pykolab/auth/ldap/__init__.py:391
+#, python-format
+msgid "Failed to authenticate as user %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:357
+#, python-format
+msgid "Authentication for %r failed (password)"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:369
 #, python-format
 msgid "Error occured, there is no such object: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:254
+#: ../pykolab/auth/ldap/__init__.py:381
 msgid "Authentication cache failed to clear entry"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:260
+#: ../pykolab/auth/ldap/__init__.py:387
 #, python-format
 msgid "Exception occured: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:280
+#: ../pykolab/auth/ldap/__init__.py:419
 msgid "Connecting to LDAP..."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:284
+#: ../pykolab/auth/ldap/__init__.py:423
 #, python-format
 msgid "Attempting to use LDAP URI %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:371
+#: ../pykolab/auth/ldap/__init__.py:524
 #, python-format
 msgid "Entry ID: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:373
+#: ../pykolab/auth/ldap/__init__.py:526
 #, python-format
 msgid "Entry DN: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:376
+#: ../pykolab/auth/ldap/__init__.py:529
 #, python-format
 msgid ""
 "ldap search: (%r, %r, filterstr='(objectclass=*)', attrlist=[ 'dn' ] + %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:500
+#: ../pykolab/auth/ldap/__init__.py:648 ../pykolab/auth/ldap/__init__.py:801
 #, python-format
-msgid "Finding recipient with filter %r"
+msgid "Finding resource with filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:576
+#: ../pykolab/auth/ldap/__init__.py:725
 #, python-format
-msgid "Finding resource with filter %r"
+msgid "Finding recipient with filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:607
+#: ../pykolab/auth/ldap/__init__.py:832
 #, python-format
 msgid "Using timestamp %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:644
+#: ../pykolab/auth/ldap/__init__.py:869
 #, python-format
-msgid "Not applying recipient policy for %s "
+msgid "Not applying recipient policy for %s (disabled through configuration)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:654
+#: ../pykolab/auth/ldap/__init__.py:879
 #, python-format
 msgid "Applying recipient policy to %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:671
+#: ../pykolab/auth/ldap/__init__.py:896
 #, 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:682
+#: ../pykolab/auth/ldap/__init__.py:907
 #, python-format
 msgid "key %r not in entry"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:684
+#: ../pykolab/auth/ldap/__init__.py:909
 #, python-format
 msgid "key %r is the prim. mail attr."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:686
+#: ../pykolab/auth/ldap/__init__.py:911
 msgid "prim. mail pol. is not empty"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:689
+#: ../pykolab/auth/ldap/__init__.py:914
 #, python-format
 msgid "key %r is the sec. mail attr."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:691
+#: ../pykolab/auth/ldap/__init__.py:916
 msgid "sec. mail pol. is not empty"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:695 ../pykolab/auth/ldap/__init__.py:709
+#: ../pykolab/auth/ldap/__init__.py:920 ../pykolab/auth/ldap/__init__.py:934
 #, python-format
 msgid "Attributes %r are not yet available for entry %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:748
+#: ../pykolab/auth/ldap/__init__.py:973
 #, python-format
 msgid "No results for mail address %s found"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:759
+#: ../pykolab/auth/ldap/__init__.py:984
 #, python-format
 msgid "1 result for address %s found, verifying"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:769
+#: ../pykolab/auth/ldap/__init__.py:994
 #, 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:780 ../pykolab/auth/ldap/__init__.py:869
+#: ../pykolab/auth/ldap/__init__.py:1005 ../pykolab/auth/ldap/__init__.py:1094
 msgid "Address assigned to us"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:835
+#: ../pykolab/auth/ldap/__init__.py:1060
 #, python-format
 msgid "No results for address %s found"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:846
+#: ../pykolab/auth/ldap/__init__.py:1071
 #, python-format
-msgid "1 result for address %s found, "
+msgid "1 result for address %s found, verifying..."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:857
-msgid "Too bad, secondary email "
+#: ../pykolab/auth/ldap/__init__.py:1082
+#, python-format
+msgid "Too bad, secondary email address %s already in use for %s (we are %s)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:884
-msgid "Recipient policy composed the following set of secondary "
+#: ../pykolab/auth/ldap/__init__.py:1109
+#, python-format
+msgid ""
+"Recipient policy composed the following set of secondary email addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:895
+#: ../pykolab/auth/ldap/__init__.py:1120
 #, python-format
 msgid "Secondary mail addresses that we want is not None: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:906
-msgid "Avoiding the duplication of the primary mail "
+#: ../pykolab/auth/ldap/__init__.py:1131
+#, 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:917
+#: ../pykolab/auth/ldap/__init__.py:1142
 #, python-format
 msgid "Entry is getting secondary mail addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:925
-msgid "Entry did not have any secondary mail "
+#: ../pykolab/auth/ldap/__init__.py:1150
+#, python-format
+msgid "Entry did not have any secondary mail addresses in %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:942 ../pykolab/auth/ldap/__init__.py:948
+#: ../pykolab/auth/ldap/__init__.py:1167 ../pykolab/auth/ldap/__init__.py:1173
 #, python-format
 msgid "secondary_mail_addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:943 ../pykolab/auth/ldap/__init__.py:949
+#: ../pykolab/auth/ldap/__init__.py:1168 ../pykolab/auth/ldap/__init__.py:1174
 #, python-format
 msgid "entry[%s]: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:960
+#: ../pykolab/auth/ldap/__init__.py:1185
 #, python-format
 msgid "Entry modifications list: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:988
+#: ../pykolab/auth/ldap/__init__.py:1219
 #, python-format
 msgid "Setting entry attribute %r to %r for %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1024
+#: ../pykolab/auth/ldap/__init__.py:1255
 #, python-format
 msgid ""
 "Could not update dn %r:\n"
 "%r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1050
+#: ../pykolab/auth/ldap/__init__.py:1281
 #, python-format
 msgid "Using filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1065
+#: ../pykolab/auth/ldap/__init__.py:1296
 #, python-format
 msgid "Synchronization is searching against base DN: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1114
+#: ../pykolab/auth/ldap/__init__.py:1343
 #, 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:1185
-msgid "Invalid DN, username and/or password."
+#: ../pykolab/auth/ldap/__init__.py:1406
+msgid "Attempting to bind without a DN but with a password"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1310 ../pykolab/auth/ldap/__init__.py:1327
-#: ../pykolab/auth/ldap/__init__.py:1701 ../pykolab/auth/ldap/__init__.py:1718
-#, python-format
-msgid "Found a subject %r with access %r"
+#: ../pykolab/auth/ldap/__init__.py:1411
+msgid "Attempting to bind with a DN but without a password"
 msgstr ""
 
 #: ../pykolab/auth/ldap/__init__.py:1429
 #, python-format
+msgid "Binding with bind_dn: %s and password: %s"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1447 ../pykolab/auth/ldap/__init__.py:1471
+msgid "Invalid DN, username and/or password."
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1452
+msgid "bind() called but already bound"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1474
+msgid "bind_priv() called but already bound"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1686
+#, python-format
 msgid "Entry %s attribute value: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1437
+#: ../pykolab/auth/ldap/__init__.py:1694
 #, python-format
 msgid "imap.user_mailbox_server(%r) result: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1500 ../pykolab/auth/ldap/__init__.py:2828
+#: ../pykolab/auth/ldap/__init__.py:1755
 #, python-format
-msgid "%s"
+msgid "An error occured: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1767 ../pykolab/auth/ldap/__init__.py:1967
+#: ../pykolab/auth/ldap/__init__.py:1993 ../pykolab/auth/ldap/__init__.py:2187
 #, python-format
 msgid "Result from recipient policy: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2022
+#: ../pykolab/auth/ldap/__init__.py:2242
 #, python-format
 msgid "Kolab user %s does not have a result attribute %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2181
+#: ../pykolab/auth/ldap/__init__.py:2267
+#, python-format
+msgid "Naming contexts found: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:2274
+#, python-format
+msgid "Domains/Root DNs found: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:2434
+#, python-format
+msgid "Searching root dn for domain %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:2439
+#, python-format
+msgid "Returning from cache: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:2444
 #, python-format
 msgid "Finding domain root dn for domain %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2288
-msgid "Authentication database DOWN"
+#: ../pykolab/auth/ldap/__init__.py:2474
+#, python-format
+msgid "Setting domain root dn from LDAP for domain %r: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2372 ../pykolab/auth/ldap/__init__.py:2420
+#: ../pykolab/auth/ldap/__init__.py:2620 ../pykolab/auth/ldap/__init__.py:2668
 #, python-format
 msgid "Entry type: %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2509
+#: ../pykolab/auth/ldap/__init__.py:2746
 msgid "LDAP Search Result Data Entry:"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2525
+#: ../pykolab/auth/ldap/__init__.py:2762
 msgid "Entry Change Notification attributes:"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2530
+#: ../pykolab/auth/ldap/__init__.py:2767
 #, python-format
 msgid "Change Type: %r (%r)"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2538
+#: ../pykolab/auth/ldap/__init__.py:2775
 #, python-format
 msgid "Previous DN: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2593
+#: ../pykolab/auth/ldap/__init__.py:2830
 #, python-format
 msgid "Object %s searched no longer exists"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2603
+#: ../pykolab/auth/ldap/__init__.py:2840
 #, python-format
 msgid "%d results..."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2706
+#: ../pykolab/auth/ldap/__init__.py:2943
 #, python-format
 msgid "Searching with filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2758
+#: ../pykolab/auth/ldap/__init__.py:2995
 #, python-format
 msgid "Checking for support for %s on %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2777
+#: ../pykolab/auth/ldap/__init__.py:3014
 #, python-format
 msgid "Found support for %s"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:2822
+#: ../pykolab/auth/ldap/__init__.py:3068
+msgid "-- reconnecting in 10 seconds."
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:3076
 #, python-format
 msgid "An error occured using %s: %r"
 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
@@ -804,7 +943,8 @@
 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
@@ -812,12 +952,13 @@
 msgid "Recipient %r is not the primary recipient for address %r"
 msgstr ""
 
-#: ../pykolab/cli/cmd_add_domain.py:36
+#: ../pykolab/cli/cmd_add_domain.py:36 ../pykolab/cli/cmd_check_quota.py:37
 #: ../pykolab/cli/cmd_count_domain_mailboxes.py:38
 #: ../pykolab/cli/cmd_create_mailbox.py:36
+#: ../pykolab/cli/cmd_delete_domain.py:39
 #: ../pykolab/cli/cmd_export_mailbox.py:33
 #: ../pykolab/cli/cmd_list_deleted_mailboxes.py:38
-#: ../pykolab/cli/cmd_list_domain_mailboxes.py:36
+#: ../pykolab/cli/cmd_list_domain_mailboxes.py:37
 #: ../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
@@ -838,12 +979,14 @@
 msgid "Add a new domain."
 msgstr ""
 
-#: ../pykolab/cli/cmd_add_domain.py:55 ../pykolab/cli/cmd_delete_domain.py:44
+#: ../pykolab/cli/cmd_add_domain.py:55 ../pykolab/cli/cmd_delete_domain.py:55
 #: ../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
+#: ../pykolab/cli/cmd_add_domain.py:67 ../pykolab/cli/cmd_delete_domain.py:67
 #: ../pykolab/cli/cmd_find_domain.py:56
 msgid "Domain name"
 msgstr ""
@@ -873,20 +1016,45 @@
 
 #: ../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_list_messages.py:100
 #: ../pykolab/cli/cmd_remove_user_subscription.py:73
 msgid "No such folder"
 msgstr ""
 
+#: ../pykolab/cli/cmd_check_quota.py:44
+msgid "Do not apply any changes."
+msgstr ""
+
+#: ../pykolab/cli/cmd_check_quota.py:53
 #: ../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_list_domain_mailboxes.py:49
+#: ../pykolab/cli/cmd_list_mailboxes.py:52
+#: ../pykolab/cli/cmd_list_messages.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_check_quota.py:57
+msgid "Compare existing IMAP quota with LDAP quota."
+msgstr ""
+
+#: ../pykolab/cli/cmd_check_quota.py:84 ../pykolab/cli/cmd_user_info.py:51
+#, python-format
+msgid "No such user %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_check_quota.py:98
+#, python-format
+msgid "No quota for user %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_check_quota.py:105
+#, python-format
+msgid "user quota does not match for %s (IMAP: %d, LDAP: %d)"
+msgstr ""
+
 #: ../pykolab/cli/cmd_create_mailbox.py:42
 msgid "Set metadata for folder to ANNOTATION=VALUE"
 msgstr ""
@@ -907,6 +1075,10 @@
 msgid "Delete a domain."
 msgstr ""
 
+#: ../pykolab/cli/cmd_delete_domain.py:46
+msgid "Force deleting the domain even if it contains user accounts"
+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
@@ -919,10 +1091,8 @@
 #: ../pykolab/cli/cmd_list_mailbox_metadata.py:54
 #: ../pykolab/cli/cmd_set_mailbox_acl.py:54
 #: ../pykolab/cli/cmd_set_mailbox_metadata.py:66
-#: ../pykolab/cli/cmd_set_quota.py:48 ../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
+#: ../pykolab/cli/cmd_set_quota.py:48 ../tests/unit/test-015-translate.py:15
+#: ../tests/unit/test-015-translate.py:19
 msgid "Folder name"
 msgstr ""
 
@@ -963,7 +1133,7 @@
 msgstr ""
 
 #: ../pykolab/cli/cmd_delete_message.py:52
-#: ../pykolab/cli/cmd_list_messages.py:58
+#: ../pykolab/cli/cmd_list_messages.py:76
 msgid "Specify a folder"
 msgstr ""
 
@@ -991,13 +1161,13 @@
 msgstr ""
 
 #: ../pykolab/cli/cmd_list_deleted_mailboxes.py:43
-#: ../pykolab/cli/cmd_list_domain_mailboxes.py:41
+#: ../pykolab/cli/cmd_list_domain_mailboxes.py:42
 #: ../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_domain_mailboxes.py:58
+#: ../pykolab/cli/cmd_list_domain_mailboxes.py:59
 msgid "Domain"
 msgstr ""
 
@@ -1014,7 +1184,11 @@
 msgid "Include messages flagged as \\Deleted"
 msgstr ""
 
-#: ../pykolab/cli/cmd_list_messages.py:47
+#: ../pykolab/cli/cmd_list_messages.py:61
+msgid "List messages as user USER"
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_messages.py:65
 msgid "List messages in a folder"
 msgstr ""
 
@@ -1194,38 +1368,38 @@
 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
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:105
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:153
 #, 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
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:110
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:158
 #, 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
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:114
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:162
 #, 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
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:116
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:164
 #, 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
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:118
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:166
 #, python-format
 msgid "No recipients for '%s' (use --delete to delete)!"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:136
+#: ../pykolab/cli/cmd_sync_mailhost_attrs.py:147
 #, python-format
 msgid "Multiple recipients for '%s'!"
 msgstr ""
@@ -1238,22 +1412,26 @@
 msgid "Resync from the beginning"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync.py:72
+#: ../pykolab/cli/cmd_sync.py:68
+msgid "Only sync the specified domain"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:82
 #, python-format
 msgid "Found %d domains in %d seconds"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync.py:85
+#: ../pykolab/cli/cmd_sync.py:98
 #, python-format
 msgid "Running for domain %s"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync.py:92
+#: ../pykolab/cli/cmd_sync.py:105
 #, python-format
 msgid "Synchronizing users for %s took %d seconds"
 msgstr ""
 
-#: ../pykolab/cli/cmd_sync.py:109
+#: ../pykolab/cli/cmd_sync.py:123
 #, python-format
 msgid "Worker process %s handling %s"
 msgstr ""
@@ -1270,11 +1448,6 @@
 msgid "Email address"
 msgstr ""
 
-#: ../pykolab/cli/cmd_user_info.py:51
-#, python-format
-msgid "No such user %s"
-msgstr ""
-
 #. This is a nested command
 #. This is a nested component
 #: ../pykolab/cli/commands.py:97 ../pykolab/setup/components.py:90
@@ -1292,7 +1465,7 @@
 msgstr ""
 
 #: ../pykolab/cli/commands.py:192 ../pykolab/setup/components.py:257
-#: ../wallace/modules.py:376
+#: ../wallace/modules.py:391
 #, python-format
 msgid "Alias for %s"
 msgstr ""
@@ -1301,7 +1474,7 @@
 msgid "Not yet implemented"
 msgstr ""
 
-#: ../pykolab/cli/sieve/cmd_list.py:43 ../pykolab/cli/sieve/cmd_put.py:42
+#: ../pykolab/cli/sieve/cmd_list.py:49 ../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 ""
@@ -1417,7 +1590,8 @@
 #: ../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
@@ -1499,100 +1673,106 @@
 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 "Use the default answer to all questions."
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:294
-msgid "Log file to use"
+#: ../pykolab/conf/__init__.py:292
+msgid "Set the logging level. One of info, warn, error, critical or debug"
 msgstr ""
 
 #: ../pykolab/conf/__init__.py:300
-msgid "Be quiet."
+msgid "Log file to use"
 msgstr ""
 
 #: ../pykolab/conf/__init__.py:306
+msgid "Be quiet."
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:312
 msgid "Answer yes to all questions."
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:328
+#: ../pykolab/conf/__init__.py:334
 msgid "No command supplied"
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:416
+#: ../pykolab/conf/__init__.py:422
 msgid "Insufficient options. Need section, key and value -in that order."
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:419
+#: ../pykolab/conf/__init__.py:425
 #, python-format
 msgid "No section '%s' exists."
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:461
+#: ../pykolab/conf/__init__.py:467
 #, python-format
 msgid "Setting %s to %r (from the default values for CLI options)"
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:534
+#: ../pykolab/conf/__init__.py:540
 #, python-format
 msgid "Could not execute configuration function: %s"
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:542
+#: ../pykolab/conf/__init__.py:548
 #, python-format
 msgid "Option %s/%s does not exist in config file %s, pulling from defaults"
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:550 ../pykolab/conf/__init__.py:553
+#: ../pykolab/conf/__init__.py:556 ../pykolab/conf/__init__.py:559
 msgid "Option does not exist in defaults."
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:563
+#: ../pykolab/conf/__init__.py:569
 #, python-format
 msgid "Configuration file %s not readable."
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:566
+#: ../pykolab/conf/__init__.py:572
 #, python-format
 msgid "Configuration file %s does not exist."
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:571
+#: ../pykolab/conf/__init__.py:577
 msgid ""
 "WARNING: A negative debug level value does not make this program be any more "
 "silent."
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:577
+#: ../pykolab/conf/__init__.py:583
 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
+#: ../pykolab/conf/__init__.py:591 ../pykolab/conf/__init__.py:597
+#: ../pykolab/conf/__init__.py:601 ../pykolab/conf/__init__.py:607
 msgid "Cannot start SASL authentication daemon"
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:612
+#: ../pykolab/conf/__init__.py:618
 msgid "No imaplib library found."
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:622
+#: ../pykolab/conf/__init__.py:628
 msgid "No LMTP class found in the smtplib library."
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:632
+#: ../pykolab/conf/__init__.py:638
 msgid "No SMTP class found in the smtplib library."
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:646
+#: ../pykolab/conf/__init__.py:652
 #, python-format
 msgid "Found you specified a specific set of items to test: %s"
 msgstr ""
 
-#: ../pykolab/conf/__init__.py:654
+#: ../pykolab/conf/__init__.py:660
 #, python-format
 msgid "Selectively selecting: %s"
 msgstr ""
@@ -1621,98 +1801,121 @@
 msgid "OpenLDAP or compatible"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:80
+#: ../pykolab/imap/cyrus.py:83
 #, python-format
 msgid "Could not connect to Cyrus IMAP server %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:138
+#: ../pykolab/imap/cyrus.py:150 ../pykolab/imap/dovecot.py:285
 #, python-format
 msgid "Continuing with separator: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:143
+#: ../pykolab/imap/cyrus.py:159
 msgid "Detected we are running in a Murder topology"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:147
+#: ../pykolab/imap/cyrus.py:167
 msgid "This system is not part of a murder topology"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:168
+#: ../pykolab/imap/cyrus.py:196
 #, python-format
 msgid "Checking actual backend server for folder %s through annotations"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:173
-msgid "Possibly reproducing the find "
+#: ../pykolab/imap/cyrus.py:206
+#, python-format
+msgid ""
+"Possibly reproducing the find mailfolder server answer from previously "
+"detected and stored annotation value: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:196
+#: ../pykolab/imap/cyrus.py:236
 #, python-format
 msgid "Could not get the annotations after %s tries."
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:200
+#: ../pykolab/imap/cyrus.py:250
 #, python-format
 msgid "No annotations for %s: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:207
+#: ../pykolab/imap/cyrus.py:262
 #, python-format
 msgid "Server for INBOX folder %s is %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:227
+#. Removed server reconnection for dovecot, we only have one server
+#: ../pykolab/imap/cyrus.py:294 ../pykolab/imap/dovecot.py:311
 #, python-format
 msgid "Setting quota for folder %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:231
+#: ../pykolab/imap/cyrus.py:305 ../pykolab/imap/dovecot.py:315
 #, python-format
 msgid "Could not set quota for mailfolder %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:241
+#: ../pykolab/imap/cyrus.py:319 ../pykolab/imap/dovecot.py:320
 #, python-format
 msgid "Moving INBOX folder %s to %s on partition %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:243
+#: ../pykolab/imap/cyrus.py:329 ../pykolab/imap/dovecot.py:322
 #, python-format
 msgid "Moving INBOX folder %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:259
+#: ../pykolab/imap/cyrus.py:355
 #, python-format
 msgid "Setting annotation %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:264
+#: ../pykolab/imap/cyrus.py:366
 #, python-format
 msgid "Could not set annotation %r on mail folder %r: %r"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:268
+#: ../pykolab/imap/cyrus.py:376 ../pykolab/imap/dovecot.py:451
 #, python-format
 msgid "Transferring folder %s from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:328
+#: ../pykolab/imap/cyrus.py:464 ../pykolab/imap/dovecot.py:511
 #, python-format
 msgid "Undeleting %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:339
+#: ../pykolab/imap/cyrus.py:484
 #, python-format
-msgid "Would have transfered %s from %s to %s"
+msgid "Would have transferred %s from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/cyrus.py:341
+#: ../pykolab/imap/cyrus.py:491 ../pykolab/imap/dovecot.py:524
 #, python-format
 msgid "Would have renamed %s to %s"
 msgstr ""
 
+#: ../pykolab/imap/dovecot.py:220
+#, python-format
+msgid "Could not connect to Dovecot IMAP server %r"
+msgstr ""
+
+#: ../pykolab/imap/dovecot.py:292
+msgid "Detected METADATA support"
+msgstr ""
+
+#: ../pykolab/imap/dovecot.py:295
+#, python-format
+msgid "This system does not support METADATA: '%s'"
+msgstr ""
+
+#: ../pykolab/imap/dovecot.py:522
+#, python-format
+msgid "Would have transfered %s from %s to %s"
+msgstr ""
+
 #: ../pykolab/imap/__init__.py:46
 #, python-format
 msgid "Cleaning up ACL entries for %s across all folders"
@@ -1782,179 +1985,190 @@
 msgid "%r has no attribute %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:389
+#: ../pykolab/imap/__init__.py:360
+#, python-format
+msgid "Invalid access identifier %r for subject %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:397
 #, python-format
 msgid "Could not set ACL for %s on folder %s: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:423 ../pykolab/imap/__init__.py:458
+#: ../pykolab/imap/__init__.py:431 ../pykolab/imap/__init__.py:467
 #, python-format
 msgid "Creating new shared folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:483 ../pykolab/imap/__init__.py:736
+#: ../pykolab/imap/__init__.py:496 ../pykolab/imap/__init__.py:776
 #, python-format
 msgid "Downcasing mailbox name %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:487
+#: ../pykolab/imap/__init__.py:500
 #, python-format
 msgid "Creating new mailbox for user %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:502 ../pykolab/imap/__init__.py:609
+#: ../pykolab/imap/__init__.py:515 ../pykolab/imap/__init__.py:644
 msgid "Waiting for the Cyrus IMAP Murder to settle..."
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:555
+#: ../pykolab/imap/__init__.py:590
 #, python-format
 msgid "Creating additional folders for user %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:583
+#: ../pykolab/imap/__init__.py:618
 #, python-format
 msgid "Waiting for the Cyrus murder to settle... %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:598
+#: ../pykolab/imap/__init__.py:633
 #, python-format
 msgid "Correcting additional folder name from %r to %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:614
+#: ../pykolab/imap/__init__.py:649
 #, python-format
 msgid "Mailbox already exists: %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:654
+#: ../pykolab/imap/__init__.py:689
 msgid "Subscribing user to the additional folders"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:668
+#: ../pykolab/imap/__init__.py:703
 msgid "Using the following tests for folder subscriptions:"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:670
+#: ../pykolab/imap/__init__.py:705
 #, python-format
 msgid "    %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:673
+#: ../pykolab/imap/__init__.py:708
 #, python-format
 msgid "Folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:685
+#: ../pykolab/imap/__init__.py:720
 #, python-format
 msgid "Subscribing %s to folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:689
+#: ../pykolab/imap/__init__.py:724
 #, python-format
 msgid "Subscribing %s to folder %s failed: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:719
+#: ../pykolab/imap/__init__.py:750
+#, python-format
+msgid "Could not set quota on %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:757
 #, python-format
 msgid "Could not rename %s to reside on partition %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:752
+#: ../pykolab/imap/__init__.py:794
 #, python-format
 msgid "INBOX folder to rename (%s) does not exist"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:755 ../pykolab/imap/__init__.py:831
+#: ../pykolab/imap/__init__.py:797 ../pykolab/imap/__init__.py:905
 #, python-format
 msgid "Renaming INBOX from %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:759
+#: ../pykolab/imap/__init__.py:801
 #, python-format
 msgid "Could not rename INBOX folder %s to %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:761 ../pykolab/imap/__init__.py:835
+#: ../pykolab/imap/__init__.py:803 ../pykolab/imap/__init__.py:909
 #, python-format
 msgid "Moving INBOX folder %s won't succeed as target folder %s already exists"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:765
+#: ../pykolab/imap/__init__.py:807
 #, python-format
 msgid "Server for mailbox %r is %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:773
+#: ../pykolab/imap/__init__.py:815
 #, python-format
 msgid "Looking for folder '%s', we found folders: %r"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:796
+#: ../pykolab/imap/__init__.py:829 ../pykolab/imap/__init__.py:872
+#: ../pykolab/imap/__init__.py:886
 #, python-format
-msgid "Setting ACL rights %s for subject %s on folder "
+msgid "Removing ACL rights %s for subject %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:807
+#: ../pykolab/imap/__init__.py:861
 #, python-format
-msgid "Removing ACL rights %s for subject %s on folder "
+msgid "Setting ACL rights %s for subject %s on folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:828
+#: ../pykolab/imap/__init__.py:902
 #, python-format
 msgid "Found old INBOX folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:837
+#: ../pykolab/imap/__init__.py:911
 #, python-format
 msgid "Did not find old folder user/%s to rename"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:839
+#: ../pykolab/imap/__init__.py:913
 msgid "Value for user is not a dictionary"
 msgstr ""
 
 #. TODO: Go in fact correct the quota.
-#: ../pykolab/imap/__init__.py:907
+#: ../pykolab/imap/__init__.py:981
 #, python-format
 msgid "Cannot get current IMAP quota for folder %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:920
+#: ../pykolab/imap/__init__.py:994
 #, python-format
 msgid "Quota for %s currently is %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:926
+#: ../pykolab/imap/__init__.py:1000
 #, python-format
 msgid "Adjusting authentication database quota for folder %s to %d"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:931
+#: ../pykolab/imap/__init__.py:1005
 #, python-format
 msgid "Correcting quota for %s to %s (currently %s)"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1008
+#: ../pykolab/imap/__init__.py:1082
 #, python-format
 msgid "Checking folder: %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1013
+#: ../pykolab/imap/__init__.py:1087
 #, python-format
 msgid "Folder has no corresponding user (1): %s"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1016
+#: ../pykolab/imap/__init__.py:1090
 #, python-format
 msgid "Folder has no corresponding user (2): %s"
 msgstr ""
 
 #. We got user identifier only
-#: ../pykolab/imap/__init__.py:1031
+#: ../pykolab/imap/__init__.py:1105
 msgid "Please don't give us just a user identifier"
 msgstr ""
 
-#: ../pykolab/imap/__init__.py:1034
+#: ../pykolab/imap/__init__.py:1108
 #, python-format
 msgid "Deleting folder %s"
 msgstr ""
@@ -2001,8 +2215,8 @@
 msgstr ""
 
 #: ../pykolab/itip/__init__.py:288 ../pykolab/itip/__init__.py:332
-#: ../wallace/module_invitationpolicy.py:1205
-#: ../wallace/module_invitationpolicy.py:1269
+#: ../wallace/module_invitationpolicy.py:1253
+#: ../wallace/module_invitationpolicy.py:1328
 #: ../wallace/module_resources.py:1347
 #, python-format
 msgid "SMTP sendmail error: %r"
@@ -2153,7 +2367,7 @@
 msgstr ""
 
 #: ../pykolab/plugins/roundcubedb/__init__.py:55
-#: ../pykolab/setup/setup_roundcube.py:168
+#: ../pykolab/setup/setup_roundcube.py:106
 msgid "Roundcube installation path not found."
 msgstr ""
 
@@ -2173,6 +2387,16 @@
 msgid "No such component."
 msgstr ""
 
+#: ../pykolab/setup/__init__.py:55
+msgid "SELinux currently enforcing. Read https://git.kolab.org/u/1"
+msgstr ""
+
+#: ../pykolab/setup/__init__.py:67
+msgid ""
+"SELinux configured to enforce a policy on startup. Read https://git.kolab."
+"org/u/1"
+msgstr ""
+
 #: ../pykolab/setup/setup_freebusy.py:47
 msgid "Setup Free/Busy."
 msgstr ""
@@ -2181,6 +2405,22 @@
 msgid "Free/Busy is not installed on this system"
 msgstr ""
 
+#: ../pykolab/setup/setup_guam.py:41
+msgid "Setup Guam."
+msgstr ""
+
+#: ../pykolab/setup/setup_guam.py:45
+msgid "Guam is not installed on this system"
+msgstr ""
+
+#: ../pykolab/setup/setup_guam.py:58
+msgid "Could not start the guam service."
+msgstr ""
+
+#: ../pykolab/setup/setup_guam.py:63
+msgid "Could not configure the guam service to start on boot"
+msgstr ""
+
 #: ../pykolab/setup/setup_imap.py:45
 msgid "Setup IMAP."
 msgstr ""
@@ -2193,15 +2433,14 @@
 msgid "Could not write out Cyrus IMAP configuration file /etc/cyrus.conf"
 msgstr ""
 
-#: ../pykolab/setup/setup_imap.py:158
+#: ../pykolab/setup/setup_imap.py:162
 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:472
-#: ../pykolab/setup/setup_mysql.py:63 ../pykolab/setup/setup_roundcube.py:245
-#: ../pykolab/setup/setup_syncroton.py:105
-msgid "Could not configure to start on boot, the "
+#: ../pykolab/setup/setup_imap.py:177
+msgid ""
+"Could not configure to start on boot, the cyrus-imapd and kolab-saslauthd "
+"services."
 msgstr ""
 
 #: ../pykolab/setup/setup_kolabd.py:44
@@ -2218,10 +2457,14 @@
 "                        "
 msgstr ""
 
-#: ../pykolab/setup/setup_kolabd.py:81
+#: ../pykolab/setup/setup_kolabd.py:84
 msgid "Could not start the kolab server service."
 msgstr ""
 
+#: ../pykolab/setup/setup_kolabd.py:96
+msgid "Could not configure to start on boot, the kolab server service."
+msgstr ""
+
 #: ../pykolab/setup/setup_ldap.py:45
 msgid "LDAP Options"
 msgstr ""
@@ -2246,15 +2489,19 @@
 msgid "Setup configuration for Active Directory compatibility."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:88
+#: ../pykolab/setup/setup_ldap.py:92
+msgid "Specify password for the Domain Manager."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:96
 msgid "Setup LDAP."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:97
+#: ../pykolab/setup/setup_ldap.py:105
 msgid "Skipping setup of LDAP, as specified"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:126
+#: ../pykolab/setup/setup_ldap.py:134
 msgid ""
 "\n"
 "                        You can not configure Kolab to run against OpenLDAP\n"
@@ -2262,7 +2509,7 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:139
+#: ../pykolab/setup/setup_ldap.py:147
 msgid ""
 "\n"
 "                                It seems 389 Directory Server has an "
@@ -2278,7 +2525,7 @@
 "                            "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:154
+#: ../pykolab/setup/setup_ldap.py:162
 msgid ""
 "\n"
 "                        Please supply a password for the LDAP administrator "
@@ -2289,11 +2536,11 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:162
+#: ../pykolab/setup/setup_ldap.py:170
 msgid "Administrator password"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:169
+#: ../pykolab/setup/setup_ldap.py:180
 msgid ""
 "\n"
 "                        Please supply a password for the LDAP Directory "
@@ -2306,11 +2553,11 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:178
+#: ../pykolab/setup/setup_ldap.py:189
 msgid "Directory Manager password"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:185
+#: ../pykolab/setup/setup_ldap.py:196
 msgid ""
 "\n"
 "                        Please choose the system user and group the service\n"
@@ -2320,15 +2567,15 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:195 ../pykolab/setup/setup_ldap.py:198
+#: ../pykolab/setup/setup_ldap.py:206 ../pykolab/setup/setup_ldap.py:209
 msgid "User"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:196 ../pykolab/setup/setup_ldap.py:199
+#: ../pykolab/setup/setup_ldap.py:207 ../pykolab/setup/setup_ldap.py:210
 msgid "Group"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:234
+#: ../pykolab/setup/setup_ldap.py:245
 msgid ""
 "\n"
 "                        This setup procedure plans to set up Kolab Groupware "
@@ -2342,18 +2589,18 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:248
+#: ../pykolab/setup/setup_ldap.py:259
 msgid "Domain name to use"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:253 ../pykolab/setup/setup_ldap.py:278
+#: ../pykolab/setup/setup_ldap.py:264 ../pykolab/setup/setup_ldap.py:289
 msgid ""
 "\n"
 "                                    Invalid input. Please try again.\n"
 "                                "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:262
+#: ../pykolab/setup/setup_ldap.py:273
 msgid ""
 "\n"
 "                        The standard root dn we composed for you follows. "
@@ -2362,15 +2609,15 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:273
+#: ../pykolab/setup/setup_ldap.py:284
 msgid "Root DN to use"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:325
+#: ../pykolab/setup/setup_ldap.py:336
 msgid "No directory server setup tool available."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:337
+#: ../pykolab/setup/setup_ldap.py:348
 msgid ""
 "\n"
 "                    Setup is now going to set up the 389 Directory Server. "
@@ -2381,11 +2628,11 @@
 "                "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:344
+#: ../pykolab/setup/setup_ldap.py:355
 msgid "Setting up 389 Directory Server"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:356
+#: ../pykolab/setup/setup_ldap.py:367
 msgid ""
 "\n"
 "                        An error was detected in the setup procedure for "
@@ -2399,27 +2646,31 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:373
+#: ../pykolab/setup/setup_ldap.py:384
 msgid "Setup DS stdout:"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:376
+#: ../pykolab/setup/setup_ldap.py:387
 msgid "Setup DS stderr:"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:402
+#: ../pykolab/setup/setup_ldap.py:413
 msgid "Could not copy the LDAP extensions for Kolab"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:405
+#: ../pykolab/setup/setup_ldap.py:416
 msgid "Could not find the ldap Kolab schema file"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:417
+#: ../pykolab/setup/setup_ldap.py:429
 msgid "Could not start the directory server service."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:431
+#: ../pykolab/setup/setup_ldap.py:438
+msgid "Could not configure to start on boot, the directory server service."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:443
 msgid ""
 "\n"
 "                        Please supply a Cyrus Administrator password. This\n"
@@ -2431,11 +2682,11 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:441
+#: ../pykolab/setup/setup_ldap.py:453
 msgid "Cyrus Administrator password"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:448
+#: ../pykolab/setup/setup_ldap.py:460
 msgid ""
 "\n"
 "                        Please supply a Kolab Service account password. "
@@ -2448,64 +2699,80 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:457
+#: ../pykolab/setup/setup_ldap.py:469
 msgid "Kolab Service password"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:467
+#: ../pykolab/setup/setup_ldap.py:479
 msgid "Writing out configuration to kolab.conf"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:481
+#: ../pykolab/setup/setup_ldap.py:493
 msgid "Inserting service users into LDAP."
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:555
+#: ../pykolab/setup/setup_ldap.py:567
 msgid "Writing out cn=kolab,cn=config"
 msgstr ""
 
-#. TODO: Add kolab-admin role
-#. TODO: Assign kolab-admin admin ACLs
-#: ../pykolab/setup/setup_ldap.py:579
+#: ../pykolab/setup/setup_ldap.py:583
 #, python-format
 msgid "Adding domain %s to list of domains for this deployment"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:607
+#: ../pykolab/setup/setup_ldap.py:611
 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:615
+#: ../pykolab/setup/setup_ldap.py:619
 msgid "Enabling attribute uniqueness plugin"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:621
+#: ../pykolab/setup/setup_ldap.py:625
 msgid "Enabling referential integrity plugin"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:627
+#: ../pykolab/setup/setup_ldap.py:631
 msgid "Enabling and configuring account policy plugin"
 msgstr ""
 
-#. TODO: Add kolab-admin role
-#: ../pykolab/setup/setup_ldap.py:642
+#. Add kolab-admin role
+#: ../pykolab/setup/setup_ldap.py:646
 msgid "Adding the kolab-admin role"
 msgstr ""
 
-#. TODO: User writeable attributes on root_dn
-#: ../pykolab/setup/setup_ldap.py:653
+#. User writeable attributes on root_dn
+#: ../pykolab/setup/setup_ldap.py:657
 #, python-format
 msgid "Setting access control to %s"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:674
+#: ../pykolab/setup/setup_ldap.py:677
 msgid "directory server admin service not available"
 msgstr ""
 
-#: ../pykolab/setup/setup_ldap.py:682
-msgid "Could not start and configure to start on boot, the "
+#: ../pykolab/setup/setup_ldap.py:685
+msgid ""
+"Could not start and configure to start on boot, the directory server admin "
+"service."
+msgstr ""
+
+#: ../pykolab/setup/setup_manticore.py:44
+msgid "Setup Manticore."
+msgstr ""
+
+#: ../pykolab/setup/setup_manticore.py:48
+msgid "Manticore is not installed on this system"
+msgstr ""
+
+#: ../pykolab/setup/setup_manticore.py:94
+msgid "Could not start the manticore service."
+msgstr ""
+
+#: ../pykolab/setup/setup_manticore.py:100
+msgid "Could not configure the manticore service to start on boot"
 msgstr ""
 
 #: ../pykolab/setup/setup_mta.py:41
@@ -2521,31 +2788,53 @@
 msgid "Could not write out Postfix configuration file /etc/postfix/master.cf"
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:406
+#: ../pykolab/setup/setup_mta.py:413
 msgid "Could not write out Amavis configuration file amavisd.conf"
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:414
+#: ../pykolab/setup/setup_mta.py:421
 msgid "Not writing out any configuration for Amavis."
 msgstr ""
 
-#: ../pykolab/setup/setup_mta.py:454
+#: ../pykolab/setup/setup_mta.py:482
 msgid "Could not start the postfix, clamav and amavisd services services."
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:39
+#: ../pykolab/setup/setup_mta.py:500
+msgid ""
+"Could not configure to start on boot, the postfix, clamav and amavisd "
+"services."
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:40
+msgid "MySQL Options"
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:46
+msgid "Specify whether to use an (existing) or (new) MySQL server."
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:50
 msgid "Setup MySQL."
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:54
+#: ../pykolab/setup/setup_mysql.py:78
 msgid "Could not start the MySQL database service."
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:76
+#: ../pykolab/setup/setup_mysql.py:87
+msgid "Could not configure to start on boot, the MySQL database service."
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:90
+msgid "Waiting for at most 30 seconds for MySQL/MariaDB to settle..."
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:114
 msgid "What MySQL server are we setting up?"
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:80
+#: ../pykolab/setup/setup_mysql.py:118
 msgid ""
 "\n"
 "                        Please supply the root password for MySQL, so we can "
@@ -2555,13 +2844,13 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:87 ../pykolab/setup/setup_mysql.py:104
-#: ../pykolab/setup/setup_roundcube.py:191
+#: ../pykolab/setup/setup_mysql.py:125 ../pykolab/setup/setup_mysql.py:142
+#: ../pykolab/setup/setup_roundcube.py:218
 #: ../pykolab/setup/setup_syncroton.py:66
 msgid "MySQL root password"
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:93
+#: ../pykolab/setup/setup_mysql.py:131
 msgid ""
 "\n"
 "                        Please supply a root password for MySQL. This "
@@ -2576,7 +2865,7 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:148
+#: ../pykolab/setup/setup_mysql.py:186
 msgid ""
 "\n"
 "                        Please supply a password for the MySQL user "
@@ -2587,11 +2876,11 @@
 "                    "
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:156
+#: ../pykolab/setup/setup_mysql.py:194
 msgid "MySQL kolab password"
 msgstr ""
 
-#: ../pykolab/setup/setup_mysql.py:175
+#: ../pykolab/setup/setup_mysql.py:213
 msgid "Could not find the MySQL Kolab schema file"
 msgstr ""
 
@@ -2634,11 +2923,11 @@
 msgid "Could not find PHP configuration file php.ini"
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:44
+#: ../pykolab/setup/setup_roundcube.py:45
 msgid "Setup Roundcube."
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:48
+#: ../pykolab/setup/setup_roundcube.py:49
 msgid ""
 "\n"
 "                    Please supply a password for the MySQL user "
@@ -2648,25 +2937,34 @@
 "                "
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:56
+#: ../pykolab/setup/setup_roundcube.py:57
 msgid "MySQL roundcube password"
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:126
+#: ../pykolab/setup/setup_roundcube.py:144
 #, python-format
 msgid "Using template file %r"
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:133
+#: ../pykolab/setup/setup_roundcube.py:151
 #, python-format
 msgid "Successfully compiled template %r, writing out to %r"
 msgstr ""
 
-#: ../pykolab/setup/setup_roundcube.py:236
-#: ../pykolab/setup/setup_syncroton.py:96
+#: ../pykolab/setup/setup_roundcube.py:263
+msgid "Cannot find the configuration directory for roundcube."
+msgstr ""
+
+#: ../pykolab/setup/setup_roundcube.py:291
+#: ../pykolab/setup/setup_syncroton.py:100
 msgid "Could not start the webserver server service."
 msgstr ""
 
+#: ../pykolab/setup/setup_roundcube.py:300
+#: ../pykolab/setup/setup_syncroton.py:109
+msgid "Could not configure to start on boot, the webserver server service."
+msgstr ""
+
 #: ../pykolab/setup/setup_syncroton.py:40
 msgid "Setup Syncroton."
 msgstr ""
@@ -2696,222 +2994,238 @@
 msgid "No database available"
 msgstr ""
 
-#: ../pykolab/utils.py:62 ../pykolab/utils.py:64
+#: ../pykolab/utils.py:69 ../pykolab/utils.py:71
 #, python-format
 msgid "Confirm %s: "
 msgstr ""
 
-#: ../pykolab/utils.py:67
-msgid "Incorrect confirmation. "
+#: ../pykolab/utils.py:74
+msgid "Incorrect confirmation. Please try again."
 msgstr ""
 
-#: ../pykolab/utils.py:72 ../pykolab/utils.py:77
+#: ../pykolab/utils.py:79 ../pykolab/utils.py:84
 #, python-format
 msgid "%s: "
 msgstr ""
 
-#: ../pykolab/utils.py:74 ../pykolab/utils.py:79
+#: ../pykolab/utils.py:81 ../pykolab/utils.py:86
 #, python-format
 msgid "%s [%s]: "
 msgstr ""
 
-#: ../pykolab/utils.py:124
+#: ../pykolab/utils.py:139
 msgid "Please answer 'yes' or 'no'."
 msgstr ""
 
-#: ../pykolab/utils.py:164
+#: ../pykolab/utils.py:184
 msgid "Choice"
 msgstr ""
 
-#: ../pykolab/utils.py:167
+#: ../pykolab/utils.py:187
 msgid "Choice (type '?' for options)"
 msgstr ""
 
-#: ../pykolab/utils.py:268
+#: ../pykolab/utils.py:288
 #, python-format
 msgid "Could not change the permissions on %s"
 msgstr ""
 
-#: ../pykolab/utils.py:484
+#: ../pykolab/utils.py:526
 #, python-format
 msgid "Transliterating string %r with locale %r"
 msgstr ""
 
-#: ../pykolab/utils.py:492
+#: ../pykolab/utils.py:534
 msgid "Attempting to set locale"
 msgstr ""
 
-#: ../pykolab/utils.py:494
+#: ../pykolab/utils.py:536
 msgid "Success setting locale"
 msgstr ""
 
-#: ../pykolab/utils.py:496
+#: ../pykolab/utils.py:538
 msgid "Failure to set locale"
 msgstr ""
 
-#: ../pykolab/utils.py:504
+#: ../pykolab/utils.py:546
 #, python-format
 msgid "Executing '%s | %s'"
 msgstr ""
 
-#: ../pykolab/utils.py:515
+#: ../pykolab/utils.py:557
 #, python-format
 msgid "Could not translate %s using locale %s"
 msgstr ""
 
-#: ../pykolab/wap_client/__init__.py:399
+#: ../pykolab/wap_client/__init__.py:416
 #, python-format
 msgid "Requesting %r with params %r"
 msgstr ""
 
-#: ../pykolab/wap_client/__init__.py:407
+#: ../pykolab/wap_client/__init__.py:424
 #, python-format
 msgid "Got response: %r"
 msgstr ""
 
+#: ../pykolab/wap_client/__init__.py:429
+#, python-format
+msgid "Connection error: %r; re-connecting..."
+msgstr ""
+
 #. Some data is not JSON
-#: ../pykolab/wap_client/__init__.py:413
+#: ../pykolab/wap_client/__init__.py:441
 msgid "Response data is not JSON"
 msgstr ""
 
 #. support integer values, too
-#: ../pykolab/xml/attendee.py:9 ../pykolab/xml/attendee.py:17
+#: ../pykolab/xml/attendee.py:9 ../pykolab/xml/attendee.py:18
 msgid "Needs Action"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:10 ../pykolab/xml/attendee.py:18
+#: ../pykolab/xml/attendee.py:10 ../pykolab/xml/attendee.py:19
 msgid "Accepted"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:11 ../pykolab/xml/attendee.py:19
+#: ../pykolab/xml/attendee.py:11 ../pykolab/xml/attendee.py:20
 msgid "Declined"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:12 ../pykolab/xml/attendee.py:20
+#: ../pykolab/xml/attendee.py:12 ../pykolab/xml/attendee.py:21
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:13 ../pykolab/xml/attendee.py:21
+#: ../pykolab/xml/attendee.py:13 ../pykolab/xml/attendee.py:22
 msgid "Delegated"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:14 ../pykolab/xml/attendee.py:22
+#: ../pykolab/xml/attendee.py:14 ../pykolab/xml/attendee.py:23
+msgid "Started"
+msgstr ""
+
+#: ../pykolab/xml/attendee.py:15 ../pykolab/xml/attendee.py:24
 msgid "Completed"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:15 ../pykolab/xml/attendee.py:23
-msgid "Started"
+#: ../pykolab/xml/attendee.py:16
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:914
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:926
+msgid "Pending"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:132 ../pykolab/xml/attendee.py:154
+#: ../pykolab/xml/attendee.py:133 ../pykolab/xml/attendee.py:155
 msgid "Not a valid attendee"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:139
+#: ../pykolab/xml/attendee.py:140
 msgid "No valid delegator references found"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:159
+#: ../pykolab/xml/attendee.py:160
 msgid "No valid delegatee references found"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:219
+#: ../pykolab/xml/attendee.py:220
 #, python-format
 msgid "Invalid cutype %r"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:231
+#: ../pykolab/xml/attendee.py:232
 #, python-format
 msgid "Invalid participant status %r"
 msgstr ""
 
-#: ../pykolab/xml/attendee.py:239
+#: ../pykolab/xml/attendee.py:240
 #, python-format
 msgid "Invalid role %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:179
+#: ../pykolab/xml/event.py:168
+#, python-format
+msgid "Rdate needs datetime.date or datetime.datetime instance, got %r"
+msgstr ""
+
+#: ../pykolab/xml/event.py:185
 #, python-format
 msgid "Exdate needs datetime.date or datetime.datetime instance, got %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:395
+#: ../pykolab/xml/event.py:403
 #, python-format
 msgid "No attendee with email or name %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:403
+#: ../pykolab/xml/event.py:411
 #, python-format
 msgid "Invalid argument value attendee %r, must be basestring or Attendee"
 msgstr ""
 
-#: ../pykolab/xml/event.py:415
+#: ../pykolab/xml/event.py:423
 #, python-format
 msgid "No attendee with email %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:421
+#: ../pykolab/xml/event.py:429
 #, python-format
 msgid "No attendee with name %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:471 ../pykolab/xml/utils.py:162
+#: ../pykolab/xml/event.py:479 ../pykolab/xml/utils.py:180
 msgid "%Y-%m-%d"
 msgstr ""
 
-#: ../pykolab/xml/event.py:473 ../pykolab/xml/utils.py:163
+#: ../pykolab/xml/event.py:481 ../pykolab/xml/utils.py:181
 msgid "%H:%M (%Z)"
 msgstr ""
 
-#: ../pykolab/xml/event.py:603
+#: ../pykolab/xml/event.py:614
 msgid "Invalid participant status"
 msgstr ""
 
-#: ../pykolab/xml/event.py:802
+#: ../pykolab/xml/event.py:820 ../pykolab/xml/note.py:94
 #, python-format
 msgid "Invalid classification %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:833
+#: ../pykolab/xml/event.py:851
 #, python-format
 msgid "Event end needs datetime.date or datetime.datetime instance, got %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:843
+#: ../pykolab/xml/event.py:865
 #, python-format
 msgid "Invalid custom property name %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:978
+#: ../pykolab/xml/event.py:1017
 #, python-format
 msgid ""
 "Event last-modified needs datetime.date or datetime.datetime instance, got %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:1021
+#: ../pykolab/xml/event.py:1060
 #, python-format
 msgid "Event start needs datetime.date or datetime.datetime instance, got %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:1031
+#: ../pykolab/xml/event.py:1070
 #, python-format
 msgid "Invalid status set: %r"
 msgstr ""
 
-#: ../pykolab/xml/event.py:1054
+#: ../pykolab/xml/event.py:1093
 msgid "Event recurrence-id needs datetime.datetime instance"
 msgstr ""
 
-#: ../pykolab/xml/event.py:1291
+#: ../pykolab/xml/event.py:1330
 msgid "No sender specified"
 msgstr ""
 
-#: ../pykolab/xml/event.py:1300
+#: ../pykolab/xml/event.py:1339
 #, python-format
 msgid "Invitation for %s was %s"
 msgstr ""
 
-#: ../pykolab/xml/event.py:1305
+#: ../pykolab/xml/event.py:1344
 msgid "This is an automated response to one of your event requests."
 msgstr ""
 
@@ -2950,163 +3264,159 @@
 msgid "Every %d seconds"
 msgstr ""
 
-#: ../pykolab/xml/todo.py:158
+#: ../pykolab/xml/todo.py:162
 msgid "Todo due needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:131
+#: ../pykolab/xml/utils.py:149
 msgid "Name"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:132
+#: ../pykolab/xml/utils.py:150
 msgid "Summary"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:133
+#: ../pykolab/xml/utils.py:151
 msgid "Location"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:134
+#: ../pykolab/xml/utils.py:152
 msgid "Description"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:135
+#: ../pykolab/xml/utils.py:153
 msgid "URL"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:136
+#: ../pykolab/xml/utils.py:154
 msgid "Status"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:137
+#: ../pykolab/xml/utils.py:155
 msgid "Priority"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:138
+#: ../pykolab/xml/utils.py:156
 msgid "Attendee"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:139
+#: ../pykolab/xml/utils.py:157
 msgid "Start"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:140
+#: ../pykolab/xml/utils.py:158
 msgid "End"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:141
+#: ../pykolab/xml/utils.py:159
 msgid "Due"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:142
+#: ../pykolab/xml/utils.py:160
 msgid "Repeat"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:143
+#: ../pykolab/xml/utils.py:161
 msgid "Repeat Exception"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:144
+#: ../pykolab/xml/utils.py:162
 msgid "Organizer"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:145
+#: ../pykolab/xml/utils.py:163
 msgid "Attachment"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:146
+#: ../pykolab/xml/utils.py:164
 msgid "Alarm"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:147
+#: ../pykolab/xml/utils.py:165
 msgid "Classification"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:148
+#: ../pykolab/xml/utils.py:166
 msgid "Progress"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:193
+#: ../pykolab/xml/utils.py:211
 #, python-format
 msgid "for %d times"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:195
+#: ../pykolab/xml/utils.py:213
 #, python-format
 msgid "until %s"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:200
+#: ../pykolab/xml/utils.py:218
 msgid "Display message"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:201
+#: ../pykolab/xml/utils.py:219
 msgid "Send email"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:202
+#: ../pykolab/xml/utils.py:220
 msgid "Play sound"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:208
+#: ../pykolab/xml/utils.py:226
 #, python-format
 msgid "%s after"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:208
+#: ../pykolab/xml/utils.py:226
 #, python-format
 msgid "%s before"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:217
+#: ../pykolab/xml/utils.py:235
 #, python-format
 msgid "%d day(s)"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:223
+#: ../pykolab/xml/utils.py:241
 #, python-format
 msgid "%d hour(s)"
 msgstr ""
 
-#: ../pykolab/xml/utils.py:225
+#: ../pykolab/xml/utils.py:243
 #, python-format
 msgid "%d minute(s)"
 msgstr ""
 
-#: ../saslauthd/__init__.py:76
+#: ../saslauthd/__init__.py:77
 msgid "Socket file to bind to."
 msgstr ""
 
-#: ../saslauthd/__init__.py:108
+#: ../saslauthd/__init__.py:109
 #, python-format
 msgid "Could not create %r: %r"
 msgstr ""
 
-#: ../saslauthd/__init__.py:146 ../saslauthd/__init__.py:154
-#: ../wallace/__init__.py:439 ../wallace/__init__.py:448
-msgid "Traceback occurred, please report a bug at http://bugzilla.kolabsys.com"
-msgstr ""
-
-#: ../saslauthd/__init__.py:194
-msgid "kolab-saslauthd could not accept "
+#: ../saslauthd/__init__.py:220
+#, python-format
+msgid "kolab-saslauthd could not accept connections on socket: %r"
 msgstr ""
 
-#: ../saslauthd/__init__.py:199
+#: ../saslauthd/__init__.py:225
 msgid "Maximum tries exceeded, exiting"
 msgstr ""
 
-#: ../tests/functional/test_wallace/test_005_resource_invitation.py:197
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:196
 #: ../wallace/module_resources.py:1251
 #, 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:641
 #: ../tests/functional/test_wallace/test_005_resource_invitation.py:657
-#: ../tests/functional/test_wallace/test_005_resource_invitation.py:673
-#: ../tests/functional/test_wallace/test_005_resource_invitation.py:732
-#: ../tests/functional/test_wallace/test_005_resource_invitation.py:788
-#: ../tests/functional/test_wallace/test_005_resource_invitation.py:801
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:715
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:771
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:785
 #: ../wallace/module_resources.py:1335
 #, python-format
 msgid "Booking for %s has been %s"
@@ -3116,30 +3426,30 @@
 #. 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:694
-#: ../tests/functional/test_wallace/test_005_resource_invitation.py:722
-#: ../tests/functional/test_wallace/test_005_resource_invitation.py:760
-#: ../tests/functional/test_wallace/test_005_resource_invitation.py:777
-#: ../tests/functional/test_wallace/test_005_resource_invitation.py:831
-#: ../tests/functional/test_wallace/test_005_resource_invitation.py:980
-#: ../tests/functional/test_wallace/test_005_resource_invitation.py:996
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:677
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:704
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:742
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:759
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:814
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:968
+#: ../tests/functional/test_wallace/test_005_resource_invitation.py:984
 #: ../wallace/module_resources.py:1433
 #, python-format
 msgid "Booking request for %s requires confirmation"
 msgstr ""
 
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:241
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1288
-#: ../wallace/module_invitationpolicy.py:474
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:242
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1267
+#: ../wallace/module_invitationpolicy.py:479
 #, python-format
 msgid "\"%(summary)s\" has been %(status)s"
 msgstr ""
 
 #. this should trigger a notification message
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:897
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1272
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1421
-#: ../wallace/module_invitationpolicy.py:1258
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:886
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1251
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1396
+#: ../wallace/module_invitationpolicy.py:1316
 #, python-format
 msgid "\"%s\" has been cancelled"
 msgstr ""
@@ -3149,24 +3459,19 @@
 #. 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:915
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:921
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:934
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:952
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1055
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1060
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1401
-#: ../wallace/module_invitationpolicy.py:1193
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:903
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:909
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:922
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:939
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1039
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1044
+#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:1377
+#: ../wallace/module_invitationpolicy.py:1234
 #, python-format
 msgid "\"%s\" has been updated"
 msgstr ""
 
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:926
-#: ../tests/functional/test_wallace/test_007_invitationpolicy.py:938
-msgid "PENDING"
-msgstr ""
-
-#: ../tests/unit/test-011-itip.py:532
+#: ../tests/unit/test-011-itip.py:529
 #, python-format
 msgid "Invitation for %(summary)s was %(status)s"
 msgstr ""
@@ -3191,117 +3496,125 @@
 msgid "Worker process %s initializing"
 msgstr ""
 
-#: ../wallace/__init__.py:122
+#: ../wallace/__init__.py:123
 msgid "Bind address for Wallace."
 msgstr ""
 
-#: ../wallace/__init__.py:140
+#: ../wallace/__init__.py:142
 msgid "Number of threads to use."
 msgstr ""
 
-#: ../wallace/__init__.py:156
+#: ../wallace/__init__.py:159
 msgid "Port that Wallace is supposed to use."
 msgstr ""
 
-#: ../wallace/__init__.py:205
+#: ../wallace/__init__.py:208
 #, 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:217
+#: ../wallace/__init__.py:220
 msgid "Could not shut down socket"
 msgstr ""
 
-#: ../wallace/__init__.py:286
+#: ../wallace/__init__.py:289
 msgid "Accepted connection"
 msgstr ""
 
-#: ../wallace/__init__.py:464
+#: ../wallace/__init__.py:494
 #, python-format
 msgid "Could not write pid file %s"
 msgstr ""
 
-#: ../wallace/module_footer.py:55 ../wallace/module_gpgencrypt.py:60
+#: ../wallace/module_footer.py:63 ../wallace/module_gpgencrypt.py:100
 #: ../wallace/module_invitationpolicy.py:227 ../wallace/module_optout.py:61
 #: ../wallace/module_resources.py:127
 #, python-format
 msgid "Issuing callback after processing to stage %s"
 msgstr ""
 
-#: ../wallace/module_footer.py:56 ../wallace/module_gpgencrypt.py:61
+#: ../wallace/module_footer.py:64 ../wallace/module_gpgencrypt.py:101
 #: ../wallace/module_invitationpolicy.py:229 ../wallace/module_optout.py:62
 #: ../wallace/module_resources.py:133
 #, python-format
 msgid "Testing cb_action_%s()"
 msgstr ""
 
-#: ../wallace/module_footer.py:58 ../wallace/module_gpgencrypt.py:63
+#: ../wallace/module_footer.py:66 ../wallace/module_gpgencrypt.py:103
 #: ../wallace/module_invitationpolicy.py:231 ../wallace/module_optout.py:64
 #: ../wallace/module_resources.py:136
 #, python-format
 msgid "Attempting to execute cb_action_%s()"
 msgstr ""
 
-#: ../wallace/module_footer.py:62
+#: ../wallace/module_footer.py:70
 #, python-format
 msgid "Executing module footer for %r, %r"
 msgstr ""
 
-#: ../wallace/module_footer.py:80
+#: ../wallace/module_footer.py:88
 msgid "No contents configured for footer module"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:66
+#: ../wallace/module_gpgencrypt.py:106
 #, python-format
 msgid "Executing module gpgencrypt for %r, %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:98
+#: ../wallace/module_gpgencrypt.py:138
 msgid "Message is already encrypted (app/pgp-enc content-type)"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:102
+#: ../wallace/module_gpgencrypt.py:142
 msgid "Message already encrypted by main content-type header"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:131
+#: ../wallace/module_gpgencrypt.py:171
 msgid ""
 "Configured to encrypt to a key not configured, and strict policy enabled. "
 "Bailing out."
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:134
+#: ../wallace/module_gpgencrypt.py:174
 msgid ""
 "Configured to encrypt to a key not configured, but continuing anyway (see "
 "'gpgencrypt_strict')."
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:171
+#: ../wallace/module_gpgencrypt.py:211
 #, python-format
 msgid "Recipients: %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:183
+#: ../wallace/module_gpgencrypt.py:222
 #, python-format
 msgid "Current keys: %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:188
+#: ../wallace/module_gpgencrypt.py:227
 #, python-format
 msgid "Retrieving key for recipient: %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:192 ../wallace/module_gpgencrypt.py:208
+#: ../wallace/module_gpgencrypt.py:231 ../wallace/module_gpgencrypt.py:247
 #, python-format
 msgid "Found matching address %r"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:200
+#: ../wallace/module_gpgencrypt.py:239
 #, python-format
 msgid "Found matching address %r in remote keys"
 msgstr ""
 
-#: ../wallace/module_gpgencrypt.py:232
+#: ../wallace/module_gpgencrypt.py:259
+msgid "Mime Message - we need to build multipart/encrypted structure"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:268
+msgid "No Mime Message - encypt plain"
+msgstr ""
+
+#: ../wallace/module_gpgencrypt.py:284
 #, python-format
 msgid "An error occurred: %r"
 msgstr ""
@@ -3386,214 +3699,218 @@
 msgid "Precondition for object %r fulfilled: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:447
+#: ../wallace/module_invitationpolicy.py:449
 #, 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:452
+#: ../wallace/module_invitationpolicy.py:454
 #, python-format
 msgid "Auto-updating %s %r on iTip REQUEST (no re-scheduling)"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:500
+#: ../wallace/module_invitationpolicy.py:505
 msgid "Forward invitation for notification"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:515
+#: ../wallace/module_invitationpolicy.py:520
 msgid "Pass reply for manual processing"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:522
+#: ../wallace/module_invitationpolicy.py:527
 #, python-format
 msgid "Sender Attendee: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:534
+#: ../wallace/module_invitationpolicy.py:539
 #, python-format
 msgid ""
 "The iTip reply sequence (%r) doesn't match the referred object version (%r). "
 "Forwarding to Inbox."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:540
+#: ../wallace/module_invitationpolicy.py:545
 #, python-format
 msgid "Auto-updating %s %r on iTip REPLY"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:567
+#: ../wallace/module_invitationpolicy.py:572
 #, python-format
 msgid "Add delegatee: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:570
+#: ../wallace/module_invitationpolicy.py:575
 #, python-format
 msgid "Update existing delegatee: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:577
+#: ../wallace/module_invitationpolicy.py:582
 #, python-format
 msgid "Update delegator: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:594
+#: ../wallace/module_invitationpolicy.py:600
 msgid ""
 "The object referred by this reply was not found in the user's folders. "
 "Forwarding to Inbox."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:607
+#: ../wallace/module_invitationpolicy.py:613
 msgid "Pass cancellation for manual processing"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:630
+#: ../wallace/module_invitationpolicy.py:636
 #, python-format
 msgid "Remove cancelled %s instance %s from %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:641
+#: ../wallace/module_invitationpolicy.py:647
 #, python-format
 msgid "Update cancelled %s %r with STATUS=CANCELLED"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:654
+#: ../wallace/module_invitationpolicy.py:662
 msgid ""
 "The object referred by this cancel request was not found in the user's "
 "folders. Forwarding to Inbox."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:683
+#: ../wallace/module_invitationpolicy.py:691
 #, python-format
 msgid "Checking if email address %r belongs to a local user"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:688
+#: ../wallace/module_invitationpolicy.py:696
 #, python-format
 msgid "User DN: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:690
+#: ../wallace/module_invitationpolicy.py:698
 #, python-format
 msgid "No user record(s) found for %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:746
+#: ../wallace/module_invitationpolicy.py:754
 #, python-format
 msgid "User record doesn't have the mailbox attribute %r set"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:759
+#: ../wallace/module_invitationpolicy.py:767
 #, python-format
 msgid "IMAP proxy authentication failed: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:781
+#: ../wallace/module_invitationpolicy.py:789
 #, python-format
 msgid "List %r folders for user %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:796
+#: ../wallace/module_invitationpolicy.py:804
 #, python-format
 msgid "IMAP metadata for %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:832
+#: ../wallace/module_invitationpolicy.py:842
 #, python-format
 msgid "Searching folder %r for %s %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:842
-#: ../wallace/module_resources.py:675 ../wallace/module_resources.py:736
+#: ../wallace/module_invitationpolicy.py:852 ../wallace/module_resources.py:675
+#: ../wallace/module_resources.py:736
 #, python-format
 msgid "No UID found in IMAP response: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:868
+#: ../wallace/module_invitationpolicy.py:878
 #, python-format
 msgid "Failed to parse %s from message %s/%s: %s"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:896
+#: ../wallace/module_invitationpolicy.py:906
 #, python-format
 msgid "Listing events from folder %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:909
-#: ../wallace/module_resources.py:482 ../wallace/module_resources.py:683
-#: ../wallace/module_resources.py:763
+#: ../wallace/module_invitationpolicy.py:919 ../wallace/module_resources.py:482
+#: ../wallace/module_resources.py:683 ../wallace/module_resources.py:763
 #, python-format
 msgid "Failed to parse event from message %s/%s: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:915
+#: ../wallace/module_invitationpolicy.py:925
 #, python-format
 msgid "Existing event %r conflicts with invitation %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:922
-#: ../wallace/module_resources.py:526
+#: ../wallace/module_invitationpolicy.py:932 ../wallace/module_resources.py:526
 #, python-format
 msgid "start: %r, end: %r, total: %r, messages: %d"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:948
+#: ../wallace/module_invitationpolicy.py:960
 #, python-format
 msgid "%r is locked, waiting..."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1020
+#: ../wallace/module_invitationpolicy.py:1040
 #, python-format
 msgid "Failed to save %s: no target folder found for user %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1031
+#: ../wallace/module_invitationpolicy.py:1051
 #, python-format
 msgid "Save %s %r to user folder %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1044
+#: ../wallace/module_invitationpolicy.py:1064
 #, python-format
 msgid "Failed to save %s to user folder at %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1063
+#: ../wallace/module_invitationpolicy.py:1083
 #, python-format
 msgid "Delete %s %r in %r by UID: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1071
+#: ../wallace/module_invitationpolicy.py:1091
 #, python-format
 msgid "Delete %s %r in %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1082
+#: ../wallace/module_invitationpolicy.py:1102
 #, python-format
 msgid "Failed to delete %s from folder %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1108
+#: ../wallace/module_invitationpolicy.py:1130
+#: ../wallace/module_invitationpolicy.py:1304
+#, python-format
+msgid "%s commented: %s"
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1133
 #, python-format
 msgid "Compose participation status summary for %s %r to user %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1141
+#: ../wallace/module_invitationpolicy.py:1171
 #, python-format
 msgid ""
 "Waiting for more automated replies (got %d of %d); skipping notification"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1151
+#: ../wallace/module_invitationpolicy.py:1192
 #, python-format
 msgid "Changes submitted by %s have been automatically applied."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1160
+#: ../wallace/module_invitationpolicy.py:1201
 msgid "(removed)"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1166
+#: ../wallace/module_invitationpolicy.py:1207
 #, python-format
 msgid ""
 "\n"
@@ -3603,7 +3920,7 @@
 "        "
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1174
+#: ../wallace/module_invitationpolicy.py:1215
 #, python-format
 msgid ""
 "\n"
@@ -3613,74 +3930,78 @@
 "        "
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1184
+#: ../wallace/module_invitationpolicy.py:1225
 msgid "NOTE: This update only refers to this single occurrence!"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1186
-#: ../wallace/module_invitationpolicy.py:1251
-#: ../wallace/module_invitationpolicy.py:1352
+#: ../wallace/module_invitationpolicy.py:1227
+#: ../wallace/module_invitationpolicy.py:1309
+#: ../wallace/module_invitationpolicy.py:1411
 msgid "*** This is an automated message. Please do not reply. ***"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1203
+#: ../wallace/module_invitationpolicy.py:1249
 #, python-format
 msgid "Sent update notification to %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1222
+#: ../wallace/module_invitationpolicy.py:1274
 #, python-format
 msgid "Send cancellation notification for %s %r to user %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1232
+#: ../wallace/module_invitationpolicy.py:1284
 #, python-format
 msgid "The assignment for '%(summary)s' has been cancelled by %(organizer)s."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1237
-msgid "The copy in your tasklist as been removed accordingly."
+#: ../wallace/module_invitationpolicy.py:1289
+msgid "The copy in your tasklist has been removed accordingly."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1239
-msgid "The copy in your tasklist as been marked as cancelled accordingly."
+#: ../wallace/module_invitationpolicy.py:1291
+msgid "The copy in your tasklist has been marked as cancelled accordingly."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1241
+#: ../wallace/module_invitationpolicy.py:1293
 #, python-format
 msgid ""
 "The event '%(summary)s' at %(start)s has been cancelled by %(organizer)s."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1247
-msgid "The copy in your calendar as been removed accordingly."
+#: ../wallace/module_invitationpolicy.py:1299
+msgid "The copy in your calendar has been removed accordingly."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1249
-msgid "The copy in your calendar as been marked as cancelled accordingly."
+#: ../wallace/module_invitationpolicy.py:1301
+msgid "The copy in your calendar has been marked as cancelled accordingly."
+msgstr ""
+
+#: ../wallace/module_invitationpolicy.py:1307
+msgid "NOTE: This cancellation only refers to this single occurrence!"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1342
+#: ../wallace/module_invitationpolicy.py:1401
 #, python-format
 msgid "Updated %s's copy of %r: %r"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1345
+#: ../wallace/module_invitationpolicy.py:1404
 #, python-format
 msgid "Attendee %s's copy of %r not found"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1348
+#: ../wallace/module_invitationpolicy.py:1407
 #, python-format
 msgid "Attendee %r not found in LDAP"
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1355
+#: ../wallace/module_invitationpolicy.py:1414
 #, python-format
 msgid "%(name)s has %(status)s your assignment for %(summary)s."
 msgstr ""
 
-#: ../wallace/module_invitationpolicy.py:1357
+#: ../wallace/module_invitationpolicy.py:1416
 #, python-format
 msgid "%(name)s has %(status)s your invitation for %(summary)s."
 msgstr ""
@@ -3693,7 +4014,8 @@
 
 #: ../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
@@ -3717,11 +4039,13 @@
 msgstr ""
 
 #: ../wallace/module_resources.py:187
-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:195
-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
@@ -3772,7 +4096,7 @@
 
 #: ../wallace/module_resources.py:302
 #, python-format
-msgid "Invalid response (%r) recieved from resource owner for event %r"
+msgid "Invalid response (%r) received from resource owner for event %r"
 msgstr ""
 
 #: ../wallace/module_resources.py:306
@@ -3996,7 +4320,8 @@
 msgstr ""
 
 #: ../wallace/module_resources.py:1092
-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:1219
@@ -4047,8 +4372,8 @@
 #, 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"
@@ -4093,58 +4418,63 @@
 msgstr ""
 
 #. This is a nested module
-#: ../wallace/modules.py:97
+#: ../wallace/modules.py:98
 #, python-format
 msgid "Module Group: %s"
 msgstr ""
 
-#: ../wallace/modules.py:108 ../wallace/modules.py:120
+#: ../wallace/modules.py:109 ../wallace/modules.py:125
 #, python-format
 msgid "No such module %r in modules %r (1)."
 msgstr ""
 
-#: ../wallace/modules.py:113
+#: ../wallace/modules.py:114
 #, python-format
 msgid "No such module %r in modules %r (2)."
 msgstr ""
 
-#: ../wallace/modules.py:126
+#: ../wallace/modules.py:120 ../wallace/modules.py:172
+#, python-format
+msgid "Unknown error occurred; %r"
+msgstr ""
+
+#: ../wallace/modules.py:178
 #, python-format
 msgid "Holding message in queue for manual review (%s by %s)"
 msgstr ""
 
-#: ../wallace/modules.py:129
+#: ../wallace/modules.py:181
 #, python-format
 msgid "Deferring message in %s (by module %s)"
 msgstr ""
 
-#: ../wallace/modules.py:141
+#: ../wallace/modules.py:193
 #, python-format
 msgid "The time when the message was sent: %r"
 msgstr ""
 
-#: ../wallace/modules.py:142
+#: ../wallace/modules.py:194
 #, python-format
 msgid "The time now: %r"
 msgstr ""
 
-#: ../wallace/modules.py:143
+#: ../wallace/modules.py:195
 #, python-format
 msgid "The time delta: %r"
 msgstr ""
 
 #. TODO: Send NDR back to user
-#: ../wallace/modules.py:147
+#: ../wallace/modules.py:199
 #, python-format
 msgid "Message in file %s older then 5 days, deleting"
 msgstr ""
 
-#: ../wallace/modules.py:172
+#: ../wallace/modules.py:224
 #, python-format
 msgid "Rejecting message in %s (by module %s)"
 msgstr ""
 
-#: ../wallace/modules.py:193
+#: ../wallace/modules.py:245
 #, python-format
 msgid ""
 "This is the email system Wallace at %s.\n"
@@ -4159,29 +4489,29 @@
 "recipients.\n"
 msgstr ""
 
-#: ../wallace/modules.py:208
+#: ../wallace/modules.py:260
 #, python-format
 msgid ""
 "X-Wallace-Module: %s\n"
 "X-Wallace-Result: REJECT\n"
 msgstr ""
 
-#: ../wallace/modules.py:267
+#: ../wallace/modules.py:304
 #, python-format
 msgid "Accepting message in %s (by module %s)"
 msgstr ""
 
-#: ../wallace/modules.py:269
+#: ../wallace/modules.py:306
 #, python-format
 msgid "Accepting message in: %r"
 msgstr ""
 
-#: ../wallace/modules.py:276
+#: ../wallace/modules.py:313
 #, python-format
 msgid "recipients: %r"
 msgstr ""
 
-#: ../wallace/modules.py:354
+#: ../wallace/modules.py:369
 #, python-format
 msgid "Module '%s' already registered"
 msgstr ""

pykolab-0.8.1.tar.gz/pykolab/auth/ldap/__init__.py -> pykolab-0.8.3.tar.gz/pykolab/auth/ldap/__init__.py Changed

@@ -153,7 +153,7 @@
         except:
             pass
 
-        self.connect()
+        self.connect(immediate=True)
         self._bind()
 
         # See if we know a base_dn for the domain
@@ -161,7 +161,8 @@
 
         try:
             base_dn = auth_cache.get_entry(self.domain)
-        except:
+        except Exception, errmsg:
+            log.error(_("Authentication cache failed: %r") % (errmsg))
             pass
 
         if base_dn == None:
@@ -180,7 +181,10 @@
                 pass
 
         try:
-            user_filter = self.config_get_raw('user_filter') % ({'base_dn':base_dn})
+            user_filter = self.config_get_raw('user_filter') % (
+                    {'base_dn': base_dn}
+                )
+
         except TypeError, errmsg:
             user_filter = self.config_get_raw('user_filter')
 
@@ -196,12 +200,16 @@
 
         entry_dn = None
 
+        # Attempt to obtain an entry_dn from cache.
         try:
             entry_dn = auth_cache.get_entry(_filter)
-        except:
+        except Exception, errmsg:
+            log.error(_("Authentication cache failed: %r") % (errmsg))
             pass
 
-        if entry_dn == None:
+        retval = False
+
+        if entry_dn is None:
             _search = self.ldap.search_ext(
                     base_dn,
                     ldap.SCOPE_SUBTREE,
@@ -221,15 +229,95 @@
                 log.error(_("LDAP server unavailable: %r") % (errmsg))
                 log.error(_("%s") % (traceback.format_exc()))
                 self._disconnect()
+
                 return False
 
-            if len(_result_data) >= 1:
+            except Exception, errmsg:
+                log.error(_("Exception occurred: %r") % (errmsg))
+                log.error(_("%s") % (traceback.format_exc()))
+                self._disconnect()
+
+                return False
+
+            log.debug(
+                    _("Length of entries found: %r") % (
+                            len(_result_data)
+                        ),
+                    level=8
+                )
+
+            if len(_result_data) == 1:
                 (entry_dn, entry_attrs) = _result_data[0]
 
+            elif len(_result_data) > 1:
+                try:
+                    log.info(
+                            _("Authentication for %r failed " +
+                                "(multiple entries)") % (
+                                    login[0]
+                                )
+                        )
+                except:
+                    pass
+
+                self._disconnect()
+                return False
+
+            else:
+                try:
+                    log.info(
+                            _("Authentication for %r failed (no entry)") % (
+                                    login[0]
+                                )
+                        )
+                except:
+                    pass
+
+                self._disconnect()
+                return False
+
+            if entry_dn is None:
+                try:
+                    log.info(
+                            _("Authentication for %r failed (LDAP error?)") % (
+                                    login[0]
+                                )
+                        )
+                except:
+                    pass
+
+                self._disconnect()
+                return False
+
             try:
-                # Needs to be synchronous or succeeds and continues setting retval
-                # to True!!
+                # Needs to be synchronous or succeeds and continues setting
+                # retval to True!!
                 retval = self._bind(entry_dn, login[1])
+
+                if retval:
+                    try:
+                        log.info(
+                                _("Authentication for %r succeeded") % (
+                                        login[0]
+                                    )
+                            )
+
+                    except:
+                        pass
+
+                else:
+                    try:
+                        log.info(
+                                _("Authentication for %r failed (error)") % (
+                                        login[0]
+                                    )
+                            )
+                    except:
+                        pass
+
+                    self._disconnect()
+                    return False
+
                 try:
                     auth_cache.set_entry(_filter, entry_dn)
                 except Exception, errmsg:
@@ -239,56 +327,92 @@
             except ldap.SERVER_DOWN, errmsg:
                 log.error(_("Authentication failed, LDAP server unavailable"))
                 self._disconnect()
-                pass
 
-            except:
+                return False
+
+            except Exception, errmsg:
                 try:
                     log.debug(
-                            _("Failed to authenticate as user %s") % (login[0]),
+                            _("Failed to authenticate as user %r") % (
+                                    login[0]
+                                ),
                             level=8
                         )
                 except:
                     pass
 
-                retval = False
+                self._disconnect()
+                return False
+
         else:
             try:
-                # Needs to be synchronous or succeeds and continues setting retval
-                # to True!!
+                # Needs to be synchronous or succeeds and continues setting
+                # retval to True!!
                 retval = self._bind(entry_dn, login[1])
+
+                if retval:
+                    log.info(_("Authentication for %r succeeded") % (login[0]))
+                else:
+                    log.info(
+                            _("Authentication for %r failed (password)") % (
+                                    login[0]
+                                )
+                        )
+
+                    self._disconnect()
+                    return False
+
                 auth_cache.set_entry(_filter, entry_dn)
 
             except ldap.NO_SUCH_OBJECT, errmsg:
-                log.debug(_("Error occured, there is no such object: %r") % (errmsg), level=8)
+                log.debug(
+                        _("Error occured, there is no such object: %r") % (
+                                errmsg
+                            ),
+                        level=8
+                    )
+
                 self.bind = None
+
                 try:
                     auth_cache.del_entry(_filter)
+
                 except:
                     log.error(_("Authentication cache failed to clear entry"))
                     pass
 
-                return self.authenticate(login, realm)
+                retval = self.authenticate(login, realm)
 
             except Exception, errmsg:
                 log.debug(_("Exception occured: %r") %(errmsg))
+
                 try:
                     log.debug(
-                            _("Failed to authenticate as user %s") % (login[0]),
+                            _("Failed to authenticate as user %r") % (
+                                    login[0]
+                                ),
                             level=8
                         )
+
                 except:
                     pass
 
-                retval = False
+                self._disconnect()
+                return False
+
+        self._disconnect()
 
         return retval
 
-    def connect(self, priv=None):
+    def connect(self, priv=None, immediate=True):
         """
             Connect to the LDAP server through the uri configured.
         """
+        # Already connected
         if priv is None and self.ldap is not None:
             return
+
+        # Already connected
         if priv is not None and self.ldap_priv is not None:
             return
 
@@ -303,13 +427,22 @@
         if conf.debuglevel > 8:
             trace_level = 1
 
+        if immediate:
+            retry_max = 1
+            retry_delay = 1.0
+        else:
+            retry_max = 200
+            retry_delay = 3.0
+
         conn = ldap.ldapobject.ReconnectLDAPObject(
                 uri,
                 trace_level=trace_level,
-                retry_max=200,
-                retry_delay=3.0
+                retry_max=retry_max,
+                retry_delay=retry_delay
             )
 
+        conn.set_option(ldap.OPT_TIMEOUT, 10)
+
         conn.protocol_version = 3
         conn.supported_controls = []
 
@@ -1268,6 +1401,16 @@
             self.bind = None
             self.connect()
 
+        # If the bind_dn is None and the bind_pw is not... fail
+        if bind_dn is None and bind_pw is not None:
+            log.error(_("Attempting to bind without a DN but with a password"))
+            return False
+
+        # and the same vice-versa
+        if bind_dn is not None and bind_pw is None:
+            log.error(_("Attempting to bind with a DN but without a password"))
+            return False
+
         # If we are to bind as foo, we have no state.
         if bind_dn is not None:
             self.bind = None
@@ -1288,18 +1431,26 @@
 
             # TODO: Binding errors control
             try:
+                # Must be synchronous
                 self.ldap.simple_bind_s(bind_dn, bind_pw)
                 self.bind = {'dn': bind_dn, 'pw': bind_pw}
+
                 return True
+
             except ldap.SERVER_DOWN, errmsg:
                 log.error(_("LDAP server unavailable: %r") % (errmsg))
                 log.error(_("%s") % (traceback.format_exc()))
+
                 return False
+
             except ldap.INVALID_CREDENTIALS:
                 log.error(_("Invalid DN, username and/or password."))
+
                 return False
+
         else:
             log.debug(_("bind() called but already bound"), level=8)
+
             return True
 
     def _bind_priv(self):

pykolab-0.8.1.tar.gz/pykolab/imap/__init__.py -> pykolab-0.8.3.tar.gz/pykolab/imap/__init__.py Changed

pykolab-0.8.1.tar.gz/pykolab/imap/cyrus.py -> pykolab-0.8.3.tar.gz/pykolab/imap/cyrus.py Changed

pykolab-0.8.1.tar.gz/pykolab/xml/attendee.py -> pykolab-0.8.3.tar.gz/pykolab/xml/attendee.py Changed

pykolab-0.8.1.tar.gz/tests/functional/test_wallace/test_007_invitationpolicy.py -> pykolab-0.8.3.tar.gz/tests/functional/test_wallace/test_007_invitationpolicy.py Changed

pykolab-0.8.1.tar.gz/tests/unit/test-020-auth_cache.py -> pykolab-0.8.3.tar.gz/tests/unit/test-020-auth_cache.py Changed

pykolab-0.8.1.tar.gz/wallace/__init__.py -> pykolab-0.8.3.tar.gz/wallace/__init__.py Changed

pykolab.dsc Changed

@@ -2,7 +2,7 @@
 Source: pykolab
 Binary: pykolab, kolab-cli, kolab-conf, kolab-saslauthd, kolab-server, kolab-telemetry, kolab-xml, wallace
 Architecture: all
-Version: 0.8.1-0~kolab1
+Version: 0.8.3-0~kolab1
 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
 Uploaders: Paul Klos <kolab@klos2day.nl>
 Homepage: http://www.kolab.org
@@ -28,8 +28,8 @@
                 python-icalendar,
                 python-minimal,
                 python-nose,
-                univention-config-dev | bash
-Package-List: 
+                univention-config-dev | bash (>= 1.0)
+Package-List:
  kolab-cli deb python optional
  kolab-conf deb python optional
  kolab-saslauthd deb python optional
@@ -38,6 +38,6 @@
  kolab-xml deb python optional
  pykolab deb python optional
  wallace deb python optional
-Files: 
- 00000000000000000000000000000000 0 pykolab-0.8.1.tar.gz
+Files:
+ 00000000000000000000000000000000 0 pykolab-0.8.3.tar.gz
  00000000000000000000000000000000 0 debian.tar.gz

Build Results
RPM Lint

Refresh

Comments for request 1762 0

Request History

vanmeeuwen created request over 8 years ago

Check in 0.8.3

vanmeeuwen accepted review over 8 years ago

vanmeeuwen approved review over 8 years ago

vanmeeuwen accepted review over 8 years ago

vanmeeuwen accepted request over 8 years ago