[packaging] 4 commits - bin/pykolab-update-lang configure.ac conf/kolab.conf debian/changelog kolabd/kolabd.sysvinit po/bn_IN.po po/bn.po po/ca.po po/cs.po po/da.po po/de.po po/el.po po/es.po po/fi.po po/fr.po po/gl.po po/gu.po po/hi.po po/hr.po po/hu.po po/is.po po/it.po po/ja.po po/ko.po po/ml.po po/ms.po po/nb.po po/nl.po po/or.po po/pa.po po/pl.po po/POTFILES.in po/POTFILES.skip po/pt_BR.po po/pt.po po/pykolab.pot po/ru.po po/sk.po po/sl.po po/sr at latin.po po/sr.po po/sv.po po/ta.po po/tr.po po/uk.po po/zh_CN.po po/zh_TW.po pykolab/auth pykolab/imap saslauthd/kolab-saslauthd.sysvinit share/templates .tx/config wallace/modules.py wallace/wallace.sysvinit

Paul Klos klos at kolabsys.com
Thu Sep 6 17:37:45 CEST 2012


 .tx/config                                              |    9 
 bin/pykolab-update-lang                                 |   27 
 conf/kolab.conf                                         |   42 
 configure.ac                                            |    2 
 debian/changelog                                        |    7 
 kolabd/kolabd.sysvinit                                  |   12 
 po/POTFILES.in                                          |  390 --
 po/POTFILES.skip                                        |  186 +
 po/bn.po                                                | 2173 +++++++++-------
 po/bn_IN.po                                             | 2173 +++++++++-------
 po/ca.po                                                | 2173 +++++++++-------
 po/cs.po                                                | 2173 +++++++++-------
 po/da.po                                                | 2173 +++++++++-------
 po/de.po                                                | 2173 +++++++++-------
 po/el.po                                                | 2173 +++++++++-------
 po/es.po                                                | 2173 +++++++++-------
 po/fi.po                                                | 2173 +++++++++-------
 po/fr.po                                                | 2173 +++++++++-------
 po/gl.po                                                | 2173 +++++++++-------
 po/gu.po                                                | 2173 +++++++++-------
 po/hi.po                                                | 2173 +++++++++-------
 po/hr.po                                                | 2173 +++++++++-------
 po/hu.po                                                | 2173 +++++++++-------
 po/is.po                                                | 2173 +++++++++-------
 po/it.po                                                | 2173 +++++++++-------
 po/ja.po                                                | 2173 +++++++++-------
 po/ko.po                                                | 2173 +++++++++-------
 po/ml.po                                                | 2173 +++++++++-------
 po/ms.po                                                | 2173 +++++++++-------
 po/nb.po                                                | 2173 +++++++++-------
 po/nl.po                                                | 2173 +++++++++-------
 po/or.po                                                | 2173 +++++++++-------
 po/pa.po                                                | 2173 +++++++++-------
 po/pl.po                                                | 2173 +++++++++-------
 po/pt.po                                                | 2173 +++++++++-------
 po/pt_BR.po                                             | 2173 +++++++++-------
 po/pykolab.pot                                          | 2173 +++++++++-------
 po/ru.po                                                | 2173 +++++++++-------
 po/sk.po                                                | 2173 +++++++++-------
 po/sl.po                                                | 2173 +++++++++-------
 po/sr.po                                                | 2173 +++++++++-------
 po/sr at latin.po                                          | 2173 +++++++++-------
 po/sv.po                                                | 2173 +++++++++-------
 po/ta.po                                                | 2173 +++++++++-------
 po/tr.po                                                | 2173 +++++++++-------
 po/uk.po                                                | 2173 +++++++++-------
 po/zh_CN.po                                             | 2173 +++++++++-------
 po/zh_TW.po                                             | 2173 +++++++++-------
 pykolab/auth/ldap/__init__.py                           |    7 
 pykolab/imap/__init__.py                                |   89 
 pykolab/imap/cyrus.py                                   |   12 
 saslauthd/kolab-saslauthd.sysvinit                      |   12 
 share/templates/horde/conf.d/10-kolab_conf_base.php.tpl |   66 
 share/templates/roundcubemail/main.inc.php.tpl          |    7 
 wallace/modules.py                                      |    7 
 wallace/wallace.sysvinit                                |   12 
 56 files changed, 51110 insertions(+), 36697 deletions(-)

New commits:
commit cc24ca0e8ddcd4166f441af79dcad494097be5e7
Author: Paul Klos <kolab at klos2day.nl>
Date:   Thu Sep 6 16:48:32 2012 +0200

    Imported Upstream version 0.5.4

diff --git a/debian/changelog b/debian/changelog
index 094d4d9..aad2a35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pykolab (0.5.4-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Imported Upstream version 0.5.4
+
+ -- Paul Klos <kolab at klos2day.nl>  Thu, 06 Sep 2012 16:47:00 +0200
+
 pykolab (0.5.3-1.1) unstable; urgency=low
 
   * Non-maintainer upload.


commit 375db8e6b16d3a495f6f5722a150ec4b43a9e3da
Merge: d2429c5 9c82330
Author: Paul Klos <kolab at klos2day.nl>
Date:   Thu Sep 6 16:46:04 2012 +0200

    Merge tag 'upstream/0.5.4'
    
    Upstream version 0.5.4



commit 9c82330e83338875ec93b49d597d6893de43ca31
Author: Paul Klos <kolab at klos2day.nl>
Date:   Thu Sep 6 16:45:48 2012 +0200

    Imported Upstream version 0.5.4

diff --git a/.tx/config b/.tx/config
new file mode 100644
index 0000000..8c8b6ce
--- /dev/null
+++ b/.tx/config
@@ -0,0 +1,9 @@
+[main]
+host = https://www.transifex.net
+type = PO
+
+[pykolab.pykolab-0-5]
+file_filter = po/<lang>.po
+source_file = po/pykolab.pot
+source_lang = en_US
+
diff --git a/bin/pykolab-update-lang b/bin/pykolab-update-lang
index cd2cdb5..a351e40 100755
--- a/bin/pykolab-update-lang
+++ b/bin/pykolab-update-lang
@@ -1,15 +1,34 @@
 #!/bin/bash
 
 echo "Updating language files"
+
+> po/POTFILES.in
+> po/POTFILES.skip
+
+find . -type f -name "*.py" -o -name "*.py.in" | \
+    sort | \
+    sed -e 's/^.\///g' | \
+    while read file; do
+        if [ $(git ls-files --error-unmatch "${file}" >/dev/null 2>&1; echo $?) -eq 0 ]; then
+            echo "${file}" >> po/POTFILES.in
+        else
+            echo "${file}" >> po/POTFILES.skip
+        fi
+    done
+
 cd po/
+
 intltool-update --pot --gettext-package=pykolab
+
 if [ "$1" == "po" ]; then
     for lang_file in `ls -1 *.po`; do
         lang=$(echo ${lang_file} | cut -f1 -d'.')
+        tx pull -f -l ${lang}
         intltool-update -d ${lang}
-        msginit --no-translator --locale=${lang} --input=pykolab.pot --output=${lang_file}
-        msgmerge -U ${lang_file} pykolab.pot
-    done
-    
+    done    
 fi
+
+echo "Push the new .pot file back to transifex"
+
+tx push -s
 cd ..
diff --git a/conf/kolab.conf b/conf/kolab.conf
index d20b9b7..02d301d 100644
--- a/conf/kolab.conf
+++ b/conf/kolab.conf
@@ -227,74 +227,68 @@ autocreate_folders = {
             },
         'Calendar': {
                 'annotations': {
-                        '/vendor/kolab/folder-test': "true",
-                        '/vendor/kolab/folder-type': "event.default",
+                        '/private/vendor/kolab/folder-type': "event.default",
+                        '/shared/vendor/kolab/folder-type': "event",
                     },
             },
         'Calendar/Personal Calendar': {
                 'annotations': {
-                        '/vendor/kolab/folder-test': "true",
-                        '/vendor/kolab/folder-type': "event",
+                        '/shared/vendor/kolab/folder-type': "event",
                     },
             },
         'Configuration': {
                 'annotations': {
-                        '/vendor/kolab/folder-test': "true",
-                        '/vendor/kolab/folder-type': "configuration.default",
+                        '/private/vendor/kolab/folder-type': "configuration.default",
+                        '/shared/vendor/kolab/folder-type': "configuration.default",
                     },
             },
         'Drafts': {
                 'annotations': {
-                        '/vendor/kolab/folder-test': "true",
-                        '/vendor/kolab/folder-type': "mail.drafts",
+                        '/private/vendor/kolab/folder-type': "mail.drafts",
                     },
             },
         'Contacts': {
                 'annotations': {
-                        '/vendor/kolab/folder-test': "true",
-                        '/vendor/kolab/folder-type': "contact.default",
+                        '/private/vendor/kolab/folder-type': "contact.default",
+                        '/shared/vendor/kolab/folder-type': "contact",
                 },
             },
         'Contacts/Personal Contacts': {
                 'annotations': {
-                        '/vendor/kolab/folder-test': "true",
-                        '/vendor/kolab/folder-type': "contact",
+                        '/shared/vendor/kolab/folder-type': "contact",
                     },
             },
         'Journal': {
                 'annotations': {
-                        '/vendor/kolab/folder-test': "true",
-                        '/vendor/kolab/folder-type': "journal.default",
+                        '/private/vendor/kolab/folder-type': "journal.default",
+                        '/shared/vendor/kolab/folder-type': "journal",
                     },
             },
         'Notes': {
                 'annotations': {
-                        '/vendor/kolab/folder-test': "true",
-                        '/vendor/kolab/folder-type': 'note.default',
+                        '/private/vendor/kolab/folder-type': 'note.default',
+                        '/shared/vendor/kolab/folder-type': 'note',
                     },
             },
         'Sent': {
                 'annotations': {
-                        '/vendor/kolab/folder-test': "true",
-                        '/vendor/kolab/folder-type': "mail.sentitems",
+                        '/private/vendor/kolab/folder-type': "mail.sentitems",
                     },
             },
         'Spam': {
                 'annotations': {
-                        '/vendor/kolab/folder-test': "true",
-                        '/vendor/kolab/folder-type': "mail.junkemail",
+                        '/private/vendor/kolab/folder-type': "mail.junkemail",
                     },
             },
         'Tasks': {
                 'annotations': {
-                        '/vendor/kolab/folder-test': "true",
-                        '/vendor/kolab/folder-type': "task.default",
+                        '/private/vendor/kolab/folder-type': "task.default",
+                        '/shared/vendor/kolab/folder-type': "task",
                     },
             },
         'Trash': {
                 'annotations': {
-                        '/vendor/kolab/folder-test': "true",
-                        '/vendor/kolab/folder-type': "mail.trash",
+                        '/private/vendor/kolab/folder-type': "mail.trash",
                     },
             },
     }
diff --git a/configure.ac b/configure.ac
index 692e114..6d12299 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([pykolab], 0.5.3)
+AC_INIT([pykolab], 0.5.4)
 AC_SUBST([RELEASE], 1)
 
 AC_CONFIG_SRCDIR(pykolab/constants.py.in)
diff --git a/kolabd/kolabd.sysvinit b/kolabd/kolabd.sysvinit
index 9f452ff..302dfa9 100644
--- a/kolabd/kolabd.sysvinit
+++ b/kolabd/kolabd.sysvinit
@@ -12,8 +12,8 @@
 # Provides: kolabd
 # Default-Start: -
 # Default-Stop: 0 1 2 6
-# Required-Start: $local_fs $network
-# Required-Stop: $local_fs $network
+# Required-Start: $remote_fs $local_fs $network
+# Required-Stop: $remote_fs $local_fs $network
 # Short-Description: Start/Stop the Kolab Server daemon
 # Description:      The Kolab server is a server process which synchronizes
 #                   LDAP, SQL and other authentication databases with Cyrus IMAP,
@@ -21,7 +21,9 @@
 ### END INIT INFO
 
 # Source function library.
-. /etc/init.d/functions
+if [ -f /etc/init.d/functions ]; then
+    . /etc/init.d/functions
+fi
 
 # Source our configuration file for these variables.
 FLAGS="--fork -l warning"
@@ -30,6 +32,10 @@ if [ -f /etc/sysconfig/kolabd ] ; then
     . /etc/sysconfig/kolabd
 fi
 
+if [ -f /etc/default/kolabd ]; then
+    . /etc/default/kolabd
+fi
+
 RETVAL=0
 
 # Set up some common variables before we launch into what might be
diff --git a/po/POTFILES.in b/po/POTFILES.in
index de9f491..d57cd5f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,273 +1,117 @@
-[encoding: UTF-8]
-./kolab/__init__.py
-./test-wallace-send.py
-./wallace/__init__.py
-./wallace/future_module_footer.py
-./wallace/future_module_correctsentdate.py
-./wallace/modules.py
-./wallace/future_module_googletranslate.py
-./wallace/future_module_dlp.py
-./wallace/module_optout.py
-./wallace/future_module_resources.py
-./wallace/future_module_freebusy.py
-./wallace/future_module_statistics.py
-./wallace/future_module_bcc.py
-./wallace/future_module_conversations.py
-./tests/__init__.py
-./tests/test-002-pykolab_conf_split.py
-./tests/test-003-conf_get_list.py
-./tests/test-001-import_pykolab_conf.py
-./tests/test-000-import_pykolab.py
-./setup-kolab.py
-./play/migrate_mail_to_uid_prod.py
-./play/detect-object-type.py
-./play/test_submission.py
-./play/test_undelete.py
-./play/kolab-sap/kolab_smtp_access_policy.py
-./play/confmgmt/__init__.py
-./play/confmgmt/augeas.py
-./play/confmgmt/db.py
-./play/confmgmt/model.py
-./play/test_folders.py
-./play/migrate_uid_to_mail.py
-./play/split_message_file.py
-./play/test-kolab-smtp-access-policy-load.py
-./play/test-login-as.py
-./play/test_imap.py
-./play/test.py
-./play/test_imapd.py
-./play/augeas-insert.py
-./play/imap_annotations_test.py
-./play/libkolabxml/todo.py
-./play/libkolabxml/event.py
-./play/libkolabxml/event_rfc822.py
-./play/libkolabxml/contact.py
-./play/libkolabxml/event_imap.py
-./play/persistent_search.py
-./play/migrate_mail_to_uid.py
-./play/noheaderini.py
-./play/flawed_zpush_testing_create_folders.py
-./play/migrate_uid_to_mail_prod.py
-./play/cleanup_acls.py
-./play/persistent_search_kolab_23.py
-./play/strip_many_headers.py
-./play/parallel_persistent_searches.py
-./play/sync_repl_kolab_23.py
-./play/test_socket.py
-./play/sqlalchemy_schemadisplay.py
-./play/test_filter.py
-./play/test_socket_client.py
-./play/test-parse_ldap_uri.py
-./play/roundcube_database.py
-./play/confmgmt.py
-./play/rolequota/__init__.py
-./play/test-output.py
-./play/test_cal_spread.py
-./play/migrate_lowercase_uid.py
-./play/test_kolabxml.py
-./play/unicode-to-ascii.py
-./play/openssl/license.py
-./play/fork.py
-./play/pygpgme/verify.py
-./play/pygpgme/sign.py
-./play/test-entitlements.py
-./play/unicode_test.py
-./play/load_test.py
-./play/conf.py
-./play/roundcube_database/__init__.py
-./play/roundcube_database/users.py
-./play/roundcube_database/identities.py
-./play/push_contacts.py
-./play/effectiverights.py
-./play/sync_client.py
-./play/anon-imap/anon-imap.py
-./play/test_page_control.py
-./play/wap/group.members_list.py
-./play/wap/user.info.py
-./play/wap/roles.list.py
-./play/wap/role.delete.py
-./play/wap/form_value.select_options-preferredlanguage.py
-./play/wap/form_value.list_options-c.py
-./play/wap/domain.info.py
-./play/wap/system.select_domain.py
-./play/wap/domains.capabilities.py
-./play/wap/role.find_by_attribute.py
-./play/wap/group.add.py
-./play/wap/form_value.generate_cn.py
-./play/wap/user_types.list.py
-./play/wap/form_value.generate_uid.py
-./play/wap/role.add.py
-./play/wap/scu.py
-./play/wap/user.delete.py
-./play/wap/group.info.py
-./play/wap/role.capabilities.py
-./play/wap/form_value.generate_password.py
-./play/wap/domains.list.py
-./play/wap/group_types.list.py
-./play/wap/user.edit.py
-./play/wap/form_value.generate_mail.py
-./play/wap/user.add.py
-./play/wap/form_value.select_options-ou.py
-./play/wap/groups.list.py
-./play/wap/form_value.generate_displayname.py
-./play/wap/users.list.py
-./play/wap/role.info.py
-./play/wap/system.capabilities.py
-./play/parse_policy.py
-./testaci.py
-./kwap/kwap/__init__.py
-./kwap/kwap/tests/__init__.py
-./kwap/kwap/tests/functional/__init__.py
-./kwap/kwap/tests/functional/test_authentication.py
-./kwap/kwap/tests/functional/test_root.py
-./kwap/kwap/tests/models/test_auth.py
-./kwap/kwap/tests/models/__init__.py
-./kwap/kwap/templates/__init__.py
-./kwap/kwap/templates/domain/__init__.py
-./kwap/kwap/controllers/__init__.py
-./kwap/kwap/controllers/template.py
-./kwap/kwap/controllers/secure.py
-./kwap/kwap/controllers/domain.py
-./kwap/kwap/controllers/error.py
-./kwap/kwap/controllers/root.py
-./kwap/kwap/model/__init__.py
-./kwap/kwap/model/auth.py
-./kwap/kwap/config/__init__.py
-./kwap/kwap/config/environment.py
-./kwap/kwap/config/app_cfg.py
-./kwap/kwap/config/middleware.py
-./kwap/kwap/websetup/__init__.py
-./kwap/kwap/websetup/schema.py
-./kwap/kwap/websetup/bootstrap.py
-./kwap/kwap/lib/__init__.py
-./kwap/kwap/lib/base.py
-./kwap/kwap/lib/app_globals.py
-./kwap/kwap/lib/helpers.py
-./kwap/kwap/grids/__init__.py
-./kwap/kwap/grids/domains.py
-./kwap/ez_setup/__init__.py
-./kwap/data/templates/home/kanarip/devel/src/kolab/pykolab.git/kwap/kwap/templates/master.mak.py
-./kwap/data/templates/home/kanarip/devel/src/kolab/pykolab.git/kwap/kwap/templates/error.mak.py
-./kwap/data/templates/home/kanarip/devel/src/kolab/pykolab.git/kwap/kwap/templates/index.mak.py
-./kwap/data/templates/home/kanarip/devel/src/kolab/pykolab.git/kwap/kwap/templates/environ.mak.py
-./kwap/data/templates/home/kanarip/devel/src/kolab/pykolab.git/kwap/kwap/templates/about.mak.py
-./kwap/data/templates/home/kanarip/devel/src/kolab/pykolab.git/kwap/kwap/templates/data.mak.py
-./kwap/data/templates/home/kanarip/devel/src/kolab/pykolab.git/kwap/kwap/templates/login.mak.py
-./kwap/data/templates/home/kanarip/devel/src/kolab/pykolab.git/kwap/kwap/templates/authentication.mak.py
-./kwap/setup.py
-./saslauthd.py
-./kolabtest.py
-./test-urllib.py
-./bonnie/__init__.py
-./kolabd.py
-./kolabd/__init__.py
-./kolabd/process.py
-./ext/python/Tools/freeze/bkfile.py
-./ext/python/Tools/freeze/freeze.py
-./ext/python/Tools/freeze/makefreeze.py
-./ext/python/Tools/freeze/checkextensions.py
-./ext/python/Tools/freeze/winmakemakefile.py
-./ext/python/Tools/freeze/makemakefile.py
-./ext/python/Tools/freeze/makeconfig.py
-./ext/python/Tools/freeze/parsesetup.py
-./ext/python/Tools/freeze/checkextensions_win32.py
-./ext/python/Tools/freeze/hello.py
-./pykolab/__init__.py
-./pykolab/tests/tests.py
-./pykolab/tests/__init__.py
-./pykolab/tests/imap/__init__.py
-./pykolab/tests/imap/test_create_mailbox.py
-./pykolab/tests/imap/test_login_admin.py
-./pykolab/tests/imap/test_login.py
-./pykolab/tests/wap/__init__.py
-./pykolab/tests/wap/test_login.py
-./pykolab/auth/__init__.py
-./pykolab/auth/ldap/__init__.py
-./pykolab/auth/ldap/openldap/__init__.py
-./pykolab/auth/ldap/cache.py
-./pykolab/auth/ldap/rhds/__init__.py
-./pykolab/auth/ldap/syncrepl.py
-./pykolab/auth/ldap/msds/__init__.py
-./pykolab/auth/ldap/sunds/__init__.py
-./pykolab/auth/ldap/fds/__init__.py
-./pykolab/auth/sql/__init__.py
-./pykolab/utils.py
-./pykolab/base.py
-./pykolab/conf/__init__.py
-./pykolab/conf/defaults.py
-./pykolab/conf/parser.py
-./pykolab/conf/entitlement.py
-./pykolab/logger.py
-./pykolab/errors.py
-./pykolab/constants.py
-./pykolab/translate.py
-./pykolab/cli/__init__.py
-./pykolab/cli/telemetry/__init__.py
-./pykolab/cli/telemetry/cmd_list_sessions.py
-./pykolab/cli/telemetry/cmd_examine_session.py
-./pykolab/cli/telemetry/cmd_examine_command_issue.py
-./pykolab/cli/telemetry/cmd_expire_sessions.py
-./pykolab/cli/cmd_set_mail.py
-./pykolab/cli/commands.py
-./pykolab/cli/cmd_delete_mailbox.py
-./pykolab/cli/cmd_list_deleted_mailboxes.py
-./pykolab/cli/cmd_set_language.py
-./pykolab/cli/cmd_list_mailboxes.py
-./pykolab/cli/cmd_export_mailbox.py
-./pykolab/cli/cmd_transfer_mailbox.py
-./pykolab/cli/cmd_undelete_mailbox.py
-./pykolab/cli/cmd_sync.py
-./pykolab/cli/cmd_list_domains.py
-./pykolab/cli/cmd_remove_mailaddress.py
-./pykolab/cli/cmd_create_mailbox.py
-./pykolab/plugins/__init__.py
-./pykolab/plugins/defaultfolders/__init__.py
-./pykolab/plugins/dynamicquota/__init__.py
-./pykolab/plugins/recipientpolicy/__init__.py
-./pykolab/wap_client.old/__init__.py
-./pykolab/xml/__init__.py
-./pykolab/xml/2_0/__init__.py
-./pykolab/xml/event.py
-./pykolab/xml/common.py
-./pykolab/xml/1_0/__init__.py
-./pykolab/wap_client/__init__.py
-./pykolab/wap_client/request.py
-./pykolab/wap_client/connect.py
-./pykolab/setup/__init__.py
-./pykolab/setup/setup_zpush.py
-./pykolab/setup/setup_ldap.py
-./pykolab/setup/setup_roundcube.py
-./pykolab/setup/components.py
-./pykolab/setup/setup_mta.py
-./pykolab/setup/setup_imap.py
-./pykolab/setup/setup_kolabd.py
-./pykolab/setup/setup_mysql.py
-./pykolab/setup/setup_freebusy.py
-./pykolab/imap/__init__.py
-./pykolab/imap/dovecot.py
-./pykolab/imap/cyrus.py
-./pykolab/telemetry.py
-./pykolab/tests.old/mail.py
-./pykolab/tests.old/calendar.py
-./pykolab/tests.old/zpush/__init__.py
-./pykolab/tests.old/zpush/test_000_001.py
-./pykolab/tests.old/zpush/test_000_002.py
-./pykolab/tests.old/zpush/test_000_000.py
-./pykolab/tests.old/constants.py
-./pykolab/tests.old/contacts.py
-./pykolab/tests.old/ksap/__init__.py
-./pykolab/tests.old/ksap/test_sendera.py
-./pykolab/tests.old/create-contacts.py
-./wallace.py
-./test-wallace-loadmsg.py
-./kolab.py
-./cyruslib.py
-./test-wallace.py
-./test-search.py
-./conf.py
-./bin/kolab_smtp_access_policy.py
-./bin/kolab_parse_telemetry.py
-./bin/test-read-input.py
-./bin/test_parse_policy.py
-./bonnie.py
-./saslauthd/__init__.py
+bin/kolab_parse_telemetry.py
+bin/kolab_smtp_access_policy.py
+conf.py
+cyruslib.py
+ext/python/Tools/freeze/bkfile.py
+ext/python/Tools/freeze/checkextensions.py
+ext/python/Tools/freeze/checkextensions_win32.py
+ext/python/Tools/freeze/freeze.py
+ext/python/Tools/freeze/hello.py
+ext/python/Tools/freeze/makeconfig.py
+ext/python/Tools/freeze/makefreeze.py
+ext/python/Tools/freeze/makemakefile.py
+ext/python/Tools/freeze/parsesetup.py
+ext/python/Tools/freeze/winmakemakefile.py
+kolabd/__init__.py
+kolabd/process.py
+kolabd.py
+kolab/__init__.py
+kolab.py
+pykolab/auth/__init__.py
+pykolab/auth/ldap/cache.py
+pykolab/auth/ldap/__init__.py
+pykolab/auth/ldap/syncrepl.py
+pykolab/base.py
+pykolab/cli/cmd_add_domain.py
+pykolab/cli/cmd_create_mailbox.py
+pykolab/cli/cmd_delete_mailbox_acl.py
+pykolab/cli/cmd_delete_mailbox.py
+pykolab/cli/cmd_export_mailbox.py
+pykolab/cli/cmd_list_deleted_mailboxes.py
+pykolab/cli/cmd_list_domains.py
+pykolab/cli/cmd_list_mailbox_acls.py
+pykolab/cli/cmd_list_mailboxes.py
+pykolab/cli/cmd_list_mailbox_metadata.py
+pykolab/cli/cmd_list_quota.py
+pykolab/cli/cmd_remove_mailaddress.py
+pykolab/cli/cmd_rename_mailbox.py
+pykolab/cli/cmd_set_language.py
+pykolab/cli/cmd_set_mailbox_acl.py
+pykolab/cli/cmd_set_mailbox_metadata.py
+pykolab/cli/cmd_set_mail.py
+pykolab/cli/cmd_sync.py
+pykolab/cli/cmd_transfer_mailbox.py
+pykolab/cli/cmd_undelete_mailbox.py
+pykolab/cli/commands.py
+pykolab/cli/__init__.py
+pykolab/cli/telemetry/cmd_examine_command_issue.py
+pykolab/cli/telemetry/cmd_examine_session.py
+pykolab/cli/telemetry/cmd_expire_sessions.py
+pykolab/cli/telemetry/cmd_list_sessions.py
+pykolab/cli/telemetry/__init__.py
+pykolab/conf/defaults.py
+pykolab/conf/entitlement.py
+pykolab/conf/__init__.py
+pykolab/constants.py.in
+pykolab/errors.py
+pykolab/imap/cyrus.py
+pykolab/imap/__init__.py
+pykolab/__init__.py
+pykolab/logger.py
+pykolab/plugins/defaultfolders/__init__.py
+pykolab/plugins/dynamicquota/__init__.py
+pykolab/plugins/__init__.py
+pykolab/plugins/recipientpolicy/__init__.py
+pykolab/setup/components.py
+pykolab/setup/__init__.py
+pykolab/setup/setup_freebusy.py
+pykolab/setup/setup_imap.py
+pykolab/setup/setup_kolabd.py
+pykolab/setup/setup_ldap.py
+pykolab/setup/setup_mta.py
+pykolab/setup/setup_mysql.py
+pykolab/setup/setup_php.py
+pykolab/setup/setup_roundcube.py
+pykolab/setup/setup_syncroton.py
+pykolab/setup/setup_zpush.py
+pykolab/telemetry.py
+pykolab/translate.py
+pykolab/utils.py
+pykolab/wap_client/connect.py
+pykolab/wap_client/__init__.py
+pykolab/xml/attendee.py
+pykolab/xml/contact.py
+pykolab/xml/contact_reference.py
+pykolab/xml/event.py
+pykolab/xml/__init__.py
+pykolab/xml/utils.py
+saslauthd/__init__.py
+saslauthd.py
+setup-kolab.py
+tests/functional/__init__.py
+tests/functional/test_auth/__init__.py
+tests/functional/test_auth/test_001_ldap.py
+tests/functional/test_auth/test_002_sql.py
+tests/functional/test_auth/test_003_pam.py
+tests/functional/test_auth/test_004_saslauthd.py
+tests/functional/test_kolabd/__init__.py
+tests/functional/test_kolabd/test_001_user_sync.py
+tests/functional/test_postfix/__init__.py
+tests/functional/test_wap_client/__init__.py
+tests/functional/test_wap_client/test_001_connect.py
+tests/functional/test_wap_client/test_002_user_add.py
+tests/functional/user_add.py
+tests/__init__.py
+tests/unit/__init__.py
+tests/unit/test-000-imports.py
+tests/unit/test-001-contact_reference.py
+tests/unit/test-002-attendee.py
+tests/unit/test-003-event.py
+tests/unit/test-004-icalendar.py
+tests/unit/test-005-timezone.py
+test-wallace.py
+wallace/__init__.py
+wallace/module_optout.py
+wallace/module_resources.py
+wallace/modules.py
+wallace.py
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 2b8d840..6b93f7d 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1 +1,185 @@
-pykolab/constants.py.in
+bin/test_parse_policy.py
+bin/test-read-input.py
+bonnie/__init__.py
+bonnie.py
+kwap/data/templates/home/kanarip/devel/src/kolab/pykolab.git/kwap/kwap/templates/about.mak.py
+kwap/data/templates/home/kanarip/devel/src/kolab/pykolab.git/kwap/kwap/templates/authentication.mak.py
+kwap/data/templates/home/kanarip/devel/src/kolab/pykolab.git/kwap/kwap/templates/data.mak.py
+kwap/data/templates/home/kanarip/devel/src/kolab/pykolab.git/kwap/kwap/templates/environ.mak.py
+kwap/data/templates/home/kanarip/devel/src/kolab/pykolab.git/kwap/kwap/templates/error.mak.py
+kwap/data/templates/home/kanarip/devel/src/kolab/pykolab.git/kwap/kwap/templates/index.mak.py
+kwap/data/templates/home/kanarip/devel/src/kolab/pykolab.git/kwap/kwap/templates/login.mak.py
+kwap/data/templates/home/kanarip/devel/src/kolab/pykolab.git/kwap/kwap/templates/master.mak.py
+kwap/ez_setup/__init__.py
+kwap/kwap/config/app_cfg.py
+kwap/kwap/config/environment.py
+kwap/kwap/config/__init__.py
+kwap/kwap/config/middleware.py
+kwap/kwap/controllers/domain.py
+kwap/kwap/controllers/error.py
+kwap/kwap/controllers/__init__.py
+kwap/kwap/controllers/root.py
+kwap/kwap/controllers/secure.py
+kwap/kwap/controllers/template.py
+kwap/kwap/grids/domains.py
+kwap/kwap/grids/__init__.py
+kwap/kwap/__init__.py
+kwap/kwap/lib/app_globals.py
+kwap/kwap/lib/base.py
+kwap/kwap/lib/helpers.py
+kwap/kwap/lib/__init__.py
+kwap/kwap/model/auth.py
+kwap/kwap/model/__init__.py
+kwap/kwap/templates/domain/__init__.py
+kwap/kwap/templates/__init__.py
+kwap/kwap/tests/functional/__init__.py
+kwap/kwap/tests/functional/test_authentication.py
+kwap/kwap/tests/functional/test_root.py
+kwap/kwap/tests/__init__.py
+kwap/kwap/tests/models/__init__.py
+kwap/kwap/tests/models/test_auth.py
+kwap/kwap/websetup/bootstrap.py
+kwap/kwap/websetup/__init__.py
+kwap/kwap/websetup/schema.py
+kwap/setup.py
+play/anon-imap/anon-imap.py
+play/augeas-insert.py
+play/base_64_decode.py
+play/cleanup_acls.py
+play/cliconfmgmt.py
+play/conf-add-setting.py
+play/conf-list-config-files.py
+play/confmgmt/augeas.py
+play/confmgmt/db.py
+play/confmgmt/__init__.py
+play/confmgmt/model.py
+play/conf.py
+play/conf-settings-from-file.py
+play/conf-update-file.py
+play/detect-object-type.py
+play/dttz.py
+play/effectiverights.py
+play/flawed_zpush_testing_create_folders.py
+play/fork.py
+play/get_uid.py
+play/imap_annotations_test.py
+play/kolab-sap/kolab_smtp_access_policy.py
+play/libkolabxml/contact.py
+play/libkolabxml/event_imap.py
+play/libkolabxml/event.py
+play/libkolabxml/event_rfc822.py
+play/libkolabxml/todo.py
+play/load_test.py
+play/migrate_lowercase_uid.py
+play/migrate_mail_to_uid_prod.py
+play/migrate_mail_to_uid.py
+play/migrate_uid_to_mail_prod.py
+play/migrate_uid_to_mail.py
+play/noheaderini.py
+play/openssl/license.py
+play/parallel_persistent_searches.py
+play/parse_policy.py
+play/persistent_search_kolab_23.py
+play/persistent_search.py
+play/pooling.py
+play/push_contacts.py
+play/pygpgme/sign.py
+play/pygpgme/verify.py
+play/regexps.py
+play/rolequota/__init__.py
+play/roundcube_database/identities.py
+play/roundcube_database/__init__.py
+play/roundcube_database.py
+play/roundcube_database/users.py
+play/split_message_file.py
+play/sqlalchemy_schemadisplay.py
+play/strip_many_headers.py
+play/sync_client.py
+play/sync_repl_kolab_23.py
+play/test_augeas_load.py
+play/test_cal_spread.py
+play/test-entitlements.py
+play/test_filter.py
+play/test_folders.py
+play/test-icalendar-attendee.py
+play/test_imapd.py
+play/test_imap.py
+play/test-kolab-smtp-access-policy-load.py
+play/test_kolabxml.py
+play/test-login-as.py
+play/test-namespace.py
+play/test-output.py
+play/test_page_control.py
+play/test-parse_ldap_uri.py
+play/test.py
+play/test_socket_client.py
+play/test_socket.py
+play/test_submission.py
+play/test_undelete.py
+play/unicode_test.py
+play/unicode-to-ascii.py
+play/wap/domain.info.py
+play/wap/domains.capabilities.py
+play/wap/domains.list.py
+play/wap/form_value.generate_cn.py
+play/wap/form_value.generate_displayname.py
+play/wap/form_value.generate_mail.py
+play/wap/form_value.generate_password.py
+play/wap/form_value.generate_uid.py
+play/wap/form_value.list_options-c.py
+play/wap/form_value.select_options-ou.py
+play/wap/form_value.select_options-preferredlanguage.py
+play/wap/group.add.py
+play/wap/group.info.py
+play/wap/group.members_list.py
+play/wap/groups.list.py
+play/wap/group_types.list.py
+play/wap/role.add.py
+play/wap/role.capabilities.py
+play/wap/role.delete.py
+play/wap/role.find_by_attribute.py
+play/wap/role.info.py
+play/wap/roles.list.py
+play/wap/scu.py
+play/wap/system.capabilities.py
+play/wap/system.select_domain.py
+play/wap/user.add.py
+play/wap/user.delete.py
+play/wap/user.edit.py
+play/wap/user.info.py
+play/wap/users.list.py
+play/wap/user_types.list.py
+play/xmlevent.py
+play/xmlformat.py
+play/xmlfromical.py
+play/zorbadb/test.py
+pykolab/auth/ldap/fds/__init__.py
+pykolab/auth/ldap/msds/__init__.py
+pykolab/auth/ldap/openldap/__init__.py
+pykolab/auth/ldap/rhds/__init__.py
+pykolab/auth/ldap/sunds/__init__.py
+pykolab/auth/sql/__init__.py
+pykolab/cli/cmd_set_quota.py
+pykolab/conf/parser.py
+pykolab/constants.py
+pykolab/ical/itip.py
+pykolab/imap/dovecot.py
+pykolab/plugins/roundcube/__init__.py
+pykolab/wap_client.old/__init__.py
+pykolab/xml/task.py
+testaci.py
+test-search.py
+test-send-mail-kolab_smtp_access_policy.py
+test-send-mail-kolab_smtp_access_policy-relay.py
+test-urllib.py
+test-wallace-loadmsg.py
+test-wallace-resource.py
+test-wallace-send.py
+wallace/future_module_bcc.py
+wallace/future_module_conversations.py
+wallace/future_module_correctsentdate.py
+wallace/future_module_dlp.py
+wallace/future_module_footer.py
+wallace/future_module_freebusy.py
+wallace/future_module_googletranslate.py
+wallace/future_module_statistics.py
diff --git a/po/bn.po b/po/bn.po
index 97be2a8..5124b16 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pykolab 0.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-09 14:25+0100\n"
+"POT-Creation-Date: 2012-08-11 15:04+0100\n"
 "PO-Revision-Date: 2012-05-09 14:25+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,793 +16,907 @@ msgstr ""
 "Content-Type: text/plain; charset=ASCII\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: .././wallace/__init__.py:37 .././bonnie/__init__.py:35
-#: .././kolabd/__init__.py:46 .././saslauthd/__init__.py:47
-msgid "Daemon Options"
-msgstr ""
-
-#: .././wallace/__init__.py:44 .././bonnie/__init__.py:41
-#: .././kolabd/__init__.py:52 .././saslauthd/__init__.py:53
-msgid "Fork to the background."
-msgstr ""
-
-#: .././wallace/__init__.py:52
-msgid "Bind address for Wallace."
+#: ../bin/kolab_smtp_access_policy.py:206
+#, python-format
+msgid "Adding policy request to instance %s"
 msgstr ""
 
-#: .././wallace/__init__.py:60 .././kolabd/__init__.py:58
-#: .././saslauthd/__init__.py:59
-msgid "Path to the PID file to use."
+#: ../bin/kolab_smtp_access_policy.py:446
+msgid "Unauthorized access not allowed"
 msgstr ""
 
-#: .././wallace/__init__.py:68
-msgid "Port that Wallace is supposed to use."
+#: ../bin/kolab_smtp_access_policy.py:467
+#: ../bin/kolab_smtp_access_policy.py:658
+msgid "Could not find recipient"
 msgstr ""
 
-#: .././wallace/__init__.py:102 .././wallace/__init__.py:126
-#: .././wallace/__init__.py:373 .././wallace/__init__.py:401
+#: ../bin/kolab_smtp_access_policy.py:486
+#: ../bin/kolab_smtp_access_policy.py:586
 #, python-format
-msgid "Number of threads currently running: %d"
+msgid "Could not find envelope sender user %s"
 msgstr ""
 
-#: .././wallace/__init__.py:111 .././wallace/__init__.py:135
+#: ../bin/kolab_smtp_access_policy.py:529
 #, python-format
-msgid "Continuing with %d threads currently running"
+msgid "Obtained authenticated user details for %r: %r"
 msgstr ""
 
-#. TODO: Apply throttling
-#: .././wallace/__init__.py:118
+#: ../bin/kolab_smtp_access_policy.py:608
 #, python-format
-msgid "Creating thread for message in %s"
+msgid "%s is unauthorized to send on behalf of %s"
 msgstr ""
 
-#: .././wallace/__init__.py:142
+#: ../bin/kolab_smtp_access_policy.py:618
 #, python-format
-msgid "Running thread %s for message file %s"
+msgid "User %s attempted to use envelope sender address %s "
 msgstr ""
 
-#: .././wallace/__init__.py:151
+#: ../bin/kolab_smtp_access_policy.py:682
+#: ../bin/kolab_smtp_access_policy.py:693
 #, python-format
-msgid "This message was already in module %s, delegating "
+msgid "Found user %s to be a delegate user of %s"
 msgstr ""
 
-#: .././wallace/__init__.py:160
+#: ../bin/kolab_smtp_access_policy.py:717
 #, python-format
-msgid "It was also in a certain stage: %s, letting "
+msgid "Verifying authenticated sender '%(sender)s' with "
 msgstr ""
 
-#: .././wallace/__init__.py:168 .././wallace/__init__.py:174
-#: .././wallace/__init__.py:184
+#: ../bin/kolab_smtp_access_policy.py:722
 #, python-format
-msgid "Executing module %s"
-msgstr ""
-
-#: .././wallace/__init__.py:211 .././bonnie/__init__.py:67
-#: .././kolabd/__init__.py:85 .././saslauthd/__init__.py:90
-msgid "Interrupted by user"
-msgstr ""
-
-#: .././wallace/__init__.py:215 .././wallace/__init__.py:225
-#: .././kolabd/__init__.py:90 .././kolabd/__init__.py:101
-msgid "Traceback occurred, please report a "
+msgid "Verifying unauthenticated sender '%(sender)s' "
 msgstr ""
 
-#: .././wallace/__init__.py:221 .././bonnie/__init__.py:75
-#: .././kolabd/__init__.py:96 .././saslauthd/__init__.py:98
+#: ../bin/kolab_smtp_access_policy.py:739
 #, python-format
-msgid "Type Error: %s"
-msgstr ""
-
-#: .././wallace/__init__.py:241
-msgid "Picking up deferred messages for wallace"
+msgid "Reproducing verify_recipient(%s, %s) from "
 msgstr ""
 
-#: .././wallace/__init__.py:261
+#: ../bin/kolab_smtp_access_policy.py:756
 #, python-format
-msgid "Picking up deferred messages for module %s"
-msgstr ""
-
-#. Sleep for 300 seconds before reprocessing the deferred queues.
-#. TODO: Consider using queue_run_delay from Postfix, which is where
-#. the default value of 300 seconds comes from.
-#: .././wallace/__init__.py:285
-msgid "Sleeping for 300 seconds"
+msgid "Using authentication domain %s instead of %s"
 msgstr ""
 
-#: .././wallace/__init__.py:310
+#: ../bin/kolab_smtp_access_policy.py:766
 #, python-format
-msgid "Could not bind to socket on port %d on bind "
-msgstr ""
-
-#: .././wallace/__init__.py:320
-msgid "Could not shut down socket"
+msgid "Domain %s is a primary domain"
 msgstr ""
 
-#: .././wallace/__init__.py:394
+#: ../bin/kolab_smtp_access_policy.py:774
 #, python-format
-msgid "Picking up spooled email file %s"
+msgid "Checking the recipient for domain %s that is not "
 msgstr ""
 
-#: .././wallace/__init__.py:424
-msgid "Accepted connection"
+#: ../bin/kolab_smtp_access_policy.py:790
+msgid "This recipient address is related to multiple "
 msgstr ""
 
-#. This is a nested module
-#: .././wallace/modules.py:96
+#: ../bin/kolab_smtp_access_policy.py:799
 #, python-format
-msgid "Module Group: %s"
+msgid "Recipient address %r not found. Allowing since "
 msgstr ""
 
-#: .././wallace/modules.py:107 .././wallace/modules.py:112
-msgid "No such module."
+#: ../bin/kolab_smtp_access_policy.py:827
+msgid "Invalid recipient"
 msgstr ""
 
-#: .././wallace/modules.py:118
-#, python-format
-msgid "Holding message in queue for manual review (%s by %s)"
+#: ../bin/kolab_smtp_access_policy.py:838
+msgid "Could not find this user, accepting"
 msgstr ""
 
-#: .././wallace/modules.py:121
+#: ../bin/kolab_smtp_access_policy.py:901
+#: ../bin/kolab_smtp_access_policy.py:954
 #, python-format
-msgid "Deferring message in %s (by module %s)"
+msgid "Sender %s is not allowed to send to "
 msgstr ""
 
-#: .././wallace/modules.py:131
+#: ../bin/kolab_smtp_access_policy.py:941
 #, python-format
-msgid "The time when the message was sent: %r"
+msgid "Reproducing verify_sender(%r) from cache, "
 msgstr ""
 
-#: .././wallace/modules.py:132
-#, python-format
-msgid "The time now: %r"
+#: ../bin/kolab_smtp_access_policy.py:970
+msgid "Sender uses unauthorized envelope sender address"
 msgstr ""
 
-#: .././wallace/modules.py:133
-#, python-format
-msgid "The time delta: %r"
+#: ../bin/kolab_smtp_access_policy.py:987
+msgid "Could not verify sender"
 msgstr ""
 
-#. TODO: Send NDR back to user
-#: .././wallace/modules.py:137
-#, python-format
-msgid "Message in file %s older then 5 days, deleting"
+#: ../bin/kolab_smtp_access_policy.py:994
+msgid "Verifying whether sender is allowed to send to "
 msgstr ""
 
-#: .././wallace/modules.py:162
+#: ../bin/kolab_smtp_access_policy.py:1008
 #, python-format
-msgid "Rejecting message in %s (by module %s)"
+msgid "Result is %r"
 msgstr ""
 
-#: .././wallace/modules.py:180
-#, python-format
-msgid ""
-"This is the email system Wallace at %s.\n"
-"\n"
-"I'm sorry to inform you we could not deliver the attached message\n"
-"to the following recipients:\n"
-"\n"
-"- %s\n"
-"\n"
-"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"
+#: ../bin/kolab_smtp_access_policy.py:1013
+msgid "No recipient policy restrictions exist for this sender"
 msgstr ""
 
-#: .././wallace/modules.py:195
-#, python-format
-msgid ""
-"X-Wallace-Module: %s\n"
-"X-Wallace-Result: REJECT\n"
+#: ../bin/kolab_smtp_access_policy.py:1022
+msgid "Found a recipient policy to apply for this sender."
 msgstr ""
 
-#: .././wallace/modules.py:248
+#: ../bin/kolab_smtp_access_policy.py:1037
 #, python-format
-msgid "Accepting message in %s (by module %s)"
+msgid "Sender %s not allowed to send to recipient "
 msgstr ""
 
-#: .././wallace/modules.py:316
-#, python-format
-msgid "Module '%s' already registered"
+#: ../bin/kolab_smtp_access_policy.py:1068
+msgid "Cleaning up the cache"
 msgstr ""
 
-#: .././wallace/modules.py:338 .././pykolab/tests/tests.py:183
-#: .././pykolab/cli/commands.py:183 .././pykolab/setup/components.py:243
+#: ../bin/kolab_smtp_access_policy.py:1105
 #, python-format
-msgid "Alias for %s"
+msgid "Operational Error in caching: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:57
+#: ../bin/kolab_smtp_access_policy.py:1156
 #, python-format
-msgid "Issuing callback after processing to stage %s"
+msgid "Caching the policy result with timestamp %d"
 msgstr ""
 
-#: .././wallace/module_optout.py:58
+#: ../bin/kolab_smtp_access_policy.py:1233
 #, python-format
-msgid "Testing cb_action_%s()"
+msgid "Returning action DEFER_IF_PERMIT: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:60
+#: ../bin/kolab_smtp_access_policy.py:1238
 #, python-format
-msgid "Attempting to execute cb_action_%s()"
+msgid "Returning action DUNNO: %s"
 msgstr ""
 
-#. modules.next_module('optout')
-#: .././wallace/module_optout.py:66
+#: ../bin/kolab_smtp_access_policy.py:1243
 #, python-format
-msgid "Consulting opt-out service for %r, %r"
+msgid "Returning action HOLD: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:92
+#: ../bin/kolab_smtp_access_policy.py:1248
 #, python-format
-msgid "Running opt-out consult from envelope sender '%s "
+msgid "Returning action PERMIT: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:156
+#: ../bin/kolab_smtp_access_policy.py:1253
 #, python-format
-msgid "Attempting to execute cb_action_%s(%r, %r)"
+msgid "Returning action REJECT: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:177
-#, python-format
-msgid "Could not send request to optout_url %s"
+#: ../bin/kolab_smtp_access_policy.py:1299
+msgid "Starting to loop for new request"
 msgstr ""
 
-#: .././setup-kolab.py:36 .././kolabtest.py:34 .././kolabd.py:31
-#: .././wallace.py:31 .././bonnie.py:31
-msgid "Cannot load pykolab/constants.py:"
+#: ../bin/kolab_smtp_access_policy.py:1306
+msgid "Timeout for policy request reading exceeded"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:89
-msgid "Could not import caching library, caching disabled"
+#: ../bin/kolab_smtp_access_policy.py:1312
+msgid "End of current request"
 msgstr ""
 
-#. Obtain 'kolabDelegate' from the envelope sender.
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:291
+#: ../bin/kolab_smtp_access_policy.py:1316
 #, python-format
-msgid "Obtaining envelope sender dn for %s"
+msgid "Getting line: %s"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:309
-#, python-format
-msgid ""
-"User %s attempted to use envelope sender address %s without authorization"
+#: ../bin/kolab_smtp_access_policy.py:1320
+msgid "Returning request"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:355
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:358
-#, python-format
-msgid "Found user %s to be a valid delegate user of %s"
+#: ../bin/kolab_smtp_access_policy.py:1346
+msgid "Access Policy Options"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:424
-#: .././bin/kolab_smtp_access_policy.py:1301
-msgid "Access Policy Options"
+#: ../bin/kolab_smtp_access_policy.py:1353
+msgid "SMTP Policy request timeout."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:431
-#: .././bin/kolab_smtp_access_policy.py:1308
+#: ../bin/kolab_smtp_access_policy.py:1359
 msgid "Verify the recipient access policy."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:437
-#: .././bin/kolab_smtp_access_policy.py:1314
+#: ../bin/kolab_smtp_access_policy.py:1365
 msgid "Verify the sender access policy."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:443
-#: .././bin/kolab_smtp_access_policy.py:1320
+#: ../bin/kolab_smtp_access_policy.py:1371
 msgid "Allow unauthenticated senders."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:464
-msgid "Verifying sender."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:468
-msgid "No sender specified."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:469
-msgid "Invalid sender"
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:473
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:521
-msgid "No SASL username in request."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:475
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:524
-msgid "Not allowing unauthenticated senders."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:476
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:525
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:534
-msgid "Access denied"
+#: ../bin/kolab_smtp_access_policy.py:1385
+#, python-format
+msgid "Got request instance %s"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:478
-msgid "Allowing unauthenticated senders."
+#: ../bin/kolab_smtp_access_policy.py:1394
+#, python-format
+msgid "Request instance %s is in state %s"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:484
+#: ../bin/kolab_smtp_access_policy.py:1402
 #, python-format
-msgid "Allowing authenticated sender %s to send as %s."
+msgid "Request instance %s is not yet in DATA state"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:492
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:504
+#: ../bin/kolab_smtp_access_policy.py:1414
 #, python-format
-msgid "Authenticated as sender %s"
+msgid "Request instance %s reached DATA state"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:515
-msgid "Verifying recipient."
+#: ../bin/kolab_smtp_access_policy.py:1432
+msgid "Sender access denied"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:518
-#: .././bin/kolab_smtp_access_policy.py:781
-msgid "Invalid recipient"
+#: ../bin/kolab_smtp_access_policy.py:1434
+msgid "Recipient access denied"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:536
-#: .././bin/kolab_smtp_access_policy.py:1383
+#: ../bin/kolab_smtp_access_policy.py:1436
 msgid "No objections"
 msgstr ""
 
-#: .././play/confmgmt/db.py:59 .././play/conf.py:280
-msgid "Dropping all tables..."
-msgstr ""
-
-#: .././play/confmgmt/db.py:62 .././play/conf.py:283
-msgid "Creating the necessary tables..."
-msgstr ""
-
-#: .././play/confmgmt/db.py:69 .././play/conf.py:290
-#: .././play/roundcube_database/__init__.py:57
-#: .././play/roundcube_database/users.py:114 .././pykolab/telemetry.py:652
-msgid "No database available"
-msgstr ""
-
-#: .././play/confmgmt.py:74
-#, python-format
-msgid "Searching for service with name %s"
-msgstr ""
-
-#: .././play/confmgmt.py:77
-#, python-format
-msgid "Found service %s"
+#: ../conf.py:37 ../kolab.py:34 ../saslauthd.py:33
+msgid "Cannot load pykolab/logger.py:"
 msgstr ""
 
-#: .././play/confmgmt.py:82
-#, python-format
-msgid "Searching for role with name %s"
+#: ../kolabd/__init__.py:49 ../saslauthd/__init__.py:48
+#: ../wallace/__init__.py:65
+msgid "Daemon Options"
 msgstr ""
 
-#: .././play/confmgmt.py:85
-#, python-format
-msgid "Found role %s"
+#: ../kolabd/__init__.py:56 ../saslauthd/__init__.py:55
+#: ../wallace/__init__.py:72
+msgid "Fork to the background."
 msgstr ""
 
-#: .././play/confmgmt.py:89
-#, python-format
-msgid "Searching for file with path %s"
+#: ../kolabd/__init__.py:65 ../saslauthd/__init__.py:64
+#: ../wallace/__init__.py:98
+msgid "Path to the PID file to use."
 msgstr ""
 
-#: .././play/confmgmt.py:92
-#, python-format
-msgid "File with path %s not found, adding to database"
+#: ../kolabd/__init__.py:74 ../saslauthd/__init__.py:73
+#: ../wallace/__init__.py:115
+msgid "Run as user USERNAME"
 msgstr ""
 
-#: .././play/confmgmt.py:97
-#, python-format
-msgid "Adding file with path %s to service with name %s"
+#: ../kolabd/__init__.py:84 ../saslauthd/__init__.py:83
+#: ../wallace/__init__.py:89
+msgid "Run as group GROUPNAME"
 msgstr ""
 
-#: .././play/confmgmt.py:101
+#: ../kolabd/__init__.py:122 ../pykolab/utils.py:151
+#: ../wallace/__init__.py:288
 #, python-format
-msgid "Adding setting with key %s (%r, %r)"
+msgid "Group %s does not exist"
 msgstr ""
 
-#: .././play/confmgmt.py:106
+#: ../kolabd/__init__.py:131 ../wallace/__init__.py:297
 #, python-format
-msgid "Adding setting %s to file with path %s"
+msgid "Switching real and effective group id to %d"
 msgstr ""
 
-#: .././play/confmgmt.py:110
+#: ../kolabd/__init__.py:153 ../pykolab/utils.py:175
+#: ../wallace/__init__.py:319
 #, python-format
-msgid "Adding role with name %s to setting with key %s"
+msgid "User %s does not exist"
 msgstr ""
 
-#: .././play/rolequota/__init__.py:53
-#: .././pykolab/plugins/dynamicquota/__init__.py:50
+#: ../kolabd/__init__.py:163 ../wallace/__init__.py:329
 #, python-format
-msgid "No keyword %s passed to set_user_folder_quota"
+msgid "Switching real and effective user id to %d"
 msgstr ""
 
-#: .././play/roundcube_database/__init__.py:51
-#: .././play/roundcube_database/users.py:108
-#, python-format
-msgid "Operational Error in Roundcube database: %s"
+#: ../kolabd/__init__.py:172 ../wallace/__init__.py:338
+msgid "Could not change real and effective uid and/or gid"
 msgstr ""
 
-#: .././kwap/kwap/controllers/secure.py:25
-msgid "Secure Controller here"
+#: ../kolabd/__init__.py:192 ../saslauthd/__init__.py:122
+#: ../wallace/__init__.py:358
+msgid "Interrupted by user"
 msgstr ""
 
-#: .././kwap/kwap/controllers/root.py:103
-msgid "Wrong credentials"
+#: ../kolabd/__init__.py:197 ../kolabd/__init__.py:208
+#: ../wallace/__init__.py:362 ../wallace/__init__.py:372
+msgid "Traceback occurred, please report a "
 msgstr ""
 
-#: .././kwap/kwap/controllers/root.py:118
+#: ../kolabd/__init__.py:203 ../saslauthd/__init__.py:130
+#: ../wallace/__init__.py:368
 #, python-format
-msgid "Welcome back, %s!"
-msgstr ""
-
-#: .././kwap/kwap/controllers/root.py:128
-msgid "We hope to see you soon!"
-msgstr ""
-
-#: .././saslauthd.py:33 .././kolab.py:34 .././conf.py:37
-msgid "Cannot load pykolab/logger.py:"
-msgstr ""
-
-#: .././bonnie/__init__.py:71 .././bonnie/__init__.py:79
-#: .././saslauthd/__init__.py:94 .././saslauthd/__init__.py:102
-msgid "Traceback occurred, please report a bug at http://bugzilla.kolabsys.com"
+msgid "Type Error: %s"
 msgstr ""
 
-#: .././kolabd/__init__.py:116 .././pykolab/auth/ldap/__init__.py:1291
-#: .././pykolab/cli/cmd_sync.py:33
+#: ../kolabd/__init__.py:223 ../pykolab/auth/ldap/__init__.py:1591
+#: ../pykolab/cli/cmd_sync.py:36
 msgid "Listing domains..."
 msgstr ""
 
-#: .././kolabd/__init__.py:148
+#: ../kolabd/__init__.py:256
 #, python-format
 msgid "added domains: %r, removed domains: %r"
 msgstr ""
 
-#: .././pykolab/__init__.py:50
-msgid "Returning thread local configuration"
-msgstr ""
-
-#: .././pykolab/tests/tests.py:53
-msgid "List tests"
-msgstr ""
-
-#. This is a nested test
-#: .././pykolab/tests/tests.py:86
-#, python-format
-msgid "Test Suite: %s"
-msgstr ""
-
-#: .././pykolab/tests/tests.py:100 .././pykolab/tests/tests.py:105
-msgid "No such test."
-msgstr ""
-
-#: .././pykolab/tests/tests.py:157 .././pykolab/tests/tests.py:161
-#, python-format
-msgid "Test '%s' already registered"
-msgstr ""
-
-#: .././pykolab/tests/tests.py:191 .././pykolab/cli/commands.py:191
-#: .././pykolab/setup/components.py:251
-msgid "Not yet implemented"
-msgstr ""
-
-#: .././pykolab/tests/__init__.py:39
-msgid "Test Options"
-msgstr ""
-
-#: .././pykolab/tests/__init__.py:45
-msgid "Run tests in suite SUITE. Implies a certain set of items being tested."
-msgstr ""
-
-#: .././pykolab/tests/imap/test_login.py:44
-#, python-format
-msgid "Connecting at %s"
+#: ../kolabd.py:31 ../setup-kolab.py:36 ../wallace.py:31
+msgid "Cannot load pykolab/constants.py:"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:46
+#: ../pykolab/auth/__init__.py:94
 #, python-format
-msgid "Connected at %s"
+msgid "Called for domain %r"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:51
+#: ../pykolab/auth/__init__.py:107 ../pykolab/auth/__init__.py:116
 #, python-format
-msgid "Logging in at %s"
+msgid "Using section %s and domain %s"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:53
+#: ../pykolab/auth/__init__.py:121
 #, python-format
-msgid "Logged in at %s"
+msgid "Connecting to Authentication backend for domain %s"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:60
+#: ../pykolab/auth/__init__.py:132
 #, python-format
-msgid "Test failure in %s"
+msgid "Section %s has no option 'auth_mechanism'"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:94
+#: ../pykolab/auth/__init__.py:139
 #, python-format
-msgid "Called for domain %r"
+msgid "Section %s has auth_mechanism: %r"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:107 .././pykolab/auth/__init__.py:116
-#, python-format
-msgid "Using section %s and domain %s"
+#: ../pykolab/auth/__init__.py:148 ../pykolab/auth/__init__.py:157
+msgid "Starting LDAP..."
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:121
+#: ../pykolab/auth/ldap/cache.py:109
 #, python-format
-msgid "Connecting to Authentication backend for domain %s"
+msgid "Inserting cache entry %r"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:132
+#: ../pykolab/auth/ldap/cache.py:122
 #, python-format
-msgid "Section %s has no option 'auth_mechanism'"
+msgid "Updating timestamp for cache entry %r"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:139
+#: ../pykolab/auth/ldap/cache.py:129
 #, python-format
-msgid "Section %s has auth_mechanism: %r"
-msgstr ""
-
-#: .././pykolab/auth/__init__.py:148 .././pykolab/auth/__init__.py:157
-msgid "Starting LDAP..."
+msgid "Updating result_attribute for cache entry %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:51
+#: ../pykolab/auth/ldap/__init__.py:51
 msgid "Python LDAP library does not support persistent search"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:141
+#: ../pykolab/auth/ldap/__init__.py:142
 #, python-format
 msgid "Attempting to authenticate user %s in realm %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:181
+#: ../pykolab/auth/ldap/__init__.py:184
 #, python-format
 msgid "Binding with user_dn %s and password %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:190
+#: ../pykolab/auth/ldap/__init__.py:194
 #, python-format
 msgid "Failed to authenticate as user %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:205
+#: ../pykolab/auth/ldap/__init__.py:211
 msgid "Connecting to LDAP..."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:209
+#: ../pykolab/auth/ldap/__init__.py:215
 #, python-format
 msgid "Attempting to use LDAP URI %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:345
+#: ../pykolab/auth/ldap/__init__.py:357
 #, python-format
 msgid "Finding recipient with filter %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:398
+#: ../pykolab/auth/ldap/__init__.py:425
+#, python-format
+msgid "Finding resource with filter %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:448
+#, python-format
+msgid "Using timestamp %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:480
 #, python-format
 msgid "Applying recipient policy to %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:415
+#: ../pykolab/auth/ldap/__init__.py:497
 #, python-format
 msgid "Using mail attributes: %r, with primary %r and "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:426
+#: ../pykolab/auth/ldap/__init__.py:508
 #, python-format
 msgid "key %r not in entry"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:428
+#: ../pykolab/auth/ldap/__init__.py:510
 #, python-format
 msgid "key %r is the prim. mail attr."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:430
+#: ../pykolab/auth/ldap/__init__.py:512
 msgid "prim. mail pol. is not empty"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:433
+#: ../pykolab/auth/ldap/__init__.py:515
 #, python-format
 msgid "key %r is the sec. mail attr."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:435
+#: ../pykolab/auth/ldap/__init__.py:517
 msgid "sec. mail pol. is not empty"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:438
-#: .././pykolab/auth/ldap/__init__.py:451
+#: ../pykolab/auth/ldap/__init__.py:520 ../pykolab/auth/ldap/__init__.py:533
 #, python-format
 msgid "Attributes %r are not yet available for entry %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:492
+#: ../pykolab/auth/ldap/__init__.py:574
 #, python-format
 msgid "No results for mail address %s found"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:503
+#: ../pykolab/auth/ldap/__init__.py:585
 #, python-format
 msgid "1 result for address %s found, verifying"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:513
+#: ../pykolab/auth/ldap/__init__.py:595
 #, python-format
 msgid "Too bad, primary email address %s "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:524
-#: .././pykolab/auth/ldap/__init__.py:613
+#: ../pykolab/auth/ldap/__init__.py:606 ../pykolab/auth/ldap/__init__.py:695
 msgid "Address assigned to us"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:579
+#: ../pykolab/auth/ldap/__init__.py:661
 #, python-format
 msgid "No results for address %s found"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:590
+#: ../pykolab/auth/ldap/__init__.py:672
 #, python-format
 msgid "1 result for address %s found, "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:601
+#: ../pykolab/auth/ldap/__init__.py:683
 msgid "Too bad, secondary email "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:655
+#: ../pykolab/auth/ldap/__init__.py:710
+msgid "Recipient policy composed the following set of secondary "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:716
+#, python-format
+msgid "Secondary mail addresses that we want is not None: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:727
+msgid "Avoiding the duplication of the primary mail "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:738
+#, python-format
+msgid "Entry is getting secondary mail addresses: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:746
+msgid "Entry did not have any secondary mail "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:772
 #, python-format
 msgid "Entry modifications list: %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:698
+#: ../pykolab/auth/ldap/__init__.py:792
+#, python-format
+msgid "Setting entry attribute %r to %r for %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:828
+#, python-format
+msgid "Could not update dn %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:841
 #, python-format
 msgid "Using filter %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:736
+#: ../pykolab/auth/ldap/__init__.py:879
+#, python-format
+msgid "About to consider the user quota for %r (used: %r, "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:945
 msgid "Invalid bind credentials"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:989
+#: ../pykolab/auth/ldap/__init__.py:1229
 #, python-format
 msgid "Current changelog entry %s with %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:996
+#: ../pykolab/auth/ldap/__init__.py:1242
 #, python-format
 msgid "Result from recipient policy: %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1227
+#: ../pykolab/auth/ldap/__init__.py:1385
+#, python-format
+msgid "Kolab user %s does not have a result attribute %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1527
 #, python-format
 msgid "Finding domain root dn for domain %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1315
+#: ../pykolab/auth/ldap/__init__.py:1615
 msgid "Authentication database DOWN"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1394
+#: ../pykolab/auth/ldap/__init__.py:1699 ../pykolab/auth/ldap/__init__.py:1734
 #, python-format
 msgid "Entry type: %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1492
+#: ../pykolab/auth/ldap/__init__.py:1822
 msgid "LDAP Search Result Data Entry:"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1508
+#: ../pykolab/auth/ldap/__init__.py:1838
 msgid "Entry Change Notification attributes:"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1513
+#: ../pykolab/auth/ldap/__init__.py:1843
 #, python-format
 msgid "Change Type: %r (%r)"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1521
+#: ../pykolab/auth/ldap/__init__.py:1851
 #, python-format
 msgid "Previous DN: %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1575
+#: ../pykolab/auth/ldap/__init__.py:1906
 #, python-format
 msgid "Object %s searched no longer exists"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1583
+#: ../pykolab/auth/ldap/__init__.py:1916
 #, python-format
 msgid "%d results..."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1677
+#: ../pykolab/auth/ldap/__init__.py:2014
 #, python-format
 msgid "Searching with filter %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1721
+#: ../pykolab/auth/ldap/__init__.py:2058
 #, python-format
 msgid "Checking for support for %s on %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/cache.py:109
-#, python-format
-msgid "Inserting cache entry %r"
+#: ../pykolab/cli/cmd_add_domain.py:36 ../pykolab/cli/cmd_create_mailbox.py:36
+#: ../pykolab/cli/cmd_export_mailbox.py:33
+#: ../pykolab/cli/cmd_list_mailboxes.py:39
+msgid "CLI Options"
 msgstr ""
 
-#: .././pykolab/auth/ldap/cache.py:122
-#, python-format
-msgid "Updating timestamp for cache entry %r"
+#: ../pykolab/cli/cmd_add_domain.py:42
+msgid "Add domain as alias for DOMAIN"
 msgstr ""
 
-#: .././pykolab/auth/ldap/cache.py:128
-#, python-format
-msgid "Updating result_attribute for cache entry %r"
+#: ../pykolab/cli/cmd_add_domain.py:47
+msgid "Add a new domain or domain alias."
 msgstr ""
 
-#: .././pykolab/auth/sql/__init__.py:44
-msgid "Connecting to SQL..."
+#: ../pykolab/cli/cmd_add_domain.py:55
+msgid "Could not find credentials with sufficient permissions"
 msgstr ""
 
-#: .././pykolab/utils.py:92
-msgid "Please answer 'yes' or 'no'."
+#: ../pykolab/cli/cmd_add_domain.py:80 ../pykolab/wap_client/__init__.py:113
+msgid "Invalid parent domain"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:87
-#, python-format
-msgid "Setting %s to %r (from defaults)"
+#: ../pykolab/cli/cmd_add_domain.py:86
+msgid "Domain name"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:106
-#, python-format
-msgid "Setting %s to %r (from CLI, verified)"
+#: ../pykolab/cli/cmd_create_mailbox.py:41
+msgid "Set metadata for folder to ANNOTATION=VALUE"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:109
-#, python-format
-msgid "Setting %s to %r (from CLI, not checked)"
+#: ../pykolab/cli/cmd_create_mailbox.py:50
+msgid "Invalid argument"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:150 .././pykolab/conf/__init__.py:207
-#, python-format
-msgid "Setting %s_%s to '****' (from configuration file)"
+#: ../pykolab/cli/cmd_create_mailbox.py:58
+msgid "Invalid argument for metadata"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:152 .././pykolab/conf/__init__.py:209
-#, python-format
-msgid "Setting %s_%s to %r (from configuration file)"
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:45
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:49
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:50
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:55
+msgid "ACI Subject"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:162
-msgid "Setting options from configuration file"
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:48
+#: ../pykolab/cli/cmd_list_mailbox_acls.py:41
+#: ../pykolab/cli/cmd_list_mailbox_metadata.py:41
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:54
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:54
+msgid "Folder name"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:223
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:60
+#: ../pykolab/cli/cmd_list_mailbox_acls.py:52
+#: ../pykolab/cli/cmd_list_mailbox_metadata.py:52
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:67
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:67
 #, python-format
-msgid "Configuration file %s not readable"
+msgid "No such folder %r"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:226
-#, python-format
-msgid "Reading configuration file %s"
+#: ../pykolab/cli/cmd_delete_mailbox.py:46
+msgid "No mailbox specified"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:230
+#: ../pykolab/cli/cmd_export_mailbox.py:38
+msgid "All folders this user has access to"
+msgstr ""
+
+#: ../pykolab/cli/cmd_export_mailbox.py:108
+#, python-format
+msgid "%s is not a directory"
+msgstr ""
+
+#: ../pykolab/cli/cmd_export_mailbox.py:118
+#, python-format
+msgid "ZIP file at %s.zip"
+msgstr ""
+
+#: ../pykolab/cli/cmd_export_mailbox.py:120
+#, python-format
+msgid "No directories found for user %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_mailboxes.py:44
+msgid "Display raw IMAP UTF-7 folder names"
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_mailboxes.py:75
+#, python-format
+msgid "Appending folder search for %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:49
+msgid "Invalid or unqualified email address."
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:57
+#, python-format
+msgid "No recipient found for email address %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:60
+#, python-format
+msgid "Found the following recipient(s): %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:66
+#, python-format
+msgid "Using the following mail attributes: %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:90
+msgid "Found the following recipients:"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:48
+msgid "No target mailbox name specified"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:50
+msgid "No source mailbox name specified"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:62
+#, python-format
+msgid "Source folder %r does not exist"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:66
+#, python-format
+msgid "Target folder %r already exists"
+msgstr ""
+
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:47
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:51
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:56
+msgid "ACI Permissions"
+msgstr ""
+
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:47
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:51
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:56
+msgid "Metadata value"
+msgstr ""
+
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:50
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:55
+msgid "Metadata path"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:41
+#, python-format
+msgid "Found %d domains in %d seconds"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:51
+#, python-format
+msgid "Running for domain %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:57
+#, python-format
+msgid "Synchronizing users for %s took %d seconds"
+msgstr ""
+
+#. This is a nested command
+#. This is a nested component
+#: ../pykolab/cli/commands.py:98 ../pykolab/setup/components.py:90
+#, python-format
+msgid "Command Group: %s"
+msgstr ""
+
+#: ../pykolab/cli/commands.py:109 ../pykolab/cli/commands.py:114
+msgid "No such command."
+msgstr ""
+
+#: ../pykolab/cli/commands.py:165 ../pykolab/setup/components.py:231
+#, python-format
+msgid "Command '%s' already registered"
+msgstr ""
+
+#: ../pykolab/cli/commands.py:190 ../pykolab/setup/components.py:257
+#: ../wallace/modules.py:338
+#, python-format
+msgid "Alias for %s"
+msgstr ""
+
+#: ../pykolab/cli/commands.py:198 ../pykolab/setup/components.py:265
+msgid "Not yet implemented"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:40
+msgid "Unspecified command issue identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:50
+msgid "Invalid command issue identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:60
+#: ../pykolab/cli/telemetry/cmd_examine_session.py:65
+msgid "Invalid session identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:75
+#: ../pykolab/cli/telemetry/cmd_examine_session.py:100
+#, python-format
+msgid "Session by %s on server %s"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_session.py:43
+msgid "Unspecified session identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_list_sessions.py:35
+msgid "List Options"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_list_sessions.py:40
+msgid "Display sessions since ..."
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_list_sessions.py:58
+#, python-format
+msgid "Session for user %s started at %s with ID %s"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:57 ../pykolab/conf/entitlement.py:80
+#: ../pykolab/conf/entitlement.py:98 ../pykolab/conf/entitlement.py:116
+#: ../pykolab/conf/entitlement.py:230 ../pykolab/conf/entitlement.py:246
+#: ../pykolab/conf/entitlement.py:262
+msgid "Invalid entitlement verification "
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:120 ../pykolab/conf/entitlement.py:123
+msgid "Invalid entitlement certificate"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:132
+#, python-format
+msgid "Parsing entitlement file %s"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:141
+#, python-format
+msgid "License file %s not readable!"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:147
+msgid "No entitlement directory found"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:87
+#, python-format
+msgid "Setting %s to %r (from defaults)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:106
+#, python-format
+msgid "Setting %s to %r (from CLI, verified)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:109
+#, python-format
+msgid "Setting %s to %r (from CLI, not checked)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:150 ../pykolab/conf/__init__.py:207
+#, python-format
+msgid "Setting %s_%s to '****' (from configuration file)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:152 ../pykolab/conf/__init__.py:209
+#, python-format
+msgid "Setting %s_%s to %r (from configuration file)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:162
+msgid "Setting options from configuration file"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:223
+#, python-format
+msgid "Configuration file %s not readable"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:226
+#, python-format
+msgid "Reading configuration file %s"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:230
 #, python-format
 msgid "Invalid configuration file %s"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:233
+#: ../pykolab/conf/__init__.py:233
 #, python-format
 msgid "No master configuration section [kolab] in configuration file %s"
 msgstr ""
@@ -810,1088 +924,1335 @@ msgstr ""
 #. #
 #. # Runtime Options
 #. #
-#: .././pykolab/conf/__init__.py:267
+#: ../pykolab/conf/__init__.py:267
 msgid "Runtime Options"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:272
+#: ../pykolab/conf/__init__.py:272
 msgid "Configuration file to use"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:278
+#: ../pykolab/conf/__init__.py:278
 msgid "Set the debugging "
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:286
+#: ../pykolab/conf/__init__.py:286
 msgid "Set the logging level. "
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:294
+#: ../pykolab/conf/__init__.py:294
 msgid "Log file to use"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:300
+#: ../pykolab/conf/__init__.py:300
 msgid "Be quiet."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:306
+#: ../pykolab/conf/__init__.py:306
 msgid "Answer yes to all questions."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:328
+#: ../pykolab/conf/__init__.py:328
 msgid "No command supplied"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:411
+#: ../pykolab/conf/__init__.py:411
 msgid "Insufficient options. Need section, key and value -in that order."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:414
+#: ../pykolab/conf/__init__.py:414
 #, python-format
 msgid "No section '%s' exists."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:445
+#: ../pykolab/conf/__init__.py:445
 #, python-format
 msgid "Setting %s to %r (from the default values for CLI options)"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:514
+#: ../pykolab/conf/__init__.py:514
 #, python-format
 msgid "Could not execute configuration function: %s"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:522
+#: ../pykolab/conf/__init__.py:522
 #, python-format
 msgid "Option %s/%s does not exist in config file %s, pulling from defaults"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:530 .././pykolab/conf/__init__.py:533
+#: ../pykolab/conf/__init__.py:530 ../pykolab/conf/__init__.py:533
 msgid "Option does not exist in defaults."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:531 .././pykolab/conf/__init__.py:534
-msgid "Not available"
-msgstr ""
-
-#: .././pykolab/conf/__init__.py:543
+#: ../pykolab/conf/__init__.py:543
 #, python-format
 msgid "Configuration file %s not readable."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:546
+#: ../pykolab/conf/__init__.py:546
 #, python-format
 msgid "Configuration file %s does not exist."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:551
+#: ../pykolab/conf/__init__.py:551
 msgid ""
 "WARNING: A negative debug level value does not make this program be any more "
 "silent."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:557
+#: ../pykolab/conf/__init__.py:557
 msgid "This program has 9 levels of verbosity. Using the maximum of 9."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:565 .././pykolab/conf/__init__.py:571
+#: ../pykolab/conf/__init__.py:565 ../pykolab/conf/__init__.py:571
 msgid "Cannot start SASL authentication daemon"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:582
+#: ../pykolab/conf/__init__.py:582
 msgid "No imaplib library found."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:592
+#: ../pykolab/conf/__init__.py:592
 msgid "No LMTP class found in the smtplib library."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:602
+#: ../pykolab/conf/__init__.py:602
 msgid "No SMTP class found in the smtplib library."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:616
+#: ../pykolab/conf/__init__.py:616
 #, python-format
 msgid "Found you specified a specific set of items to test: %s"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:624
+#: ../pykolab/conf/__init__.py:624
 #, python-format
 msgid "Selectively selecting: %s"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:57 .././pykolab/conf/entitlement.py:80
-#: .././pykolab/conf/entitlement.py:98 .././pykolab/conf/entitlement.py:116
-#: .././pykolab/conf/entitlement.py:229 .././pykolab/conf/entitlement.py:245
-#: .././pykolab/conf/entitlement.py:261
-msgid "Invalid entitlement verification "
+#: ../pykolab/constants.py.in:40
+msgid "PyKolab is a Kolab Systems product. For more information "
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:120 .././pykolab/conf/entitlement.py:123
-msgid "Invalid entitlement certificate"
+#: ../pykolab/constants.py.in:54
+msgid "WARNING"
+msgstr ""
+
+#: ../pykolab/constants.py.in:54
+msgid "The Fully Qualified "
+msgstr ""
+
+#: ../pykolab/constants.py.in:75
+msgid "389 Directory Server or Red Hat Directory Server"
+msgstr ""
+
+#: ../pykolab/constants.py.in:79 ../pykolab/constants.py.in:83
+msgid "OpenLDAP or compatible"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:132
+#: ../pykolab/imap/cyrus.py:79
 #, python-format
-msgid "Parsing entitlement file %s"
+msgid "Could not connect to Cyrus IMAP server %r"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:141
+#: ../pykolab/imap/cyrus.py:134
 #, python-format
-msgid "License file %s not readable!"
+msgid "Continuing with separator: %r"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:146
-msgid "No entitlement directory found"
+#: ../pykolab/imap/cyrus.py:139
+msgid "Detected we are running in a Murder topology"
 msgstr ""
 
-#: .././pykolab/logger.py:89
+#: ../pykolab/imap/cyrus.py:143
+msgid "This system is not part of a murder topology"
+msgstr ""
+
+#: ../pykolab/imap/cyrus.py:164
 #, python-format
-msgid "Cannot log to file %s: %s"
+msgid "Checking actual backend server for folder %s through annotations"
 msgstr ""
 
-#: .././pykolab/constants.py:40
-msgid "PyKolab is a Kolab Systems product. For more information "
+#: ../pykolab/imap/cyrus.py:179
+#, python-format
+msgid "Could not get the annotations after %s tries."
 msgstr ""
 
-#: .././pykolab/constants.py:54
-msgid "WARNING"
+#: ../pykolab/imap/cyrus.py:183
+#, python-format
+msgid "No annotations for %s: %r"
 msgstr ""
 
-#: .././pykolab/constants.py:54
-msgid "The Fully Qualified "
+#: ../pykolab/imap/cyrus.py:190
+#, python-format
+msgid "Server for INBOX folder %s is %s"
 msgstr ""
 
-#: .././pykolab/constants.py:75
-msgid "389 Directory Server or Red Hat Directory Server"
+#: ../pykolab/imap/cyrus.py:202
+#, python-format
+msgid "Setting quota for folder %s to %s"
 msgstr ""
 
-#: .././pykolab/constants.py:79 .././pykolab/constants.py:83
-msgid "OpenLDAP or compatible"
+#: ../pykolab/imap/cyrus.py:206
+#, python-format
+msgid "Could not set quota for mailfolder %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_list_sessions.py:35
-msgid "List Options"
+#: ../pykolab/imap/cyrus.py:215
+#, python-format
+msgid "Moving INBOX folder %s to %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_list_sessions.py:40
-msgid "Display sessions since ..."
+#: ../pykolab/imap/cyrus.py:227
+#, python-format
+msgid "Setting annotation %s on folder %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_list_sessions.py:58
+#: ../pykolab/imap/cyrus.py:234
 #, python-format
-msgid "Session for user %s started at %s with ID %s"
+msgid "Could not set annotation %r on mail folder %r: %r"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_session.py:43
-msgid "Unspecified session identifier"
+#: ../pykolab/imap/cyrus.py:238
+#, python-format
+msgid "Transferring folder %s from %s to %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_session.py:65
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:60
-msgid "Invalid session identifier"
+#: ../pykolab/imap/cyrus.py:298
+#, python-format
+msgid "Undeleting %s to %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_session.py:100
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:75
+#: ../pykolab/imap/__init__.py:45
 #, python-format
-msgid "Session by %s on server %s"
+msgid "Cleaning up ACL entries for %s across all folders"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:40
-msgid "Unspecified command issue identifier"
+#: ../pykolab/imap/__init__.py:60
+#, python-format
+msgid "Cleaning up ACL entries referring to identifier %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:50
-msgid "Invalid command issue identifier"
+#: ../pykolab/imap/__init__.py:69
+#, python-format
+msgid "Iterating over %d folders"
 msgstr ""
 
-#. This is a nested command
-#. This is a nested component
-#: .././pykolab/cli/commands.py:95 .././pykolab/setup/components.py:88
+#. Set the ACL to '' (effectively deleting the ACL entry)
+#: ../pykolab/imap/__init__.py:82
 #, python-format
-msgid "Command Group: %s"
+msgid "Removing acl %r for subject %r from folder %r"
 msgstr ""
 
-#: .././pykolab/cli/commands.py:106 .././pykolab/cli/commands.py:111
-msgid "No such command."
+#: ../pykolab/imap/__init__.py:143
+#, python-format
+msgid "Logging on to Cyrus IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/commands.py:161 .././pykolab/setup/components.py:217
+#: ../pykolab/imap/__init__.py:152
 #, python-format
-msgid "Command '%s' already registered"
+msgid "Logging on to Dovecot IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_delete_mailbox.py:43
-msgid "No mailbox specified"
+#: ../pykolab/imap/__init__.py:161
+#, python-format
+msgid "Logging on to generic IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_list_mailboxes.py:35
-#: .././pykolab/cli/cmd_export_mailbox.py:33
-msgid "CLI Options"
+#: ../pykolab/imap/__init__.py:179
+#, python-format
+msgid "Reusing existing IMAP server connection to %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_list_mailboxes.py:40
-msgid "Display raw UTF-7 folder names"
+#: ../pykolab/imap/__init__.py:181
+#, python-format
+msgid "Reconnecting to IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:38
-msgid "All folders this user has access to"
+#: ../pykolab/imap/__init__.py:197
+msgid "Called imap.disconnect() on a server that "
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:108
+#: ../pykolab/imap/__init__.py:213
 #, python-format
-msgid "%s is not a directory"
+msgid "%r has no attribute %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:118
+#: ../pykolab/imap/__init__.py:286
+msgid "Private annotations need to be set using the appropriate user account."
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:319 ../pykolab/imap/__init__.py:354
 #, python-format
-msgid "ZIP file at %s.zip"
+msgid "Creating new shared folder %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:120
+#: ../pykolab/imap/__init__.py:376
 #, python-format
-msgid "No directories found for user %s"
+msgid "Creating new mailbox for user %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_sync.py:38
+#: ../pykolab/imap/__init__.py:405
 #, python-format
-msgid "Found %d domains in %d seconds"
+msgid "Creating additional folders for user %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_sync.py:48
+#: ../pykolab/imap/__init__.py:429
 #, python-format
-msgid "Running for domain %s"
+msgid "Mailbox already exists: %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_sync.py:54
+#: ../pykolab/imap/__init__.py:472
+msgid "Subscribing user to the additional folders"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:532 ../pykolab/imap/__init__.py:611
 #, python-format
-msgid "Synchronizing users for %s took %d seconds"
+msgid "Renaming INBOX from %s to %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:536
+#, python-format
+msgid "Could not rename INBOX folder %s to %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:538 ../pykolab/imap/__init__.py:615
+#, python-format
+msgid "Moving INBOX folder %s won't succeed as target folder %s already exists"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:70
+#: ../pykolab/imap/__init__.py:551
+#, python-format
+msgid "Looking for folder '%s', we found folders: %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:574
+#, python-format
+msgid "Setting ACL rights %s for subject %s on folder "
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:585
+#, python-format
+msgid "Removing ACL rights %s for subject %s on folder "
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:608
+#, python-format
+msgid "Found old INBOX folder %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:617
+#, python-format
+msgid "Did not find old folder user/%s to rename"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:619
+msgid "Value for user is not a dictionary"
+msgstr ""
+
+#. TODO: Go in fact correct the quota.
+#: ../pykolab/imap/__init__.py:682
+#, python-format
+msgid "Cannot get current IMAP quota for folder %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:695
+#, python-format
+msgid "Quota for %s currently is %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:701
+#, python-format
+msgid "Adjusting authentication database quota for folder %s to %d"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:706
+#, python-format
+msgid "Correcting quota for %s to %s (currently %s)"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:788
+#, python-format
+msgid "Checking folder: %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:793
+#, python-format
+msgid "Folder has no corresponding user (1): %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:796
+#, python-format
+msgid "Folder has no corresponding user (2): %s"
+msgstr ""
+
+#. We got user identifier only
+#: ../pykolab/imap/__init__.py:811
+msgid "Please don't give us just a user identifier"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:814
+#, python-format
+msgid "Deleting folder %s"
+msgstr ""
+
+#: ../pykolab/__init__.py:50
+msgid "Returning thread local configuration"
+msgstr ""
+
+#: ../pykolab/logger.py:105
+#, python-format
+msgid "Could not change the ownership of log file %s"
+msgstr ""
+
+#: ../pykolab/logger.py:121
+#, python-format
+msgid "Cannot log to file %s: %s"
+msgstr ""
+
+#: ../pykolab/plugins/defaultfolders/__init__.py:47
+#, python-format
+msgid "Plugin %s called without required keyword %s."
+msgstr ""
+
+#: ../pykolab/plugins/defaultfolders/__init__.py:53
+msgid "Could not parse additional_folders"
+msgstr ""
+
+#: ../pykolab/plugins/dynamicquota/__init__.py:58
+#, python-format
+msgid "No keyword %s passed to set_user_folder_quota"
+msgstr ""
+
+#: ../pykolab/plugins/dynamicquota/__init__.py:70
+#, python-format
+msgid "Quota '%s' not an integer!"
+msgstr ""
+
+#: ../pykolab/plugins/__init__.py:70
 #, python-format
 msgid "ImportError for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:74
+#: ../pykolab/plugins/__init__.py:74
 #, python-format
 msgid "RuntimeError for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:78
+#: ../pykolab/plugins/__init__.py:78
 #, python-format
 msgid "Plugin %s failed to load (%s: %s)"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:116 .././pykolab/plugins/__init__.py:118
+#: ../pykolab/plugins/__init__.py:116 ../pykolab/plugins/__init__.py:118
 #, python-format
 msgid "Cannot set defaults for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:120
+#: ../pykolab/plugins/__init__.py:120
 #, python-format
 msgid "Cannot set defaults for plugin %s: Unknown Error"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:123
+#: ../pykolab/plugins/__init__.py:123
 #, python-format
 msgid "Not setting defaults for plugin %s: No function 'set_defaults()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:142
+#: ../pykolab/plugins/__init__.py:142
 #, python-format
 msgid "Cannot set runtime for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:144
+#: ../pykolab/plugins/__init__.py:144
 #, python-format
 msgid "Not setting runtime for plugin %s: No function 'set_runtime()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:163 .././pykolab/plugins/__init__.py:165
+#: ../pykolab/plugins/__init__.py:163 ../pykolab/plugins/__init__.py:165
 #, python-format
 msgid "Cannot add options for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:167
+#: ../pykolab/plugins/__init__.py:167
 #, python-format
 msgid "Not adding options for plugin %s: No function 'add_options()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:187
+#: ../pykolab/plugins/__init__.py:187
 #, python-format
 msgid "Cannot check options for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:189
+#: ../pykolab/plugins/__init__.py:189
 #, python-format
 msgid "Not checking options for plugin %s: No function 'check_options()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:227
+#: ../pykolab/plugins/__init__.py:227
 #, python-format
 msgid "Executing hook %s for plugin %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:231 .././pykolab/plugins/__init__.py:233
+#: ../pykolab/plugins/__init__.py:231 ../pykolab/plugins/__init__.py:233
 #, python-format
 msgid "Cannot execute hook %s for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/defaultfolders/__init__.py:47
-#, python-format
-msgid "Plugin %s called without required keyword %s."
+#: ../pykolab/plugins/recipientpolicy/__init__.py:79
+msgid "Attribute substitution for 'mail' failed in Recipient Policy"
 msgstr ""
 
-#: .././pykolab/plugins/defaultfolders/__init__.py:53
-msgid "Could not parse additional_folders"
+#: ../pykolab/plugins/recipientpolicy/__init__.py:115
+msgid "Could not parse the alternative mail routines"
 msgstr ""
 
-#: .././pykolab/plugins/dynamicquota/__init__.py:56
-#, python-format
-msgid "Quota '%s' not an integer!"
+#: ../pykolab/plugins/recipientpolicy/__init__.py:127
+#: ../pykolab/plugins/recipientpolicy/__init__.py:137
+msgid ""
+"Attribute substitution for 'alternative_mail' failed in Recipient Policy"
 msgstr ""
 
-#: .././pykolab/plugins/dynamicquota/__init__.py:63
-msgid ""
-"The new quota was set to 0, but default quota > 0, returning default quota"
+#: ../pykolab/setup/components.py:58
+msgid "Display this help."
 msgstr ""
 
-#: .././pykolab/plugins/dynamicquota/__init__.py:82
-msgid ""
-"The default quota is larger then the calculated new quota, using the default "
-"quota"
+#: ../pykolab/setup/components.py:149
+msgid "No component selected, continuing for all components"
 msgstr ""
 
-#: .././pykolab/plugins/recipientpolicy/__init__.py:70
-msgid "Attribute substitution for 'mail' failed in Recipient Policy"
+#: ../pykolab/setup/components.py:187 ../pykolab/setup/components.py:192
+msgid "No such component."
 msgstr ""
 
-#: .././pykolab/plugins/recipientpolicy/__init__.py:97
-msgid "Could not parse the alternative mail routines"
+#: ../pykolab/setup/setup_freebusy.py:46
+msgid "Setup Free/Busy."
 msgstr ""
 
-#: .././pykolab/plugins/recipientpolicy/__init__.py:109
-#: .././pykolab/plugins/recipientpolicy/__init__.py:119
-msgid ""
-"Attribute substitution for 'alternative_mail' failed in Recipient Policy"
+#: ../pykolab/setup/setup_freebusy.py:50
+msgid "Free/Busy is not installed on this system"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:40
-msgid "Setup zpush."
+#: ../pykolab/setup/setup_freebusy.py:55
+msgid ""
+"\n"
+"                        Please supply the MySQL password for the "
+"'roundcube'\n"
+"                        user. You have supplied this password earlier, and "
+"it is\n"
+"                        available from the database URI setting in\n"
+"                        /etc/roundcubemail/db.inc.php.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:44
-msgid "Z-Push is not installed on this system"
+#: ../pykolab/setup/setup_freebusy.py:64
+#: ../pykolab/setup/setup_roundcube.py:56
+msgid "MySQL roundcube password"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:70
-#: .././pykolab/setup/setup_roundcube.py:93
-#: .././pykolab/setup/setup_freebusy.py:76
+#: ../pykolab/setup/setup_freebusy.py:92
+#: ../pykolab/setup/setup_roundcube.py:116 ../pykolab/setup/setup_zpush.py:71
 #, python-format
 msgid "Using template file %r"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:77
-#: .././pykolab/setup/setup_roundcube.py:100
-#: .././pykolab/setup/setup_freebusy.py:83
+#: ../pykolab/setup/setup_freebusy.py:99
+#: ../pykolab/setup/setup_roundcube.py:123 ../pykolab/setup/setup_zpush.py:78
 #, python-format
 msgid "Successfully compiled template %r, writing out to %r"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:95 .././pykolab/setup/setup_ldap.py:184
-#: .././pykolab/setup/setup_ldap.py:358
-#: .././pykolab/setup/setup_roundcube.py:159
-#: .././pykolab/setup/setup_imap.py:137 .././pykolab/setup/setup_mysql.py:49
-#: .././pykolab/setup/setup_freebusy.py:101
-msgid "Could not start and configure to start on boot, the "
+#: ../pykolab/setup/setup_freebusy.py:119 ../pykolab/setup/setup_imap.py:143
+#: ../pykolab/setup/setup_ldap.py:288 ../pykolab/setup/setup_ldap.py:521
+#: ../pykolab/setup/setup_mta.py:309 ../pykolab/setup/setup_mysql.py:49
+#: ../pykolab/setup/setup_roundcube.py:191
+#: ../pykolab/setup/setup_syncroton.py:66 ../pykolab/setup/setup_zpush.py:98
+msgid "Could not start and configure to start on boot, the "
+msgstr ""
+
+#: ../pykolab/setup/setup_imap.py:44
+msgid "Setup IMAP."
+msgstr ""
+
+#: ../pykolab/setup/setup_imap.py:88 ../pykolab/setup/setup_imap.py:113
+msgid "Could not write out Cyrus IMAP configuration file /etc/imapd.conf"
+msgstr ""
+
+#: ../pykolab/setup/setup_kolabd.py:43
+msgid "Setup the Kolab daemon."
+msgstr ""
+
+#: ../pykolab/setup/setup_kolabd.py:51
+#, python-format
+msgid ""
+"\n"
+"                            Copying the configuration section for 'example."
+"org' over to\n"
+"                            a section applicable to your domain '%s'.\n"
+"                        "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:43
+msgid "LDAP Options"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:50
+msgid "Specify FQDN (overriding defaults)."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:58
+msgid "Allow anonymous binds (default: no)."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:62
+msgid "Setup LDAP."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:74
+msgid ""
+"\n"
+"                        Please supply a password for the LDAP administrator "
+"user\n"
+"                        'admin', used to login to the graphical console of "
+"389\n"
+"                        Directory server.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:82
+msgid "Administrator password"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:89
+msgid ""
+"\n"
+"                        Please supply a password for the LDAP Directory "
+"Manager\n"
+"                        user, which is the administrator user you will be "
+"using\n"
+"                        to at least initially log in to the Web Admin, and "
+"that\n"
+"                        Kolab uses to perform administrative tasks.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:98
+msgid "Directory Manager password"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:105
+msgid ""
+"\n"
+"                        Please choose the system user and group the service\n"
+"                        should use to run under. These should be existing,\n"
+"                        unprivileged, local system POSIX accounts with no "
+"shell.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:112
+msgid "User"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:43
-msgid "LDAP Options"
+#: ../pykolab/setup/setup_ldap.py:113
+msgid "Group"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:50
-msgid "Specify FQDN (overriding defaults)."
+#: ../pykolab/setup/setup_ldap.py:143
+msgid ""
+"\n"
+"                        This setup procedure plans to set up Kolab Groupware "
+"for\n"
+"                        the following domain name space. This domain name "
+"is\n"
+"                        obtained from the reverse DNS entry on your network\n"
+"                        interface. Please confirm this is the appropriate "
+"domain\n"
+"                        name space.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:54
-msgid "Setup LDAP."
+#: ../pykolab/setup/setup_ldap.py:157
+msgid "Domain name to use"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:66
-msgid "Administrator password"
+#: ../pykolab/setup/setup_ldap.py:162 ../pykolab/setup/setup_ldap.py:187
+msgid ""
+"\n"
+"                                    Invalid input. Please try again.\n"
+"                                "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:72
-msgid "Directory Manager password"
+#: ../pykolab/setup/setup_ldap.py:171
+msgid ""
+"\n"
+"                        The standard root dn we composed for you follows. "
+"Please\n"
+"                        confirm this is the root dn you wish to use.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:77
-msgid "User"
+#: ../pykolab/setup/setup_ldap.py:182
+msgid "Root DN to use"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:78
-msgid "Group"
+#: ../pykolab/setup/setup_ldap.py:234
+msgid ""
+"\n"
+"                    Setup is now going to set up the 389 Directory Server. "
+"This\n"
+"                    may take a little while (during which period there is "
+"no\n"
+"                    output and no progress indication).\n"
+"                "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:143
+#: ../pykolab/setup/setup_ldap.py:241
 msgid "Setting up 389 Directory Server"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:153
+#. TODO: Get the return code and display output if not successful.
+#: ../pykolab/setup/setup_ldap.py:253
 msgid "Setup DS stdout:"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:156
+#: ../pykolab/setup/setup_ldap.py:256
 msgid "Setup DS stderr:"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:175 .././pykolab/setup/setup_mysql.py:97
+#: ../pykolab/setup/setup_ldap.py:279 ../pykolab/setup/setup_mysql.py:129
 msgid "Could not find the Kolab schema file"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:189
+#: ../pykolab/setup/setup_ldap.py:293
+msgid ""
+"\n"
+"                        Please supply a Cyrus Administrator password. This\n"
+"                        password is used by Kolab to execute administrative\n"
+"                        tasks in Cyrus IMAP. You may also need the password\n"
+"                        yourself to troubleshoot Cyrus IMAP and/or perform\n"
+"                        other administrative tasks against Cyrus IMAP "
+"directly.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:303
 msgid "Cyrus Administrator password"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:195
+#: ../pykolab/setup/setup_ldap.py:310
+msgid ""
+"\n"
+"                        Please supply a Kolab Service account password. "
+"This\n"
+"                        account is used by various services such as "
+"Postfix,\n"
+"                        and Roundcube, as anonymous binds to the LDAP "
+"server\n"
+"                        will not be allowed.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:319
 msgid "Kolab Service password"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:204
+#: ../pykolab/setup/setup_ldap.py:329
 msgid "Writing out configuration to kolab.conf"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:218
+#: ../pykolab/setup/setup_ldap.py:343
 msgid "Inserting service users into LDAP."
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:262
+#: ../pykolab/setup/setup_ldap.py:417
 msgid "Writing out cn=kolab,cn=config"
 msgstr ""
 
 #. TODO: Add kolab-admin role
 #. TODO: Assign kolab-admin admin ACLs
-#: .././pykolab/setup/setup_ldap.py:286
+#: ../pykolab/setup/setup_ldap.py:441
 #, python-format
 msgid "Adding domain %s to list of domains for this deployment"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:294
+#: ../pykolab/setup/setup_ldap.py:457
 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:302
+#: ../pykolab/setup/setup_ldap.py:465
 msgid "Enabling attribute uniqueness plugin"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:308
+#: ../pykolab/setup/setup_ldap.py:471
 msgid "Enabling referential integrity plugin"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:314
+#: ../pykolab/setup/setup_ldap.py:477
 msgid "Enabling and configuring account policy plugin"
 msgstr ""
 
 #. TODO: Add kolab-admin role
-#: .././pykolab/setup/setup_ldap.py:329
+#: ../pykolab/setup/setup_ldap.py:492
 msgid "Adding the kolab-admin role"
 msgstr ""
 
 #. TODO: User writeable attributes on root_dn
-#: .././pykolab/setup/setup_ldap.py:340
+#: ../pykolab/setup/setup_ldap.py:503
 #, python-format
 msgid "Setting access control to %s"
 msgstr ""
 
-#: .././pykolab/setup/setup_roundcube.py:40
-msgid "Setup Roundcube."
-msgstr ""
-
-#: .././pykolab/setup/setup_roundcube.py:44
-#: .././pykolab/setup/setup_freebusy.py:49
-msgid "MySQL roundcube password"
-msgstr ""
-
-#: .././pykolab/setup/components.py:56
-msgid "Display this help."
-msgstr ""
-
-#: .././pykolab/setup/components.py:122
-msgid "No component selected, continuing for all components"
-msgstr ""
-
-#: .././pykolab/setup/components.py:157 .././pykolab/setup/components.py:162
-msgid "No such component."
-msgstr ""
-
-#: .././pykolab/setup/setup_mta.py:40
+#: ../pykolab/setup/setup_mta.py:40
 msgid "Setup MTA."
 msgstr ""
 
-#: .././pykolab/setup/setup_mta.py:220
+#: ../pykolab/setup/setup_mta.py:224 ../pykolab/setup/setup_php.py:80
 #, python-format
 msgid "Setting key %r to %r"
 msgstr ""
 
-#: .././pykolab/setup/setup_mta.py:248
+#: ../pykolab/setup/setup_mta.py:252
 msgid "Could not write out Postfix configuration file /etc/postfix/master.cf"
 msgstr ""
 
-#: .././pykolab/setup/setup_imap.py:39
-msgid "Setup IMAP."
-msgstr ""
-
-#: .././pykolab/setup/setup_imap.py:82 .././pykolab/setup/setup_imap.py:107
-msgid "Could not write out Cyrus IMAP configuration file /etc/imapd.conf"
-msgstr ""
-
-#: .././pykolab/setup/setup_kolabd.py:38
-msgid "Setup the Kolab daemon."
+#: ../pykolab/setup/setup_mta.py:287
+msgid "Could not write out Amavis configuration file /etc/amavisd/amavisd.conf"
 msgstr ""
 
-#: .././pykolab/setup/setup_mysql.py:39
+#: ../pykolab/setup/setup_mysql.py:39
 msgid "Setup MySQL."
 msgstr ""
 
-#: .././pykolab/setup/setup_mysql.py:53
+#: ../pykolab/setup/setup_mysql.py:53
+msgid ""
+"\n"
+"                    Please supply a root password for MySQL. This password "
+"will\n"
+"                    be the administrative user for this MySQL server, and "
+"it\n"
+"                    should be kept a secret. After this setup process has\n"
+"                    completed, Kolab is going to discard and forget about "
+"this\n"
+"                    password, but you will need it for administrative tasks "
+"in\n"
+"                    MySQL.\n"
+"                "
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:64
 msgid "MySQL root password"
 msgstr ""
 
-#: .././pykolab/setup/setup_freebusy.py:40
-msgid "Setup Free/Busy."
+#: ../pykolab/setup/setup_mysql.py:103
+msgid ""
+"\n"
+"                        Please supply a password for the MySQL user "
+"'kolab'.\n"
+"                        This password will be used by Kolab services, such "
+"as\n"
+"                        the Web Administration Panel.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_freebusy.py:44
-msgid "Free/Busy is not installed on this system"
+#: ../pykolab/setup/setup_mysql.py:111
+msgid "MySQL kolab password"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:45
-#, python-format
-msgid "Cleaning up ACL entries for %s across all folders"
+#: ../pykolab/setup/setup_php.py:42
+msgid "PHP Options"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:60
-#, python-format
-msgid "Cleaning up ACL entries referring to identifier %s"
+#: ../pykolab/setup/setup_php.py:49
+msgid "Specify the timezone for PHP."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:69
-#, python-format
-msgid "Iterating over %d folders"
+#: ../pykolab/setup/setup_php.py:53
+msgid "Setup PHP."
 msgstr ""
 
-#. Set the ACL to '' (effectively deleting the ACL entry)
-#: .././pykolab/imap/__init__.py:82
-#, python-format
-msgid "Removing acl %r for subject %r from folder %r"
+#: ../pykolab/setup/setup_php.py:58
+msgid ""
+"\n"
+"                        Please supply the timezone PHP should be using.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:143
-#, python-format
-msgid "Logging on to Cyrus IMAP server %s"
+#: ../pykolab/setup/setup_php.py:64
+msgid "Timezone ID"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:152
-#, python-format
-msgid "Logging on to Dovecot IMAP server %s"
+#: ../pykolab/setup/setup_roundcube.py:44
+msgid "Setup Roundcube."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:161
-#, python-format
-msgid "Logging on to generic IMAP server %s"
+#: ../pykolab/setup/setup_roundcube.py:48
+msgid ""
+"\n"
+"                    Please supply a password for the MySQL user "
+"'roundcube'.\n"
+"                    This password will be used by the Roundcube webmail\n"
+"                    interface.\n"
+"                "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:179
-#, python-format
-msgid "Reusing existing IMAP server connection to %s"
+#: ../pykolab/setup/setup_syncroton.py:40
+msgid "Setup Syncroton."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:181
-#, python-format
-msgid "Reconnecting to IMAP server %s"
+#: ../pykolab/setup/setup_zpush.py:41
+msgid "Setup zpush."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:197
-msgid "Called imap.disconnect() on a server that "
+#: ../pykolab/setup/setup_zpush.py:45
+msgid "Z-Push is not installed on this system"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:213
+#. start_max = (int)(time.time())
+#: ../pykolab/telemetry.py:588
 #, python-format
-msgid "%r has no attribute %s"
+msgid "Expiring sessions that started before or on %d"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:221 .././pykolab/imap/__init__.py:239
+#: ../pykolab/telemetry.py:601
 #, python-format
-msgid "Creating new shared folder %s"
+msgid "Expiring session ID: %d"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:255
+#: ../pykolab/telemetry.py:620
 #, python-format
-msgid "Creating new mailbox for user %s"
+msgid "Session with ID %d expired from database"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:280
+#: ../pykolab/telemetry.py:646
 #, python-format
-msgid "Creating additional folders for user %s"
+msgid "Operational Error in telemetry database: %s"
+msgstr ""
+
+#: ../pykolab/telemetry.py:652
+msgid "No database available"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:302
+#: ../pykolab/utils.py:57 ../pykolab/utils.py:59
 #, python-format
-msgid "Mailbox already exists: %s"
+msgid "Confirm %s: "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:345
-msgid "Subscribing user to the additional folders"
+#: ../pykolab/utils.py:62
+msgid "Incorrect confirmation. "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:380 .././pykolab/imap/__init__.py:459
+#: ../pykolab/utils.py:67 ../pykolab/utils.py:72
 #, python-format
-msgid "Renaming INBOX from %s to %s"
+msgid "%s: "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:384
+#: ../pykolab/utils.py:69 ../pykolab/utils.py:74
 #, python-format
-msgid "Could not rename INBOX folder %s to %s"
+msgid "%s [%s]: "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:386 .././pykolab/imap/__init__.py:463
-#, python-format
-msgid "Moving INBOX folder %s won't succeed as target folder %s already exists"
+#: ../pykolab/utils.py:119
+msgid "Please answer 'yes' or 'no'."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:399
+#: ../pykolab/utils.py:185
 #, python-format
-msgid "Looking for folder '%s', we found folders: %r"
+msgid "Could not change the permissions on %s"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:422
+#: ../pykolab/wap_client/__init__.py:257
 #, python-format
-msgid "Setting ACL rights %s for subject %s on folder "
+msgid "Requesting %r with params %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:433
+#: ../pykolab/wap_client/__init__.py:263
 #, python-format
-msgid "Removing ACL rights %s for subject %s on folder "
+msgid "Got response: %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:456
-#, python-format
-msgid "Found old INBOX folder %s"
+#. Some data is not JSON
+#: ../pykolab/wap_client/__init__.py:268
+msgid "Response data is not JSON"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:465
-#, python-format
-msgid "Did not find old folder user/%s to rename"
+#: ../pykolab/xml/attendee.py:79 ../pykolab/xml/attendee.py:99
+msgid "Not a valid attendee"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:467
-msgid "Value for user is not a dictionary"
+#: ../pykolab/xml/attendee.py:84
+msgid "No valid delegator references found"
 msgstr ""
 
-#. TODO: Go in fact correct the quota.
-#: .././pykolab/imap/__init__.py:527
-#, python-format
-msgid "Cannot get current IMAP quota for folder %s"
+#: ../pykolab/xml/attendee.py:104
+msgid "No valid delegatee references found"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:540
+#: ../pykolab/xml/attendee.py:140
 #, python-format
-msgid "Quota for %s currently is %s"
+msgid "Invalid cutype %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:546
+#: ../pykolab/xml/attendee.py:151
 #, python-format
-msgid "Adjusting authentication database quota for folder %s to %d"
+msgid "Invalid participant status %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:551
+#: ../pykolab/xml/attendee.py:159
 #, python-format
-msgid "Correcting quota for %s to %s (currently %s)"
+msgid "Invalid role %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:633
+#: ../pykolab/xml/event.py:172
 #, python-format
-msgid "Checking folder: %s"
+msgid "No attendee with email or name %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:638
+#: ../pykolab/xml/event.py:180
 #, python-format
-msgid "Folder has no corresponding user (1): %s"
+msgid "Invalid argument value attendee %r, must be basestring or Attendee"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:641
+#: ../pykolab/xml/event.py:186
 #, python-format
-msgid "Folder has no corresponding user (2): %s"
+msgid "No attendee with email %r"
 msgstr ""
 
-#. We got user identifier only
-#: .././pykolab/imap/__init__.py:656
-msgid "Please don't give us just a user identifier"
+#: ../pykolab/xml/event.py:192
+#, python-format
+msgid "No attendee with name %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:659
-#, python-format
-msgid "Deleting folder %s"
+#: ../pykolab/xml/event.py:338
+msgid "Invalid participant status"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:78
-#, python-format
-msgid "Could not connect to Cyrus IMAP server %r"
+#: ../pykolab/xml/event.py:538
+msgid "Event end needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:101
+#: ../pykolab/xml/event.py:657
 #, python-format
-msgid "Continuing with separator: %r"
+msgid "Invalid status %r"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:106
-msgid "Detected we are running in a Murder topology"
+#: ../pykolab/xml/event.py:678 ../pykolab/xml/event.py:728
+msgid "Event start needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:110
-msgid "This system is not part of a murder topology"
+#: ../pykolab/xml/event.py:764
+#, python-format
+msgid "Invalid status set: %r"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:131
-#, python-format
-msgid "Checking actual backend server for folder %s through annotations"
+#: ../pykolab/xml/event.py:882
+msgid "No sender specified"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:146
-#, python-format
-msgid "Could not get the annotations after %s tries."
+#: ../saslauthd/__init__.py:126 ../saslauthd/__init__.py:134
+msgid "Traceback occurred, please report a bug at http://bugzilla.kolabsys.com"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:150
+#: ../wallace/__init__.py:61
 #, python-format
-msgid "No annotations for %s: %r"
+msgid "Worker process %s initializing"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:157
-#, python-format
-msgid "Server for INBOX folder %s is %s"
+#: ../wallace/__init__.py:80
+msgid "Bind address for Wallace."
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:169
-#, python-format
-msgid "Setting quota for INBOX folder %s to %s"
+#: ../wallace/__init__.py:106
+msgid "Port that Wallace is supposed to use."
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:173
+#: ../wallace/__init__.py:157
 #, python-format
-msgid "Could not set quota for mailfolder %s"
+msgid "Could not bind to socket on port %d on bind "
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:182
-#, python-format
-msgid "Moving INBOX folder %s to %s"
+#: ../wallace/__init__.py:169
+msgid "Could not shut down socket"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:194
-#, python-format
-msgid "Setting annotation %s on folder %s"
+#: ../wallace/__init__.py:226
+msgid "Accepted connection"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:201
+#: ../wallace/__init__.py:389
 #, python-format
-msgid "Could not set annotation %r on mail folder %r: %r"
+msgid "Could not write pid file %s"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:205
+#: ../wallace/module_optout.py:61 ../wallace/module_resources.py:94
 #, python-format
-msgid "Transferring folder %s from %s to %s"
+msgid "Issuing callback after processing to stage %s"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:265
+#: ../wallace/module_optout.py:62 ../wallace/module_resources.py:100
 #, python-format
-msgid "Undeleting %s to %s"
+msgid "Testing cb_action_%s()"
 msgstr ""
 
-#. start_max = (int)(time.time())
-#: .././pykolab/telemetry.py:588
+#: ../wallace/module_optout.py:64 ../wallace/module_resources.py:103
 #, python-format
-msgid "Expiring sessions that started before or on %d"
+msgid "Attempting to execute cb_action_%s()"
 msgstr ""
 
-#: .././pykolab/telemetry.py:601
+#. modules.next_module('optout')
+#: ../wallace/module_optout.py:70
 #, python-format
-msgid "Expiring session ID: %d"
+msgid "Consulting opt-out service for %r, %r"
 msgstr ""
 
-#: .././pykolab/telemetry.py:620
+#: ../wallace/module_optout.py:96
 #, python-format
-msgid "Session with ID %d expired from database"
+msgid "Running opt-out consult from envelope sender '%s "
 msgstr ""
 
-#: .././pykolab/telemetry.py:646
+#: ../wallace/module_optout.py:160
 #, python-format
-msgid "Operational Error in telemetry database: %s"
+msgid "Attempting to execute cb_action_%s(%r, %r)"
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:92
+#: ../wallace/module_optout.py:181
 #, python-format
-msgid "Creating %d Mails"
+msgid "Could not send request to optout_url %s"
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:116
+#: ../wallace/module_resources.py:81
 #, python-format
-msgid "Sending message %s through SMTP targeting user %s@%s"
+msgid "Resource Management called for %r, %r"
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:119
-#, python-format
-msgid "Sending message %s through LMTP targeting user %s@%s"
+#: ../wallace/module_resources.py:139
+msgid "Message is not an iTip message or does not contain any "
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:122
-#, python-format
-msgid "Saving message %s to IMAP (user %s, folder %s)"
+#: ../wallace/module_resources.py:147
+msgid "iTip events attached to this message contain the "
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:125 .././pykolab/tests.old/calendar.py:198
-#: .././pykolab/tests.old/contacts.py:145
-msgid "Somehow ended up NOT sending these messages"
+#: ../wallace/module_resources.py:174
+msgid "Not an iTip message, but sent to resource nonetheless. Reject message"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:146
-#, python-format
-msgid "Creating %d Events"
+#: ../wallace/module_resources.py:182
+msgid "No itips, no resources, pass along"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:177
-#, python-format
-msgid "Creating Calendar item number %d"
+#: ../wallace/module_resources.py:186
+msgid "iTips, but no resources, pass along"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:189
-#: .././pykolab/tests.old/contacts.py:136
+#: ../wallace/module_resources.py:218
 #, python-format
-msgid "Sending UID message %s through SMTP targeting user %s@%s"
+msgid "Resources: %r"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:192
-#: .././pykolab/tests.old/contacts.py:139
+#: ../wallace/module_resources.py:236
 #, python-format
-msgid "Sending UID message %s through LMTP targeting user %s@%s"
+msgid "Checking events in resource folder %r"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:195
-#: .././pykolab/tests.old/contacts.py:142
+#: ../wallace/module_resources.py:243
 #, python-format
-msgid "Saving UID message %s to IMAP (user %s, folder %s)"
+msgid "Mailbox for resource %r doesn't exist"
 msgstr ""
 
-#: .././pykolab/tests.old/zpush/test_000_001.py:47
+#: ../wallace/module_resources.py:256
 #, python-format
-msgid "Could not load %sItem from %s, skipping the testing."
+msgid "Fetching message UID %r from folder %r"
 msgstr ""
 
-#: .././pykolab/tests.old/zpush/test_000_000.py:77
+#: ../wallace/module_resources.py:295
 #, python-format
-msgid "Authentication failure for %s"
+msgid "Event %r conflicts with event "
 msgstr ""
 
-#: .././pykolab/tests.old/contacts.py:105
+#: ../wallace/module_resources.py:308
 #, python-format
-msgid "Creating %d Contacts"
+msgid "start: %r, end: %r, total: %r, messages: %r"
 msgstr ""
 
-#: .././pykolab/tests.old/contacts.py:124
+#: ../wallace/module_resources.py:315
 #, python-format
-msgid "Creating Contact item number %d"
+msgid "Polling for resource %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:207
+#: ../wallace/module_resources.py:319
 #, python-format
-msgid "Adding policy request to instance %s"
+msgid "Resource %r has been popped from the list"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:442
-msgid "Unauthorized access not allowed"
+#: ../wallace/module_resources.py:326
+msgid "Resource is a collection"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:481
-#: .././bin/kolab_smtp_access_policy.py:541
+#: ../wallace/module_resources.py:374 ../wallace/module_resources.py:424
 #, python-format
-msgid "Could not find envelope sender user %s"
+msgid "Adding event to %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:568
+#: ../wallace/module_resources.py:473
 #, python-format
-msgid "%s is unauthorized to send on behalf of %s"
+msgid "Method %r not really interesting for us."
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:578
+#: ../wallace/module_resources.py:481
 #, python-format
-msgid "User %s attempted to use envelope sender address %s "
+msgid "Raw iTip payload: %s"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:638
-#: .././bin/kolab_smtp_access_policy.py:649
-#, python-format
-msgid "Found user %s to be a delegate user of %s"
+#: ../wallace/module_resources.py:491
+msgid "Could not read iTip from message."
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:673
-#, python-format
-msgid "Verifying authenticated sender '%(sender)s' with "
+#: ../wallace/module_resources.py:513
+msgid "iTip event without a start"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:678
-#, python-format
-msgid "Verifying unauthenticated sender '%(sender)s' "
+#. end if c.name == "VEVENT"
+#. end for c in cal.walk()
+#. end if part.get_content_type() == "text/calendar"
+#. end for part in message.walk()
+#. if message.is_multipart()
+#: ../wallace/module_resources.py:543
+msgid "Message is not an iTip message (non-multipart message)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:695
+#: ../wallace/module_resources.py:564
 #, python-format
-msgid "Reproducing verify_recipient(%s, %s) from "
+msgid "Checking if email address %r belongs to a resource (collection)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:712
+#: ../wallace/module_resources.py:575 ../wallace/module_resources.py:649
+#: ../wallace/module_resources.py:699
 #, python-format
-msgid "Using authentication domain %s instead of %s"
+msgid "No resource (collection) records found for %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:722
+#: ../wallace/module_resources.py:583 ../wallace/module_resources.py:657
+#: ../wallace/module_resources.py:707
 #, python-format
-msgid "Domain %s is a primary domain"
+msgid "Resource record(s): %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:730
+#: ../wallace/module_resources.py:589 ../wallace/module_resources.py:664
+#: ../wallace/module_resources.py:714
 #, python-format
-msgid "Checking the recipient for domain %s that is not "
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:792
-msgid "Could not find this user, accepting"
+msgid "Resource record: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:862
-#: .././bin/kolab_smtp_access_policy.py:915
+#: ../wallace/module_resources.py:608
 #, python-format
-msgid "Sender %s is not allowed to send to "
+msgid "Raw itip_events: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:902
+#: ../wallace/module_resources.py:616
 #, python-format
-msgid "Reproducing verify_sender(%r) from cache, "
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:931
-msgid "Sender uses unauthorized envelope sender address"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:948
-msgid "Could not verify sender"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:955
-msgid "Verifying whether sender is allowed to send to "
+msgid "Raw set of attendees: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:969
+#: ../wallace/module_resources.py:624
 #, python-format
-msgid "Result is %r"
+msgid "Raw set of resources: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:974
-msgid "No recipient policy restrictions exist for this sender"
+#: ../wallace/module_resources.py:638
+#, python-format
+msgid "Checking if attendee %r is a resource (collection)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:983
-msgid "Found a recipient policy to apply for this sender."
+#: ../wallace/module_resources.py:671 ../wallace/module_resources.py:717
+msgid "Resource reservation made but no resource records found"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:998
+#: ../wallace/module_resources.py:689
 #, python-format
-msgid "Sender %s not allowed to send to recipient "
+msgid "Checking if resource %r is a resource (collection)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1029
-msgid "Cleaning up the cache"
+#: ../wallace/module_resources.py:721
+msgid "The following resources are being referred to in the "
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1066
+#. This is a nested module
+#: ../wallace/modules.py:96
 #, python-format
-msgid "Operational Error in caching: %s"
+msgid "Module Group: %s"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1117
-#, python-format
-msgid "Caching the policy result with timestamp %d"
+#: ../wallace/modules.py:107 ../wallace/modules.py:112
+msgid "No such module."
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1194
+#: ../wallace/modules.py:118
 #, python-format
-msgid "Returning action DEFER_IF_PERMIT: %s"
+msgid "Holding message in queue for manual review (%s by %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1199
+#: ../wallace/modules.py:121
 #, python-format
-msgid "Returning action DUNNO: %s"
+msgid "Deferring message in %s (by module %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1204
+#: ../wallace/modules.py:131
 #, python-format
-msgid "Returning action HOLD: %s"
+msgid "The time when the message was sent: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1209
+#: ../wallace/modules.py:132
 #, python-format
-msgid "Returning action PERMIT: %s"
+msgid "The time now: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1214
+#: ../wallace/modules.py:133
 #, python-format
-msgid "Returning action REJECT: %s"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1258
-msgid "Starting to loop for new request"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1267
-msgid "End of current request"
+msgid "The time delta: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1271
+#. TODO: Send NDR back to user
+#: ../wallace/modules.py:137
 #, python-format
-msgid "Getting line: %s"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1275
-msgid "Returning request"
+msgid "Message in file %s older then 5 days, deleting"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1332
+#: ../wallace/modules.py:162
 #, python-format
-msgid "Got request instance %s"
+msgid "Rejecting message in %s (by module %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1341
+#: ../wallace/modules.py:180
 #, python-format
-msgid "Request instance %s is in state %s"
+msgid ""
+"This is the email system Wallace at %s.\n"
+"\n"
+"I'm sorry to inform you we could not deliver the attached message\n"
+"to the following recipients:\n"
+"\n"
+"- %s\n"
+"\n"
+"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 ""
 
-#: .././bin/kolab_smtp_access_policy.py:1349
+#: ../wallace/modules.py:195
 #, python-format
-msgid "Request instance %s is not yet in DATA state"
+msgid ""
+"X-Wallace-Module: %s\n"
+"X-Wallace-Result: REJECT\n"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1361
+#: ../wallace/modules.py:248
 #, python-format
-msgid "Request instance %s reached DATA state"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1379
-msgid "Sender access denied"
+msgid "Accepting message in %s (by module %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1381
-msgid "Recipient access denied"
+#: ../wallace/modules.py:316
+#, python-format
+msgid "Module '%s' already registered"
 msgstr ""
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 82c1f9d..8fcd00a 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pykolab 0.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-09 14:25+0100\n"
+"POT-Creation-Date: 2012-08-11 15:04+0100\n"
 "PO-Revision-Date: 2012-05-09 14:25+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,793 +16,907 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: .././wallace/__init__.py:37 .././bonnie/__init__.py:35
-#: .././kolabd/__init__.py:46 .././saslauthd/__init__.py:47
-msgid "Daemon Options"
-msgstr ""
-
-#: .././wallace/__init__.py:44 .././bonnie/__init__.py:41
-#: .././kolabd/__init__.py:52 .././saslauthd/__init__.py:53
-msgid "Fork to the background."
-msgstr ""
-
-#: .././wallace/__init__.py:52
-msgid "Bind address for Wallace."
+#: ../bin/kolab_smtp_access_policy.py:206
+#, python-format
+msgid "Adding policy request to instance %s"
 msgstr ""
 
-#: .././wallace/__init__.py:60 .././kolabd/__init__.py:58
-#: .././saslauthd/__init__.py:59
-msgid "Path to the PID file to use."
+#: ../bin/kolab_smtp_access_policy.py:446
+msgid "Unauthorized access not allowed"
 msgstr ""
 
-#: .././wallace/__init__.py:68
-msgid "Port that Wallace is supposed to use."
+#: ../bin/kolab_smtp_access_policy.py:467
+#: ../bin/kolab_smtp_access_policy.py:658
+msgid "Could not find recipient"
 msgstr ""
 
-#: .././wallace/__init__.py:102 .././wallace/__init__.py:126
-#: .././wallace/__init__.py:373 .././wallace/__init__.py:401
+#: ../bin/kolab_smtp_access_policy.py:486
+#: ../bin/kolab_smtp_access_policy.py:586
 #, python-format
-msgid "Number of threads currently running: %d"
+msgid "Could not find envelope sender user %s"
 msgstr ""
 
-#: .././wallace/__init__.py:111 .././wallace/__init__.py:135
+#: ../bin/kolab_smtp_access_policy.py:529
 #, python-format
-msgid "Continuing with %d threads currently running"
+msgid "Obtained authenticated user details for %r: %r"
 msgstr ""
 
-#. TODO: Apply throttling
-#: .././wallace/__init__.py:118
+#: ../bin/kolab_smtp_access_policy.py:608
 #, python-format
-msgid "Creating thread for message in %s"
+msgid "%s is unauthorized to send on behalf of %s"
 msgstr ""
 
-#: .././wallace/__init__.py:142
+#: ../bin/kolab_smtp_access_policy.py:618
 #, python-format
-msgid "Running thread %s for message file %s"
+msgid "User %s attempted to use envelope sender address %s "
 msgstr ""
 
-#: .././wallace/__init__.py:151
+#: ../bin/kolab_smtp_access_policy.py:682
+#: ../bin/kolab_smtp_access_policy.py:693
 #, python-format
-msgid "This message was already in module %s, delegating "
+msgid "Found user %s to be a delegate user of %s"
 msgstr ""
 
-#: .././wallace/__init__.py:160
+#: ../bin/kolab_smtp_access_policy.py:717
 #, python-format
-msgid "It was also in a certain stage: %s, letting "
+msgid "Verifying authenticated sender '%(sender)s' with "
 msgstr ""
 
-#: .././wallace/__init__.py:168 .././wallace/__init__.py:174
-#: .././wallace/__init__.py:184
+#: ../bin/kolab_smtp_access_policy.py:722
 #, python-format
-msgid "Executing module %s"
-msgstr ""
-
-#: .././wallace/__init__.py:211 .././bonnie/__init__.py:67
-#: .././kolabd/__init__.py:85 .././saslauthd/__init__.py:90
-msgid "Interrupted by user"
-msgstr ""
-
-#: .././wallace/__init__.py:215 .././wallace/__init__.py:225
-#: .././kolabd/__init__.py:90 .././kolabd/__init__.py:101
-msgid "Traceback occurred, please report a "
+msgid "Verifying unauthenticated sender '%(sender)s' "
 msgstr ""
 
-#: .././wallace/__init__.py:221 .././bonnie/__init__.py:75
-#: .././kolabd/__init__.py:96 .././saslauthd/__init__.py:98
+#: ../bin/kolab_smtp_access_policy.py:739
 #, python-format
-msgid "Type Error: %s"
-msgstr ""
-
-#: .././wallace/__init__.py:241
-msgid "Picking up deferred messages for wallace"
+msgid "Reproducing verify_recipient(%s, %s) from "
 msgstr ""
 
-#: .././wallace/__init__.py:261
+#: ../bin/kolab_smtp_access_policy.py:756
 #, python-format
-msgid "Picking up deferred messages for module %s"
-msgstr ""
-
-#. Sleep for 300 seconds before reprocessing the deferred queues.
-#. TODO: Consider using queue_run_delay from Postfix, which is where
-#. the default value of 300 seconds comes from.
-#: .././wallace/__init__.py:285
-msgid "Sleeping for 300 seconds"
+msgid "Using authentication domain %s instead of %s"
 msgstr ""
 
-#: .././wallace/__init__.py:310
+#: ../bin/kolab_smtp_access_policy.py:766
 #, python-format
-msgid "Could not bind to socket on port %d on bind "
-msgstr ""
-
-#: .././wallace/__init__.py:320
-msgid "Could not shut down socket"
+msgid "Domain %s is a primary domain"
 msgstr ""
 
-#: .././wallace/__init__.py:394
+#: ../bin/kolab_smtp_access_policy.py:774
 #, python-format
-msgid "Picking up spooled email file %s"
+msgid "Checking the recipient for domain %s that is not "
 msgstr ""
 
-#: .././wallace/__init__.py:424
-msgid "Accepted connection"
+#: ../bin/kolab_smtp_access_policy.py:790
+msgid "This recipient address is related to multiple "
 msgstr ""
 
-#. This is a nested module
-#: .././wallace/modules.py:96
+#: ../bin/kolab_smtp_access_policy.py:799
 #, python-format
-msgid "Module Group: %s"
+msgid "Recipient address %r not found. Allowing since "
 msgstr ""
 
-#: .././wallace/modules.py:107 .././wallace/modules.py:112
-msgid "No such module."
+#: ../bin/kolab_smtp_access_policy.py:827
+msgid "Invalid recipient"
 msgstr ""
 
-#: .././wallace/modules.py:118
-#, python-format
-msgid "Holding message in queue for manual review (%s by %s)"
+#: ../bin/kolab_smtp_access_policy.py:838
+msgid "Could not find this user, accepting"
 msgstr ""
 
-#: .././wallace/modules.py:121
+#: ../bin/kolab_smtp_access_policy.py:901
+#: ../bin/kolab_smtp_access_policy.py:954
 #, python-format
-msgid "Deferring message in %s (by module %s)"
+msgid "Sender %s is not allowed to send to "
 msgstr ""
 
-#: .././wallace/modules.py:131
+#: ../bin/kolab_smtp_access_policy.py:941
 #, python-format
-msgid "The time when the message was sent: %r"
+msgid "Reproducing verify_sender(%r) from cache, "
 msgstr ""
 
-#: .././wallace/modules.py:132
-#, python-format
-msgid "The time now: %r"
+#: ../bin/kolab_smtp_access_policy.py:970
+msgid "Sender uses unauthorized envelope sender address"
 msgstr ""
 
-#: .././wallace/modules.py:133
-#, python-format
-msgid "The time delta: %r"
+#: ../bin/kolab_smtp_access_policy.py:987
+msgid "Could not verify sender"
 msgstr ""
 
-#. TODO: Send NDR back to user
-#: .././wallace/modules.py:137
-#, python-format
-msgid "Message in file %s older then 5 days, deleting"
+#: ../bin/kolab_smtp_access_policy.py:994
+msgid "Verifying whether sender is allowed to send to "
 msgstr ""
 
-#: .././wallace/modules.py:162
+#: ../bin/kolab_smtp_access_policy.py:1008
 #, python-format
-msgid "Rejecting message in %s (by module %s)"
+msgid "Result is %r"
 msgstr ""
 
-#: .././wallace/modules.py:180
-#, python-format
-msgid ""
-"This is the email system Wallace at %s.\n"
-"\n"
-"I'm sorry to inform you we could not deliver the attached message\n"
-"to the following recipients:\n"
-"\n"
-"- %s\n"
-"\n"
-"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"
+#: ../bin/kolab_smtp_access_policy.py:1013
+msgid "No recipient policy restrictions exist for this sender"
 msgstr ""
 
-#: .././wallace/modules.py:195
-#, python-format
-msgid ""
-"X-Wallace-Module: %s\n"
-"X-Wallace-Result: REJECT\n"
+#: ../bin/kolab_smtp_access_policy.py:1022
+msgid "Found a recipient policy to apply for this sender."
 msgstr ""
 
-#: .././wallace/modules.py:248
+#: ../bin/kolab_smtp_access_policy.py:1037
 #, python-format
-msgid "Accepting message in %s (by module %s)"
+msgid "Sender %s not allowed to send to recipient "
 msgstr ""
 
-#: .././wallace/modules.py:316
-#, python-format
-msgid "Module '%s' already registered"
+#: ../bin/kolab_smtp_access_policy.py:1068
+msgid "Cleaning up the cache"
 msgstr ""
 
-#: .././wallace/modules.py:338 .././pykolab/tests/tests.py:183
-#: .././pykolab/cli/commands.py:183 .././pykolab/setup/components.py:243
+#: ../bin/kolab_smtp_access_policy.py:1105
 #, python-format
-msgid "Alias for %s"
+msgid "Operational Error in caching: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:57
+#: ../bin/kolab_smtp_access_policy.py:1156
 #, python-format
-msgid "Issuing callback after processing to stage %s"
+msgid "Caching the policy result with timestamp %d"
 msgstr ""
 
-#: .././wallace/module_optout.py:58
+#: ../bin/kolab_smtp_access_policy.py:1233
 #, python-format
-msgid "Testing cb_action_%s()"
+msgid "Returning action DEFER_IF_PERMIT: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:60
+#: ../bin/kolab_smtp_access_policy.py:1238
 #, python-format
-msgid "Attempting to execute cb_action_%s()"
+msgid "Returning action DUNNO: %s"
 msgstr ""
 
-#. modules.next_module('optout')
-#: .././wallace/module_optout.py:66
+#: ../bin/kolab_smtp_access_policy.py:1243
 #, python-format
-msgid "Consulting opt-out service for %r, %r"
+msgid "Returning action HOLD: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:92
+#: ../bin/kolab_smtp_access_policy.py:1248
 #, python-format
-msgid "Running opt-out consult from envelope sender '%s "
+msgid "Returning action PERMIT: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:156
+#: ../bin/kolab_smtp_access_policy.py:1253
 #, python-format
-msgid "Attempting to execute cb_action_%s(%r, %r)"
+msgid "Returning action REJECT: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:177
-#, python-format
-msgid "Could not send request to optout_url %s"
+#: ../bin/kolab_smtp_access_policy.py:1299
+msgid "Starting to loop for new request"
 msgstr ""
 
-#: .././setup-kolab.py:36 .././kolabtest.py:34 .././kolabd.py:31
-#: .././wallace.py:31 .././bonnie.py:31
-msgid "Cannot load pykolab/constants.py:"
+#: ../bin/kolab_smtp_access_policy.py:1306
+msgid "Timeout for policy request reading exceeded"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:89
-msgid "Could not import caching library, caching disabled"
+#: ../bin/kolab_smtp_access_policy.py:1312
+msgid "End of current request"
 msgstr ""
 
-#. Obtain 'kolabDelegate' from the envelope sender.
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:291
+#: ../bin/kolab_smtp_access_policy.py:1316
 #, python-format
-msgid "Obtaining envelope sender dn for %s"
+msgid "Getting line: %s"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:309
-#, python-format
-msgid ""
-"User %s attempted to use envelope sender address %s without authorization"
+#: ../bin/kolab_smtp_access_policy.py:1320
+msgid "Returning request"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:355
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:358
-#, python-format
-msgid "Found user %s to be a valid delegate user of %s"
+#: ../bin/kolab_smtp_access_policy.py:1346
+msgid "Access Policy Options"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:424
-#: .././bin/kolab_smtp_access_policy.py:1301
-msgid "Access Policy Options"
+#: ../bin/kolab_smtp_access_policy.py:1353
+msgid "SMTP Policy request timeout."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:431
-#: .././bin/kolab_smtp_access_policy.py:1308
+#: ../bin/kolab_smtp_access_policy.py:1359
 msgid "Verify the recipient access policy."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:437
-#: .././bin/kolab_smtp_access_policy.py:1314
+#: ../bin/kolab_smtp_access_policy.py:1365
 msgid "Verify the sender access policy."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:443
-#: .././bin/kolab_smtp_access_policy.py:1320
+#: ../bin/kolab_smtp_access_policy.py:1371
 msgid "Allow unauthenticated senders."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:464
-msgid "Verifying sender."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:468
-msgid "No sender specified."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:469
-msgid "Invalid sender"
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:473
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:521
-msgid "No SASL username in request."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:475
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:524
-msgid "Not allowing unauthenticated senders."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:476
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:525
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:534
-msgid "Access denied"
+#: ../bin/kolab_smtp_access_policy.py:1385
+#, python-format
+msgid "Got request instance %s"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:478
-msgid "Allowing unauthenticated senders."
+#: ../bin/kolab_smtp_access_policy.py:1394
+#, python-format
+msgid "Request instance %s is in state %s"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:484
+#: ../bin/kolab_smtp_access_policy.py:1402
 #, python-format
-msgid "Allowing authenticated sender %s to send as %s."
+msgid "Request instance %s is not yet in DATA state"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:492
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:504
+#: ../bin/kolab_smtp_access_policy.py:1414
 #, python-format
-msgid "Authenticated as sender %s"
+msgid "Request instance %s reached DATA state"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:515
-msgid "Verifying recipient."
+#: ../bin/kolab_smtp_access_policy.py:1432
+msgid "Sender access denied"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:518
-#: .././bin/kolab_smtp_access_policy.py:781
-msgid "Invalid recipient"
+#: ../bin/kolab_smtp_access_policy.py:1434
+msgid "Recipient access denied"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:536
-#: .././bin/kolab_smtp_access_policy.py:1383
+#: ../bin/kolab_smtp_access_policy.py:1436
 msgid "No objections"
 msgstr ""
 
-#: .././play/confmgmt/db.py:59 .././play/conf.py:280
-msgid "Dropping all tables..."
-msgstr ""
-
-#: .././play/confmgmt/db.py:62 .././play/conf.py:283
-msgid "Creating the necessary tables..."
-msgstr ""
-
-#: .././play/confmgmt/db.py:69 .././play/conf.py:290
-#: .././play/roundcube_database/__init__.py:57
-#: .././play/roundcube_database/users.py:114 .././pykolab/telemetry.py:652
-msgid "No database available"
-msgstr ""
-
-#: .././play/confmgmt.py:74
-#, python-format
-msgid "Searching for service with name %s"
-msgstr ""
-
-#: .././play/confmgmt.py:77
-#, python-format
-msgid "Found service %s"
+#: ../conf.py:37 ../kolab.py:34 ../saslauthd.py:33
+msgid "Cannot load pykolab/logger.py:"
 msgstr ""
 
-#: .././play/confmgmt.py:82
-#, python-format
-msgid "Searching for role with name %s"
+#: ../kolabd/__init__.py:49 ../saslauthd/__init__.py:48
+#: ../wallace/__init__.py:65
+msgid "Daemon Options"
 msgstr ""
 
-#: .././play/confmgmt.py:85
-#, python-format
-msgid "Found role %s"
+#: ../kolabd/__init__.py:56 ../saslauthd/__init__.py:55
+#: ../wallace/__init__.py:72
+msgid "Fork to the background."
 msgstr ""
 
-#: .././play/confmgmt.py:89
-#, python-format
-msgid "Searching for file with path %s"
+#: ../kolabd/__init__.py:65 ../saslauthd/__init__.py:64
+#: ../wallace/__init__.py:98
+msgid "Path to the PID file to use."
 msgstr ""
 
-#: .././play/confmgmt.py:92
-#, python-format
-msgid "File with path %s not found, adding to database"
+#: ../kolabd/__init__.py:74 ../saslauthd/__init__.py:73
+#: ../wallace/__init__.py:115
+msgid "Run as user USERNAME"
 msgstr ""
 
-#: .././play/confmgmt.py:97
-#, python-format
-msgid "Adding file with path %s to service with name %s"
+#: ../kolabd/__init__.py:84 ../saslauthd/__init__.py:83
+#: ../wallace/__init__.py:89
+msgid "Run as group GROUPNAME"
 msgstr ""
 
-#: .././play/confmgmt.py:101
+#: ../kolabd/__init__.py:122 ../pykolab/utils.py:151
+#: ../wallace/__init__.py:288
 #, python-format
-msgid "Adding setting with key %s (%r, %r)"
+msgid "Group %s does not exist"
 msgstr ""
 
-#: .././play/confmgmt.py:106
+#: ../kolabd/__init__.py:131 ../wallace/__init__.py:297
 #, python-format
-msgid "Adding setting %s to file with path %s"
+msgid "Switching real and effective group id to %d"
 msgstr ""
 
-#: .././play/confmgmt.py:110
+#: ../kolabd/__init__.py:153 ../pykolab/utils.py:175
+#: ../wallace/__init__.py:319
 #, python-format
-msgid "Adding role with name %s to setting with key %s"
+msgid "User %s does not exist"
 msgstr ""
 
-#: .././play/rolequota/__init__.py:53
-#: .././pykolab/plugins/dynamicquota/__init__.py:50
+#: ../kolabd/__init__.py:163 ../wallace/__init__.py:329
 #, python-format
-msgid "No keyword %s passed to set_user_folder_quota"
+msgid "Switching real and effective user id to %d"
 msgstr ""
 
-#: .././play/roundcube_database/__init__.py:51
-#: .././play/roundcube_database/users.py:108
-#, python-format
-msgid "Operational Error in Roundcube database: %s"
+#: ../kolabd/__init__.py:172 ../wallace/__init__.py:338
+msgid "Could not change real and effective uid and/or gid"
 msgstr ""
 
-#: .././kwap/kwap/controllers/secure.py:25
-msgid "Secure Controller here"
+#: ../kolabd/__init__.py:192 ../saslauthd/__init__.py:122
+#: ../wallace/__init__.py:358
+msgid "Interrupted by user"
 msgstr ""
 
-#: .././kwap/kwap/controllers/root.py:103
-msgid "Wrong credentials"
+#: ../kolabd/__init__.py:197 ../kolabd/__init__.py:208
+#: ../wallace/__init__.py:362 ../wallace/__init__.py:372
+msgid "Traceback occurred, please report a "
 msgstr ""
 
-#: .././kwap/kwap/controllers/root.py:118
+#: ../kolabd/__init__.py:203 ../saslauthd/__init__.py:130
+#: ../wallace/__init__.py:368
 #, python-format
-msgid "Welcome back, %s!"
-msgstr ""
-
-#: .././kwap/kwap/controllers/root.py:128
-msgid "We hope to see you soon!"
-msgstr ""
-
-#: .././saslauthd.py:33 .././kolab.py:34 .././conf.py:37
-msgid "Cannot load pykolab/logger.py:"
-msgstr ""
-
-#: .././bonnie/__init__.py:71 .././bonnie/__init__.py:79
-#: .././saslauthd/__init__.py:94 .././saslauthd/__init__.py:102
-msgid "Traceback occurred, please report a bug at http://bugzilla.kolabsys.com"
+msgid "Type Error: %s"
 msgstr ""
 
-#: .././kolabd/__init__.py:116 .././pykolab/auth/ldap/__init__.py:1291
-#: .././pykolab/cli/cmd_sync.py:33
+#: ../kolabd/__init__.py:223 ../pykolab/auth/ldap/__init__.py:1591
+#: ../pykolab/cli/cmd_sync.py:36
 msgid "Listing domains..."
 msgstr ""
 
-#: .././kolabd/__init__.py:148
+#: ../kolabd/__init__.py:256
 #, python-format
 msgid "added domains: %r, removed domains: %r"
 msgstr ""
 
-#: .././pykolab/__init__.py:50
-msgid "Returning thread local configuration"
-msgstr ""
-
-#: .././pykolab/tests/tests.py:53
-msgid "List tests"
-msgstr ""
-
-#. This is a nested test
-#: .././pykolab/tests/tests.py:86
-#, python-format
-msgid "Test Suite: %s"
-msgstr ""
-
-#: .././pykolab/tests/tests.py:100 .././pykolab/tests/tests.py:105
-msgid "No such test."
-msgstr ""
-
-#: .././pykolab/tests/tests.py:157 .././pykolab/tests/tests.py:161
-#, python-format
-msgid "Test '%s' already registered"
-msgstr ""
-
-#: .././pykolab/tests/tests.py:191 .././pykolab/cli/commands.py:191
-#: .././pykolab/setup/components.py:251
-msgid "Not yet implemented"
-msgstr ""
-
-#: .././pykolab/tests/__init__.py:39
-msgid "Test Options"
-msgstr ""
-
-#: .././pykolab/tests/__init__.py:45
-msgid "Run tests in suite SUITE. Implies a certain set of items being tested."
-msgstr ""
-
-#: .././pykolab/tests/imap/test_login.py:44
-#, python-format
-msgid "Connecting at %s"
+#: ../kolabd.py:31 ../setup-kolab.py:36 ../wallace.py:31
+msgid "Cannot load pykolab/constants.py:"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:46
+#: ../pykolab/auth/__init__.py:94
 #, python-format
-msgid "Connected at %s"
+msgid "Called for domain %r"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:51
+#: ../pykolab/auth/__init__.py:107 ../pykolab/auth/__init__.py:116
 #, python-format
-msgid "Logging in at %s"
+msgid "Using section %s and domain %s"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:53
+#: ../pykolab/auth/__init__.py:121
 #, python-format
-msgid "Logged in at %s"
+msgid "Connecting to Authentication backend for domain %s"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:60
+#: ../pykolab/auth/__init__.py:132
 #, python-format
-msgid "Test failure in %s"
+msgid "Section %s has no option 'auth_mechanism'"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:94
+#: ../pykolab/auth/__init__.py:139
 #, python-format
-msgid "Called for domain %r"
+msgid "Section %s has auth_mechanism: %r"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:107 .././pykolab/auth/__init__.py:116
-#, python-format
-msgid "Using section %s and domain %s"
+#: ../pykolab/auth/__init__.py:148 ../pykolab/auth/__init__.py:157
+msgid "Starting LDAP..."
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:121
+#: ../pykolab/auth/ldap/cache.py:109
 #, python-format
-msgid "Connecting to Authentication backend for domain %s"
+msgid "Inserting cache entry %r"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:132
+#: ../pykolab/auth/ldap/cache.py:122
 #, python-format
-msgid "Section %s has no option 'auth_mechanism'"
+msgid "Updating timestamp for cache entry %r"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:139
+#: ../pykolab/auth/ldap/cache.py:129
 #, python-format
-msgid "Section %s has auth_mechanism: %r"
-msgstr ""
-
-#: .././pykolab/auth/__init__.py:148 .././pykolab/auth/__init__.py:157
-msgid "Starting LDAP..."
+msgid "Updating result_attribute for cache entry %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:51
+#: ../pykolab/auth/ldap/__init__.py:51
 msgid "Python LDAP library does not support persistent search"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:141
+#: ../pykolab/auth/ldap/__init__.py:142
 #, python-format
 msgid "Attempting to authenticate user %s in realm %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:181
+#: ../pykolab/auth/ldap/__init__.py:184
 #, python-format
 msgid "Binding with user_dn %s and password %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:190
+#: ../pykolab/auth/ldap/__init__.py:194
 #, python-format
 msgid "Failed to authenticate as user %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:205
+#: ../pykolab/auth/ldap/__init__.py:211
 msgid "Connecting to LDAP..."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:209
+#: ../pykolab/auth/ldap/__init__.py:215
 #, python-format
 msgid "Attempting to use LDAP URI %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:345
+#: ../pykolab/auth/ldap/__init__.py:357
 #, python-format
 msgid "Finding recipient with filter %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:398
+#: ../pykolab/auth/ldap/__init__.py:425
+#, python-format
+msgid "Finding resource with filter %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:448
+#, python-format
+msgid "Using timestamp %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:480
 #, python-format
 msgid "Applying recipient policy to %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:415
+#: ../pykolab/auth/ldap/__init__.py:497
 #, python-format
 msgid "Using mail attributes: %r, with primary %r and "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:426
+#: ../pykolab/auth/ldap/__init__.py:508
 #, python-format
 msgid "key %r not in entry"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:428
+#: ../pykolab/auth/ldap/__init__.py:510
 #, python-format
 msgid "key %r is the prim. mail attr."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:430
+#: ../pykolab/auth/ldap/__init__.py:512
 msgid "prim. mail pol. is not empty"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:433
+#: ../pykolab/auth/ldap/__init__.py:515
 #, python-format
 msgid "key %r is the sec. mail attr."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:435
+#: ../pykolab/auth/ldap/__init__.py:517
 msgid "sec. mail pol. is not empty"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:438
-#: .././pykolab/auth/ldap/__init__.py:451
+#: ../pykolab/auth/ldap/__init__.py:520 ../pykolab/auth/ldap/__init__.py:533
 #, python-format
 msgid "Attributes %r are not yet available for entry %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:492
+#: ../pykolab/auth/ldap/__init__.py:574
 #, python-format
 msgid "No results for mail address %s found"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:503
+#: ../pykolab/auth/ldap/__init__.py:585
 #, python-format
 msgid "1 result for address %s found, verifying"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:513
+#: ../pykolab/auth/ldap/__init__.py:595
 #, python-format
 msgid "Too bad, primary email address %s "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:524
-#: .././pykolab/auth/ldap/__init__.py:613
+#: ../pykolab/auth/ldap/__init__.py:606 ../pykolab/auth/ldap/__init__.py:695
 msgid "Address assigned to us"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:579
+#: ../pykolab/auth/ldap/__init__.py:661
 #, python-format
 msgid "No results for address %s found"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:590
+#: ../pykolab/auth/ldap/__init__.py:672
 #, python-format
 msgid "1 result for address %s found, "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:601
+#: ../pykolab/auth/ldap/__init__.py:683
 msgid "Too bad, secondary email "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:655
+#: ../pykolab/auth/ldap/__init__.py:710
+msgid "Recipient policy composed the following set of secondary "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:716
+#, python-format
+msgid "Secondary mail addresses that we want is not None: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:727
+msgid "Avoiding the duplication of the primary mail "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:738
+#, python-format
+msgid "Entry is getting secondary mail addresses: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:746
+msgid "Entry did not have any secondary mail "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:772
 #, python-format
 msgid "Entry modifications list: %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:698
+#: ../pykolab/auth/ldap/__init__.py:792
+#, python-format
+msgid "Setting entry attribute %r to %r for %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:828
+#, python-format
+msgid "Could not update dn %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:841
 #, python-format
 msgid "Using filter %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:736
+#: ../pykolab/auth/ldap/__init__.py:879
+#, python-format
+msgid "About to consider the user quota for %r (used: %r, "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:945
 msgid "Invalid bind credentials"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:989
+#: ../pykolab/auth/ldap/__init__.py:1229
 #, python-format
 msgid "Current changelog entry %s with %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:996
+#: ../pykolab/auth/ldap/__init__.py:1242
 #, python-format
 msgid "Result from recipient policy: %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1227
+#: ../pykolab/auth/ldap/__init__.py:1385
+#, python-format
+msgid "Kolab user %s does not have a result attribute %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1527
 #, python-format
 msgid "Finding domain root dn for domain %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1315
+#: ../pykolab/auth/ldap/__init__.py:1615
 msgid "Authentication database DOWN"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1394
+#: ../pykolab/auth/ldap/__init__.py:1699 ../pykolab/auth/ldap/__init__.py:1734
 #, python-format
 msgid "Entry type: %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1492
+#: ../pykolab/auth/ldap/__init__.py:1822
 msgid "LDAP Search Result Data Entry:"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1508
+#: ../pykolab/auth/ldap/__init__.py:1838
 msgid "Entry Change Notification attributes:"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1513
+#: ../pykolab/auth/ldap/__init__.py:1843
 #, python-format
 msgid "Change Type: %r (%r)"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1521
+#: ../pykolab/auth/ldap/__init__.py:1851
 #, python-format
 msgid "Previous DN: %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1575
+#: ../pykolab/auth/ldap/__init__.py:1906
 #, python-format
 msgid "Object %s searched no longer exists"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1583
+#: ../pykolab/auth/ldap/__init__.py:1916
 #, python-format
 msgid "%d results..."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1677
+#: ../pykolab/auth/ldap/__init__.py:2014
 #, python-format
 msgid "Searching with filter %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1721
+#: ../pykolab/auth/ldap/__init__.py:2058
 #, python-format
 msgid "Checking for support for %s on %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/cache.py:109
-#, python-format
-msgid "Inserting cache entry %r"
+#: ../pykolab/cli/cmd_add_domain.py:36 ../pykolab/cli/cmd_create_mailbox.py:36
+#: ../pykolab/cli/cmd_export_mailbox.py:33
+#: ../pykolab/cli/cmd_list_mailboxes.py:39
+msgid "CLI Options"
 msgstr ""
 
-#: .././pykolab/auth/ldap/cache.py:122
-#, python-format
-msgid "Updating timestamp for cache entry %r"
+#: ../pykolab/cli/cmd_add_domain.py:42
+msgid "Add domain as alias for DOMAIN"
 msgstr ""
 
-#: .././pykolab/auth/ldap/cache.py:128
-#, python-format
-msgid "Updating result_attribute for cache entry %r"
+#: ../pykolab/cli/cmd_add_domain.py:47
+msgid "Add a new domain or domain alias."
 msgstr ""
 
-#: .././pykolab/auth/sql/__init__.py:44
-msgid "Connecting to SQL..."
+#: ../pykolab/cli/cmd_add_domain.py:55
+msgid "Could not find credentials with sufficient permissions"
 msgstr ""
 
-#: .././pykolab/utils.py:92
-msgid "Please answer 'yes' or 'no'."
+#: ../pykolab/cli/cmd_add_domain.py:80 ../pykolab/wap_client/__init__.py:113
+msgid "Invalid parent domain"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:87
-#, python-format
-msgid "Setting %s to %r (from defaults)"
+#: ../pykolab/cli/cmd_add_domain.py:86
+msgid "Domain name"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:106
-#, python-format
-msgid "Setting %s to %r (from CLI, verified)"
+#: ../pykolab/cli/cmd_create_mailbox.py:41
+msgid "Set metadata for folder to ANNOTATION=VALUE"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:109
-#, python-format
-msgid "Setting %s to %r (from CLI, not checked)"
+#: ../pykolab/cli/cmd_create_mailbox.py:50
+msgid "Invalid argument"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:150 .././pykolab/conf/__init__.py:207
-#, python-format
-msgid "Setting %s_%s to '****' (from configuration file)"
+#: ../pykolab/cli/cmd_create_mailbox.py:58
+msgid "Invalid argument for metadata"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:152 .././pykolab/conf/__init__.py:209
-#, python-format
-msgid "Setting %s_%s to %r (from configuration file)"
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:45
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:49
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:50
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:55
+msgid "ACI Subject"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:162
-msgid "Setting options from configuration file"
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:48
+#: ../pykolab/cli/cmd_list_mailbox_acls.py:41
+#: ../pykolab/cli/cmd_list_mailbox_metadata.py:41
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:54
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:54
+msgid "Folder name"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:223
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:60
+#: ../pykolab/cli/cmd_list_mailbox_acls.py:52
+#: ../pykolab/cli/cmd_list_mailbox_metadata.py:52
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:67
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:67
 #, python-format
-msgid "Configuration file %s not readable"
+msgid "No such folder %r"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:226
-#, python-format
-msgid "Reading configuration file %s"
+#: ../pykolab/cli/cmd_delete_mailbox.py:46
+msgid "No mailbox specified"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:230
+#: ../pykolab/cli/cmd_export_mailbox.py:38
+msgid "All folders this user has access to"
+msgstr ""
+
+#: ../pykolab/cli/cmd_export_mailbox.py:108
+#, python-format
+msgid "%s is not a directory"
+msgstr ""
+
+#: ../pykolab/cli/cmd_export_mailbox.py:118
+#, python-format
+msgid "ZIP file at %s.zip"
+msgstr ""
+
+#: ../pykolab/cli/cmd_export_mailbox.py:120
+#, python-format
+msgid "No directories found for user %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_mailboxes.py:44
+msgid "Display raw IMAP UTF-7 folder names"
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_mailboxes.py:75
+#, python-format
+msgid "Appending folder search for %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:49
+msgid "Invalid or unqualified email address."
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:57
+#, python-format
+msgid "No recipient found for email address %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:60
+#, python-format
+msgid "Found the following recipient(s): %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:66
+#, python-format
+msgid "Using the following mail attributes: %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:90
+msgid "Found the following recipients:"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:48
+msgid "No target mailbox name specified"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:50
+msgid "No source mailbox name specified"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:62
+#, python-format
+msgid "Source folder %r does not exist"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:66
+#, python-format
+msgid "Target folder %r already exists"
+msgstr ""
+
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:47
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:51
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:56
+msgid "ACI Permissions"
+msgstr ""
+
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:47
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:51
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:56
+msgid "Metadata value"
+msgstr ""
+
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:50
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:55
+msgid "Metadata path"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:41
+#, python-format
+msgid "Found %d domains in %d seconds"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:51
+#, python-format
+msgid "Running for domain %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:57
+#, python-format
+msgid "Synchronizing users for %s took %d seconds"
+msgstr ""
+
+#. This is a nested command
+#. This is a nested component
+#: ../pykolab/cli/commands.py:98 ../pykolab/setup/components.py:90
+#, python-format
+msgid "Command Group: %s"
+msgstr ""
+
+#: ../pykolab/cli/commands.py:109 ../pykolab/cli/commands.py:114
+msgid "No such command."
+msgstr ""
+
+#: ../pykolab/cli/commands.py:165 ../pykolab/setup/components.py:231
+#, python-format
+msgid "Command '%s' already registered"
+msgstr ""
+
+#: ../pykolab/cli/commands.py:190 ../pykolab/setup/components.py:257
+#: ../wallace/modules.py:338
+#, python-format
+msgid "Alias for %s"
+msgstr ""
+
+#: ../pykolab/cli/commands.py:198 ../pykolab/setup/components.py:265
+msgid "Not yet implemented"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:40
+msgid "Unspecified command issue identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:50
+msgid "Invalid command issue identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:60
+#: ../pykolab/cli/telemetry/cmd_examine_session.py:65
+msgid "Invalid session identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:75
+#: ../pykolab/cli/telemetry/cmd_examine_session.py:100
+#, python-format
+msgid "Session by %s on server %s"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_session.py:43
+msgid "Unspecified session identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_list_sessions.py:35
+msgid "List Options"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_list_sessions.py:40
+msgid "Display sessions since ..."
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_list_sessions.py:58
+#, python-format
+msgid "Session for user %s started at %s with ID %s"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:57 ../pykolab/conf/entitlement.py:80
+#: ../pykolab/conf/entitlement.py:98 ../pykolab/conf/entitlement.py:116
+#: ../pykolab/conf/entitlement.py:230 ../pykolab/conf/entitlement.py:246
+#: ../pykolab/conf/entitlement.py:262
+msgid "Invalid entitlement verification "
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:120 ../pykolab/conf/entitlement.py:123
+msgid "Invalid entitlement certificate"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:132
+#, python-format
+msgid "Parsing entitlement file %s"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:141
+#, python-format
+msgid "License file %s not readable!"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:147
+msgid "No entitlement directory found"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:87
+#, python-format
+msgid "Setting %s to %r (from defaults)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:106
+#, python-format
+msgid "Setting %s to %r (from CLI, verified)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:109
+#, python-format
+msgid "Setting %s to %r (from CLI, not checked)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:150 ../pykolab/conf/__init__.py:207
+#, python-format
+msgid "Setting %s_%s to '****' (from configuration file)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:152 ../pykolab/conf/__init__.py:209
+#, python-format
+msgid "Setting %s_%s to %r (from configuration file)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:162
+msgid "Setting options from configuration file"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:223
+#, python-format
+msgid "Configuration file %s not readable"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:226
+#, python-format
+msgid "Reading configuration file %s"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:230
 #, python-format
 msgid "Invalid configuration file %s"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:233
+#: ../pykolab/conf/__init__.py:233
 #, python-format
 msgid "No master configuration section [kolab] in configuration file %s"
 msgstr ""
@@ -810,1088 +924,1335 @@ msgstr ""
 #. #
 #. # Runtime Options
 #. #
-#: .././pykolab/conf/__init__.py:267
+#: ../pykolab/conf/__init__.py:267
 msgid "Runtime Options"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:272
+#: ../pykolab/conf/__init__.py:272
 msgid "Configuration file to use"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:278
+#: ../pykolab/conf/__init__.py:278
 msgid "Set the debugging "
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:286
+#: ../pykolab/conf/__init__.py:286
 msgid "Set the logging level. "
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:294
+#: ../pykolab/conf/__init__.py:294
 msgid "Log file to use"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:300
+#: ../pykolab/conf/__init__.py:300
 msgid "Be quiet."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:306
+#: ../pykolab/conf/__init__.py:306
 msgid "Answer yes to all questions."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:328
+#: ../pykolab/conf/__init__.py:328
 msgid "No command supplied"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:411
+#: ../pykolab/conf/__init__.py:411
 msgid "Insufficient options. Need section, key and value -in that order."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:414
+#: ../pykolab/conf/__init__.py:414
 #, python-format
 msgid "No section '%s' exists."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:445
+#: ../pykolab/conf/__init__.py:445
 #, python-format
 msgid "Setting %s to %r (from the default values for CLI options)"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:514
+#: ../pykolab/conf/__init__.py:514
 #, python-format
 msgid "Could not execute configuration function: %s"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:522
+#: ../pykolab/conf/__init__.py:522
 #, python-format
 msgid "Option %s/%s does not exist in config file %s, pulling from defaults"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:530 .././pykolab/conf/__init__.py:533
+#: ../pykolab/conf/__init__.py:530 ../pykolab/conf/__init__.py:533
 msgid "Option does not exist in defaults."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:531 .././pykolab/conf/__init__.py:534
-msgid "Not available"
-msgstr ""
-
-#: .././pykolab/conf/__init__.py:543
+#: ../pykolab/conf/__init__.py:543
 #, python-format
 msgid "Configuration file %s not readable."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:546
+#: ../pykolab/conf/__init__.py:546
 #, python-format
 msgid "Configuration file %s does not exist."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:551
+#: ../pykolab/conf/__init__.py:551
 msgid ""
 "WARNING: A negative debug level value does not make this program be any more "
 "silent."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:557
+#: ../pykolab/conf/__init__.py:557
 msgid "This program has 9 levels of verbosity. Using the maximum of 9."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:565 .././pykolab/conf/__init__.py:571
+#: ../pykolab/conf/__init__.py:565 ../pykolab/conf/__init__.py:571
 msgid "Cannot start SASL authentication daemon"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:582
+#: ../pykolab/conf/__init__.py:582
 msgid "No imaplib library found."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:592
+#: ../pykolab/conf/__init__.py:592
 msgid "No LMTP class found in the smtplib library."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:602
+#: ../pykolab/conf/__init__.py:602
 msgid "No SMTP class found in the smtplib library."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:616
+#: ../pykolab/conf/__init__.py:616
 #, python-format
 msgid "Found you specified a specific set of items to test: %s"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:624
+#: ../pykolab/conf/__init__.py:624
 #, python-format
 msgid "Selectively selecting: %s"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:57 .././pykolab/conf/entitlement.py:80
-#: .././pykolab/conf/entitlement.py:98 .././pykolab/conf/entitlement.py:116
-#: .././pykolab/conf/entitlement.py:229 .././pykolab/conf/entitlement.py:245
-#: .././pykolab/conf/entitlement.py:261
-msgid "Invalid entitlement verification "
+#: ../pykolab/constants.py.in:40
+msgid "PyKolab is a Kolab Systems product. For more information "
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:120 .././pykolab/conf/entitlement.py:123
-msgid "Invalid entitlement certificate"
+#: ../pykolab/constants.py.in:54
+msgid "WARNING"
+msgstr ""
+
+#: ../pykolab/constants.py.in:54
+msgid "The Fully Qualified "
+msgstr ""
+
+#: ../pykolab/constants.py.in:75
+msgid "389 Directory Server or Red Hat Directory Server"
+msgstr ""
+
+#: ../pykolab/constants.py.in:79 ../pykolab/constants.py.in:83
+msgid "OpenLDAP or compatible"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:132
+#: ../pykolab/imap/cyrus.py:79
 #, python-format
-msgid "Parsing entitlement file %s"
+msgid "Could not connect to Cyrus IMAP server %r"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:141
+#: ../pykolab/imap/cyrus.py:134
 #, python-format
-msgid "License file %s not readable!"
+msgid "Continuing with separator: %r"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:146
-msgid "No entitlement directory found"
+#: ../pykolab/imap/cyrus.py:139
+msgid "Detected we are running in a Murder topology"
 msgstr ""
 
-#: .././pykolab/logger.py:89
+#: ../pykolab/imap/cyrus.py:143
+msgid "This system is not part of a murder topology"
+msgstr ""
+
+#: ../pykolab/imap/cyrus.py:164
 #, python-format
-msgid "Cannot log to file %s: %s"
+msgid "Checking actual backend server for folder %s through annotations"
 msgstr ""
 
-#: .././pykolab/constants.py:40
-msgid "PyKolab is a Kolab Systems product. For more information "
+#: ../pykolab/imap/cyrus.py:179
+#, python-format
+msgid "Could not get the annotations after %s tries."
 msgstr ""
 
-#: .././pykolab/constants.py:54
-msgid "WARNING"
+#: ../pykolab/imap/cyrus.py:183
+#, python-format
+msgid "No annotations for %s: %r"
 msgstr ""
 
-#: .././pykolab/constants.py:54
-msgid "The Fully Qualified "
+#: ../pykolab/imap/cyrus.py:190
+#, python-format
+msgid "Server for INBOX folder %s is %s"
 msgstr ""
 
-#: .././pykolab/constants.py:75
-msgid "389 Directory Server or Red Hat Directory Server"
+#: ../pykolab/imap/cyrus.py:202
+#, python-format
+msgid "Setting quota for folder %s to %s"
 msgstr ""
 
-#: .././pykolab/constants.py:79 .././pykolab/constants.py:83
-msgid "OpenLDAP or compatible"
+#: ../pykolab/imap/cyrus.py:206
+#, python-format
+msgid "Could not set quota for mailfolder %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_list_sessions.py:35
-msgid "List Options"
+#: ../pykolab/imap/cyrus.py:215
+#, python-format
+msgid "Moving INBOX folder %s to %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_list_sessions.py:40
-msgid "Display sessions since ..."
+#: ../pykolab/imap/cyrus.py:227
+#, python-format
+msgid "Setting annotation %s on folder %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_list_sessions.py:58
+#: ../pykolab/imap/cyrus.py:234
 #, python-format
-msgid "Session for user %s started at %s with ID %s"
+msgid "Could not set annotation %r on mail folder %r: %r"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_session.py:43
-msgid "Unspecified session identifier"
+#: ../pykolab/imap/cyrus.py:238
+#, python-format
+msgid "Transferring folder %s from %s to %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_session.py:65
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:60
-msgid "Invalid session identifier"
+#: ../pykolab/imap/cyrus.py:298
+#, python-format
+msgid "Undeleting %s to %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_session.py:100
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:75
+#: ../pykolab/imap/__init__.py:45
 #, python-format
-msgid "Session by %s on server %s"
+msgid "Cleaning up ACL entries for %s across all folders"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:40
-msgid "Unspecified command issue identifier"
+#: ../pykolab/imap/__init__.py:60
+#, python-format
+msgid "Cleaning up ACL entries referring to identifier %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:50
-msgid "Invalid command issue identifier"
+#: ../pykolab/imap/__init__.py:69
+#, python-format
+msgid "Iterating over %d folders"
 msgstr ""
 
-#. This is a nested command
-#. This is a nested component
-#: .././pykolab/cli/commands.py:95 .././pykolab/setup/components.py:88
+#. Set the ACL to '' (effectively deleting the ACL entry)
+#: ../pykolab/imap/__init__.py:82
 #, python-format
-msgid "Command Group: %s"
+msgid "Removing acl %r for subject %r from folder %r"
 msgstr ""
 
-#: .././pykolab/cli/commands.py:106 .././pykolab/cli/commands.py:111
-msgid "No such command."
+#: ../pykolab/imap/__init__.py:143
+#, python-format
+msgid "Logging on to Cyrus IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/commands.py:161 .././pykolab/setup/components.py:217
+#: ../pykolab/imap/__init__.py:152
 #, python-format
-msgid "Command '%s' already registered"
+msgid "Logging on to Dovecot IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_delete_mailbox.py:43
-msgid "No mailbox specified"
+#: ../pykolab/imap/__init__.py:161
+#, python-format
+msgid "Logging on to generic IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_list_mailboxes.py:35
-#: .././pykolab/cli/cmd_export_mailbox.py:33
-msgid "CLI Options"
+#: ../pykolab/imap/__init__.py:179
+#, python-format
+msgid "Reusing existing IMAP server connection to %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_list_mailboxes.py:40
-msgid "Display raw UTF-7 folder names"
+#: ../pykolab/imap/__init__.py:181
+#, python-format
+msgid "Reconnecting to IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:38
-msgid "All folders this user has access to"
+#: ../pykolab/imap/__init__.py:197
+msgid "Called imap.disconnect() on a server that "
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:108
+#: ../pykolab/imap/__init__.py:213
 #, python-format
-msgid "%s is not a directory"
+msgid "%r has no attribute %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:118
+#: ../pykolab/imap/__init__.py:286
+msgid "Private annotations need to be set using the appropriate user account."
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:319 ../pykolab/imap/__init__.py:354
 #, python-format
-msgid "ZIP file at %s.zip"
+msgid "Creating new shared folder %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:120
+#: ../pykolab/imap/__init__.py:376
 #, python-format
-msgid "No directories found for user %s"
+msgid "Creating new mailbox for user %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_sync.py:38
+#: ../pykolab/imap/__init__.py:405
 #, python-format
-msgid "Found %d domains in %d seconds"
+msgid "Creating additional folders for user %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_sync.py:48
+#: ../pykolab/imap/__init__.py:429
 #, python-format
-msgid "Running for domain %s"
+msgid "Mailbox already exists: %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_sync.py:54
+#: ../pykolab/imap/__init__.py:472
+msgid "Subscribing user to the additional folders"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:532 ../pykolab/imap/__init__.py:611
 #, python-format
-msgid "Synchronizing users for %s took %d seconds"
+msgid "Renaming INBOX from %s to %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:536
+#, python-format
+msgid "Could not rename INBOX folder %s to %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:538 ../pykolab/imap/__init__.py:615
+#, python-format
+msgid "Moving INBOX folder %s won't succeed as target folder %s already exists"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:70
+#: ../pykolab/imap/__init__.py:551
+#, python-format
+msgid "Looking for folder '%s', we found folders: %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:574
+#, python-format
+msgid "Setting ACL rights %s for subject %s on folder "
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:585
+#, python-format
+msgid "Removing ACL rights %s for subject %s on folder "
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:608
+#, python-format
+msgid "Found old INBOX folder %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:617
+#, python-format
+msgid "Did not find old folder user/%s to rename"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:619
+msgid "Value for user is not a dictionary"
+msgstr ""
+
+#. TODO: Go in fact correct the quota.
+#: ../pykolab/imap/__init__.py:682
+#, python-format
+msgid "Cannot get current IMAP quota for folder %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:695
+#, python-format
+msgid "Quota for %s currently is %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:701
+#, python-format
+msgid "Adjusting authentication database quota for folder %s to %d"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:706
+#, python-format
+msgid "Correcting quota for %s to %s (currently %s)"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:788
+#, python-format
+msgid "Checking folder: %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:793
+#, python-format
+msgid "Folder has no corresponding user (1): %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:796
+#, python-format
+msgid "Folder has no corresponding user (2): %s"
+msgstr ""
+
+#. We got user identifier only
+#: ../pykolab/imap/__init__.py:811
+msgid "Please don't give us just a user identifier"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:814
+#, python-format
+msgid "Deleting folder %s"
+msgstr ""
+
+#: ../pykolab/__init__.py:50
+msgid "Returning thread local configuration"
+msgstr ""
+
+#: ../pykolab/logger.py:105
+#, python-format
+msgid "Could not change the ownership of log file %s"
+msgstr ""
+
+#: ../pykolab/logger.py:121
+#, python-format
+msgid "Cannot log to file %s: %s"
+msgstr ""
+
+#: ../pykolab/plugins/defaultfolders/__init__.py:47
+#, python-format
+msgid "Plugin %s called without required keyword %s."
+msgstr ""
+
+#: ../pykolab/plugins/defaultfolders/__init__.py:53
+msgid "Could not parse additional_folders"
+msgstr ""
+
+#: ../pykolab/plugins/dynamicquota/__init__.py:58
+#, python-format
+msgid "No keyword %s passed to set_user_folder_quota"
+msgstr ""
+
+#: ../pykolab/plugins/dynamicquota/__init__.py:70
+#, python-format
+msgid "Quota '%s' not an integer!"
+msgstr ""
+
+#: ../pykolab/plugins/__init__.py:70
 #, python-format
 msgid "ImportError for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:74
+#: ../pykolab/plugins/__init__.py:74
 #, python-format
 msgid "RuntimeError for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:78
+#: ../pykolab/plugins/__init__.py:78
 #, python-format
 msgid "Plugin %s failed to load (%s: %s)"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:116 .././pykolab/plugins/__init__.py:118
+#: ../pykolab/plugins/__init__.py:116 ../pykolab/plugins/__init__.py:118
 #, python-format
 msgid "Cannot set defaults for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:120
+#: ../pykolab/plugins/__init__.py:120
 #, python-format
 msgid "Cannot set defaults for plugin %s: Unknown Error"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:123
+#: ../pykolab/plugins/__init__.py:123
 #, python-format
 msgid "Not setting defaults for plugin %s: No function 'set_defaults()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:142
+#: ../pykolab/plugins/__init__.py:142
 #, python-format
 msgid "Cannot set runtime for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:144
+#: ../pykolab/plugins/__init__.py:144
 #, python-format
 msgid "Not setting runtime for plugin %s: No function 'set_runtime()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:163 .././pykolab/plugins/__init__.py:165
+#: ../pykolab/plugins/__init__.py:163 ../pykolab/plugins/__init__.py:165
 #, python-format
 msgid "Cannot add options for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:167
+#: ../pykolab/plugins/__init__.py:167
 #, python-format
 msgid "Not adding options for plugin %s: No function 'add_options()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:187
+#: ../pykolab/plugins/__init__.py:187
 #, python-format
 msgid "Cannot check options for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:189
+#: ../pykolab/plugins/__init__.py:189
 #, python-format
 msgid "Not checking options for plugin %s: No function 'check_options()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:227
+#: ../pykolab/plugins/__init__.py:227
 #, python-format
 msgid "Executing hook %s for plugin %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:231 .././pykolab/plugins/__init__.py:233
+#: ../pykolab/plugins/__init__.py:231 ../pykolab/plugins/__init__.py:233
 #, python-format
 msgid "Cannot execute hook %s for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/defaultfolders/__init__.py:47
-#, python-format
-msgid "Plugin %s called without required keyword %s."
+#: ../pykolab/plugins/recipientpolicy/__init__.py:79
+msgid "Attribute substitution for 'mail' failed in Recipient Policy"
 msgstr ""
 
-#: .././pykolab/plugins/defaultfolders/__init__.py:53
-msgid "Could not parse additional_folders"
+#: ../pykolab/plugins/recipientpolicy/__init__.py:115
+msgid "Could not parse the alternative mail routines"
 msgstr ""
 
-#: .././pykolab/plugins/dynamicquota/__init__.py:56
-#, python-format
-msgid "Quota '%s' not an integer!"
+#: ../pykolab/plugins/recipientpolicy/__init__.py:127
+#: ../pykolab/plugins/recipientpolicy/__init__.py:137
+msgid ""
+"Attribute substitution for 'alternative_mail' failed in Recipient Policy"
 msgstr ""
 
-#: .././pykolab/plugins/dynamicquota/__init__.py:63
-msgid ""
-"The new quota was set to 0, but default quota > 0, returning default quota"
+#: ../pykolab/setup/components.py:58
+msgid "Display this help."
 msgstr ""
 
-#: .././pykolab/plugins/dynamicquota/__init__.py:82
-msgid ""
-"The default quota is larger then the calculated new quota, using the default "
-"quota"
+#: ../pykolab/setup/components.py:149
+msgid "No component selected, continuing for all components"
 msgstr ""
 
-#: .././pykolab/plugins/recipientpolicy/__init__.py:70
-msgid "Attribute substitution for 'mail' failed in Recipient Policy"
+#: ../pykolab/setup/components.py:187 ../pykolab/setup/components.py:192
+msgid "No such component."
 msgstr ""
 
-#: .././pykolab/plugins/recipientpolicy/__init__.py:97
-msgid "Could not parse the alternative mail routines"
+#: ../pykolab/setup/setup_freebusy.py:46
+msgid "Setup Free/Busy."
 msgstr ""
 
-#: .././pykolab/plugins/recipientpolicy/__init__.py:109
-#: .././pykolab/plugins/recipientpolicy/__init__.py:119
-msgid ""
-"Attribute substitution for 'alternative_mail' failed in Recipient Policy"
+#: ../pykolab/setup/setup_freebusy.py:50
+msgid "Free/Busy is not installed on this system"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:40
-msgid "Setup zpush."
+#: ../pykolab/setup/setup_freebusy.py:55
+msgid ""
+"\n"
+"                        Please supply the MySQL password for the "
+"'roundcube'\n"
+"                        user. You have supplied this password earlier, and "
+"it is\n"
+"                        available from the database URI setting in\n"
+"                        /etc/roundcubemail/db.inc.php.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:44
-msgid "Z-Push is not installed on this system"
+#: ../pykolab/setup/setup_freebusy.py:64
+#: ../pykolab/setup/setup_roundcube.py:56
+msgid "MySQL roundcube password"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:70
-#: .././pykolab/setup/setup_roundcube.py:93
-#: .././pykolab/setup/setup_freebusy.py:76
+#: ../pykolab/setup/setup_freebusy.py:92
+#: ../pykolab/setup/setup_roundcube.py:116 ../pykolab/setup/setup_zpush.py:71
 #, python-format
 msgid "Using template file %r"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:77
-#: .././pykolab/setup/setup_roundcube.py:100
-#: .././pykolab/setup/setup_freebusy.py:83
+#: ../pykolab/setup/setup_freebusy.py:99
+#: ../pykolab/setup/setup_roundcube.py:123 ../pykolab/setup/setup_zpush.py:78
 #, python-format
 msgid "Successfully compiled template %r, writing out to %r"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:95 .././pykolab/setup/setup_ldap.py:184
-#: .././pykolab/setup/setup_ldap.py:358
-#: .././pykolab/setup/setup_roundcube.py:159
-#: .././pykolab/setup/setup_imap.py:137 .././pykolab/setup/setup_mysql.py:49
-#: .././pykolab/setup/setup_freebusy.py:101
-msgid "Could not start and configure to start on boot, the "
+#: ../pykolab/setup/setup_freebusy.py:119 ../pykolab/setup/setup_imap.py:143
+#: ../pykolab/setup/setup_ldap.py:288 ../pykolab/setup/setup_ldap.py:521
+#: ../pykolab/setup/setup_mta.py:309 ../pykolab/setup/setup_mysql.py:49
+#: ../pykolab/setup/setup_roundcube.py:191
+#: ../pykolab/setup/setup_syncroton.py:66 ../pykolab/setup/setup_zpush.py:98
+msgid "Could not start and configure to start on boot, the "
+msgstr ""
+
+#: ../pykolab/setup/setup_imap.py:44
+msgid "Setup IMAP."
+msgstr ""
+
+#: ../pykolab/setup/setup_imap.py:88 ../pykolab/setup/setup_imap.py:113
+msgid "Could not write out Cyrus IMAP configuration file /etc/imapd.conf"
+msgstr ""
+
+#: ../pykolab/setup/setup_kolabd.py:43
+msgid "Setup the Kolab daemon."
+msgstr ""
+
+#: ../pykolab/setup/setup_kolabd.py:51
+#, python-format
+msgid ""
+"\n"
+"                            Copying the configuration section for 'example."
+"org' over to\n"
+"                            a section applicable to your domain '%s'.\n"
+"                        "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:43
+msgid "LDAP Options"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:50
+msgid "Specify FQDN (overriding defaults)."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:58
+msgid "Allow anonymous binds (default: no)."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:62
+msgid "Setup LDAP."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:74
+msgid ""
+"\n"
+"                        Please supply a password for the LDAP administrator "
+"user\n"
+"                        'admin', used to login to the graphical console of "
+"389\n"
+"                        Directory server.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:82
+msgid "Administrator password"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:89
+msgid ""
+"\n"
+"                        Please supply a password for the LDAP Directory "
+"Manager\n"
+"                        user, which is the administrator user you will be "
+"using\n"
+"                        to at least initially log in to the Web Admin, and "
+"that\n"
+"                        Kolab uses to perform administrative tasks.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:98
+msgid "Directory Manager password"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:105
+msgid ""
+"\n"
+"                        Please choose the system user and group the service\n"
+"                        should use to run under. These should be existing,\n"
+"                        unprivileged, local system POSIX accounts with no "
+"shell.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:112
+msgid "User"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:43
-msgid "LDAP Options"
+#: ../pykolab/setup/setup_ldap.py:113
+msgid "Group"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:50
-msgid "Specify FQDN (overriding defaults)."
+#: ../pykolab/setup/setup_ldap.py:143
+msgid ""
+"\n"
+"                        This setup procedure plans to set up Kolab Groupware "
+"for\n"
+"                        the following domain name space. This domain name "
+"is\n"
+"                        obtained from the reverse DNS entry on your network\n"
+"                        interface. Please confirm this is the appropriate "
+"domain\n"
+"                        name space.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:54
-msgid "Setup LDAP."
+#: ../pykolab/setup/setup_ldap.py:157
+msgid "Domain name to use"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:66
-msgid "Administrator password"
+#: ../pykolab/setup/setup_ldap.py:162 ../pykolab/setup/setup_ldap.py:187
+msgid ""
+"\n"
+"                                    Invalid input. Please try again.\n"
+"                                "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:72
-msgid "Directory Manager password"
+#: ../pykolab/setup/setup_ldap.py:171
+msgid ""
+"\n"
+"                        The standard root dn we composed for you follows. "
+"Please\n"
+"                        confirm this is the root dn you wish to use.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:77
-msgid "User"
+#: ../pykolab/setup/setup_ldap.py:182
+msgid "Root DN to use"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:78
-msgid "Group"
+#: ../pykolab/setup/setup_ldap.py:234
+msgid ""
+"\n"
+"                    Setup is now going to set up the 389 Directory Server. "
+"This\n"
+"                    may take a little while (during which period there is "
+"no\n"
+"                    output and no progress indication).\n"
+"                "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:143
+#: ../pykolab/setup/setup_ldap.py:241
 msgid "Setting up 389 Directory Server"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:153
+#. TODO: Get the return code and display output if not successful.
+#: ../pykolab/setup/setup_ldap.py:253
 msgid "Setup DS stdout:"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:156
+#: ../pykolab/setup/setup_ldap.py:256
 msgid "Setup DS stderr:"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:175 .././pykolab/setup/setup_mysql.py:97
+#: ../pykolab/setup/setup_ldap.py:279 ../pykolab/setup/setup_mysql.py:129
 msgid "Could not find the Kolab schema file"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:189
+#: ../pykolab/setup/setup_ldap.py:293
+msgid ""
+"\n"
+"                        Please supply a Cyrus Administrator password. This\n"
+"                        password is used by Kolab to execute administrative\n"
+"                        tasks in Cyrus IMAP. You may also need the password\n"
+"                        yourself to troubleshoot Cyrus IMAP and/or perform\n"
+"                        other administrative tasks against Cyrus IMAP "
+"directly.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:303
 msgid "Cyrus Administrator password"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:195
+#: ../pykolab/setup/setup_ldap.py:310
+msgid ""
+"\n"
+"                        Please supply a Kolab Service account password. "
+"This\n"
+"                        account is used by various services such as "
+"Postfix,\n"
+"                        and Roundcube, as anonymous binds to the LDAP "
+"server\n"
+"                        will not be allowed.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:319
 msgid "Kolab Service password"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:204
+#: ../pykolab/setup/setup_ldap.py:329
 msgid "Writing out configuration to kolab.conf"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:218
+#: ../pykolab/setup/setup_ldap.py:343
 msgid "Inserting service users into LDAP."
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:262
+#: ../pykolab/setup/setup_ldap.py:417
 msgid "Writing out cn=kolab,cn=config"
 msgstr ""
 
 #. TODO: Add kolab-admin role
 #. TODO: Assign kolab-admin admin ACLs
-#: .././pykolab/setup/setup_ldap.py:286
+#: ../pykolab/setup/setup_ldap.py:441
 #, python-format
 msgid "Adding domain %s to list of domains for this deployment"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:294
+#: ../pykolab/setup/setup_ldap.py:457
 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:302
+#: ../pykolab/setup/setup_ldap.py:465
 msgid "Enabling attribute uniqueness plugin"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:308
+#: ../pykolab/setup/setup_ldap.py:471
 msgid "Enabling referential integrity plugin"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:314
+#: ../pykolab/setup/setup_ldap.py:477
 msgid "Enabling and configuring account policy plugin"
 msgstr ""
 
 #. TODO: Add kolab-admin role
-#: .././pykolab/setup/setup_ldap.py:329
+#: ../pykolab/setup/setup_ldap.py:492
 msgid "Adding the kolab-admin role"
 msgstr ""
 
 #. TODO: User writeable attributes on root_dn
-#: .././pykolab/setup/setup_ldap.py:340
+#: ../pykolab/setup/setup_ldap.py:503
 #, python-format
 msgid "Setting access control to %s"
 msgstr ""
 
-#: .././pykolab/setup/setup_roundcube.py:40
-msgid "Setup Roundcube."
-msgstr ""
-
-#: .././pykolab/setup/setup_roundcube.py:44
-#: .././pykolab/setup/setup_freebusy.py:49
-msgid "MySQL roundcube password"
-msgstr ""
-
-#: .././pykolab/setup/components.py:56
-msgid "Display this help."
-msgstr ""
-
-#: .././pykolab/setup/components.py:122
-msgid "No component selected, continuing for all components"
-msgstr ""
-
-#: .././pykolab/setup/components.py:157 .././pykolab/setup/components.py:162
-msgid "No such component."
-msgstr ""
-
-#: .././pykolab/setup/setup_mta.py:40
+#: ../pykolab/setup/setup_mta.py:40
 msgid "Setup MTA."
 msgstr ""
 
-#: .././pykolab/setup/setup_mta.py:220
+#: ../pykolab/setup/setup_mta.py:224 ../pykolab/setup/setup_php.py:80
 #, python-format
 msgid "Setting key %r to %r"
 msgstr ""
 
-#: .././pykolab/setup/setup_mta.py:248
+#: ../pykolab/setup/setup_mta.py:252
 msgid "Could not write out Postfix configuration file /etc/postfix/master.cf"
 msgstr ""
 
-#: .././pykolab/setup/setup_imap.py:39
-msgid "Setup IMAP."
-msgstr ""
-
-#: .././pykolab/setup/setup_imap.py:82 .././pykolab/setup/setup_imap.py:107
-msgid "Could not write out Cyrus IMAP configuration file /etc/imapd.conf"
-msgstr ""
-
-#: .././pykolab/setup/setup_kolabd.py:38
-msgid "Setup the Kolab daemon."
+#: ../pykolab/setup/setup_mta.py:287
+msgid "Could not write out Amavis configuration file /etc/amavisd/amavisd.conf"
 msgstr ""
 
-#: .././pykolab/setup/setup_mysql.py:39
+#: ../pykolab/setup/setup_mysql.py:39
 msgid "Setup MySQL."
 msgstr ""
 
-#: .././pykolab/setup/setup_mysql.py:53
+#: ../pykolab/setup/setup_mysql.py:53
+msgid ""
+"\n"
+"                    Please supply a root password for MySQL. This password "
+"will\n"
+"                    be the administrative user for this MySQL server, and "
+"it\n"
+"                    should be kept a secret. After this setup process has\n"
+"                    completed, Kolab is going to discard and forget about "
+"this\n"
+"                    password, but you will need it for administrative tasks "
+"in\n"
+"                    MySQL.\n"
+"                "
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:64
 msgid "MySQL root password"
 msgstr ""
 
-#: .././pykolab/setup/setup_freebusy.py:40
-msgid "Setup Free/Busy."
+#: ../pykolab/setup/setup_mysql.py:103
+msgid ""
+"\n"
+"                        Please supply a password for the MySQL user "
+"'kolab'.\n"
+"                        This password will be used by Kolab services, such "
+"as\n"
+"                        the Web Administration Panel.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_freebusy.py:44
-msgid "Free/Busy is not installed on this system"
+#: ../pykolab/setup/setup_mysql.py:111
+msgid "MySQL kolab password"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:45
-#, python-format
-msgid "Cleaning up ACL entries for %s across all folders"
+#: ../pykolab/setup/setup_php.py:42
+msgid "PHP Options"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:60
-#, python-format
-msgid "Cleaning up ACL entries referring to identifier %s"
+#: ../pykolab/setup/setup_php.py:49
+msgid "Specify the timezone for PHP."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:69
-#, python-format
-msgid "Iterating over %d folders"
+#: ../pykolab/setup/setup_php.py:53
+msgid "Setup PHP."
 msgstr ""
 
-#. Set the ACL to '' (effectively deleting the ACL entry)
-#: .././pykolab/imap/__init__.py:82
-#, python-format
-msgid "Removing acl %r for subject %r from folder %r"
+#: ../pykolab/setup/setup_php.py:58
+msgid ""
+"\n"
+"                        Please supply the timezone PHP should be using.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:143
-#, python-format
-msgid "Logging on to Cyrus IMAP server %s"
+#: ../pykolab/setup/setup_php.py:64
+msgid "Timezone ID"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:152
-#, python-format
-msgid "Logging on to Dovecot IMAP server %s"
+#: ../pykolab/setup/setup_roundcube.py:44
+msgid "Setup Roundcube."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:161
-#, python-format
-msgid "Logging on to generic IMAP server %s"
+#: ../pykolab/setup/setup_roundcube.py:48
+msgid ""
+"\n"
+"                    Please supply a password for the MySQL user "
+"'roundcube'.\n"
+"                    This password will be used by the Roundcube webmail\n"
+"                    interface.\n"
+"                "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:179
-#, python-format
-msgid "Reusing existing IMAP server connection to %s"
+#: ../pykolab/setup/setup_syncroton.py:40
+msgid "Setup Syncroton."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:181
-#, python-format
-msgid "Reconnecting to IMAP server %s"
+#: ../pykolab/setup/setup_zpush.py:41
+msgid "Setup zpush."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:197
-msgid "Called imap.disconnect() on a server that "
+#: ../pykolab/setup/setup_zpush.py:45
+msgid "Z-Push is not installed on this system"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:213
+#. start_max = (int)(time.time())
+#: ../pykolab/telemetry.py:588
 #, python-format
-msgid "%r has no attribute %s"
+msgid "Expiring sessions that started before or on %d"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:221 .././pykolab/imap/__init__.py:239
+#: ../pykolab/telemetry.py:601
 #, python-format
-msgid "Creating new shared folder %s"
+msgid "Expiring session ID: %d"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:255
+#: ../pykolab/telemetry.py:620
 #, python-format
-msgid "Creating new mailbox for user %s"
+msgid "Session with ID %d expired from database"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:280
+#: ../pykolab/telemetry.py:646
 #, python-format
-msgid "Creating additional folders for user %s"
+msgid "Operational Error in telemetry database: %s"
+msgstr ""
+
+#: ../pykolab/telemetry.py:652
+msgid "No database available"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:302
+#: ../pykolab/utils.py:57 ../pykolab/utils.py:59
 #, python-format
-msgid "Mailbox already exists: %s"
+msgid "Confirm %s: "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:345
-msgid "Subscribing user to the additional folders"
+#: ../pykolab/utils.py:62
+msgid "Incorrect confirmation. "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:380 .././pykolab/imap/__init__.py:459
+#: ../pykolab/utils.py:67 ../pykolab/utils.py:72
 #, python-format
-msgid "Renaming INBOX from %s to %s"
+msgid "%s: "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:384
+#: ../pykolab/utils.py:69 ../pykolab/utils.py:74
 #, python-format
-msgid "Could not rename INBOX folder %s to %s"
+msgid "%s [%s]: "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:386 .././pykolab/imap/__init__.py:463
-#, python-format
-msgid "Moving INBOX folder %s won't succeed as target folder %s already exists"
+#: ../pykolab/utils.py:119
+msgid "Please answer 'yes' or 'no'."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:399
+#: ../pykolab/utils.py:185
 #, python-format
-msgid "Looking for folder '%s', we found folders: %r"
+msgid "Could not change the permissions on %s"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:422
+#: ../pykolab/wap_client/__init__.py:257
 #, python-format
-msgid "Setting ACL rights %s for subject %s on folder "
+msgid "Requesting %r with params %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:433
+#: ../pykolab/wap_client/__init__.py:263
 #, python-format
-msgid "Removing ACL rights %s for subject %s on folder "
+msgid "Got response: %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:456
-#, python-format
-msgid "Found old INBOX folder %s"
+#. Some data is not JSON
+#: ../pykolab/wap_client/__init__.py:268
+msgid "Response data is not JSON"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:465
-#, python-format
-msgid "Did not find old folder user/%s to rename"
+#: ../pykolab/xml/attendee.py:79 ../pykolab/xml/attendee.py:99
+msgid "Not a valid attendee"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:467
-msgid "Value for user is not a dictionary"
+#: ../pykolab/xml/attendee.py:84
+msgid "No valid delegator references found"
 msgstr ""
 
-#. TODO: Go in fact correct the quota.
-#: .././pykolab/imap/__init__.py:527
-#, python-format
-msgid "Cannot get current IMAP quota for folder %s"
+#: ../pykolab/xml/attendee.py:104
+msgid "No valid delegatee references found"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:540
+#: ../pykolab/xml/attendee.py:140
 #, python-format
-msgid "Quota for %s currently is %s"
+msgid "Invalid cutype %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:546
+#: ../pykolab/xml/attendee.py:151
 #, python-format
-msgid "Adjusting authentication database quota for folder %s to %d"
+msgid "Invalid participant status %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:551
+#: ../pykolab/xml/attendee.py:159
 #, python-format
-msgid "Correcting quota for %s to %s (currently %s)"
+msgid "Invalid role %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:633
+#: ../pykolab/xml/event.py:172
 #, python-format
-msgid "Checking folder: %s"
+msgid "No attendee with email or name %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:638
+#: ../pykolab/xml/event.py:180
 #, python-format
-msgid "Folder has no corresponding user (1): %s"
+msgid "Invalid argument value attendee %r, must be basestring or Attendee"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:641
+#: ../pykolab/xml/event.py:186
 #, python-format
-msgid "Folder has no corresponding user (2): %s"
+msgid "No attendee with email %r"
 msgstr ""
 
-#. We got user identifier only
-#: .././pykolab/imap/__init__.py:656
-msgid "Please don't give us just a user identifier"
+#: ../pykolab/xml/event.py:192
+#, python-format
+msgid "No attendee with name %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:659
-#, python-format
-msgid "Deleting folder %s"
+#: ../pykolab/xml/event.py:338
+msgid "Invalid participant status"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:78
-#, python-format
-msgid "Could not connect to Cyrus IMAP server %r"
+#: ../pykolab/xml/event.py:538
+msgid "Event end needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:101
+#: ../pykolab/xml/event.py:657
 #, python-format
-msgid "Continuing with separator: %r"
+msgid "Invalid status %r"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:106
-msgid "Detected we are running in a Murder topology"
+#: ../pykolab/xml/event.py:678 ../pykolab/xml/event.py:728
+msgid "Event start needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:110
-msgid "This system is not part of a murder topology"
+#: ../pykolab/xml/event.py:764
+#, python-format
+msgid "Invalid status set: %r"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:131
-#, python-format
-msgid "Checking actual backend server for folder %s through annotations"
+#: ../pykolab/xml/event.py:882
+msgid "No sender specified"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:146
-#, python-format
-msgid "Could not get the annotations after %s tries."
+#: ../saslauthd/__init__.py:126 ../saslauthd/__init__.py:134
+msgid "Traceback occurred, please report a bug at http://bugzilla.kolabsys.com"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:150
+#: ../wallace/__init__.py:61
 #, python-format
-msgid "No annotations for %s: %r"
+msgid "Worker process %s initializing"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:157
-#, python-format
-msgid "Server for INBOX folder %s is %s"
+#: ../wallace/__init__.py:80
+msgid "Bind address for Wallace."
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:169
-#, python-format
-msgid "Setting quota for INBOX folder %s to %s"
+#: ../wallace/__init__.py:106
+msgid "Port that Wallace is supposed to use."
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:173
+#: ../wallace/__init__.py:157
 #, python-format
-msgid "Could not set quota for mailfolder %s"
+msgid "Could not bind to socket on port %d on bind "
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:182
-#, python-format
-msgid "Moving INBOX folder %s to %s"
+#: ../wallace/__init__.py:169
+msgid "Could not shut down socket"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:194
-#, python-format
-msgid "Setting annotation %s on folder %s"
+#: ../wallace/__init__.py:226
+msgid "Accepted connection"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:201
+#: ../wallace/__init__.py:389
 #, python-format
-msgid "Could not set annotation %r on mail folder %r: %r"
+msgid "Could not write pid file %s"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:205
+#: ../wallace/module_optout.py:61 ../wallace/module_resources.py:94
 #, python-format
-msgid "Transferring folder %s from %s to %s"
+msgid "Issuing callback after processing to stage %s"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:265
+#: ../wallace/module_optout.py:62 ../wallace/module_resources.py:100
 #, python-format
-msgid "Undeleting %s to %s"
+msgid "Testing cb_action_%s()"
 msgstr ""
 
-#. start_max = (int)(time.time())
-#: .././pykolab/telemetry.py:588
+#: ../wallace/module_optout.py:64 ../wallace/module_resources.py:103
 #, python-format
-msgid "Expiring sessions that started before or on %d"
+msgid "Attempting to execute cb_action_%s()"
 msgstr ""
 
-#: .././pykolab/telemetry.py:601
+#. modules.next_module('optout')
+#: ../wallace/module_optout.py:70
 #, python-format
-msgid "Expiring session ID: %d"
+msgid "Consulting opt-out service for %r, %r"
 msgstr ""
 
-#: .././pykolab/telemetry.py:620
+#: ../wallace/module_optout.py:96
 #, python-format
-msgid "Session with ID %d expired from database"
+msgid "Running opt-out consult from envelope sender '%s "
 msgstr ""
 
-#: .././pykolab/telemetry.py:646
+#: ../wallace/module_optout.py:160
 #, python-format
-msgid "Operational Error in telemetry database: %s"
+msgid "Attempting to execute cb_action_%s(%r, %r)"
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:92
+#: ../wallace/module_optout.py:181
 #, python-format
-msgid "Creating %d Mails"
+msgid "Could not send request to optout_url %s"
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:116
+#: ../wallace/module_resources.py:81
 #, python-format
-msgid "Sending message %s through SMTP targeting user %s@%s"
+msgid "Resource Management called for %r, %r"
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:119
-#, python-format
-msgid "Sending message %s through LMTP targeting user %s@%s"
+#: ../wallace/module_resources.py:139
+msgid "Message is not an iTip message or does not contain any "
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:122
-#, python-format
-msgid "Saving message %s to IMAP (user %s, folder %s)"
+#: ../wallace/module_resources.py:147
+msgid "iTip events attached to this message contain the "
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:125 .././pykolab/tests.old/calendar.py:198
-#: .././pykolab/tests.old/contacts.py:145
-msgid "Somehow ended up NOT sending these messages"
+#: ../wallace/module_resources.py:174
+msgid "Not an iTip message, but sent to resource nonetheless. Reject message"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:146
-#, python-format
-msgid "Creating %d Events"
+#: ../wallace/module_resources.py:182
+msgid "No itips, no resources, pass along"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:177
-#, python-format
-msgid "Creating Calendar item number %d"
+#: ../wallace/module_resources.py:186
+msgid "iTips, but no resources, pass along"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:189
-#: .././pykolab/tests.old/contacts.py:136
+#: ../wallace/module_resources.py:218
 #, python-format
-msgid "Sending UID message %s through SMTP targeting user %s@%s"
+msgid "Resources: %r"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:192
-#: .././pykolab/tests.old/contacts.py:139
+#: ../wallace/module_resources.py:236
 #, python-format
-msgid "Sending UID message %s through LMTP targeting user %s@%s"
+msgid "Checking events in resource folder %r"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:195
-#: .././pykolab/tests.old/contacts.py:142
+#: ../wallace/module_resources.py:243
 #, python-format
-msgid "Saving UID message %s to IMAP (user %s, folder %s)"
+msgid "Mailbox for resource %r doesn't exist"
 msgstr ""
 
-#: .././pykolab/tests.old/zpush/test_000_001.py:47
+#: ../wallace/module_resources.py:256
 #, python-format
-msgid "Could not load %sItem from %s, skipping the testing."
+msgid "Fetching message UID %r from folder %r"
 msgstr ""
 
-#: .././pykolab/tests.old/zpush/test_000_000.py:77
+#: ../wallace/module_resources.py:295
 #, python-format
-msgid "Authentication failure for %s"
+msgid "Event %r conflicts with event "
 msgstr ""
 
-#: .././pykolab/tests.old/contacts.py:105
+#: ../wallace/module_resources.py:308
 #, python-format
-msgid "Creating %d Contacts"
+msgid "start: %r, end: %r, total: %r, messages: %r"
 msgstr ""
 
-#: .././pykolab/tests.old/contacts.py:124
+#: ../wallace/module_resources.py:315
 #, python-format
-msgid "Creating Contact item number %d"
+msgid "Polling for resource %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:207
+#: ../wallace/module_resources.py:319
 #, python-format
-msgid "Adding policy request to instance %s"
+msgid "Resource %r has been popped from the list"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:442
-msgid "Unauthorized access not allowed"
+#: ../wallace/module_resources.py:326
+msgid "Resource is a collection"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:481
-#: .././bin/kolab_smtp_access_policy.py:541
+#: ../wallace/module_resources.py:374 ../wallace/module_resources.py:424
 #, python-format
-msgid "Could not find envelope sender user %s"
+msgid "Adding event to %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:568
+#: ../wallace/module_resources.py:473
 #, python-format
-msgid "%s is unauthorized to send on behalf of %s"
+msgid "Method %r not really interesting for us."
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:578
+#: ../wallace/module_resources.py:481
 #, python-format
-msgid "User %s attempted to use envelope sender address %s "
+msgid "Raw iTip payload: %s"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:638
-#: .././bin/kolab_smtp_access_policy.py:649
-#, python-format
-msgid "Found user %s to be a delegate user of %s"
+#: ../wallace/module_resources.py:491
+msgid "Could not read iTip from message."
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:673
-#, python-format
-msgid "Verifying authenticated sender '%(sender)s' with "
+#: ../wallace/module_resources.py:513
+msgid "iTip event without a start"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:678
-#, python-format
-msgid "Verifying unauthenticated sender '%(sender)s' "
+#. end if c.name == "VEVENT"
+#. end for c in cal.walk()
+#. end if part.get_content_type() == "text/calendar"
+#. end for part in message.walk()
+#. if message.is_multipart()
+#: ../wallace/module_resources.py:543
+msgid "Message is not an iTip message (non-multipart message)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:695
+#: ../wallace/module_resources.py:564
 #, python-format
-msgid "Reproducing verify_recipient(%s, %s) from "
+msgid "Checking if email address %r belongs to a resource (collection)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:712
+#: ../wallace/module_resources.py:575 ../wallace/module_resources.py:649
+#: ../wallace/module_resources.py:699
 #, python-format
-msgid "Using authentication domain %s instead of %s"
+msgid "No resource (collection) records found for %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:722
+#: ../wallace/module_resources.py:583 ../wallace/module_resources.py:657
+#: ../wallace/module_resources.py:707
 #, python-format
-msgid "Domain %s is a primary domain"
+msgid "Resource record(s): %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:730
+#: ../wallace/module_resources.py:589 ../wallace/module_resources.py:664
+#: ../wallace/module_resources.py:714
 #, python-format
-msgid "Checking the recipient for domain %s that is not "
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:792
-msgid "Could not find this user, accepting"
+msgid "Resource record: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:862
-#: .././bin/kolab_smtp_access_policy.py:915
+#: ../wallace/module_resources.py:608
 #, python-format
-msgid "Sender %s is not allowed to send to "
+msgid "Raw itip_events: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:902
+#: ../wallace/module_resources.py:616
 #, python-format
-msgid "Reproducing verify_sender(%r) from cache, "
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:931
-msgid "Sender uses unauthorized envelope sender address"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:948
-msgid "Could not verify sender"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:955
-msgid "Verifying whether sender is allowed to send to "
+msgid "Raw set of attendees: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:969
+#: ../wallace/module_resources.py:624
 #, python-format
-msgid "Result is %r"
+msgid "Raw set of resources: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:974
-msgid "No recipient policy restrictions exist for this sender"
+#: ../wallace/module_resources.py:638
+#, python-format
+msgid "Checking if attendee %r is a resource (collection)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:983
-msgid "Found a recipient policy to apply for this sender."
+#: ../wallace/module_resources.py:671 ../wallace/module_resources.py:717
+msgid "Resource reservation made but no resource records found"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:998
+#: ../wallace/module_resources.py:689
 #, python-format
-msgid "Sender %s not allowed to send to recipient "
+msgid "Checking if resource %r is a resource (collection)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1029
-msgid "Cleaning up the cache"
+#: ../wallace/module_resources.py:721
+msgid "The following resources are being referred to in the "
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1066
+#. This is a nested module
+#: ../wallace/modules.py:96
 #, python-format
-msgid "Operational Error in caching: %s"
+msgid "Module Group: %s"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1117
-#, python-format
-msgid "Caching the policy result with timestamp %d"
+#: ../wallace/modules.py:107 ../wallace/modules.py:112
+msgid "No such module."
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1194
+#: ../wallace/modules.py:118
 #, python-format
-msgid "Returning action DEFER_IF_PERMIT: %s"
+msgid "Holding message in queue for manual review (%s by %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1199
+#: ../wallace/modules.py:121
 #, python-format
-msgid "Returning action DUNNO: %s"
+msgid "Deferring message in %s (by module %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1204
+#: ../wallace/modules.py:131
 #, python-format
-msgid "Returning action HOLD: %s"
+msgid "The time when the message was sent: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1209
+#: ../wallace/modules.py:132
 #, python-format
-msgid "Returning action PERMIT: %s"
+msgid "The time now: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1214
+#: ../wallace/modules.py:133
 #, python-format
-msgid "Returning action REJECT: %s"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1258
-msgid "Starting to loop for new request"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1267
-msgid "End of current request"
+msgid "The time delta: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1271
+#. TODO: Send NDR back to user
+#: ../wallace/modules.py:137
 #, python-format
-msgid "Getting line: %s"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1275
-msgid "Returning request"
+msgid "Message in file %s older then 5 days, deleting"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1332
+#: ../wallace/modules.py:162
 #, python-format
-msgid "Got request instance %s"
+msgid "Rejecting message in %s (by module %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1341
+#: ../wallace/modules.py:180
 #, python-format
-msgid "Request instance %s is in state %s"
+msgid ""
+"This is the email system Wallace at %s.\n"
+"\n"
+"I'm sorry to inform you we could not deliver the attached message\n"
+"to the following recipients:\n"
+"\n"
+"- %s\n"
+"\n"
+"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 ""
 
-#: .././bin/kolab_smtp_access_policy.py:1349
+#: ../wallace/modules.py:195
 #, python-format
-msgid "Request instance %s is not yet in DATA state"
+msgid ""
+"X-Wallace-Module: %s\n"
+"X-Wallace-Result: REJECT\n"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1361
+#: ../wallace/modules.py:248
 #, python-format
-msgid "Request instance %s reached DATA state"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1379
-msgid "Sender access denied"
+msgid "Accepting message in %s (by module %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1381
-msgid "Recipient access denied"
+#: ../wallace/modules.py:316
+#, python-format
+msgid "Module '%s' already registered"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index bb65cb0..f092934 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pykolab 0.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-09 14:25+0100\n"
+"POT-Creation-Date: 2012-08-11 15:04+0100\n"
 "PO-Revision-Date: 2012-05-09 14:25+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,793 +16,907 @@ msgstr ""
 "Content-Type: text/plain; charset=ASCII\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: .././wallace/__init__.py:37 .././bonnie/__init__.py:35
-#: .././kolabd/__init__.py:46 .././saslauthd/__init__.py:47
-msgid "Daemon Options"
-msgstr ""
-
-#: .././wallace/__init__.py:44 .././bonnie/__init__.py:41
-#: .././kolabd/__init__.py:52 .././saslauthd/__init__.py:53
-msgid "Fork to the background."
-msgstr ""
-
-#: .././wallace/__init__.py:52
-msgid "Bind address for Wallace."
+#: ../bin/kolab_smtp_access_policy.py:206
+#, python-format
+msgid "Adding policy request to instance %s"
 msgstr ""
 
-#: .././wallace/__init__.py:60 .././kolabd/__init__.py:58
-#: .././saslauthd/__init__.py:59
-msgid "Path to the PID file to use."
+#: ../bin/kolab_smtp_access_policy.py:446
+msgid "Unauthorized access not allowed"
 msgstr ""
 
-#: .././wallace/__init__.py:68
-msgid "Port that Wallace is supposed to use."
+#: ../bin/kolab_smtp_access_policy.py:467
+#: ../bin/kolab_smtp_access_policy.py:658
+msgid "Could not find recipient"
 msgstr ""
 
-#: .././wallace/__init__.py:102 .././wallace/__init__.py:126
-#: .././wallace/__init__.py:373 .././wallace/__init__.py:401
+#: ../bin/kolab_smtp_access_policy.py:486
+#: ../bin/kolab_smtp_access_policy.py:586
 #, python-format
-msgid "Number of threads currently running: %d"
+msgid "Could not find envelope sender user %s"
 msgstr ""
 
-#: .././wallace/__init__.py:111 .././wallace/__init__.py:135
+#: ../bin/kolab_smtp_access_policy.py:529
 #, python-format
-msgid "Continuing with %d threads currently running"
+msgid "Obtained authenticated user details for %r: %r"
 msgstr ""
 
-#. TODO: Apply throttling
-#: .././wallace/__init__.py:118
+#: ../bin/kolab_smtp_access_policy.py:608
 #, python-format
-msgid "Creating thread for message in %s"
+msgid "%s is unauthorized to send on behalf of %s"
 msgstr ""
 
-#: .././wallace/__init__.py:142
+#: ../bin/kolab_smtp_access_policy.py:618
 #, python-format
-msgid "Running thread %s for message file %s"
+msgid "User %s attempted to use envelope sender address %s "
 msgstr ""
 
-#: .././wallace/__init__.py:151
+#: ../bin/kolab_smtp_access_policy.py:682
+#: ../bin/kolab_smtp_access_policy.py:693
 #, python-format
-msgid "This message was already in module %s, delegating "
+msgid "Found user %s to be a delegate user of %s"
 msgstr ""
 
-#: .././wallace/__init__.py:160
+#: ../bin/kolab_smtp_access_policy.py:717
 #, python-format
-msgid "It was also in a certain stage: %s, letting "
+msgid "Verifying authenticated sender '%(sender)s' with "
 msgstr ""
 
-#: .././wallace/__init__.py:168 .././wallace/__init__.py:174
-#: .././wallace/__init__.py:184
+#: ../bin/kolab_smtp_access_policy.py:722
 #, python-format
-msgid "Executing module %s"
-msgstr ""
-
-#: .././wallace/__init__.py:211 .././bonnie/__init__.py:67
-#: .././kolabd/__init__.py:85 .././saslauthd/__init__.py:90
-msgid "Interrupted by user"
-msgstr ""
-
-#: .././wallace/__init__.py:215 .././wallace/__init__.py:225
-#: .././kolabd/__init__.py:90 .././kolabd/__init__.py:101
-msgid "Traceback occurred, please report a "
+msgid "Verifying unauthenticated sender '%(sender)s' "
 msgstr ""
 
-#: .././wallace/__init__.py:221 .././bonnie/__init__.py:75
-#: .././kolabd/__init__.py:96 .././saslauthd/__init__.py:98
+#: ../bin/kolab_smtp_access_policy.py:739
 #, python-format
-msgid "Type Error: %s"
-msgstr ""
-
-#: .././wallace/__init__.py:241
-msgid "Picking up deferred messages for wallace"
+msgid "Reproducing verify_recipient(%s, %s) from "
 msgstr ""
 
-#: .././wallace/__init__.py:261
+#: ../bin/kolab_smtp_access_policy.py:756
 #, python-format
-msgid "Picking up deferred messages for module %s"
-msgstr ""
-
-#. Sleep for 300 seconds before reprocessing the deferred queues.
-#. TODO: Consider using queue_run_delay from Postfix, which is where
-#. the default value of 300 seconds comes from.
-#: .././wallace/__init__.py:285
-msgid "Sleeping for 300 seconds"
+msgid "Using authentication domain %s instead of %s"
 msgstr ""
 
-#: .././wallace/__init__.py:310
+#: ../bin/kolab_smtp_access_policy.py:766
 #, python-format
-msgid "Could not bind to socket on port %d on bind "
-msgstr ""
-
-#: .././wallace/__init__.py:320
-msgid "Could not shut down socket"
+msgid "Domain %s is a primary domain"
 msgstr ""
 
-#: .././wallace/__init__.py:394
+#: ../bin/kolab_smtp_access_policy.py:774
 #, python-format
-msgid "Picking up spooled email file %s"
+msgid "Checking the recipient for domain %s that is not "
 msgstr ""
 
-#: .././wallace/__init__.py:424
-msgid "Accepted connection"
+#: ../bin/kolab_smtp_access_policy.py:790
+msgid "This recipient address is related to multiple "
 msgstr ""
 
-#. This is a nested module
-#: .././wallace/modules.py:96
+#: ../bin/kolab_smtp_access_policy.py:799
 #, python-format
-msgid "Module Group: %s"
+msgid "Recipient address %r not found. Allowing since "
 msgstr ""
 
-#: .././wallace/modules.py:107 .././wallace/modules.py:112
-msgid "No such module."
+#: ../bin/kolab_smtp_access_policy.py:827
+msgid "Invalid recipient"
 msgstr ""
 
-#: .././wallace/modules.py:118
-#, python-format
-msgid "Holding message in queue for manual review (%s by %s)"
+#: ../bin/kolab_smtp_access_policy.py:838
+msgid "Could not find this user, accepting"
 msgstr ""
 
-#: .././wallace/modules.py:121
+#: ../bin/kolab_smtp_access_policy.py:901
+#: ../bin/kolab_smtp_access_policy.py:954
 #, python-format
-msgid "Deferring message in %s (by module %s)"
+msgid "Sender %s is not allowed to send to "
 msgstr ""
 
-#: .././wallace/modules.py:131
+#: ../bin/kolab_smtp_access_policy.py:941
 #, python-format
-msgid "The time when the message was sent: %r"
+msgid "Reproducing verify_sender(%r) from cache, "
 msgstr ""
 
-#: .././wallace/modules.py:132
-#, python-format
-msgid "The time now: %r"
+#: ../bin/kolab_smtp_access_policy.py:970
+msgid "Sender uses unauthorized envelope sender address"
 msgstr ""
 
-#: .././wallace/modules.py:133
-#, python-format
-msgid "The time delta: %r"
+#: ../bin/kolab_smtp_access_policy.py:987
+msgid "Could not verify sender"
 msgstr ""
 
-#. TODO: Send NDR back to user
-#: .././wallace/modules.py:137
-#, python-format
-msgid "Message in file %s older then 5 days, deleting"
+#: ../bin/kolab_smtp_access_policy.py:994
+msgid "Verifying whether sender is allowed to send to "
 msgstr ""
 
-#: .././wallace/modules.py:162
+#: ../bin/kolab_smtp_access_policy.py:1008
 #, python-format
-msgid "Rejecting message in %s (by module %s)"
+msgid "Result is %r"
 msgstr ""
 
-#: .././wallace/modules.py:180
-#, python-format
-msgid ""
-"This is the email system Wallace at %s.\n"
-"\n"
-"I'm sorry to inform you we could not deliver the attached message\n"
-"to the following recipients:\n"
-"\n"
-"- %s\n"
-"\n"
-"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"
+#: ../bin/kolab_smtp_access_policy.py:1013
+msgid "No recipient policy restrictions exist for this sender"
 msgstr ""
 
-#: .././wallace/modules.py:195
-#, python-format
-msgid ""
-"X-Wallace-Module: %s\n"
-"X-Wallace-Result: REJECT\n"
+#: ../bin/kolab_smtp_access_policy.py:1022
+msgid "Found a recipient policy to apply for this sender."
 msgstr ""
 
-#: .././wallace/modules.py:248
+#: ../bin/kolab_smtp_access_policy.py:1037
 #, python-format
-msgid "Accepting message in %s (by module %s)"
+msgid "Sender %s not allowed to send to recipient "
 msgstr ""
 
-#: .././wallace/modules.py:316
-#, python-format
-msgid "Module '%s' already registered"
+#: ../bin/kolab_smtp_access_policy.py:1068
+msgid "Cleaning up the cache"
 msgstr ""
 
-#: .././wallace/modules.py:338 .././pykolab/tests/tests.py:183
-#: .././pykolab/cli/commands.py:183 .././pykolab/setup/components.py:243
+#: ../bin/kolab_smtp_access_policy.py:1105
 #, python-format
-msgid "Alias for %s"
+msgid "Operational Error in caching: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:57
+#: ../bin/kolab_smtp_access_policy.py:1156
 #, python-format
-msgid "Issuing callback after processing to stage %s"
+msgid "Caching the policy result with timestamp %d"
 msgstr ""
 
-#: .././wallace/module_optout.py:58
+#: ../bin/kolab_smtp_access_policy.py:1233
 #, python-format
-msgid "Testing cb_action_%s()"
+msgid "Returning action DEFER_IF_PERMIT: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:60
+#: ../bin/kolab_smtp_access_policy.py:1238
 #, python-format
-msgid "Attempting to execute cb_action_%s()"
+msgid "Returning action DUNNO: %s"
 msgstr ""
 
-#. modules.next_module('optout')
-#: .././wallace/module_optout.py:66
+#: ../bin/kolab_smtp_access_policy.py:1243
 #, python-format
-msgid "Consulting opt-out service for %r, %r"
+msgid "Returning action HOLD: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:92
+#: ../bin/kolab_smtp_access_policy.py:1248
 #, python-format
-msgid "Running opt-out consult from envelope sender '%s "
+msgid "Returning action PERMIT: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:156
+#: ../bin/kolab_smtp_access_policy.py:1253
 #, python-format
-msgid "Attempting to execute cb_action_%s(%r, %r)"
+msgid "Returning action REJECT: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:177
-#, python-format
-msgid "Could not send request to optout_url %s"
+#: ../bin/kolab_smtp_access_policy.py:1299
+msgid "Starting to loop for new request"
 msgstr ""
 
-#: .././setup-kolab.py:36 .././kolabtest.py:34 .././kolabd.py:31
-#: .././wallace.py:31 .././bonnie.py:31
-msgid "Cannot load pykolab/constants.py:"
+#: ../bin/kolab_smtp_access_policy.py:1306
+msgid "Timeout for policy request reading exceeded"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:89
-msgid "Could not import caching library, caching disabled"
+#: ../bin/kolab_smtp_access_policy.py:1312
+msgid "End of current request"
 msgstr ""
 
-#. Obtain 'kolabDelegate' from the envelope sender.
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:291
+#: ../bin/kolab_smtp_access_policy.py:1316
 #, python-format
-msgid "Obtaining envelope sender dn for %s"
+msgid "Getting line: %s"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:309
-#, python-format
-msgid ""
-"User %s attempted to use envelope sender address %s without authorization"
+#: ../bin/kolab_smtp_access_policy.py:1320
+msgid "Returning request"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:355
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:358
-#, python-format
-msgid "Found user %s to be a valid delegate user of %s"
+#: ../bin/kolab_smtp_access_policy.py:1346
+msgid "Access Policy Options"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:424
-#: .././bin/kolab_smtp_access_policy.py:1301
-msgid "Access Policy Options"
+#: ../bin/kolab_smtp_access_policy.py:1353
+msgid "SMTP Policy request timeout."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:431
-#: .././bin/kolab_smtp_access_policy.py:1308
+#: ../bin/kolab_smtp_access_policy.py:1359
 msgid "Verify the recipient access policy."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:437
-#: .././bin/kolab_smtp_access_policy.py:1314
+#: ../bin/kolab_smtp_access_policy.py:1365
 msgid "Verify the sender access policy."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:443
-#: .././bin/kolab_smtp_access_policy.py:1320
+#: ../bin/kolab_smtp_access_policy.py:1371
 msgid "Allow unauthenticated senders."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:464
-msgid "Verifying sender."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:468
-msgid "No sender specified."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:469
-msgid "Invalid sender"
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:473
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:521
-msgid "No SASL username in request."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:475
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:524
-msgid "Not allowing unauthenticated senders."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:476
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:525
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:534
-msgid "Access denied"
+#: ../bin/kolab_smtp_access_policy.py:1385
+#, python-format
+msgid "Got request instance %s"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:478
-msgid "Allowing unauthenticated senders."
+#: ../bin/kolab_smtp_access_policy.py:1394
+#, python-format
+msgid "Request instance %s is in state %s"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:484
+#: ../bin/kolab_smtp_access_policy.py:1402
 #, python-format
-msgid "Allowing authenticated sender %s to send as %s."
+msgid "Request instance %s is not yet in DATA state"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:492
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:504
+#: ../bin/kolab_smtp_access_policy.py:1414
 #, python-format
-msgid "Authenticated as sender %s"
+msgid "Request instance %s reached DATA state"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:515
-msgid "Verifying recipient."
+#: ../bin/kolab_smtp_access_policy.py:1432
+msgid "Sender access denied"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:518
-#: .././bin/kolab_smtp_access_policy.py:781
-msgid "Invalid recipient"
+#: ../bin/kolab_smtp_access_policy.py:1434
+msgid "Recipient access denied"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:536
-#: .././bin/kolab_smtp_access_policy.py:1383
+#: ../bin/kolab_smtp_access_policy.py:1436
 msgid "No objections"
 msgstr ""
 
-#: .././play/confmgmt/db.py:59 .././play/conf.py:280
-msgid "Dropping all tables..."
-msgstr ""
-
-#: .././play/confmgmt/db.py:62 .././play/conf.py:283
-msgid "Creating the necessary tables..."
-msgstr ""
-
-#: .././play/confmgmt/db.py:69 .././play/conf.py:290
-#: .././play/roundcube_database/__init__.py:57
-#: .././play/roundcube_database/users.py:114 .././pykolab/telemetry.py:652
-msgid "No database available"
-msgstr ""
-
-#: .././play/confmgmt.py:74
-#, python-format
-msgid "Searching for service with name %s"
-msgstr ""
-
-#: .././play/confmgmt.py:77
-#, python-format
-msgid "Found service %s"
+#: ../conf.py:37 ../kolab.py:34 ../saslauthd.py:33
+msgid "Cannot load pykolab/logger.py:"
 msgstr ""
 
-#: .././play/confmgmt.py:82
-#, python-format
-msgid "Searching for role with name %s"
+#: ../kolabd/__init__.py:49 ../saslauthd/__init__.py:48
+#: ../wallace/__init__.py:65
+msgid "Daemon Options"
 msgstr ""
 
-#: .././play/confmgmt.py:85
-#, python-format
-msgid "Found role %s"
+#: ../kolabd/__init__.py:56 ../saslauthd/__init__.py:55
+#: ../wallace/__init__.py:72
+msgid "Fork to the background."
 msgstr ""
 
-#: .././play/confmgmt.py:89
-#, python-format
-msgid "Searching for file with path %s"
+#: ../kolabd/__init__.py:65 ../saslauthd/__init__.py:64
+#: ../wallace/__init__.py:98
+msgid "Path to the PID file to use."
 msgstr ""
 
-#: .././play/confmgmt.py:92
-#, python-format
-msgid "File with path %s not found, adding to database"
+#: ../kolabd/__init__.py:74 ../saslauthd/__init__.py:73
+#: ../wallace/__init__.py:115
+msgid "Run as user USERNAME"
 msgstr ""
 
-#: .././play/confmgmt.py:97
-#, python-format
-msgid "Adding file with path %s to service with name %s"
+#: ../kolabd/__init__.py:84 ../saslauthd/__init__.py:83
+#: ../wallace/__init__.py:89
+msgid "Run as group GROUPNAME"
 msgstr ""
 
-#: .././play/confmgmt.py:101
+#: ../kolabd/__init__.py:122 ../pykolab/utils.py:151
+#: ../wallace/__init__.py:288
 #, python-format
-msgid "Adding setting with key %s (%r, %r)"
+msgid "Group %s does not exist"
 msgstr ""
 
-#: .././play/confmgmt.py:106
+#: ../kolabd/__init__.py:131 ../wallace/__init__.py:297
 #, python-format
-msgid "Adding setting %s to file with path %s"
+msgid "Switching real and effective group id to %d"
 msgstr ""
 
-#: .././play/confmgmt.py:110
+#: ../kolabd/__init__.py:153 ../pykolab/utils.py:175
+#: ../wallace/__init__.py:319
 #, python-format
-msgid "Adding role with name %s to setting with key %s"
+msgid "User %s does not exist"
 msgstr ""
 
-#: .././play/rolequota/__init__.py:53
-#: .././pykolab/plugins/dynamicquota/__init__.py:50
+#: ../kolabd/__init__.py:163 ../wallace/__init__.py:329
 #, python-format
-msgid "No keyword %s passed to set_user_folder_quota"
+msgid "Switching real and effective user id to %d"
 msgstr ""
 
-#: .././play/roundcube_database/__init__.py:51
-#: .././play/roundcube_database/users.py:108
-#, python-format
-msgid "Operational Error in Roundcube database: %s"
+#: ../kolabd/__init__.py:172 ../wallace/__init__.py:338
+msgid "Could not change real and effective uid and/or gid"
 msgstr ""
 
-#: .././kwap/kwap/controllers/secure.py:25
-msgid "Secure Controller here"
+#: ../kolabd/__init__.py:192 ../saslauthd/__init__.py:122
+#: ../wallace/__init__.py:358
+msgid "Interrupted by user"
 msgstr ""
 
-#: .././kwap/kwap/controllers/root.py:103
-msgid "Wrong credentials"
+#: ../kolabd/__init__.py:197 ../kolabd/__init__.py:208
+#: ../wallace/__init__.py:362 ../wallace/__init__.py:372
+msgid "Traceback occurred, please report a "
 msgstr ""
 
-#: .././kwap/kwap/controllers/root.py:118
+#: ../kolabd/__init__.py:203 ../saslauthd/__init__.py:130
+#: ../wallace/__init__.py:368
 #, python-format
-msgid "Welcome back, %s!"
-msgstr ""
-
-#: .././kwap/kwap/controllers/root.py:128
-msgid "We hope to see you soon!"
-msgstr ""
-
-#: .././saslauthd.py:33 .././kolab.py:34 .././conf.py:37
-msgid "Cannot load pykolab/logger.py:"
-msgstr ""
-
-#: .././bonnie/__init__.py:71 .././bonnie/__init__.py:79
-#: .././saslauthd/__init__.py:94 .././saslauthd/__init__.py:102
-msgid "Traceback occurred, please report a bug at http://bugzilla.kolabsys.com"
+msgid "Type Error: %s"
 msgstr ""
 
-#: .././kolabd/__init__.py:116 .././pykolab/auth/ldap/__init__.py:1291
-#: .././pykolab/cli/cmd_sync.py:33
+#: ../kolabd/__init__.py:223 ../pykolab/auth/ldap/__init__.py:1591
+#: ../pykolab/cli/cmd_sync.py:36
 msgid "Listing domains..."
 msgstr ""
 
-#: .././kolabd/__init__.py:148
+#: ../kolabd/__init__.py:256
 #, python-format
 msgid "added domains: %r, removed domains: %r"
 msgstr ""
 
-#: .././pykolab/__init__.py:50
-msgid "Returning thread local configuration"
-msgstr ""
-
-#: .././pykolab/tests/tests.py:53
-msgid "List tests"
-msgstr ""
-
-#. This is a nested test
-#: .././pykolab/tests/tests.py:86
-#, python-format
-msgid "Test Suite: %s"
-msgstr ""
-
-#: .././pykolab/tests/tests.py:100 .././pykolab/tests/tests.py:105
-msgid "No such test."
-msgstr ""
-
-#: .././pykolab/tests/tests.py:157 .././pykolab/tests/tests.py:161
-#, python-format
-msgid "Test '%s' already registered"
-msgstr ""
-
-#: .././pykolab/tests/tests.py:191 .././pykolab/cli/commands.py:191
-#: .././pykolab/setup/components.py:251
-msgid "Not yet implemented"
-msgstr ""
-
-#: .././pykolab/tests/__init__.py:39
-msgid "Test Options"
-msgstr ""
-
-#: .././pykolab/tests/__init__.py:45
-msgid "Run tests in suite SUITE. Implies a certain set of items being tested."
-msgstr ""
-
-#: .././pykolab/tests/imap/test_login.py:44
-#, python-format
-msgid "Connecting at %s"
+#: ../kolabd.py:31 ../setup-kolab.py:36 ../wallace.py:31
+msgid "Cannot load pykolab/constants.py:"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:46
+#: ../pykolab/auth/__init__.py:94
 #, python-format
-msgid "Connected at %s"
+msgid "Called for domain %r"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:51
+#: ../pykolab/auth/__init__.py:107 ../pykolab/auth/__init__.py:116
 #, python-format
-msgid "Logging in at %s"
+msgid "Using section %s and domain %s"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:53
+#: ../pykolab/auth/__init__.py:121
 #, python-format
-msgid "Logged in at %s"
+msgid "Connecting to Authentication backend for domain %s"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:60
+#: ../pykolab/auth/__init__.py:132
 #, python-format
-msgid "Test failure in %s"
+msgid "Section %s has no option 'auth_mechanism'"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:94
+#: ../pykolab/auth/__init__.py:139
 #, python-format
-msgid "Called for domain %r"
+msgid "Section %s has auth_mechanism: %r"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:107 .././pykolab/auth/__init__.py:116
-#, python-format
-msgid "Using section %s and domain %s"
+#: ../pykolab/auth/__init__.py:148 ../pykolab/auth/__init__.py:157
+msgid "Starting LDAP..."
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:121
+#: ../pykolab/auth/ldap/cache.py:109
 #, python-format
-msgid "Connecting to Authentication backend for domain %s"
+msgid "Inserting cache entry %r"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:132
+#: ../pykolab/auth/ldap/cache.py:122
 #, python-format
-msgid "Section %s has no option 'auth_mechanism'"
+msgid "Updating timestamp for cache entry %r"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:139
+#: ../pykolab/auth/ldap/cache.py:129
 #, python-format
-msgid "Section %s has auth_mechanism: %r"
-msgstr ""
-
-#: .././pykolab/auth/__init__.py:148 .././pykolab/auth/__init__.py:157
-msgid "Starting LDAP..."
+msgid "Updating result_attribute for cache entry %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:51
+#: ../pykolab/auth/ldap/__init__.py:51
 msgid "Python LDAP library does not support persistent search"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:141
+#: ../pykolab/auth/ldap/__init__.py:142
 #, python-format
 msgid "Attempting to authenticate user %s in realm %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:181
+#: ../pykolab/auth/ldap/__init__.py:184
 #, python-format
 msgid "Binding with user_dn %s and password %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:190
+#: ../pykolab/auth/ldap/__init__.py:194
 #, python-format
 msgid "Failed to authenticate as user %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:205
+#: ../pykolab/auth/ldap/__init__.py:211
 msgid "Connecting to LDAP..."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:209
+#: ../pykolab/auth/ldap/__init__.py:215
 #, python-format
 msgid "Attempting to use LDAP URI %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:345
+#: ../pykolab/auth/ldap/__init__.py:357
 #, python-format
 msgid "Finding recipient with filter %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:398
+#: ../pykolab/auth/ldap/__init__.py:425
+#, python-format
+msgid "Finding resource with filter %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:448
+#, python-format
+msgid "Using timestamp %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:480
 #, python-format
 msgid "Applying recipient policy to %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:415
+#: ../pykolab/auth/ldap/__init__.py:497
 #, python-format
 msgid "Using mail attributes: %r, with primary %r and "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:426
+#: ../pykolab/auth/ldap/__init__.py:508
 #, python-format
 msgid "key %r not in entry"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:428
+#: ../pykolab/auth/ldap/__init__.py:510
 #, python-format
 msgid "key %r is the prim. mail attr."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:430
+#: ../pykolab/auth/ldap/__init__.py:512
 msgid "prim. mail pol. is not empty"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:433
+#: ../pykolab/auth/ldap/__init__.py:515
 #, python-format
 msgid "key %r is the sec. mail attr."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:435
+#: ../pykolab/auth/ldap/__init__.py:517
 msgid "sec. mail pol. is not empty"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:438
-#: .././pykolab/auth/ldap/__init__.py:451
+#: ../pykolab/auth/ldap/__init__.py:520 ../pykolab/auth/ldap/__init__.py:533
 #, python-format
 msgid "Attributes %r are not yet available for entry %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:492
+#: ../pykolab/auth/ldap/__init__.py:574
 #, python-format
 msgid "No results for mail address %s found"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:503
+#: ../pykolab/auth/ldap/__init__.py:585
 #, python-format
 msgid "1 result for address %s found, verifying"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:513
+#: ../pykolab/auth/ldap/__init__.py:595
 #, python-format
 msgid "Too bad, primary email address %s "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:524
-#: .././pykolab/auth/ldap/__init__.py:613
+#: ../pykolab/auth/ldap/__init__.py:606 ../pykolab/auth/ldap/__init__.py:695
 msgid "Address assigned to us"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:579
+#: ../pykolab/auth/ldap/__init__.py:661
 #, python-format
 msgid "No results for address %s found"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:590
+#: ../pykolab/auth/ldap/__init__.py:672
 #, python-format
 msgid "1 result for address %s found, "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:601
+#: ../pykolab/auth/ldap/__init__.py:683
 msgid "Too bad, secondary email "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:655
+#: ../pykolab/auth/ldap/__init__.py:710
+msgid "Recipient policy composed the following set of secondary "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:716
+#, python-format
+msgid "Secondary mail addresses that we want is not None: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:727
+msgid "Avoiding the duplication of the primary mail "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:738
+#, python-format
+msgid "Entry is getting secondary mail addresses: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:746
+msgid "Entry did not have any secondary mail "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:772
 #, python-format
 msgid "Entry modifications list: %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:698
+#: ../pykolab/auth/ldap/__init__.py:792
+#, python-format
+msgid "Setting entry attribute %r to %r for %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:828
+#, python-format
+msgid "Could not update dn %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:841
 #, python-format
 msgid "Using filter %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:736
+#: ../pykolab/auth/ldap/__init__.py:879
+#, python-format
+msgid "About to consider the user quota for %r (used: %r, "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:945
 msgid "Invalid bind credentials"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:989
+#: ../pykolab/auth/ldap/__init__.py:1229
 #, python-format
 msgid "Current changelog entry %s with %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:996
+#: ../pykolab/auth/ldap/__init__.py:1242
 #, python-format
 msgid "Result from recipient policy: %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1227
+#: ../pykolab/auth/ldap/__init__.py:1385
+#, python-format
+msgid "Kolab user %s does not have a result attribute %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1527
 #, python-format
 msgid "Finding domain root dn for domain %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1315
+#: ../pykolab/auth/ldap/__init__.py:1615
 msgid "Authentication database DOWN"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1394
+#: ../pykolab/auth/ldap/__init__.py:1699 ../pykolab/auth/ldap/__init__.py:1734
 #, python-format
 msgid "Entry type: %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1492
+#: ../pykolab/auth/ldap/__init__.py:1822
 msgid "LDAP Search Result Data Entry:"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1508
+#: ../pykolab/auth/ldap/__init__.py:1838
 msgid "Entry Change Notification attributes:"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1513
+#: ../pykolab/auth/ldap/__init__.py:1843
 #, python-format
 msgid "Change Type: %r (%r)"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1521
+#: ../pykolab/auth/ldap/__init__.py:1851
 #, python-format
 msgid "Previous DN: %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1575
+#: ../pykolab/auth/ldap/__init__.py:1906
 #, python-format
 msgid "Object %s searched no longer exists"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1583
+#: ../pykolab/auth/ldap/__init__.py:1916
 #, python-format
 msgid "%d results..."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1677
+#: ../pykolab/auth/ldap/__init__.py:2014
 #, python-format
 msgid "Searching with filter %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1721
+#: ../pykolab/auth/ldap/__init__.py:2058
 #, python-format
 msgid "Checking for support for %s on %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/cache.py:109
-#, python-format
-msgid "Inserting cache entry %r"
+#: ../pykolab/cli/cmd_add_domain.py:36 ../pykolab/cli/cmd_create_mailbox.py:36
+#: ../pykolab/cli/cmd_export_mailbox.py:33
+#: ../pykolab/cli/cmd_list_mailboxes.py:39
+msgid "CLI Options"
 msgstr ""
 
-#: .././pykolab/auth/ldap/cache.py:122
-#, python-format
-msgid "Updating timestamp for cache entry %r"
+#: ../pykolab/cli/cmd_add_domain.py:42
+msgid "Add domain as alias for DOMAIN"
 msgstr ""
 
-#: .././pykolab/auth/ldap/cache.py:128
-#, python-format
-msgid "Updating result_attribute for cache entry %r"
+#: ../pykolab/cli/cmd_add_domain.py:47
+msgid "Add a new domain or domain alias."
 msgstr ""
 
-#: .././pykolab/auth/sql/__init__.py:44
-msgid "Connecting to SQL..."
+#: ../pykolab/cli/cmd_add_domain.py:55
+msgid "Could not find credentials with sufficient permissions"
 msgstr ""
 
-#: .././pykolab/utils.py:92
-msgid "Please answer 'yes' or 'no'."
+#: ../pykolab/cli/cmd_add_domain.py:80 ../pykolab/wap_client/__init__.py:113
+msgid "Invalid parent domain"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:87
-#, python-format
-msgid "Setting %s to %r (from defaults)"
+#: ../pykolab/cli/cmd_add_domain.py:86
+msgid "Domain name"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:106
-#, python-format
-msgid "Setting %s to %r (from CLI, verified)"
+#: ../pykolab/cli/cmd_create_mailbox.py:41
+msgid "Set metadata for folder to ANNOTATION=VALUE"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:109
-#, python-format
-msgid "Setting %s to %r (from CLI, not checked)"
+#: ../pykolab/cli/cmd_create_mailbox.py:50
+msgid "Invalid argument"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:150 .././pykolab/conf/__init__.py:207
-#, python-format
-msgid "Setting %s_%s to '****' (from configuration file)"
+#: ../pykolab/cli/cmd_create_mailbox.py:58
+msgid "Invalid argument for metadata"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:152 .././pykolab/conf/__init__.py:209
-#, python-format
-msgid "Setting %s_%s to %r (from configuration file)"
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:45
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:49
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:50
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:55
+msgid "ACI Subject"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:162
-msgid "Setting options from configuration file"
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:48
+#: ../pykolab/cli/cmd_list_mailbox_acls.py:41
+#: ../pykolab/cli/cmd_list_mailbox_metadata.py:41
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:54
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:54
+msgid "Folder name"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:223
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:60
+#: ../pykolab/cli/cmd_list_mailbox_acls.py:52
+#: ../pykolab/cli/cmd_list_mailbox_metadata.py:52
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:67
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:67
 #, python-format
-msgid "Configuration file %s not readable"
+msgid "No such folder %r"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:226
-#, python-format
-msgid "Reading configuration file %s"
+#: ../pykolab/cli/cmd_delete_mailbox.py:46
+msgid "No mailbox specified"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:230
+#: ../pykolab/cli/cmd_export_mailbox.py:38
+msgid "All folders this user has access to"
+msgstr ""
+
+#: ../pykolab/cli/cmd_export_mailbox.py:108
+#, python-format
+msgid "%s is not a directory"
+msgstr ""
+
+#: ../pykolab/cli/cmd_export_mailbox.py:118
+#, python-format
+msgid "ZIP file at %s.zip"
+msgstr ""
+
+#: ../pykolab/cli/cmd_export_mailbox.py:120
+#, python-format
+msgid "No directories found for user %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_mailboxes.py:44
+msgid "Display raw IMAP UTF-7 folder names"
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_mailboxes.py:75
+#, python-format
+msgid "Appending folder search for %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:49
+msgid "Invalid or unqualified email address."
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:57
+#, python-format
+msgid "No recipient found for email address %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:60
+#, python-format
+msgid "Found the following recipient(s): %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:66
+#, python-format
+msgid "Using the following mail attributes: %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:90
+msgid "Found the following recipients:"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:48
+msgid "No target mailbox name specified"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:50
+msgid "No source mailbox name specified"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:62
+#, python-format
+msgid "Source folder %r does not exist"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:66
+#, python-format
+msgid "Target folder %r already exists"
+msgstr ""
+
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:47
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:51
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:56
+msgid "ACI Permissions"
+msgstr ""
+
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:47
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:51
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:56
+msgid "Metadata value"
+msgstr ""
+
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:50
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:55
+msgid "Metadata path"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:41
+#, python-format
+msgid "Found %d domains in %d seconds"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:51
+#, python-format
+msgid "Running for domain %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:57
+#, python-format
+msgid "Synchronizing users for %s took %d seconds"
+msgstr ""
+
+#. This is a nested command
+#. This is a nested component
+#: ../pykolab/cli/commands.py:98 ../pykolab/setup/components.py:90
+#, python-format
+msgid "Command Group: %s"
+msgstr ""
+
+#: ../pykolab/cli/commands.py:109 ../pykolab/cli/commands.py:114
+msgid "No such command."
+msgstr ""
+
+#: ../pykolab/cli/commands.py:165 ../pykolab/setup/components.py:231
+#, python-format
+msgid "Command '%s' already registered"
+msgstr ""
+
+#: ../pykolab/cli/commands.py:190 ../pykolab/setup/components.py:257
+#: ../wallace/modules.py:338
+#, python-format
+msgid "Alias for %s"
+msgstr ""
+
+#: ../pykolab/cli/commands.py:198 ../pykolab/setup/components.py:265
+msgid "Not yet implemented"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:40
+msgid "Unspecified command issue identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:50
+msgid "Invalid command issue identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:60
+#: ../pykolab/cli/telemetry/cmd_examine_session.py:65
+msgid "Invalid session identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:75
+#: ../pykolab/cli/telemetry/cmd_examine_session.py:100
+#, python-format
+msgid "Session by %s on server %s"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_session.py:43
+msgid "Unspecified session identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_list_sessions.py:35
+msgid "List Options"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_list_sessions.py:40
+msgid "Display sessions since ..."
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_list_sessions.py:58
+#, python-format
+msgid "Session for user %s started at %s with ID %s"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:57 ../pykolab/conf/entitlement.py:80
+#: ../pykolab/conf/entitlement.py:98 ../pykolab/conf/entitlement.py:116
+#: ../pykolab/conf/entitlement.py:230 ../pykolab/conf/entitlement.py:246
+#: ../pykolab/conf/entitlement.py:262
+msgid "Invalid entitlement verification "
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:120 ../pykolab/conf/entitlement.py:123
+msgid "Invalid entitlement certificate"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:132
+#, python-format
+msgid "Parsing entitlement file %s"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:141
+#, python-format
+msgid "License file %s not readable!"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:147
+msgid "No entitlement directory found"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:87
+#, python-format
+msgid "Setting %s to %r (from defaults)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:106
+#, python-format
+msgid "Setting %s to %r (from CLI, verified)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:109
+#, python-format
+msgid "Setting %s to %r (from CLI, not checked)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:150 ../pykolab/conf/__init__.py:207
+#, python-format
+msgid "Setting %s_%s to '****' (from configuration file)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:152 ../pykolab/conf/__init__.py:209
+#, python-format
+msgid "Setting %s_%s to %r (from configuration file)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:162
+msgid "Setting options from configuration file"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:223
+#, python-format
+msgid "Configuration file %s not readable"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:226
+#, python-format
+msgid "Reading configuration file %s"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:230
 #, python-format
 msgid "Invalid configuration file %s"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:233
+#: ../pykolab/conf/__init__.py:233
 #, python-format
 msgid "No master configuration section [kolab] in configuration file %s"
 msgstr ""
@@ -810,1088 +924,1335 @@ msgstr ""
 #. #
 #. # Runtime Options
 #. #
-#: .././pykolab/conf/__init__.py:267
+#: ../pykolab/conf/__init__.py:267
 msgid "Runtime Options"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:272
+#: ../pykolab/conf/__init__.py:272
 msgid "Configuration file to use"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:278
+#: ../pykolab/conf/__init__.py:278
 msgid "Set the debugging "
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:286
+#: ../pykolab/conf/__init__.py:286
 msgid "Set the logging level. "
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:294
+#: ../pykolab/conf/__init__.py:294
 msgid "Log file to use"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:300
+#: ../pykolab/conf/__init__.py:300
 msgid "Be quiet."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:306
+#: ../pykolab/conf/__init__.py:306
 msgid "Answer yes to all questions."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:328
+#: ../pykolab/conf/__init__.py:328
 msgid "No command supplied"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:411
+#: ../pykolab/conf/__init__.py:411
 msgid "Insufficient options. Need section, key and value -in that order."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:414
+#: ../pykolab/conf/__init__.py:414
 #, python-format
 msgid "No section '%s' exists."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:445
+#: ../pykolab/conf/__init__.py:445
 #, python-format
 msgid "Setting %s to %r (from the default values for CLI options)"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:514
+#: ../pykolab/conf/__init__.py:514
 #, python-format
 msgid "Could not execute configuration function: %s"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:522
+#: ../pykolab/conf/__init__.py:522
 #, python-format
 msgid "Option %s/%s does not exist in config file %s, pulling from defaults"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:530 .././pykolab/conf/__init__.py:533
+#: ../pykolab/conf/__init__.py:530 ../pykolab/conf/__init__.py:533
 msgid "Option does not exist in defaults."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:531 .././pykolab/conf/__init__.py:534
-msgid "Not available"
-msgstr ""
-
-#: .././pykolab/conf/__init__.py:543
+#: ../pykolab/conf/__init__.py:543
 #, python-format
 msgid "Configuration file %s not readable."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:546
+#: ../pykolab/conf/__init__.py:546
 #, python-format
 msgid "Configuration file %s does not exist."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:551
+#: ../pykolab/conf/__init__.py:551
 msgid ""
 "WARNING: A negative debug level value does not make this program be any more "
 "silent."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:557
+#: ../pykolab/conf/__init__.py:557
 msgid "This program has 9 levels of verbosity. Using the maximum of 9."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:565 .././pykolab/conf/__init__.py:571
+#: ../pykolab/conf/__init__.py:565 ../pykolab/conf/__init__.py:571
 msgid "Cannot start SASL authentication daemon"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:582
+#: ../pykolab/conf/__init__.py:582
 msgid "No imaplib library found."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:592
+#: ../pykolab/conf/__init__.py:592
 msgid "No LMTP class found in the smtplib library."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:602
+#: ../pykolab/conf/__init__.py:602
 msgid "No SMTP class found in the smtplib library."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:616
+#: ../pykolab/conf/__init__.py:616
 #, python-format
 msgid "Found you specified a specific set of items to test: %s"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:624
+#: ../pykolab/conf/__init__.py:624
 #, python-format
 msgid "Selectively selecting: %s"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:57 .././pykolab/conf/entitlement.py:80
-#: .././pykolab/conf/entitlement.py:98 .././pykolab/conf/entitlement.py:116
-#: .././pykolab/conf/entitlement.py:229 .././pykolab/conf/entitlement.py:245
-#: .././pykolab/conf/entitlement.py:261
-msgid "Invalid entitlement verification "
+#: ../pykolab/constants.py.in:40
+msgid "PyKolab is a Kolab Systems product. For more information "
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:120 .././pykolab/conf/entitlement.py:123
-msgid "Invalid entitlement certificate"
+#: ../pykolab/constants.py.in:54
+msgid "WARNING"
+msgstr ""
+
+#: ../pykolab/constants.py.in:54
+msgid "The Fully Qualified "
+msgstr ""
+
+#: ../pykolab/constants.py.in:75
+msgid "389 Directory Server or Red Hat Directory Server"
+msgstr ""
+
+#: ../pykolab/constants.py.in:79 ../pykolab/constants.py.in:83
+msgid "OpenLDAP or compatible"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:132
+#: ../pykolab/imap/cyrus.py:79
 #, python-format
-msgid "Parsing entitlement file %s"
+msgid "Could not connect to Cyrus IMAP server %r"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:141
+#: ../pykolab/imap/cyrus.py:134
 #, python-format
-msgid "License file %s not readable!"
+msgid "Continuing with separator: %r"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:146
-msgid "No entitlement directory found"
+#: ../pykolab/imap/cyrus.py:139
+msgid "Detected we are running in a Murder topology"
 msgstr ""
 
-#: .././pykolab/logger.py:89
+#: ../pykolab/imap/cyrus.py:143
+msgid "This system is not part of a murder topology"
+msgstr ""
+
+#: ../pykolab/imap/cyrus.py:164
 #, python-format
-msgid "Cannot log to file %s: %s"
+msgid "Checking actual backend server for folder %s through annotations"
 msgstr ""
 
-#: .././pykolab/constants.py:40
-msgid "PyKolab is a Kolab Systems product. For more information "
+#: ../pykolab/imap/cyrus.py:179
+#, python-format
+msgid "Could not get the annotations after %s tries."
 msgstr ""
 
-#: .././pykolab/constants.py:54
-msgid "WARNING"
+#: ../pykolab/imap/cyrus.py:183
+#, python-format
+msgid "No annotations for %s: %r"
 msgstr ""
 
-#: .././pykolab/constants.py:54
-msgid "The Fully Qualified "
+#: ../pykolab/imap/cyrus.py:190
+#, python-format
+msgid "Server for INBOX folder %s is %s"
 msgstr ""
 
-#: .././pykolab/constants.py:75
-msgid "389 Directory Server or Red Hat Directory Server"
+#: ../pykolab/imap/cyrus.py:202
+#, python-format
+msgid "Setting quota for folder %s to %s"
 msgstr ""
 
-#: .././pykolab/constants.py:79 .././pykolab/constants.py:83
-msgid "OpenLDAP or compatible"
+#: ../pykolab/imap/cyrus.py:206
+#, python-format
+msgid "Could not set quota for mailfolder %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_list_sessions.py:35
-msgid "List Options"
+#: ../pykolab/imap/cyrus.py:215
+#, python-format
+msgid "Moving INBOX folder %s to %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_list_sessions.py:40
-msgid "Display sessions since ..."
+#: ../pykolab/imap/cyrus.py:227
+#, python-format
+msgid "Setting annotation %s on folder %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_list_sessions.py:58
+#: ../pykolab/imap/cyrus.py:234
 #, python-format
-msgid "Session for user %s started at %s with ID %s"
+msgid "Could not set annotation %r on mail folder %r: %r"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_session.py:43
-msgid "Unspecified session identifier"
+#: ../pykolab/imap/cyrus.py:238
+#, python-format
+msgid "Transferring folder %s from %s to %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_session.py:65
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:60
-msgid "Invalid session identifier"
+#: ../pykolab/imap/cyrus.py:298
+#, python-format
+msgid "Undeleting %s to %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_session.py:100
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:75
+#: ../pykolab/imap/__init__.py:45
 #, python-format
-msgid "Session by %s on server %s"
+msgid "Cleaning up ACL entries for %s across all folders"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:40
-msgid "Unspecified command issue identifier"
+#: ../pykolab/imap/__init__.py:60
+#, python-format
+msgid "Cleaning up ACL entries referring to identifier %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:50
-msgid "Invalid command issue identifier"
+#: ../pykolab/imap/__init__.py:69
+#, python-format
+msgid "Iterating over %d folders"
 msgstr ""
 
-#. This is a nested command
-#. This is a nested component
-#: .././pykolab/cli/commands.py:95 .././pykolab/setup/components.py:88
+#. Set the ACL to '' (effectively deleting the ACL entry)
+#: ../pykolab/imap/__init__.py:82
 #, python-format
-msgid "Command Group: %s"
+msgid "Removing acl %r for subject %r from folder %r"
 msgstr ""
 
-#: .././pykolab/cli/commands.py:106 .././pykolab/cli/commands.py:111
-msgid "No such command."
+#: ../pykolab/imap/__init__.py:143
+#, python-format
+msgid "Logging on to Cyrus IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/commands.py:161 .././pykolab/setup/components.py:217
+#: ../pykolab/imap/__init__.py:152
 #, python-format
-msgid "Command '%s' already registered"
+msgid "Logging on to Dovecot IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_delete_mailbox.py:43
-msgid "No mailbox specified"
+#: ../pykolab/imap/__init__.py:161
+#, python-format
+msgid "Logging on to generic IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_list_mailboxes.py:35
-#: .././pykolab/cli/cmd_export_mailbox.py:33
-msgid "CLI Options"
+#: ../pykolab/imap/__init__.py:179
+#, python-format
+msgid "Reusing existing IMAP server connection to %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_list_mailboxes.py:40
-msgid "Display raw UTF-7 folder names"
+#: ../pykolab/imap/__init__.py:181
+#, python-format
+msgid "Reconnecting to IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:38
-msgid "All folders this user has access to"
+#: ../pykolab/imap/__init__.py:197
+msgid "Called imap.disconnect() on a server that "
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:108
+#: ../pykolab/imap/__init__.py:213
 #, python-format
-msgid "%s is not a directory"
+msgid "%r has no attribute %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:118
+#: ../pykolab/imap/__init__.py:286
+msgid "Private annotations need to be set using the appropriate user account."
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:319 ../pykolab/imap/__init__.py:354
 #, python-format
-msgid "ZIP file at %s.zip"
+msgid "Creating new shared folder %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:120
+#: ../pykolab/imap/__init__.py:376
 #, python-format
-msgid "No directories found for user %s"
+msgid "Creating new mailbox for user %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_sync.py:38
+#: ../pykolab/imap/__init__.py:405
 #, python-format
-msgid "Found %d domains in %d seconds"
+msgid "Creating additional folders for user %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_sync.py:48
+#: ../pykolab/imap/__init__.py:429
 #, python-format
-msgid "Running for domain %s"
+msgid "Mailbox already exists: %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_sync.py:54
+#: ../pykolab/imap/__init__.py:472
+msgid "Subscribing user to the additional folders"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:532 ../pykolab/imap/__init__.py:611
 #, python-format
-msgid "Synchronizing users for %s took %d seconds"
+msgid "Renaming INBOX from %s to %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:536
+#, python-format
+msgid "Could not rename INBOX folder %s to %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:538 ../pykolab/imap/__init__.py:615
+#, python-format
+msgid "Moving INBOX folder %s won't succeed as target folder %s already exists"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:70
+#: ../pykolab/imap/__init__.py:551
+#, python-format
+msgid "Looking for folder '%s', we found folders: %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:574
+#, python-format
+msgid "Setting ACL rights %s for subject %s on folder "
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:585
+#, python-format
+msgid "Removing ACL rights %s for subject %s on folder "
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:608
+#, python-format
+msgid "Found old INBOX folder %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:617
+#, python-format
+msgid "Did not find old folder user/%s to rename"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:619
+msgid "Value for user is not a dictionary"
+msgstr ""
+
+#. TODO: Go in fact correct the quota.
+#: ../pykolab/imap/__init__.py:682
+#, python-format
+msgid "Cannot get current IMAP quota for folder %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:695
+#, python-format
+msgid "Quota for %s currently is %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:701
+#, python-format
+msgid "Adjusting authentication database quota for folder %s to %d"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:706
+#, python-format
+msgid "Correcting quota for %s to %s (currently %s)"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:788
+#, python-format
+msgid "Checking folder: %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:793
+#, python-format
+msgid "Folder has no corresponding user (1): %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:796
+#, python-format
+msgid "Folder has no corresponding user (2): %s"
+msgstr ""
+
+#. We got user identifier only
+#: ../pykolab/imap/__init__.py:811
+msgid "Please don't give us just a user identifier"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:814
+#, python-format
+msgid "Deleting folder %s"
+msgstr ""
+
+#: ../pykolab/__init__.py:50
+msgid "Returning thread local configuration"
+msgstr ""
+
+#: ../pykolab/logger.py:105
+#, python-format
+msgid "Could not change the ownership of log file %s"
+msgstr ""
+
+#: ../pykolab/logger.py:121
+#, python-format
+msgid "Cannot log to file %s: %s"
+msgstr ""
+
+#: ../pykolab/plugins/defaultfolders/__init__.py:47
+#, python-format
+msgid "Plugin %s called without required keyword %s."
+msgstr ""
+
+#: ../pykolab/plugins/defaultfolders/__init__.py:53
+msgid "Could not parse additional_folders"
+msgstr ""
+
+#: ../pykolab/plugins/dynamicquota/__init__.py:58
+#, python-format
+msgid "No keyword %s passed to set_user_folder_quota"
+msgstr ""
+
+#: ../pykolab/plugins/dynamicquota/__init__.py:70
+#, python-format
+msgid "Quota '%s' not an integer!"
+msgstr ""
+
+#: ../pykolab/plugins/__init__.py:70
 #, python-format
 msgid "ImportError for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:74
+#: ../pykolab/plugins/__init__.py:74
 #, python-format
 msgid "RuntimeError for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:78
+#: ../pykolab/plugins/__init__.py:78
 #, python-format
 msgid "Plugin %s failed to load (%s: %s)"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:116 .././pykolab/plugins/__init__.py:118
+#: ../pykolab/plugins/__init__.py:116 ../pykolab/plugins/__init__.py:118
 #, python-format
 msgid "Cannot set defaults for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:120
+#: ../pykolab/plugins/__init__.py:120
 #, python-format
 msgid "Cannot set defaults for plugin %s: Unknown Error"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:123
+#: ../pykolab/plugins/__init__.py:123
 #, python-format
 msgid "Not setting defaults for plugin %s: No function 'set_defaults()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:142
+#: ../pykolab/plugins/__init__.py:142
 #, python-format
 msgid "Cannot set runtime for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:144
+#: ../pykolab/plugins/__init__.py:144
 #, python-format
 msgid "Not setting runtime for plugin %s: No function 'set_runtime()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:163 .././pykolab/plugins/__init__.py:165
+#: ../pykolab/plugins/__init__.py:163 ../pykolab/plugins/__init__.py:165
 #, python-format
 msgid "Cannot add options for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:167
+#: ../pykolab/plugins/__init__.py:167
 #, python-format
 msgid "Not adding options for plugin %s: No function 'add_options()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:187
+#: ../pykolab/plugins/__init__.py:187
 #, python-format
 msgid "Cannot check options for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:189
+#: ../pykolab/plugins/__init__.py:189
 #, python-format
 msgid "Not checking options for plugin %s: No function 'check_options()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:227
+#: ../pykolab/plugins/__init__.py:227
 #, python-format
 msgid "Executing hook %s for plugin %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:231 .././pykolab/plugins/__init__.py:233
+#: ../pykolab/plugins/__init__.py:231 ../pykolab/plugins/__init__.py:233
 #, python-format
 msgid "Cannot execute hook %s for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/defaultfolders/__init__.py:47
-#, python-format
-msgid "Plugin %s called without required keyword %s."
+#: ../pykolab/plugins/recipientpolicy/__init__.py:79
+msgid "Attribute substitution for 'mail' failed in Recipient Policy"
 msgstr ""
 
-#: .././pykolab/plugins/defaultfolders/__init__.py:53
-msgid "Could not parse additional_folders"
+#: ../pykolab/plugins/recipientpolicy/__init__.py:115
+msgid "Could not parse the alternative mail routines"
 msgstr ""
 
-#: .././pykolab/plugins/dynamicquota/__init__.py:56
-#, python-format
-msgid "Quota '%s' not an integer!"
+#: ../pykolab/plugins/recipientpolicy/__init__.py:127
+#: ../pykolab/plugins/recipientpolicy/__init__.py:137
+msgid ""
+"Attribute substitution for 'alternative_mail' failed in Recipient Policy"
 msgstr ""
 
-#: .././pykolab/plugins/dynamicquota/__init__.py:63
-msgid ""
-"The new quota was set to 0, but default quota > 0, returning default quota"
+#: ../pykolab/setup/components.py:58
+msgid "Display this help."
 msgstr ""
 
-#: .././pykolab/plugins/dynamicquota/__init__.py:82
-msgid ""
-"The default quota is larger then the calculated new quota, using the default "
-"quota"
+#: ../pykolab/setup/components.py:149
+msgid "No component selected, continuing for all components"
 msgstr ""
 
-#: .././pykolab/plugins/recipientpolicy/__init__.py:70
-msgid "Attribute substitution for 'mail' failed in Recipient Policy"
+#: ../pykolab/setup/components.py:187 ../pykolab/setup/components.py:192
+msgid "No such component."
 msgstr ""
 
-#: .././pykolab/plugins/recipientpolicy/__init__.py:97
-msgid "Could not parse the alternative mail routines"
+#: ../pykolab/setup/setup_freebusy.py:46
+msgid "Setup Free/Busy."
 msgstr ""
 
-#: .././pykolab/plugins/recipientpolicy/__init__.py:109
-#: .././pykolab/plugins/recipientpolicy/__init__.py:119
-msgid ""
-"Attribute substitution for 'alternative_mail' failed in Recipient Policy"
+#: ../pykolab/setup/setup_freebusy.py:50
+msgid "Free/Busy is not installed on this system"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:40
-msgid "Setup zpush."
+#: ../pykolab/setup/setup_freebusy.py:55
+msgid ""
+"\n"
+"                        Please supply the MySQL password for the "
+"'roundcube'\n"
+"                        user. You have supplied this password earlier, and "
+"it is\n"
+"                        available from the database URI setting in\n"
+"                        /etc/roundcubemail/db.inc.php.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:44
-msgid "Z-Push is not installed on this system"
+#: ../pykolab/setup/setup_freebusy.py:64
+#: ../pykolab/setup/setup_roundcube.py:56
+msgid "MySQL roundcube password"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:70
-#: .././pykolab/setup/setup_roundcube.py:93
-#: .././pykolab/setup/setup_freebusy.py:76
+#: ../pykolab/setup/setup_freebusy.py:92
+#: ../pykolab/setup/setup_roundcube.py:116 ../pykolab/setup/setup_zpush.py:71
 #, python-format
 msgid "Using template file %r"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:77
-#: .././pykolab/setup/setup_roundcube.py:100
-#: .././pykolab/setup/setup_freebusy.py:83
+#: ../pykolab/setup/setup_freebusy.py:99
+#: ../pykolab/setup/setup_roundcube.py:123 ../pykolab/setup/setup_zpush.py:78
 #, python-format
 msgid "Successfully compiled template %r, writing out to %r"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:95 .././pykolab/setup/setup_ldap.py:184
-#: .././pykolab/setup/setup_ldap.py:358
-#: .././pykolab/setup/setup_roundcube.py:159
-#: .././pykolab/setup/setup_imap.py:137 .././pykolab/setup/setup_mysql.py:49
-#: .././pykolab/setup/setup_freebusy.py:101
-msgid "Could not start and configure to start on boot, the "
+#: ../pykolab/setup/setup_freebusy.py:119 ../pykolab/setup/setup_imap.py:143
+#: ../pykolab/setup/setup_ldap.py:288 ../pykolab/setup/setup_ldap.py:521
+#: ../pykolab/setup/setup_mta.py:309 ../pykolab/setup/setup_mysql.py:49
+#: ../pykolab/setup/setup_roundcube.py:191
+#: ../pykolab/setup/setup_syncroton.py:66 ../pykolab/setup/setup_zpush.py:98
+msgid "Could not start and configure to start on boot, the "
+msgstr ""
+
+#: ../pykolab/setup/setup_imap.py:44
+msgid "Setup IMAP."
+msgstr ""
+
+#: ../pykolab/setup/setup_imap.py:88 ../pykolab/setup/setup_imap.py:113
+msgid "Could not write out Cyrus IMAP configuration file /etc/imapd.conf"
+msgstr ""
+
+#: ../pykolab/setup/setup_kolabd.py:43
+msgid "Setup the Kolab daemon."
+msgstr ""
+
+#: ../pykolab/setup/setup_kolabd.py:51
+#, python-format
+msgid ""
+"\n"
+"                            Copying the configuration section for 'example."
+"org' over to\n"
+"                            a section applicable to your domain '%s'.\n"
+"                        "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:43
+msgid "LDAP Options"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:50
+msgid "Specify FQDN (overriding defaults)."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:58
+msgid "Allow anonymous binds (default: no)."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:62
+msgid "Setup LDAP."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:74
+msgid ""
+"\n"
+"                        Please supply a password for the LDAP administrator "
+"user\n"
+"                        'admin', used to login to the graphical console of "
+"389\n"
+"                        Directory server.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:82
+msgid "Administrator password"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:89
+msgid ""
+"\n"
+"                        Please supply a password for the LDAP Directory "
+"Manager\n"
+"                        user, which is the administrator user you will be "
+"using\n"
+"                        to at least initially log in to the Web Admin, and "
+"that\n"
+"                        Kolab uses to perform administrative tasks.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:98
+msgid "Directory Manager password"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:105
+msgid ""
+"\n"
+"                        Please choose the system user and group the service\n"
+"                        should use to run under. These should be existing,\n"
+"                        unprivileged, local system POSIX accounts with no "
+"shell.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:112
+msgid "User"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:43
-msgid "LDAP Options"
+#: ../pykolab/setup/setup_ldap.py:113
+msgid "Group"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:50
-msgid "Specify FQDN (overriding defaults)."
+#: ../pykolab/setup/setup_ldap.py:143
+msgid ""
+"\n"
+"                        This setup procedure plans to set up Kolab Groupware "
+"for\n"
+"                        the following domain name space. This domain name "
+"is\n"
+"                        obtained from the reverse DNS entry on your network\n"
+"                        interface. Please confirm this is the appropriate "
+"domain\n"
+"                        name space.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:54
-msgid "Setup LDAP."
+#: ../pykolab/setup/setup_ldap.py:157
+msgid "Domain name to use"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:66
-msgid "Administrator password"
+#: ../pykolab/setup/setup_ldap.py:162 ../pykolab/setup/setup_ldap.py:187
+msgid ""
+"\n"
+"                                    Invalid input. Please try again.\n"
+"                                "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:72
-msgid "Directory Manager password"
+#: ../pykolab/setup/setup_ldap.py:171
+msgid ""
+"\n"
+"                        The standard root dn we composed for you follows. "
+"Please\n"
+"                        confirm this is the root dn you wish to use.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:77
-msgid "User"
+#: ../pykolab/setup/setup_ldap.py:182
+msgid "Root DN to use"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:78
-msgid "Group"
+#: ../pykolab/setup/setup_ldap.py:234
+msgid ""
+"\n"
+"                    Setup is now going to set up the 389 Directory Server. "
+"This\n"
+"                    may take a little while (during which period there is "
+"no\n"
+"                    output and no progress indication).\n"
+"                "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:143
+#: ../pykolab/setup/setup_ldap.py:241
 msgid "Setting up 389 Directory Server"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:153
+#. TODO: Get the return code and display output if not successful.
+#: ../pykolab/setup/setup_ldap.py:253
 msgid "Setup DS stdout:"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:156
+#: ../pykolab/setup/setup_ldap.py:256
 msgid "Setup DS stderr:"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:175 .././pykolab/setup/setup_mysql.py:97
+#: ../pykolab/setup/setup_ldap.py:279 ../pykolab/setup/setup_mysql.py:129
 msgid "Could not find the Kolab schema file"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:189
+#: ../pykolab/setup/setup_ldap.py:293
+msgid ""
+"\n"
+"                        Please supply a Cyrus Administrator password. This\n"
+"                        password is used by Kolab to execute administrative\n"
+"                        tasks in Cyrus IMAP. You may also need the password\n"
+"                        yourself to troubleshoot Cyrus IMAP and/or perform\n"
+"                        other administrative tasks against Cyrus IMAP "
+"directly.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:303
 msgid "Cyrus Administrator password"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:195
+#: ../pykolab/setup/setup_ldap.py:310
+msgid ""
+"\n"
+"                        Please supply a Kolab Service account password. "
+"This\n"
+"                        account is used by various services such as "
+"Postfix,\n"
+"                        and Roundcube, as anonymous binds to the LDAP "
+"server\n"
+"                        will not be allowed.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:319
 msgid "Kolab Service password"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:204
+#: ../pykolab/setup/setup_ldap.py:329
 msgid "Writing out configuration to kolab.conf"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:218
+#: ../pykolab/setup/setup_ldap.py:343
 msgid "Inserting service users into LDAP."
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:262
+#: ../pykolab/setup/setup_ldap.py:417
 msgid "Writing out cn=kolab,cn=config"
 msgstr ""
 
 #. TODO: Add kolab-admin role
 #. TODO: Assign kolab-admin admin ACLs
-#: .././pykolab/setup/setup_ldap.py:286
+#: ../pykolab/setup/setup_ldap.py:441
 #, python-format
 msgid "Adding domain %s to list of domains for this deployment"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:294
+#: ../pykolab/setup/setup_ldap.py:457
 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:302
+#: ../pykolab/setup/setup_ldap.py:465
 msgid "Enabling attribute uniqueness plugin"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:308
+#: ../pykolab/setup/setup_ldap.py:471
 msgid "Enabling referential integrity plugin"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:314
+#: ../pykolab/setup/setup_ldap.py:477
 msgid "Enabling and configuring account policy plugin"
 msgstr ""
 
 #. TODO: Add kolab-admin role
-#: .././pykolab/setup/setup_ldap.py:329
+#: ../pykolab/setup/setup_ldap.py:492
 msgid "Adding the kolab-admin role"
 msgstr ""
 
 #. TODO: User writeable attributes on root_dn
-#: .././pykolab/setup/setup_ldap.py:340
+#: ../pykolab/setup/setup_ldap.py:503
 #, python-format
 msgid "Setting access control to %s"
 msgstr ""
 
-#: .././pykolab/setup/setup_roundcube.py:40
-msgid "Setup Roundcube."
-msgstr ""
-
-#: .././pykolab/setup/setup_roundcube.py:44
-#: .././pykolab/setup/setup_freebusy.py:49
-msgid "MySQL roundcube password"
-msgstr ""
-
-#: .././pykolab/setup/components.py:56
-msgid "Display this help."
-msgstr ""
-
-#: .././pykolab/setup/components.py:122
-msgid "No component selected, continuing for all components"
-msgstr ""
-
-#: .././pykolab/setup/components.py:157 .././pykolab/setup/components.py:162
-msgid "No such component."
-msgstr ""
-
-#: .././pykolab/setup/setup_mta.py:40
+#: ../pykolab/setup/setup_mta.py:40
 msgid "Setup MTA."
 msgstr ""
 
-#: .././pykolab/setup/setup_mta.py:220
+#: ../pykolab/setup/setup_mta.py:224 ../pykolab/setup/setup_php.py:80
 #, python-format
 msgid "Setting key %r to %r"
 msgstr ""
 
-#: .././pykolab/setup/setup_mta.py:248
+#: ../pykolab/setup/setup_mta.py:252
 msgid "Could not write out Postfix configuration file /etc/postfix/master.cf"
 msgstr ""
 
-#: .././pykolab/setup/setup_imap.py:39
-msgid "Setup IMAP."
-msgstr ""
-
-#: .././pykolab/setup/setup_imap.py:82 .././pykolab/setup/setup_imap.py:107
-msgid "Could not write out Cyrus IMAP configuration file /etc/imapd.conf"
-msgstr ""
-
-#: .././pykolab/setup/setup_kolabd.py:38
-msgid "Setup the Kolab daemon."
+#: ../pykolab/setup/setup_mta.py:287
+msgid "Could not write out Amavis configuration file /etc/amavisd/amavisd.conf"
 msgstr ""
 
-#: .././pykolab/setup/setup_mysql.py:39
+#: ../pykolab/setup/setup_mysql.py:39
 msgid "Setup MySQL."
 msgstr ""
 
-#: .././pykolab/setup/setup_mysql.py:53
+#: ../pykolab/setup/setup_mysql.py:53
+msgid ""
+"\n"
+"                    Please supply a root password for MySQL. This password "
+"will\n"
+"                    be the administrative user for this MySQL server, and "
+"it\n"
+"                    should be kept a secret. After this setup process has\n"
+"                    completed, Kolab is going to discard and forget about "
+"this\n"
+"                    password, but you will need it for administrative tasks "
+"in\n"
+"                    MySQL.\n"
+"                "
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:64
 msgid "MySQL root password"
 msgstr ""
 
-#: .././pykolab/setup/setup_freebusy.py:40
-msgid "Setup Free/Busy."
+#: ../pykolab/setup/setup_mysql.py:103
+msgid ""
+"\n"
+"                        Please supply a password for the MySQL user "
+"'kolab'.\n"
+"                        This password will be used by Kolab services, such "
+"as\n"
+"                        the Web Administration Panel.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_freebusy.py:44
-msgid "Free/Busy is not installed on this system"
+#: ../pykolab/setup/setup_mysql.py:111
+msgid "MySQL kolab password"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:45
-#, python-format
-msgid "Cleaning up ACL entries for %s across all folders"
+#: ../pykolab/setup/setup_php.py:42
+msgid "PHP Options"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:60
-#, python-format
-msgid "Cleaning up ACL entries referring to identifier %s"
+#: ../pykolab/setup/setup_php.py:49
+msgid "Specify the timezone for PHP."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:69
-#, python-format
-msgid "Iterating over %d folders"
+#: ../pykolab/setup/setup_php.py:53
+msgid "Setup PHP."
 msgstr ""
 
-#. Set the ACL to '' (effectively deleting the ACL entry)
-#: .././pykolab/imap/__init__.py:82
-#, python-format
-msgid "Removing acl %r for subject %r from folder %r"
+#: ../pykolab/setup/setup_php.py:58
+msgid ""
+"\n"
+"                        Please supply the timezone PHP should be using.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:143
-#, python-format
-msgid "Logging on to Cyrus IMAP server %s"
+#: ../pykolab/setup/setup_php.py:64
+msgid "Timezone ID"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:152
-#, python-format
-msgid "Logging on to Dovecot IMAP server %s"
+#: ../pykolab/setup/setup_roundcube.py:44
+msgid "Setup Roundcube."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:161
-#, python-format
-msgid "Logging on to generic IMAP server %s"
+#: ../pykolab/setup/setup_roundcube.py:48
+msgid ""
+"\n"
+"                    Please supply a password for the MySQL user "
+"'roundcube'.\n"
+"                    This password will be used by the Roundcube webmail\n"
+"                    interface.\n"
+"                "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:179
-#, python-format
-msgid "Reusing existing IMAP server connection to %s"
+#: ../pykolab/setup/setup_syncroton.py:40
+msgid "Setup Syncroton."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:181
-#, python-format
-msgid "Reconnecting to IMAP server %s"
+#: ../pykolab/setup/setup_zpush.py:41
+msgid "Setup zpush."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:197
-msgid "Called imap.disconnect() on a server that "
+#: ../pykolab/setup/setup_zpush.py:45
+msgid "Z-Push is not installed on this system"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:213
+#. start_max = (int)(time.time())
+#: ../pykolab/telemetry.py:588
 #, python-format
-msgid "%r has no attribute %s"
+msgid "Expiring sessions that started before or on %d"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:221 .././pykolab/imap/__init__.py:239
+#: ../pykolab/telemetry.py:601
 #, python-format
-msgid "Creating new shared folder %s"
+msgid "Expiring session ID: %d"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:255
+#: ../pykolab/telemetry.py:620
 #, python-format
-msgid "Creating new mailbox for user %s"
+msgid "Session with ID %d expired from database"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:280
+#: ../pykolab/telemetry.py:646
 #, python-format
-msgid "Creating additional folders for user %s"
+msgid "Operational Error in telemetry database: %s"
+msgstr ""
+
+#: ../pykolab/telemetry.py:652
+msgid "No database available"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:302
+#: ../pykolab/utils.py:57 ../pykolab/utils.py:59
 #, python-format
-msgid "Mailbox already exists: %s"
+msgid "Confirm %s: "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:345
-msgid "Subscribing user to the additional folders"
+#: ../pykolab/utils.py:62
+msgid "Incorrect confirmation. "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:380 .././pykolab/imap/__init__.py:459
+#: ../pykolab/utils.py:67 ../pykolab/utils.py:72
 #, python-format
-msgid "Renaming INBOX from %s to %s"
+msgid "%s: "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:384
+#: ../pykolab/utils.py:69 ../pykolab/utils.py:74
 #, python-format
-msgid "Could not rename INBOX folder %s to %s"
+msgid "%s [%s]: "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:386 .././pykolab/imap/__init__.py:463
-#, python-format
-msgid "Moving INBOX folder %s won't succeed as target folder %s already exists"
+#: ../pykolab/utils.py:119
+msgid "Please answer 'yes' or 'no'."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:399
+#: ../pykolab/utils.py:185
 #, python-format
-msgid "Looking for folder '%s', we found folders: %r"
+msgid "Could not change the permissions on %s"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:422
+#: ../pykolab/wap_client/__init__.py:257
 #, python-format
-msgid "Setting ACL rights %s for subject %s on folder "
+msgid "Requesting %r with params %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:433
+#: ../pykolab/wap_client/__init__.py:263
 #, python-format
-msgid "Removing ACL rights %s for subject %s on folder "
+msgid "Got response: %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:456
-#, python-format
-msgid "Found old INBOX folder %s"
+#. Some data is not JSON
+#: ../pykolab/wap_client/__init__.py:268
+msgid "Response data is not JSON"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:465
-#, python-format
-msgid "Did not find old folder user/%s to rename"
+#: ../pykolab/xml/attendee.py:79 ../pykolab/xml/attendee.py:99
+msgid "Not a valid attendee"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:467
-msgid "Value for user is not a dictionary"
+#: ../pykolab/xml/attendee.py:84
+msgid "No valid delegator references found"
 msgstr ""
 
-#. TODO: Go in fact correct the quota.
-#: .././pykolab/imap/__init__.py:527
-#, python-format
-msgid "Cannot get current IMAP quota for folder %s"
+#: ../pykolab/xml/attendee.py:104
+msgid "No valid delegatee references found"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:540
+#: ../pykolab/xml/attendee.py:140
 #, python-format
-msgid "Quota for %s currently is %s"
+msgid "Invalid cutype %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:546
+#: ../pykolab/xml/attendee.py:151
 #, python-format
-msgid "Adjusting authentication database quota for folder %s to %d"
+msgid "Invalid participant status %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:551
+#: ../pykolab/xml/attendee.py:159
 #, python-format
-msgid "Correcting quota for %s to %s (currently %s)"
+msgid "Invalid role %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:633
+#: ../pykolab/xml/event.py:172
 #, python-format
-msgid "Checking folder: %s"
+msgid "No attendee with email or name %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:638
+#: ../pykolab/xml/event.py:180
 #, python-format
-msgid "Folder has no corresponding user (1): %s"
+msgid "Invalid argument value attendee %r, must be basestring or Attendee"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:641
+#: ../pykolab/xml/event.py:186
 #, python-format
-msgid "Folder has no corresponding user (2): %s"
+msgid "No attendee with email %r"
 msgstr ""
 
-#. We got user identifier only
-#: .././pykolab/imap/__init__.py:656
-msgid "Please don't give us just a user identifier"
+#: ../pykolab/xml/event.py:192
+#, python-format
+msgid "No attendee with name %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:659
-#, python-format
-msgid "Deleting folder %s"
+#: ../pykolab/xml/event.py:338
+msgid "Invalid participant status"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:78
-#, python-format
-msgid "Could not connect to Cyrus IMAP server %r"
+#: ../pykolab/xml/event.py:538
+msgid "Event end needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:101
+#: ../pykolab/xml/event.py:657
 #, python-format
-msgid "Continuing with separator: %r"
+msgid "Invalid status %r"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:106
-msgid "Detected we are running in a Murder topology"
+#: ../pykolab/xml/event.py:678 ../pykolab/xml/event.py:728
+msgid "Event start needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:110
-msgid "This system is not part of a murder topology"
+#: ../pykolab/xml/event.py:764
+#, python-format
+msgid "Invalid status set: %r"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:131
-#, python-format
-msgid "Checking actual backend server for folder %s through annotations"
+#: ../pykolab/xml/event.py:882
+msgid "No sender specified"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:146
-#, python-format
-msgid "Could not get the annotations after %s tries."
+#: ../saslauthd/__init__.py:126 ../saslauthd/__init__.py:134
+msgid "Traceback occurred, please report a bug at http://bugzilla.kolabsys.com"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:150
+#: ../wallace/__init__.py:61
 #, python-format
-msgid "No annotations for %s: %r"
+msgid "Worker process %s initializing"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:157
-#, python-format
-msgid "Server for INBOX folder %s is %s"
+#: ../wallace/__init__.py:80
+msgid "Bind address for Wallace."
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:169
-#, python-format
-msgid "Setting quota for INBOX folder %s to %s"
+#: ../wallace/__init__.py:106
+msgid "Port that Wallace is supposed to use."
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:173
+#: ../wallace/__init__.py:157
 #, python-format
-msgid "Could not set quota for mailfolder %s"
+msgid "Could not bind to socket on port %d on bind "
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:182
-#, python-format
-msgid "Moving INBOX folder %s to %s"
+#: ../wallace/__init__.py:169
+msgid "Could not shut down socket"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:194
-#, python-format
-msgid "Setting annotation %s on folder %s"
+#: ../wallace/__init__.py:226
+msgid "Accepted connection"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:201
+#: ../wallace/__init__.py:389
 #, python-format
-msgid "Could not set annotation %r on mail folder %r: %r"
+msgid "Could not write pid file %s"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:205
+#: ../wallace/module_optout.py:61 ../wallace/module_resources.py:94
 #, python-format
-msgid "Transferring folder %s from %s to %s"
+msgid "Issuing callback after processing to stage %s"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:265
+#: ../wallace/module_optout.py:62 ../wallace/module_resources.py:100
 #, python-format
-msgid "Undeleting %s to %s"
+msgid "Testing cb_action_%s()"
 msgstr ""
 
-#. start_max = (int)(time.time())
-#: .././pykolab/telemetry.py:588
+#: ../wallace/module_optout.py:64 ../wallace/module_resources.py:103
 #, python-format
-msgid "Expiring sessions that started before or on %d"
+msgid "Attempting to execute cb_action_%s()"
 msgstr ""
 
-#: .././pykolab/telemetry.py:601
+#. modules.next_module('optout')
+#: ../wallace/module_optout.py:70
 #, python-format
-msgid "Expiring session ID: %d"
+msgid "Consulting opt-out service for %r, %r"
 msgstr ""
 
-#: .././pykolab/telemetry.py:620
+#: ../wallace/module_optout.py:96
 #, python-format
-msgid "Session with ID %d expired from database"
+msgid "Running opt-out consult from envelope sender '%s "
 msgstr ""
 
-#: .././pykolab/telemetry.py:646
+#: ../wallace/module_optout.py:160
 #, python-format
-msgid "Operational Error in telemetry database: %s"
+msgid "Attempting to execute cb_action_%s(%r, %r)"
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:92
+#: ../wallace/module_optout.py:181
 #, python-format
-msgid "Creating %d Mails"
+msgid "Could not send request to optout_url %s"
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:116
+#: ../wallace/module_resources.py:81
 #, python-format
-msgid "Sending message %s through SMTP targeting user %s@%s"
+msgid "Resource Management called for %r, %r"
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:119
-#, python-format
-msgid "Sending message %s through LMTP targeting user %s@%s"
+#: ../wallace/module_resources.py:139
+msgid "Message is not an iTip message or does not contain any "
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:122
-#, python-format
-msgid "Saving message %s to IMAP (user %s, folder %s)"
+#: ../wallace/module_resources.py:147
+msgid "iTip events attached to this message contain the "
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:125 .././pykolab/tests.old/calendar.py:198
-#: .././pykolab/tests.old/contacts.py:145
-msgid "Somehow ended up NOT sending these messages"
+#: ../wallace/module_resources.py:174
+msgid "Not an iTip message, but sent to resource nonetheless. Reject message"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:146
-#, python-format
-msgid "Creating %d Events"
+#: ../wallace/module_resources.py:182
+msgid "No itips, no resources, pass along"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:177
-#, python-format
-msgid "Creating Calendar item number %d"
+#: ../wallace/module_resources.py:186
+msgid "iTips, but no resources, pass along"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:189
-#: .././pykolab/tests.old/contacts.py:136
+#: ../wallace/module_resources.py:218
 #, python-format
-msgid "Sending UID message %s through SMTP targeting user %s@%s"
+msgid "Resources: %r"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:192
-#: .././pykolab/tests.old/contacts.py:139
+#: ../wallace/module_resources.py:236
 #, python-format
-msgid "Sending UID message %s through LMTP targeting user %s@%s"
+msgid "Checking events in resource folder %r"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:195
-#: .././pykolab/tests.old/contacts.py:142
+#: ../wallace/module_resources.py:243
 #, python-format
-msgid "Saving UID message %s to IMAP (user %s, folder %s)"
+msgid "Mailbox for resource %r doesn't exist"
 msgstr ""
 
-#: .././pykolab/tests.old/zpush/test_000_001.py:47
+#: ../wallace/module_resources.py:256
 #, python-format
-msgid "Could not load %sItem from %s, skipping the testing."
+msgid "Fetching message UID %r from folder %r"
 msgstr ""
 
-#: .././pykolab/tests.old/zpush/test_000_000.py:77
+#: ../wallace/module_resources.py:295
 #, python-format
-msgid "Authentication failure for %s"
+msgid "Event %r conflicts with event "
 msgstr ""
 
-#: .././pykolab/tests.old/contacts.py:105
+#: ../wallace/module_resources.py:308
 #, python-format
-msgid "Creating %d Contacts"
+msgid "start: %r, end: %r, total: %r, messages: %r"
 msgstr ""
 
-#: .././pykolab/tests.old/contacts.py:124
+#: ../wallace/module_resources.py:315
 #, python-format
-msgid "Creating Contact item number %d"
+msgid "Polling for resource %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:207
+#: ../wallace/module_resources.py:319
 #, python-format
-msgid "Adding policy request to instance %s"
+msgid "Resource %r has been popped from the list"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:442
-msgid "Unauthorized access not allowed"
+#: ../wallace/module_resources.py:326
+msgid "Resource is a collection"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:481
-#: .././bin/kolab_smtp_access_policy.py:541
+#: ../wallace/module_resources.py:374 ../wallace/module_resources.py:424
 #, python-format
-msgid "Could not find envelope sender user %s"
+msgid "Adding event to %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:568
+#: ../wallace/module_resources.py:473
 #, python-format
-msgid "%s is unauthorized to send on behalf of %s"
+msgid "Method %r not really interesting for us."
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:578
+#: ../wallace/module_resources.py:481
 #, python-format
-msgid "User %s attempted to use envelope sender address %s "
+msgid "Raw iTip payload: %s"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:638
-#: .././bin/kolab_smtp_access_policy.py:649
-#, python-format
-msgid "Found user %s to be a delegate user of %s"
+#: ../wallace/module_resources.py:491
+msgid "Could not read iTip from message."
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:673
-#, python-format
-msgid "Verifying authenticated sender '%(sender)s' with "
+#: ../wallace/module_resources.py:513
+msgid "iTip event without a start"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:678
-#, python-format
-msgid "Verifying unauthenticated sender '%(sender)s' "
+#. end if c.name == "VEVENT"
+#. end for c in cal.walk()
+#. end if part.get_content_type() == "text/calendar"
+#. end for part in message.walk()
+#. if message.is_multipart()
+#: ../wallace/module_resources.py:543
+msgid "Message is not an iTip message (non-multipart message)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:695
+#: ../wallace/module_resources.py:564
 #, python-format
-msgid "Reproducing verify_recipient(%s, %s) from "
+msgid "Checking if email address %r belongs to a resource (collection)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:712
+#: ../wallace/module_resources.py:575 ../wallace/module_resources.py:649
+#: ../wallace/module_resources.py:699
 #, python-format
-msgid "Using authentication domain %s instead of %s"
+msgid "No resource (collection) records found for %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:722
+#: ../wallace/module_resources.py:583 ../wallace/module_resources.py:657
+#: ../wallace/module_resources.py:707
 #, python-format
-msgid "Domain %s is a primary domain"
+msgid "Resource record(s): %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:730
+#: ../wallace/module_resources.py:589 ../wallace/module_resources.py:664
+#: ../wallace/module_resources.py:714
 #, python-format
-msgid "Checking the recipient for domain %s that is not "
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:792
-msgid "Could not find this user, accepting"
+msgid "Resource record: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:862
-#: .././bin/kolab_smtp_access_policy.py:915
+#: ../wallace/module_resources.py:608
 #, python-format
-msgid "Sender %s is not allowed to send to "
+msgid "Raw itip_events: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:902
+#: ../wallace/module_resources.py:616
 #, python-format
-msgid "Reproducing verify_sender(%r) from cache, "
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:931
-msgid "Sender uses unauthorized envelope sender address"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:948
-msgid "Could not verify sender"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:955
-msgid "Verifying whether sender is allowed to send to "
+msgid "Raw set of attendees: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:969
+#: ../wallace/module_resources.py:624
 #, python-format
-msgid "Result is %r"
+msgid "Raw set of resources: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:974
-msgid "No recipient policy restrictions exist for this sender"
+#: ../wallace/module_resources.py:638
+#, python-format
+msgid "Checking if attendee %r is a resource (collection)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:983
-msgid "Found a recipient policy to apply for this sender."
+#: ../wallace/module_resources.py:671 ../wallace/module_resources.py:717
+msgid "Resource reservation made but no resource records found"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:998
+#: ../wallace/module_resources.py:689
 #, python-format
-msgid "Sender %s not allowed to send to recipient "
+msgid "Checking if resource %r is a resource (collection)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1029
-msgid "Cleaning up the cache"
+#: ../wallace/module_resources.py:721
+msgid "The following resources are being referred to in the "
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1066
+#. This is a nested module
+#: ../wallace/modules.py:96
 #, python-format
-msgid "Operational Error in caching: %s"
+msgid "Module Group: %s"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1117
-#, python-format
-msgid "Caching the policy result with timestamp %d"
+#: ../wallace/modules.py:107 ../wallace/modules.py:112
+msgid "No such module."
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1194
+#: ../wallace/modules.py:118
 #, python-format
-msgid "Returning action DEFER_IF_PERMIT: %s"
+msgid "Holding message in queue for manual review (%s by %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1199
+#: ../wallace/modules.py:121
 #, python-format
-msgid "Returning action DUNNO: %s"
+msgid "Deferring message in %s (by module %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1204
+#: ../wallace/modules.py:131
 #, python-format
-msgid "Returning action HOLD: %s"
+msgid "The time when the message was sent: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1209
+#: ../wallace/modules.py:132
 #, python-format
-msgid "Returning action PERMIT: %s"
+msgid "The time now: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1214
+#: ../wallace/modules.py:133
 #, python-format
-msgid "Returning action REJECT: %s"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1258
-msgid "Starting to loop for new request"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1267
-msgid "End of current request"
+msgid "The time delta: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1271
+#. TODO: Send NDR back to user
+#: ../wallace/modules.py:137
 #, python-format
-msgid "Getting line: %s"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1275
-msgid "Returning request"
+msgid "Message in file %s older then 5 days, deleting"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1332
+#: ../wallace/modules.py:162
 #, python-format
-msgid "Got request instance %s"
+msgid "Rejecting message in %s (by module %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1341
+#: ../wallace/modules.py:180
 #, python-format
-msgid "Request instance %s is in state %s"
+msgid ""
+"This is the email system Wallace at %s.\n"
+"\n"
+"I'm sorry to inform you we could not deliver the attached message\n"
+"to the following recipients:\n"
+"\n"
+"- %s\n"
+"\n"
+"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 ""
 
-#: .././bin/kolab_smtp_access_policy.py:1349
+#: ../wallace/modules.py:195
 #, python-format
-msgid "Request instance %s is not yet in DATA state"
+msgid ""
+"X-Wallace-Module: %s\n"
+"X-Wallace-Result: REJECT\n"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1361
+#: ../wallace/modules.py:248
 #, python-format
-msgid "Request instance %s reached DATA state"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1379
-msgid "Sender access denied"
+msgid "Accepting message in %s (by module %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1381
-msgid "Recipient access denied"
+#: ../wallace/modules.py:316
+#, python-format
+msgid "Module '%s' already registered"
 msgstr ""
diff --git a/po/cs.po b/po/cs.po
index 2894aa0..356809f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pykolab 0.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-09 14:25+0100\n"
+"POT-Creation-Date: 2012-08-11 15:04+0100\n"
 "PO-Revision-Date: 2012-05-09 14:25+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,793 +17,907 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: .././wallace/__init__.py:37 .././bonnie/__init__.py:35
-#: .././kolabd/__init__.py:46 .././saslauthd/__init__.py:47
-msgid "Daemon Options"
-msgstr ""
-
-#: .././wallace/__init__.py:44 .././bonnie/__init__.py:41
-#: .././kolabd/__init__.py:52 .././saslauthd/__init__.py:53
-msgid "Fork to the background."
-msgstr ""
-
-#: .././wallace/__init__.py:52
-msgid "Bind address for Wallace."
+#: ../bin/kolab_smtp_access_policy.py:206
+#, python-format
+msgid "Adding policy request to instance %s"
 msgstr ""
 
-#: .././wallace/__init__.py:60 .././kolabd/__init__.py:58
-#: .././saslauthd/__init__.py:59
-msgid "Path to the PID file to use."
+#: ../bin/kolab_smtp_access_policy.py:446
+msgid "Unauthorized access not allowed"
 msgstr ""
 
-#: .././wallace/__init__.py:68
-msgid "Port that Wallace is supposed to use."
+#: ../bin/kolab_smtp_access_policy.py:467
+#: ../bin/kolab_smtp_access_policy.py:658
+msgid "Could not find recipient"
 msgstr ""
 
-#: .././wallace/__init__.py:102 .././wallace/__init__.py:126
-#: .././wallace/__init__.py:373 .././wallace/__init__.py:401
+#: ../bin/kolab_smtp_access_policy.py:486
+#: ../bin/kolab_smtp_access_policy.py:586
 #, python-format
-msgid "Number of threads currently running: %d"
+msgid "Could not find envelope sender user %s"
 msgstr ""
 
-#: .././wallace/__init__.py:111 .././wallace/__init__.py:135
+#: ../bin/kolab_smtp_access_policy.py:529
 #, python-format
-msgid "Continuing with %d threads currently running"
+msgid "Obtained authenticated user details for %r: %r"
 msgstr ""
 
-#. TODO: Apply throttling
-#: .././wallace/__init__.py:118
+#: ../bin/kolab_smtp_access_policy.py:608
 #, python-format
-msgid "Creating thread for message in %s"
+msgid "%s is unauthorized to send on behalf of %s"
 msgstr ""
 
-#: .././wallace/__init__.py:142
+#: ../bin/kolab_smtp_access_policy.py:618
 #, python-format
-msgid "Running thread %s for message file %s"
+msgid "User %s attempted to use envelope sender address %s "
 msgstr ""
 
-#: .././wallace/__init__.py:151
+#: ../bin/kolab_smtp_access_policy.py:682
+#: ../bin/kolab_smtp_access_policy.py:693
 #, python-format
-msgid "This message was already in module %s, delegating "
+msgid "Found user %s to be a delegate user of %s"
 msgstr ""
 
-#: .././wallace/__init__.py:160
+#: ../bin/kolab_smtp_access_policy.py:717
 #, python-format
-msgid "It was also in a certain stage: %s, letting "
+msgid "Verifying authenticated sender '%(sender)s' with "
 msgstr ""
 
-#: .././wallace/__init__.py:168 .././wallace/__init__.py:174
-#: .././wallace/__init__.py:184
+#: ../bin/kolab_smtp_access_policy.py:722
 #, python-format
-msgid "Executing module %s"
-msgstr ""
-
-#: .././wallace/__init__.py:211 .././bonnie/__init__.py:67
-#: .././kolabd/__init__.py:85 .././saslauthd/__init__.py:90
-msgid "Interrupted by user"
-msgstr ""
-
-#: .././wallace/__init__.py:215 .././wallace/__init__.py:225
-#: .././kolabd/__init__.py:90 .././kolabd/__init__.py:101
-msgid "Traceback occurred, please report a "
+msgid "Verifying unauthenticated sender '%(sender)s' "
 msgstr ""
 
-#: .././wallace/__init__.py:221 .././bonnie/__init__.py:75
-#: .././kolabd/__init__.py:96 .././saslauthd/__init__.py:98
+#: ../bin/kolab_smtp_access_policy.py:739
 #, python-format
-msgid "Type Error: %s"
-msgstr ""
-
-#: .././wallace/__init__.py:241
-msgid "Picking up deferred messages for wallace"
+msgid "Reproducing verify_recipient(%s, %s) from "
 msgstr ""
 
-#: .././wallace/__init__.py:261
+#: ../bin/kolab_smtp_access_policy.py:756
 #, python-format
-msgid "Picking up deferred messages for module %s"
-msgstr ""
-
-#. Sleep for 300 seconds before reprocessing the deferred queues.
-#. TODO: Consider using queue_run_delay from Postfix, which is where
-#. the default value of 300 seconds comes from.
-#: .././wallace/__init__.py:285
-msgid "Sleeping for 300 seconds"
+msgid "Using authentication domain %s instead of %s"
 msgstr ""
 
-#: .././wallace/__init__.py:310
+#: ../bin/kolab_smtp_access_policy.py:766
 #, python-format
-msgid "Could not bind to socket on port %d on bind "
-msgstr ""
-
-#: .././wallace/__init__.py:320
-msgid "Could not shut down socket"
+msgid "Domain %s is a primary domain"
 msgstr ""
 
-#: .././wallace/__init__.py:394
+#: ../bin/kolab_smtp_access_policy.py:774
 #, python-format
-msgid "Picking up spooled email file %s"
+msgid "Checking the recipient for domain %s that is not "
 msgstr ""
 
-#: .././wallace/__init__.py:424
-msgid "Accepted connection"
+#: ../bin/kolab_smtp_access_policy.py:790
+msgid "This recipient address is related to multiple "
 msgstr ""
 
-#. This is a nested module
-#: .././wallace/modules.py:96
+#: ../bin/kolab_smtp_access_policy.py:799
 #, python-format
-msgid "Module Group: %s"
+msgid "Recipient address %r not found. Allowing since "
 msgstr ""
 
-#: .././wallace/modules.py:107 .././wallace/modules.py:112
-msgid "No such module."
+#: ../bin/kolab_smtp_access_policy.py:827
+msgid "Invalid recipient"
 msgstr ""
 
-#: .././wallace/modules.py:118
-#, python-format
-msgid "Holding message in queue for manual review (%s by %s)"
+#: ../bin/kolab_smtp_access_policy.py:838
+msgid "Could not find this user, accepting"
 msgstr ""
 
-#: .././wallace/modules.py:121
+#: ../bin/kolab_smtp_access_policy.py:901
+#: ../bin/kolab_smtp_access_policy.py:954
 #, python-format
-msgid "Deferring message in %s (by module %s)"
+msgid "Sender %s is not allowed to send to "
 msgstr ""
 
-#: .././wallace/modules.py:131
+#: ../bin/kolab_smtp_access_policy.py:941
 #, python-format
-msgid "The time when the message was sent: %r"
+msgid "Reproducing verify_sender(%r) from cache, "
 msgstr ""
 
-#: .././wallace/modules.py:132
-#, python-format
-msgid "The time now: %r"
+#: ../bin/kolab_smtp_access_policy.py:970
+msgid "Sender uses unauthorized envelope sender address"
 msgstr ""
 
-#: .././wallace/modules.py:133
-#, python-format
-msgid "The time delta: %r"
+#: ../bin/kolab_smtp_access_policy.py:987
+msgid "Could not verify sender"
 msgstr ""
 
-#. TODO: Send NDR back to user
-#: .././wallace/modules.py:137
-#, python-format
-msgid "Message in file %s older then 5 days, deleting"
+#: ../bin/kolab_smtp_access_policy.py:994
+msgid "Verifying whether sender is allowed to send to "
 msgstr ""
 
-#: .././wallace/modules.py:162
+#: ../bin/kolab_smtp_access_policy.py:1008
 #, python-format
-msgid "Rejecting message in %s (by module %s)"
+msgid "Result is %r"
 msgstr ""
 
-#: .././wallace/modules.py:180
-#, python-format
-msgid ""
-"This is the email system Wallace at %s.\n"
-"\n"
-"I'm sorry to inform you we could not deliver the attached message\n"
-"to the following recipients:\n"
-"\n"
-"- %s\n"
-"\n"
-"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"
+#: ../bin/kolab_smtp_access_policy.py:1013
+msgid "No recipient policy restrictions exist for this sender"
 msgstr ""
 
-#: .././wallace/modules.py:195
-#, python-format
-msgid ""
-"X-Wallace-Module: %s\n"
-"X-Wallace-Result: REJECT\n"
+#: ../bin/kolab_smtp_access_policy.py:1022
+msgid "Found a recipient policy to apply for this sender."
 msgstr ""
 
-#: .././wallace/modules.py:248
+#: ../bin/kolab_smtp_access_policy.py:1037
 #, python-format
-msgid "Accepting message in %s (by module %s)"
+msgid "Sender %s not allowed to send to recipient "
 msgstr ""
 
-#: .././wallace/modules.py:316
-#, python-format
-msgid "Module '%s' already registered"
+#: ../bin/kolab_smtp_access_policy.py:1068
+msgid "Cleaning up the cache"
 msgstr ""
 
-#: .././wallace/modules.py:338 .././pykolab/tests/tests.py:183
-#: .././pykolab/cli/commands.py:183 .././pykolab/setup/components.py:243
+#: ../bin/kolab_smtp_access_policy.py:1105
 #, python-format
-msgid "Alias for %s"
+msgid "Operational Error in caching: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:57
+#: ../bin/kolab_smtp_access_policy.py:1156
 #, python-format
-msgid "Issuing callback after processing to stage %s"
+msgid "Caching the policy result with timestamp %d"
 msgstr ""
 
-#: .././wallace/module_optout.py:58
+#: ../bin/kolab_smtp_access_policy.py:1233
 #, python-format
-msgid "Testing cb_action_%s()"
+msgid "Returning action DEFER_IF_PERMIT: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:60
+#: ../bin/kolab_smtp_access_policy.py:1238
 #, python-format
-msgid "Attempting to execute cb_action_%s()"
+msgid "Returning action DUNNO: %s"
 msgstr ""
 
-#. modules.next_module('optout')
-#: .././wallace/module_optout.py:66
+#: ../bin/kolab_smtp_access_policy.py:1243
 #, python-format
-msgid "Consulting opt-out service for %r, %r"
+msgid "Returning action HOLD: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:92
+#: ../bin/kolab_smtp_access_policy.py:1248
 #, python-format
-msgid "Running opt-out consult from envelope sender '%s "
+msgid "Returning action PERMIT: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:156
+#: ../bin/kolab_smtp_access_policy.py:1253
 #, python-format
-msgid "Attempting to execute cb_action_%s(%r, %r)"
+msgid "Returning action REJECT: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:177
-#, python-format
-msgid "Could not send request to optout_url %s"
+#: ../bin/kolab_smtp_access_policy.py:1299
+msgid "Starting to loop for new request"
 msgstr ""
 
-#: .././setup-kolab.py:36 .././kolabtest.py:34 .././kolabd.py:31
-#: .././wallace.py:31 .././bonnie.py:31
-msgid "Cannot load pykolab/constants.py:"
+#: ../bin/kolab_smtp_access_policy.py:1306
+msgid "Timeout for policy request reading exceeded"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:89
-msgid "Could not import caching library, caching disabled"
+#: ../bin/kolab_smtp_access_policy.py:1312
+msgid "End of current request"
 msgstr ""
 
-#. Obtain 'kolabDelegate' from the envelope sender.
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:291
+#: ../bin/kolab_smtp_access_policy.py:1316
 #, python-format
-msgid "Obtaining envelope sender dn for %s"
+msgid "Getting line: %s"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:309
-#, python-format
-msgid ""
-"User %s attempted to use envelope sender address %s without authorization"
+#: ../bin/kolab_smtp_access_policy.py:1320
+msgid "Returning request"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:355
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:358
-#, python-format
-msgid "Found user %s to be a valid delegate user of %s"
+#: ../bin/kolab_smtp_access_policy.py:1346
+msgid "Access Policy Options"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:424
-#: .././bin/kolab_smtp_access_policy.py:1301
-msgid "Access Policy Options"
+#: ../bin/kolab_smtp_access_policy.py:1353
+msgid "SMTP Policy request timeout."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:431
-#: .././bin/kolab_smtp_access_policy.py:1308
+#: ../bin/kolab_smtp_access_policy.py:1359
 msgid "Verify the recipient access policy."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:437
-#: .././bin/kolab_smtp_access_policy.py:1314
+#: ../bin/kolab_smtp_access_policy.py:1365
 msgid "Verify the sender access policy."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:443
-#: .././bin/kolab_smtp_access_policy.py:1320
+#: ../bin/kolab_smtp_access_policy.py:1371
 msgid "Allow unauthenticated senders."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:464
-msgid "Verifying sender."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:468
-msgid "No sender specified."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:469
-msgid "Invalid sender"
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:473
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:521
-msgid "No SASL username in request."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:475
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:524
-msgid "Not allowing unauthenticated senders."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:476
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:525
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:534
-msgid "Access denied"
+#: ../bin/kolab_smtp_access_policy.py:1385
+#, python-format
+msgid "Got request instance %s"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:478
-msgid "Allowing unauthenticated senders."
+#: ../bin/kolab_smtp_access_policy.py:1394
+#, python-format
+msgid "Request instance %s is in state %s"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:484
+#: ../bin/kolab_smtp_access_policy.py:1402
 #, python-format
-msgid "Allowing authenticated sender %s to send as %s."
+msgid "Request instance %s is not yet in DATA state"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:492
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:504
+#: ../bin/kolab_smtp_access_policy.py:1414
 #, python-format
-msgid "Authenticated as sender %s"
+msgid "Request instance %s reached DATA state"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:515
-msgid "Verifying recipient."
+#: ../bin/kolab_smtp_access_policy.py:1432
+msgid "Sender access denied"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:518
-#: .././bin/kolab_smtp_access_policy.py:781
-msgid "Invalid recipient"
+#: ../bin/kolab_smtp_access_policy.py:1434
+msgid "Recipient access denied"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:536
-#: .././bin/kolab_smtp_access_policy.py:1383
+#: ../bin/kolab_smtp_access_policy.py:1436
 msgid "No objections"
 msgstr ""
 
-#: .././play/confmgmt/db.py:59 .././play/conf.py:280
-msgid "Dropping all tables..."
-msgstr ""
-
-#: .././play/confmgmt/db.py:62 .././play/conf.py:283
-msgid "Creating the necessary tables..."
-msgstr ""
-
-#: .././play/confmgmt/db.py:69 .././play/conf.py:290
-#: .././play/roundcube_database/__init__.py:57
-#: .././play/roundcube_database/users.py:114 .././pykolab/telemetry.py:652
-msgid "No database available"
-msgstr ""
-
-#: .././play/confmgmt.py:74
-#, python-format
-msgid "Searching for service with name %s"
-msgstr ""
-
-#: .././play/confmgmt.py:77
-#, python-format
-msgid "Found service %s"
+#: ../conf.py:37 ../kolab.py:34 ../saslauthd.py:33
+msgid "Cannot load pykolab/logger.py:"
 msgstr ""
 
-#: .././play/confmgmt.py:82
-#, python-format
-msgid "Searching for role with name %s"
+#: ../kolabd/__init__.py:49 ../saslauthd/__init__.py:48
+#: ../wallace/__init__.py:65
+msgid "Daemon Options"
 msgstr ""
 
-#: .././play/confmgmt.py:85
-#, python-format
-msgid "Found role %s"
+#: ../kolabd/__init__.py:56 ../saslauthd/__init__.py:55
+#: ../wallace/__init__.py:72
+msgid "Fork to the background."
 msgstr ""
 
-#: .././play/confmgmt.py:89
-#, python-format
-msgid "Searching for file with path %s"
+#: ../kolabd/__init__.py:65 ../saslauthd/__init__.py:64
+#: ../wallace/__init__.py:98
+msgid "Path to the PID file to use."
 msgstr ""
 
-#: .././play/confmgmt.py:92
-#, python-format
-msgid "File with path %s not found, adding to database"
+#: ../kolabd/__init__.py:74 ../saslauthd/__init__.py:73
+#: ../wallace/__init__.py:115
+msgid "Run as user USERNAME"
 msgstr ""
 
-#: .././play/confmgmt.py:97
-#, python-format
-msgid "Adding file with path %s to service with name %s"
+#: ../kolabd/__init__.py:84 ../saslauthd/__init__.py:83
+#: ../wallace/__init__.py:89
+msgid "Run as group GROUPNAME"
 msgstr ""
 
-#: .././play/confmgmt.py:101
+#: ../kolabd/__init__.py:122 ../pykolab/utils.py:151
+#: ../wallace/__init__.py:288
 #, python-format
-msgid "Adding setting with key %s (%r, %r)"
+msgid "Group %s does not exist"
 msgstr ""
 
-#: .././play/confmgmt.py:106
+#: ../kolabd/__init__.py:131 ../wallace/__init__.py:297
 #, python-format
-msgid "Adding setting %s to file with path %s"
+msgid "Switching real and effective group id to %d"
 msgstr ""
 
-#: .././play/confmgmt.py:110
+#: ../kolabd/__init__.py:153 ../pykolab/utils.py:175
+#: ../wallace/__init__.py:319
 #, python-format
-msgid "Adding role with name %s to setting with key %s"
+msgid "User %s does not exist"
 msgstr ""
 
-#: .././play/rolequota/__init__.py:53
-#: .././pykolab/plugins/dynamicquota/__init__.py:50
+#: ../kolabd/__init__.py:163 ../wallace/__init__.py:329
 #, python-format
-msgid "No keyword %s passed to set_user_folder_quota"
+msgid "Switching real and effective user id to %d"
 msgstr ""
 
-#: .././play/roundcube_database/__init__.py:51
-#: .././play/roundcube_database/users.py:108
-#, python-format
-msgid "Operational Error in Roundcube database: %s"
+#: ../kolabd/__init__.py:172 ../wallace/__init__.py:338
+msgid "Could not change real and effective uid and/or gid"
 msgstr ""
 
-#: .././kwap/kwap/controllers/secure.py:25
-msgid "Secure Controller here"
+#: ../kolabd/__init__.py:192 ../saslauthd/__init__.py:122
+#: ../wallace/__init__.py:358
+msgid "Interrupted by user"
 msgstr ""
 
-#: .././kwap/kwap/controllers/root.py:103
-msgid "Wrong credentials"
+#: ../kolabd/__init__.py:197 ../kolabd/__init__.py:208
+#: ../wallace/__init__.py:362 ../wallace/__init__.py:372
+msgid "Traceback occurred, please report a "
 msgstr ""
 
-#: .././kwap/kwap/controllers/root.py:118
+#: ../kolabd/__init__.py:203 ../saslauthd/__init__.py:130
+#: ../wallace/__init__.py:368
 #, python-format
-msgid "Welcome back, %s!"
-msgstr ""
-
-#: .././kwap/kwap/controllers/root.py:128
-msgid "We hope to see you soon!"
-msgstr ""
-
-#: .././saslauthd.py:33 .././kolab.py:34 .././conf.py:37
-msgid "Cannot load pykolab/logger.py:"
-msgstr ""
-
-#: .././bonnie/__init__.py:71 .././bonnie/__init__.py:79
-#: .././saslauthd/__init__.py:94 .././saslauthd/__init__.py:102
-msgid "Traceback occurred, please report a bug at http://bugzilla.kolabsys.com"
+msgid "Type Error: %s"
 msgstr ""
 
-#: .././kolabd/__init__.py:116 .././pykolab/auth/ldap/__init__.py:1291
-#: .././pykolab/cli/cmd_sync.py:33
+#: ../kolabd/__init__.py:223 ../pykolab/auth/ldap/__init__.py:1591
+#: ../pykolab/cli/cmd_sync.py:36
 msgid "Listing domains..."
 msgstr ""
 
-#: .././kolabd/__init__.py:148
+#: ../kolabd/__init__.py:256
 #, python-format
 msgid "added domains: %r, removed domains: %r"
 msgstr ""
 
-#: .././pykolab/__init__.py:50
-msgid "Returning thread local configuration"
-msgstr ""
-
-#: .././pykolab/tests/tests.py:53
-msgid "List tests"
-msgstr ""
-
-#. This is a nested test
-#: .././pykolab/tests/tests.py:86
-#, python-format
-msgid "Test Suite: %s"
-msgstr ""
-
-#: .././pykolab/tests/tests.py:100 .././pykolab/tests/tests.py:105
-msgid "No such test."
-msgstr ""
-
-#: .././pykolab/tests/tests.py:157 .././pykolab/tests/tests.py:161
-#, python-format
-msgid "Test '%s' already registered"
-msgstr ""
-
-#: .././pykolab/tests/tests.py:191 .././pykolab/cli/commands.py:191
-#: .././pykolab/setup/components.py:251
-msgid "Not yet implemented"
-msgstr ""
-
-#: .././pykolab/tests/__init__.py:39
-msgid "Test Options"
-msgstr ""
-
-#: .././pykolab/tests/__init__.py:45
-msgid "Run tests in suite SUITE. Implies a certain set of items being tested."
-msgstr ""
-
-#: .././pykolab/tests/imap/test_login.py:44
-#, python-format
-msgid "Connecting at %s"
+#: ../kolabd.py:31 ../setup-kolab.py:36 ../wallace.py:31
+msgid "Cannot load pykolab/constants.py:"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:46
+#: ../pykolab/auth/__init__.py:94
 #, python-format
-msgid "Connected at %s"
+msgid "Called for domain %r"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:51
+#: ../pykolab/auth/__init__.py:107 ../pykolab/auth/__init__.py:116
 #, python-format
-msgid "Logging in at %s"
+msgid "Using section %s and domain %s"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:53
+#: ../pykolab/auth/__init__.py:121
 #, python-format
-msgid "Logged in at %s"
+msgid "Connecting to Authentication backend for domain %s"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:60
+#: ../pykolab/auth/__init__.py:132
 #, python-format
-msgid "Test failure in %s"
+msgid "Section %s has no option 'auth_mechanism'"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:94
+#: ../pykolab/auth/__init__.py:139
 #, python-format
-msgid "Called for domain %r"
+msgid "Section %s has auth_mechanism: %r"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:107 .././pykolab/auth/__init__.py:116
-#, python-format
-msgid "Using section %s and domain %s"
+#: ../pykolab/auth/__init__.py:148 ../pykolab/auth/__init__.py:157
+msgid "Starting LDAP..."
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:121
+#: ../pykolab/auth/ldap/cache.py:109
 #, python-format
-msgid "Connecting to Authentication backend for domain %s"
+msgid "Inserting cache entry %r"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:132
+#: ../pykolab/auth/ldap/cache.py:122
 #, python-format
-msgid "Section %s has no option 'auth_mechanism'"
+msgid "Updating timestamp for cache entry %r"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:139
+#: ../pykolab/auth/ldap/cache.py:129
 #, python-format
-msgid "Section %s has auth_mechanism: %r"
-msgstr ""
-
-#: .././pykolab/auth/__init__.py:148 .././pykolab/auth/__init__.py:157
-msgid "Starting LDAP..."
+msgid "Updating result_attribute for cache entry %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:51
+#: ../pykolab/auth/ldap/__init__.py:51
 msgid "Python LDAP library does not support persistent search"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:141
+#: ../pykolab/auth/ldap/__init__.py:142
 #, python-format
 msgid "Attempting to authenticate user %s in realm %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:181
+#: ../pykolab/auth/ldap/__init__.py:184
 #, python-format
 msgid "Binding with user_dn %s and password %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:190
+#: ../pykolab/auth/ldap/__init__.py:194
 #, python-format
 msgid "Failed to authenticate as user %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:205
+#: ../pykolab/auth/ldap/__init__.py:211
 msgid "Connecting to LDAP..."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:209
+#: ../pykolab/auth/ldap/__init__.py:215
 #, python-format
 msgid "Attempting to use LDAP URI %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:345
+#: ../pykolab/auth/ldap/__init__.py:357
 #, python-format
 msgid "Finding recipient with filter %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:398
+#: ../pykolab/auth/ldap/__init__.py:425
+#, python-format
+msgid "Finding resource with filter %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:448
+#, python-format
+msgid "Using timestamp %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:480
 #, python-format
 msgid "Applying recipient policy to %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:415
+#: ../pykolab/auth/ldap/__init__.py:497
 #, python-format
 msgid "Using mail attributes: %r, with primary %r and "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:426
+#: ../pykolab/auth/ldap/__init__.py:508
 #, python-format
 msgid "key %r not in entry"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:428
+#: ../pykolab/auth/ldap/__init__.py:510
 #, python-format
 msgid "key %r is the prim. mail attr."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:430
+#: ../pykolab/auth/ldap/__init__.py:512
 msgid "prim. mail pol. is not empty"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:433
+#: ../pykolab/auth/ldap/__init__.py:515
 #, python-format
 msgid "key %r is the sec. mail attr."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:435
+#: ../pykolab/auth/ldap/__init__.py:517
 msgid "sec. mail pol. is not empty"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:438
-#: .././pykolab/auth/ldap/__init__.py:451
+#: ../pykolab/auth/ldap/__init__.py:520 ../pykolab/auth/ldap/__init__.py:533
 #, python-format
 msgid "Attributes %r are not yet available for entry %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:492
+#: ../pykolab/auth/ldap/__init__.py:574
 #, python-format
 msgid "No results for mail address %s found"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:503
+#: ../pykolab/auth/ldap/__init__.py:585
 #, python-format
 msgid "1 result for address %s found, verifying"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:513
+#: ../pykolab/auth/ldap/__init__.py:595
 #, python-format
 msgid "Too bad, primary email address %s "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:524
-#: .././pykolab/auth/ldap/__init__.py:613
+#: ../pykolab/auth/ldap/__init__.py:606 ../pykolab/auth/ldap/__init__.py:695
 msgid "Address assigned to us"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:579
+#: ../pykolab/auth/ldap/__init__.py:661
 #, python-format
 msgid "No results for address %s found"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:590
+#: ../pykolab/auth/ldap/__init__.py:672
 #, python-format
 msgid "1 result for address %s found, "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:601
+#: ../pykolab/auth/ldap/__init__.py:683
 msgid "Too bad, secondary email "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:655
+#: ../pykolab/auth/ldap/__init__.py:710
+msgid "Recipient policy composed the following set of secondary "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:716
+#, python-format
+msgid "Secondary mail addresses that we want is not None: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:727
+msgid "Avoiding the duplication of the primary mail "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:738
+#, python-format
+msgid "Entry is getting secondary mail addresses: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:746
+msgid "Entry did not have any secondary mail "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:772
 #, python-format
 msgid "Entry modifications list: %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:698
+#: ../pykolab/auth/ldap/__init__.py:792
+#, python-format
+msgid "Setting entry attribute %r to %r for %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:828
+#, python-format
+msgid "Could not update dn %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:841
 #, python-format
 msgid "Using filter %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:736
+#: ../pykolab/auth/ldap/__init__.py:879
+#, python-format
+msgid "About to consider the user quota for %r (used: %r, "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:945
 msgid "Invalid bind credentials"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:989
+#: ../pykolab/auth/ldap/__init__.py:1229
 #, python-format
 msgid "Current changelog entry %s with %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:996
+#: ../pykolab/auth/ldap/__init__.py:1242
 #, python-format
 msgid "Result from recipient policy: %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1227
+#: ../pykolab/auth/ldap/__init__.py:1385
+#, python-format
+msgid "Kolab user %s does not have a result attribute %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1527
 #, python-format
 msgid "Finding domain root dn for domain %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1315
+#: ../pykolab/auth/ldap/__init__.py:1615
 msgid "Authentication database DOWN"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1394
+#: ../pykolab/auth/ldap/__init__.py:1699 ../pykolab/auth/ldap/__init__.py:1734
 #, python-format
 msgid "Entry type: %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1492
+#: ../pykolab/auth/ldap/__init__.py:1822
 msgid "LDAP Search Result Data Entry:"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1508
+#: ../pykolab/auth/ldap/__init__.py:1838
 msgid "Entry Change Notification attributes:"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1513
+#: ../pykolab/auth/ldap/__init__.py:1843
 #, python-format
 msgid "Change Type: %r (%r)"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1521
+#: ../pykolab/auth/ldap/__init__.py:1851
 #, python-format
 msgid "Previous DN: %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1575
+#: ../pykolab/auth/ldap/__init__.py:1906
 #, python-format
 msgid "Object %s searched no longer exists"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1583
+#: ../pykolab/auth/ldap/__init__.py:1916
 #, python-format
 msgid "%d results..."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1677
+#: ../pykolab/auth/ldap/__init__.py:2014
 #, python-format
 msgid "Searching with filter %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1721
+#: ../pykolab/auth/ldap/__init__.py:2058
 #, python-format
 msgid "Checking for support for %s on %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/cache.py:109
-#, python-format
-msgid "Inserting cache entry %r"
+#: ../pykolab/cli/cmd_add_domain.py:36 ../pykolab/cli/cmd_create_mailbox.py:36
+#: ../pykolab/cli/cmd_export_mailbox.py:33
+#: ../pykolab/cli/cmd_list_mailboxes.py:39
+msgid "CLI Options"
 msgstr ""
 
-#: .././pykolab/auth/ldap/cache.py:122
-#, python-format
-msgid "Updating timestamp for cache entry %r"
+#: ../pykolab/cli/cmd_add_domain.py:42
+msgid "Add domain as alias for DOMAIN"
 msgstr ""
 
-#: .././pykolab/auth/ldap/cache.py:128
-#, python-format
-msgid "Updating result_attribute for cache entry %r"
+#: ../pykolab/cli/cmd_add_domain.py:47
+msgid "Add a new domain or domain alias."
 msgstr ""
 
-#: .././pykolab/auth/sql/__init__.py:44
-msgid "Connecting to SQL..."
+#: ../pykolab/cli/cmd_add_domain.py:55
+msgid "Could not find credentials with sufficient permissions"
 msgstr ""
 
-#: .././pykolab/utils.py:92
-msgid "Please answer 'yes' or 'no'."
+#: ../pykolab/cli/cmd_add_domain.py:80 ../pykolab/wap_client/__init__.py:113
+msgid "Invalid parent domain"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:87
-#, python-format
-msgid "Setting %s to %r (from defaults)"
+#: ../pykolab/cli/cmd_add_domain.py:86
+msgid "Domain name"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:106
-#, python-format
-msgid "Setting %s to %r (from CLI, verified)"
+#: ../pykolab/cli/cmd_create_mailbox.py:41
+msgid "Set metadata for folder to ANNOTATION=VALUE"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:109
-#, python-format
-msgid "Setting %s to %r (from CLI, not checked)"
+#: ../pykolab/cli/cmd_create_mailbox.py:50
+msgid "Invalid argument"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:150 .././pykolab/conf/__init__.py:207
-#, python-format
-msgid "Setting %s_%s to '****' (from configuration file)"
+#: ../pykolab/cli/cmd_create_mailbox.py:58
+msgid "Invalid argument for metadata"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:152 .././pykolab/conf/__init__.py:209
-#, python-format
-msgid "Setting %s_%s to %r (from configuration file)"
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:45
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:49
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:50
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:55
+msgid "ACI Subject"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:162
-msgid "Setting options from configuration file"
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:48
+#: ../pykolab/cli/cmd_list_mailbox_acls.py:41
+#: ../pykolab/cli/cmd_list_mailbox_metadata.py:41
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:54
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:54
+msgid "Folder name"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:223
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:60
+#: ../pykolab/cli/cmd_list_mailbox_acls.py:52
+#: ../pykolab/cli/cmd_list_mailbox_metadata.py:52
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:67
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:67
 #, python-format
-msgid "Configuration file %s not readable"
+msgid "No such folder %r"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:226
-#, python-format
-msgid "Reading configuration file %s"
+#: ../pykolab/cli/cmd_delete_mailbox.py:46
+msgid "No mailbox specified"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:230
+#: ../pykolab/cli/cmd_export_mailbox.py:38
+msgid "All folders this user has access to"
+msgstr ""
+
+#: ../pykolab/cli/cmd_export_mailbox.py:108
+#, python-format
+msgid "%s is not a directory"
+msgstr ""
+
+#: ../pykolab/cli/cmd_export_mailbox.py:118
+#, python-format
+msgid "ZIP file at %s.zip"
+msgstr ""
+
+#: ../pykolab/cli/cmd_export_mailbox.py:120
+#, python-format
+msgid "No directories found for user %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_mailboxes.py:44
+msgid "Display raw IMAP UTF-7 folder names"
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_mailboxes.py:75
+#, python-format
+msgid "Appending folder search for %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:49
+msgid "Invalid or unqualified email address."
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:57
+#, python-format
+msgid "No recipient found for email address %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:60
+#, python-format
+msgid "Found the following recipient(s): %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:66
+#, python-format
+msgid "Using the following mail attributes: %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:90
+msgid "Found the following recipients:"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:48
+msgid "No target mailbox name specified"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:50
+msgid "No source mailbox name specified"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:62
+#, python-format
+msgid "Source folder %r does not exist"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:66
+#, python-format
+msgid "Target folder %r already exists"
+msgstr ""
+
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:47
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:51
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:56
+msgid "ACI Permissions"
+msgstr ""
+
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:47
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:51
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:56
+msgid "Metadata value"
+msgstr ""
+
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:50
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:55
+msgid "Metadata path"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:41
+#, python-format
+msgid "Found %d domains in %d seconds"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:51
+#, python-format
+msgid "Running for domain %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:57
+#, python-format
+msgid "Synchronizing users for %s took %d seconds"
+msgstr ""
+
+#. This is a nested command
+#. This is a nested component
+#: ../pykolab/cli/commands.py:98 ../pykolab/setup/components.py:90
+#, python-format
+msgid "Command Group: %s"
+msgstr ""
+
+#: ../pykolab/cli/commands.py:109 ../pykolab/cli/commands.py:114
+msgid "No such command."
+msgstr ""
+
+#: ../pykolab/cli/commands.py:165 ../pykolab/setup/components.py:231
+#, python-format
+msgid "Command '%s' already registered"
+msgstr ""
+
+#: ../pykolab/cli/commands.py:190 ../pykolab/setup/components.py:257
+#: ../wallace/modules.py:338
+#, python-format
+msgid "Alias for %s"
+msgstr ""
+
+#: ../pykolab/cli/commands.py:198 ../pykolab/setup/components.py:265
+msgid "Not yet implemented"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:40
+msgid "Unspecified command issue identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:50
+msgid "Invalid command issue identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:60
+#: ../pykolab/cli/telemetry/cmd_examine_session.py:65
+msgid "Invalid session identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:75
+#: ../pykolab/cli/telemetry/cmd_examine_session.py:100
+#, python-format
+msgid "Session by %s on server %s"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_session.py:43
+msgid "Unspecified session identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_list_sessions.py:35
+msgid "List Options"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_list_sessions.py:40
+msgid "Display sessions since ..."
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_list_sessions.py:58
+#, python-format
+msgid "Session for user %s started at %s with ID %s"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:57 ../pykolab/conf/entitlement.py:80
+#: ../pykolab/conf/entitlement.py:98 ../pykolab/conf/entitlement.py:116
+#: ../pykolab/conf/entitlement.py:230 ../pykolab/conf/entitlement.py:246
+#: ../pykolab/conf/entitlement.py:262
+msgid "Invalid entitlement verification "
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:120 ../pykolab/conf/entitlement.py:123
+msgid "Invalid entitlement certificate"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:132
+#, python-format
+msgid "Parsing entitlement file %s"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:141
+#, python-format
+msgid "License file %s not readable!"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:147
+msgid "No entitlement directory found"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:87
+#, python-format
+msgid "Setting %s to %r (from defaults)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:106
+#, python-format
+msgid "Setting %s to %r (from CLI, verified)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:109
+#, python-format
+msgid "Setting %s to %r (from CLI, not checked)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:150 ../pykolab/conf/__init__.py:207
+#, python-format
+msgid "Setting %s_%s to '****' (from configuration file)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:152 ../pykolab/conf/__init__.py:209
+#, python-format
+msgid "Setting %s_%s to %r (from configuration file)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:162
+msgid "Setting options from configuration file"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:223
+#, python-format
+msgid "Configuration file %s not readable"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:226
+#, python-format
+msgid "Reading configuration file %s"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:230
 #, python-format
 msgid "Invalid configuration file %s"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:233
+#: ../pykolab/conf/__init__.py:233
 #, python-format
 msgid "No master configuration section [kolab] in configuration file %s"
 msgstr ""
@@ -811,1088 +925,1335 @@ msgstr ""
 #. #
 #. # Runtime Options
 #. #
-#: .././pykolab/conf/__init__.py:267
+#: ../pykolab/conf/__init__.py:267
 msgid "Runtime Options"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:272
+#: ../pykolab/conf/__init__.py:272
 msgid "Configuration file to use"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:278
+#: ../pykolab/conf/__init__.py:278
 msgid "Set the debugging "
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:286
+#: ../pykolab/conf/__init__.py:286
 msgid "Set the logging level. "
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:294
+#: ../pykolab/conf/__init__.py:294
 msgid "Log file to use"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:300
+#: ../pykolab/conf/__init__.py:300
 msgid "Be quiet."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:306
+#: ../pykolab/conf/__init__.py:306
 msgid "Answer yes to all questions."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:328
+#: ../pykolab/conf/__init__.py:328
 msgid "No command supplied"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:411
+#: ../pykolab/conf/__init__.py:411
 msgid "Insufficient options. Need section, key and value -in that order."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:414
+#: ../pykolab/conf/__init__.py:414
 #, python-format
 msgid "No section '%s' exists."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:445
+#: ../pykolab/conf/__init__.py:445
 #, python-format
 msgid "Setting %s to %r (from the default values for CLI options)"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:514
+#: ../pykolab/conf/__init__.py:514
 #, python-format
 msgid "Could not execute configuration function: %s"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:522
+#: ../pykolab/conf/__init__.py:522
 #, python-format
 msgid "Option %s/%s does not exist in config file %s, pulling from defaults"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:530 .././pykolab/conf/__init__.py:533
+#: ../pykolab/conf/__init__.py:530 ../pykolab/conf/__init__.py:533
 msgid "Option does not exist in defaults."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:531 .././pykolab/conf/__init__.py:534
-msgid "Not available"
-msgstr ""
-
-#: .././pykolab/conf/__init__.py:543
+#: ../pykolab/conf/__init__.py:543
 #, python-format
 msgid "Configuration file %s not readable."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:546
+#: ../pykolab/conf/__init__.py:546
 #, python-format
 msgid "Configuration file %s does not exist."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:551
+#: ../pykolab/conf/__init__.py:551
 msgid ""
 "WARNING: A negative debug level value does not make this program be any more "
 "silent."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:557
+#: ../pykolab/conf/__init__.py:557
 msgid "This program has 9 levels of verbosity. Using the maximum of 9."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:565 .././pykolab/conf/__init__.py:571
+#: ../pykolab/conf/__init__.py:565 ../pykolab/conf/__init__.py:571
 msgid "Cannot start SASL authentication daemon"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:582
+#: ../pykolab/conf/__init__.py:582
 msgid "No imaplib library found."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:592
+#: ../pykolab/conf/__init__.py:592
 msgid "No LMTP class found in the smtplib library."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:602
+#: ../pykolab/conf/__init__.py:602
 msgid "No SMTP class found in the smtplib library."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:616
+#: ../pykolab/conf/__init__.py:616
 #, python-format
 msgid "Found you specified a specific set of items to test: %s"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:624
+#: ../pykolab/conf/__init__.py:624
 #, python-format
 msgid "Selectively selecting: %s"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:57 .././pykolab/conf/entitlement.py:80
-#: .././pykolab/conf/entitlement.py:98 .././pykolab/conf/entitlement.py:116
-#: .././pykolab/conf/entitlement.py:229 .././pykolab/conf/entitlement.py:245
-#: .././pykolab/conf/entitlement.py:261
-msgid "Invalid entitlement verification "
+#: ../pykolab/constants.py.in:40
+msgid "PyKolab is a Kolab Systems product. For more information "
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:120 .././pykolab/conf/entitlement.py:123
-msgid "Invalid entitlement certificate"
+#: ../pykolab/constants.py.in:54
+msgid "WARNING"
+msgstr ""
+
+#: ../pykolab/constants.py.in:54
+msgid "The Fully Qualified "
+msgstr ""
+
+#: ../pykolab/constants.py.in:75
+msgid "389 Directory Server or Red Hat Directory Server"
+msgstr ""
+
+#: ../pykolab/constants.py.in:79 ../pykolab/constants.py.in:83
+msgid "OpenLDAP or compatible"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:132
+#: ../pykolab/imap/cyrus.py:79
 #, python-format
-msgid "Parsing entitlement file %s"
+msgid "Could not connect to Cyrus IMAP server %r"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:141
+#: ../pykolab/imap/cyrus.py:134
 #, python-format
-msgid "License file %s not readable!"
+msgid "Continuing with separator: %r"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:146
-msgid "No entitlement directory found"
+#: ../pykolab/imap/cyrus.py:139
+msgid "Detected we are running in a Murder topology"
 msgstr ""
 
-#: .././pykolab/logger.py:89
+#: ../pykolab/imap/cyrus.py:143
+msgid "This system is not part of a murder topology"
+msgstr ""
+
+#: ../pykolab/imap/cyrus.py:164
 #, python-format
-msgid "Cannot log to file %s: %s"
+msgid "Checking actual backend server for folder %s through annotations"
 msgstr ""
 
-#: .././pykolab/constants.py:40
-msgid "PyKolab is a Kolab Systems product. For more information "
+#: ../pykolab/imap/cyrus.py:179
+#, python-format
+msgid "Could not get the annotations after %s tries."
 msgstr ""
 
-#: .././pykolab/constants.py:54
-msgid "WARNING"
+#: ../pykolab/imap/cyrus.py:183
+#, python-format
+msgid "No annotations for %s: %r"
 msgstr ""
 
-#: .././pykolab/constants.py:54
-msgid "The Fully Qualified "
+#: ../pykolab/imap/cyrus.py:190
+#, python-format
+msgid "Server for INBOX folder %s is %s"
 msgstr ""
 
-#: .././pykolab/constants.py:75
-msgid "389 Directory Server or Red Hat Directory Server"
+#: ../pykolab/imap/cyrus.py:202
+#, python-format
+msgid "Setting quota for folder %s to %s"
 msgstr ""
 
-#: .././pykolab/constants.py:79 .././pykolab/constants.py:83
-msgid "OpenLDAP or compatible"
+#: ../pykolab/imap/cyrus.py:206
+#, python-format
+msgid "Could not set quota for mailfolder %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_list_sessions.py:35
-msgid "List Options"
+#: ../pykolab/imap/cyrus.py:215
+#, python-format
+msgid "Moving INBOX folder %s to %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_list_sessions.py:40
-msgid "Display sessions since ..."
+#: ../pykolab/imap/cyrus.py:227
+#, python-format
+msgid "Setting annotation %s on folder %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_list_sessions.py:58
+#: ../pykolab/imap/cyrus.py:234
 #, python-format
-msgid "Session for user %s started at %s with ID %s"
+msgid "Could not set annotation %r on mail folder %r: %r"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_session.py:43
-msgid "Unspecified session identifier"
+#: ../pykolab/imap/cyrus.py:238
+#, python-format
+msgid "Transferring folder %s from %s to %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_session.py:65
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:60
-msgid "Invalid session identifier"
+#: ../pykolab/imap/cyrus.py:298
+#, python-format
+msgid "Undeleting %s to %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_session.py:100
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:75
+#: ../pykolab/imap/__init__.py:45
 #, python-format
-msgid "Session by %s on server %s"
+msgid "Cleaning up ACL entries for %s across all folders"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:40
-msgid "Unspecified command issue identifier"
+#: ../pykolab/imap/__init__.py:60
+#, python-format
+msgid "Cleaning up ACL entries referring to identifier %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:50
-msgid "Invalid command issue identifier"
+#: ../pykolab/imap/__init__.py:69
+#, python-format
+msgid "Iterating over %d folders"
 msgstr ""
 
-#. This is a nested command
-#. This is a nested component
-#: .././pykolab/cli/commands.py:95 .././pykolab/setup/components.py:88
+#. Set the ACL to '' (effectively deleting the ACL entry)
+#: ../pykolab/imap/__init__.py:82
 #, python-format
-msgid "Command Group: %s"
+msgid "Removing acl %r for subject %r from folder %r"
 msgstr ""
 
-#: .././pykolab/cli/commands.py:106 .././pykolab/cli/commands.py:111
-msgid "No such command."
+#: ../pykolab/imap/__init__.py:143
+#, python-format
+msgid "Logging on to Cyrus IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/commands.py:161 .././pykolab/setup/components.py:217
+#: ../pykolab/imap/__init__.py:152
 #, python-format
-msgid "Command '%s' already registered"
+msgid "Logging on to Dovecot IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_delete_mailbox.py:43
-msgid "No mailbox specified"
+#: ../pykolab/imap/__init__.py:161
+#, python-format
+msgid "Logging on to generic IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_list_mailboxes.py:35
-#: .././pykolab/cli/cmd_export_mailbox.py:33
-msgid "CLI Options"
+#: ../pykolab/imap/__init__.py:179
+#, python-format
+msgid "Reusing existing IMAP server connection to %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_list_mailboxes.py:40
-msgid "Display raw UTF-7 folder names"
+#: ../pykolab/imap/__init__.py:181
+#, python-format
+msgid "Reconnecting to IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:38
-msgid "All folders this user has access to"
+#: ../pykolab/imap/__init__.py:197
+msgid "Called imap.disconnect() on a server that "
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:108
+#: ../pykolab/imap/__init__.py:213
 #, python-format
-msgid "%s is not a directory"
+msgid "%r has no attribute %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:118
+#: ../pykolab/imap/__init__.py:286
+msgid "Private annotations need to be set using the appropriate user account."
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:319 ../pykolab/imap/__init__.py:354
 #, python-format
-msgid "ZIP file at %s.zip"
+msgid "Creating new shared folder %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:120
+#: ../pykolab/imap/__init__.py:376
 #, python-format
-msgid "No directories found for user %s"
+msgid "Creating new mailbox for user %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_sync.py:38
+#: ../pykolab/imap/__init__.py:405
 #, python-format
-msgid "Found %d domains in %d seconds"
+msgid "Creating additional folders for user %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_sync.py:48
+#: ../pykolab/imap/__init__.py:429
 #, python-format
-msgid "Running for domain %s"
+msgid "Mailbox already exists: %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_sync.py:54
+#: ../pykolab/imap/__init__.py:472
+msgid "Subscribing user to the additional folders"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:532 ../pykolab/imap/__init__.py:611
 #, python-format
-msgid "Synchronizing users for %s took %d seconds"
+msgid "Renaming INBOX from %s to %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:536
+#, python-format
+msgid "Could not rename INBOX folder %s to %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:538 ../pykolab/imap/__init__.py:615
+#, python-format
+msgid "Moving INBOX folder %s won't succeed as target folder %s already exists"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:70
+#: ../pykolab/imap/__init__.py:551
+#, python-format
+msgid "Looking for folder '%s', we found folders: %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:574
+#, python-format
+msgid "Setting ACL rights %s for subject %s on folder "
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:585
+#, python-format
+msgid "Removing ACL rights %s for subject %s on folder "
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:608
+#, python-format
+msgid "Found old INBOX folder %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:617
+#, python-format
+msgid "Did not find old folder user/%s to rename"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:619
+msgid "Value for user is not a dictionary"
+msgstr ""
+
+#. TODO: Go in fact correct the quota.
+#: ../pykolab/imap/__init__.py:682
+#, python-format
+msgid "Cannot get current IMAP quota for folder %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:695
+#, python-format
+msgid "Quota for %s currently is %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:701
+#, python-format
+msgid "Adjusting authentication database quota for folder %s to %d"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:706
+#, python-format
+msgid "Correcting quota for %s to %s (currently %s)"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:788
+#, python-format
+msgid "Checking folder: %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:793
+#, python-format
+msgid "Folder has no corresponding user (1): %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:796
+#, python-format
+msgid "Folder has no corresponding user (2): %s"
+msgstr ""
+
+#. We got user identifier only
+#: ../pykolab/imap/__init__.py:811
+msgid "Please don't give us just a user identifier"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:814
+#, python-format
+msgid "Deleting folder %s"
+msgstr ""
+
+#: ../pykolab/__init__.py:50
+msgid "Returning thread local configuration"
+msgstr ""
+
+#: ../pykolab/logger.py:105
+#, python-format
+msgid "Could not change the ownership of log file %s"
+msgstr ""
+
+#: ../pykolab/logger.py:121
+#, python-format
+msgid "Cannot log to file %s: %s"
+msgstr ""
+
+#: ../pykolab/plugins/defaultfolders/__init__.py:47
+#, python-format
+msgid "Plugin %s called without required keyword %s."
+msgstr ""
+
+#: ../pykolab/plugins/defaultfolders/__init__.py:53
+msgid "Could not parse additional_folders"
+msgstr ""
+
+#: ../pykolab/plugins/dynamicquota/__init__.py:58
+#, python-format
+msgid "No keyword %s passed to set_user_folder_quota"
+msgstr ""
+
+#: ../pykolab/plugins/dynamicquota/__init__.py:70
+#, python-format
+msgid "Quota '%s' not an integer!"
+msgstr ""
+
+#: ../pykolab/plugins/__init__.py:70
 #, python-format
 msgid "ImportError for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:74
+#: ../pykolab/plugins/__init__.py:74
 #, python-format
 msgid "RuntimeError for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:78
+#: ../pykolab/plugins/__init__.py:78
 #, python-format
 msgid "Plugin %s failed to load (%s: %s)"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:116 .././pykolab/plugins/__init__.py:118
+#: ../pykolab/plugins/__init__.py:116 ../pykolab/plugins/__init__.py:118
 #, python-format
 msgid "Cannot set defaults for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:120
+#: ../pykolab/plugins/__init__.py:120
 #, python-format
 msgid "Cannot set defaults for plugin %s: Unknown Error"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:123
+#: ../pykolab/plugins/__init__.py:123
 #, python-format
 msgid "Not setting defaults for plugin %s: No function 'set_defaults()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:142
+#: ../pykolab/plugins/__init__.py:142
 #, python-format
 msgid "Cannot set runtime for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:144
+#: ../pykolab/plugins/__init__.py:144
 #, python-format
 msgid "Not setting runtime for plugin %s: No function 'set_runtime()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:163 .././pykolab/plugins/__init__.py:165
+#: ../pykolab/plugins/__init__.py:163 ../pykolab/plugins/__init__.py:165
 #, python-format
 msgid "Cannot add options for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:167
+#: ../pykolab/plugins/__init__.py:167
 #, python-format
 msgid "Not adding options for plugin %s: No function 'add_options()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:187
+#: ../pykolab/plugins/__init__.py:187
 #, python-format
 msgid "Cannot check options for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:189
+#: ../pykolab/plugins/__init__.py:189
 #, python-format
 msgid "Not checking options for plugin %s: No function 'check_options()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:227
+#: ../pykolab/plugins/__init__.py:227
 #, python-format
 msgid "Executing hook %s for plugin %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:231 .././pykolab/plugins/__init__.py:233
+#: ../pykolab/plugins/__init__.py:231 ../pykolab/plugins/__init__.py:233
 #, python-format
 msgid "Cannot execute hook %s for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/defaultfolders/__init__.py:47
-#, python-format
-msgid "Plugin %s called without required keyword %s."
+#: ../pykolab/plugins/recipientpolicy/__init__.py:79
+msgid "Attribute substitution for 'mail' failed in Recipient Policy"
 msgstr ""
 
-#: .././pykolab/plugins/defaultfolders/__init__.py:53
-msgid "Could not parse additional_folders"
+#: ../pykolab/plugins/recipientpolicy/__init__.py:115
+msgid "Could not parse the alternative mail routines"
 msgstr ""
 
-#: .././pykolab/plugins/dynamicquota/__init__.py:56
-#, python-format
-msgid "Quota '%s' not an integer!"
+#: ../pykolab/plugins/recipientpolicy/__init__.py:127
+#: ../pykolab/plugins/recipientpolicy/__init__.py:137
+msgid ""
+"Attribute substitution for 'alternative_mail' failed in Recipient Policy"
 msgstr ""
 
-#: .././pykolab/plugins/dynamicquota/__init__.py:63
-msgid ""
-"The new quota was set to 0, but default quota > 0, returning default quota"
+#: ../pykolab/setup/components.py:58
+msgid "Display this help."
 msgstr ""
 
-#: .././pykolab/plugins/dynamicquota/__init__.py:82
-msgid ""
-"The default quota is larger then the calculated new quota, using the default "
-"quota"
+#: ../pykolab/setup/components.py:149
+msgid "No component selected, continuing for all components"
 msgstr ""
 
-#: .././pykolab/plugins/recipientpolicy/__init__.py:70
-msgid "Attribute substitution for 'mail' failed in Recipient Policy"
+#: ../pykolab/setup/components.py:187 ../pykolab/setup/components.py:192
+msgid "No such component."
 msgstr ""
 
-#: .././pykolab/plugins/recipientpolicy/__init__.py:97
-msgid "Could not parse the alternative mail routines"
+#: ../pykolab/setup/setup_freebusy.py:46
+msgid "Setup Free/Busy."
 msgstr ""
 
-#: .././pykolab/plugins/recipientpolicy/__init__.py:109
-#: .././pykolab/plugins/recipientpolicy/__init__.py:119
-msgid ""
-"Attribute substitution for 'alternative_mail' failed in Recipient Policy"
+#: ../pykolab/setup/setup_freebusy.py:50
+msgid "Free/Busy is not installed on this system"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:40
-msgid "Setup zpush."
+#: ../pykolab/setup/setup_freebusy.py:55
+msgid ""
+"\n"
+"                        Please supply the MySQL password for the "
+"'roundcube'\n"
+"                        user. You have supplied this password earlier, and "
+"it is\n"
+"                        available from the database URI setting in\n"
+"                        /etc/roundcubemail/db.inc.php.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:44
-msgid "Z-Push is not installed on this system"
+#: ../pykolab/setup/setup_freebusy.py:64
+#: ../pykolab/setup/setup_roundcube.py:56
+msgid "MySQL roundcube password"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:70
-#: .././pykolab/setup/setup_roundcube.py:93
-#: .././pykolab/setup/setup_freebusy.py:76
+#: ../pykolab/setup/setup_freebusy.py:92
+#: ../pykolab/setup/setup_roundcube.py:116 ../pykolab/setup/setup_zpush.py:71
 #, python-format
 msgid "Using template file %r"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:77
-#: .././pykolab/setup/setup_roundcube.py:100
-#: .././pykolab/setup/setup_freebusy.py:83
+#: ../pykolab/setup/setup_freebusy.py:99
+#: ../pykolab/setup/setup_roundcube.py:123 ../pykolab/setup/setup_zpush.py:78
 #, python-format
 msgid "Successfully compiled template %r, writing out to %r"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:95 .././pykolab/setup/setup_ldap.py:184
-#: .././pykolab/setup/setup_ldap.py:358
-#: .././pykolab/setup/setup_roundcube.py:159
-#: .././pykolab/setup/setup_imap.py:137 .././pykolab/setup/setup_mysql.py:49
-#: .././pykolab/setup/setup_freebusy.py:101
-msgid "Could not start and configure to start on boot, the "
+#: ../pykolab/setup/setup_freebusy.py:119 ../pykolab/setup/setup_imap.py:143
+#: ../pykolab/setup/setup_ldap.py:288 ../pykolab/setup/setup_ldap.py:521
+#: ../pykolab/setup/setup_mta.py:309 ../pykolab/setup/setup_mysql.py:49
+#: ../pykolab/setup/setup_roundcube.py:191
+#: ../pykolab/setup/setup_syncroton.py:66 ../pykolab/setup/setup_zpush.py:98
+msgid "Could not start and configure to start on boot, the "
+msgstr ""
+
+#: ../pykolab/setup/setup_imap.py:44
+msgid "Setup IMAP."
+msgstr ""
+
+#: ../pykolab/setup/setup_imap.py:88 ../pykolab/setup/setup_imap.py:113
+msgid "Could not write out Cyrus IMAP configuration file /etc/imapd.conf"
+msgstr ""
+
+#: ../pykolab/setup/setup_kolabd.py:43
+msgid "Setup the Kolab daemon."
+msgstr ""
+
+#: ../pykolab/setup/setup_kolabd.py:51
+#, python-format
+msgid ""
+"\n"
+"                            Copying the configuration section for 'example."
+"org' over to\n"
+"                            a section applicable to your domain '%s'.\n"
+"                        "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:43
+msgid "LDAP Options"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:50
+msgid "Specify FQDN (overriding defaults)."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:58
+msgid "Allow anonymous binds (default: no)."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:62
+msgid "Setup LDAP."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:74
+msgid ""
+"\n"
+"                        Please supply a password for the LDAP administrator "
+"user\n"
+"                        'admin', used to login to the graphical console of "
+"389\n"
+"                        Directory server.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:82
+msgid "Administrator password"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:89
+msgid ""
+"\n"
+"                        Please supply a password for the LDAP Directory "
+"Manager\n"
+"                        user, which is the administrator user you will be "
+"using\n"
+"                        to at least initially log in to the Web Admin, and "
+"that\n"
+"                        Kolab uses to perform administrative tasks.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:98
+msgid "Directory Manager password"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:105
+msgid ""
+"\n"
+"                        Please choose the system user and group the service\n"
+"                        should use to run under. These should be existing,\n"
+"                        unprivileged, local system POSIX accounts with no "
+"shell.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:112
+msgid "User"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:43
-msgid "LDAP Options"
+#: ../pykolab/setup/setup_ldap.py:113
+msgid "Group"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:50
-msgid "Specify FQDN (overriding defaults)."
+#: ../pykolab/setup/setup_ldap.py:143
+msgid ""
+"\n"
+"                        This setup procedure plans to set up Kolab Groupware "
+"for\n"
+"                        the following domain name space. This domain name "
+"is\n"
+"                        obtained from the reverse DNS entry on your network\n"
+"                        interface. Please confirm this is the appropriate "
+"domain\n"
+"                        name space.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:54
-msgid "Setup LDAP."
+#: ../pykolab/setup/setup_ldap.py:157
+msgid "Domain name to use"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:66
-msgid "Administrator password"
+#: ../pykolab/setup/setup_ldap.py:162 ../pykolab/setup/setup_ldap.py:187
+msgid ""
+"\n"
+"                                    Invalid input. Please try again.\n"
+"                                "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:72
-msgid "Directory Manager password"
+#: ../pykolab/setup/setup_ldap.py:171
+msgid ""
+"\n"
+"                        The standard root dn we composed for you follows. "
+"Please\n"
+"                        confirm this is the root dn you wish to use.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:77
-msgid "User"
+#: ../pykolab/setup/setup_ldap.py:182
+msgid "Root DN to use"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:78
-msgid "Group"
+#: ../pykolab/setup/setup_ldap.py:234
+msgid ""
+"\n"
+"                    Setup is now going to set up the 389 Directory Server. "
+"This\n"
+"                    may take a little while (during which period there is "
+"no\n"
+"                    output and no progress indication).\n"
+"                "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:143
+#: ../pykolab/setup/setup_ldap.py:241
 msgid "Setting up 389 Directory Server"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:153
+#. TODO: Get the return code and display output if not successful.
+#: ../pykolab/setup/setup_ldap.py:253
 msgid "Setup DS stdout:"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:156
+#: ../pykolab/setup/setup_ldap.py:256
 msgid "Setup DS stderr:"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:175 .././pykolab/setup/setup_mysql.py:97
+#: ../pykolab/setup/setup_ldap.py:279 ../pykolab/setup/setup_mysql.py:129
 msgid "Could not find the Kolab schema file"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:189
+#: ../pykolab/setup/setup_ldap.py:293
+msgid ""
+"\n"
+"                        Please supply a Cyrus Administrator password. This\n"
+"                        password is used by Kolab to execute administrative\n"
+"                        tasks in Cyrus IMAP. You may also need the password\n"
+"                        yourself to troubleshoot Cyrus IMAP and/or perform\n"
+"                        other administrative tasks against Cyrus IMAP "
+"directly.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:303
 msgid "Cyrus Administrator password"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:195
+#: ../pykolab/setup/setup_ldap.py:310
+msgid ""
+"\n"
+"                        Please supply a Kolab Service account password. "
+"This\n"
+"                        account is used by various services such as "
+"Postfix,\n"
+"                        and Roundcube, as anonymous binds to the LDAP "
+"server\n"
+"                        will not be allowed.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:319
 msgid "Kolab Service password"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:204
+#: ../pykolab/setup/setup_ldap.py:329
 msgid "Writing out configuration to kolab.conf"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:218
+#: ../pykolab/setup/setup_ldap.py:343
 msgid "Inserting service users into LDAP."
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:262
+#: ../pykolab/setup/setup_ldap.py:417
 msgid "Writing out cn=kolab,cn=config"
 msgstr ""
 
 #. TODO: Add kolab-admin role
 #. TODO: Assign kolab-admin admin ACLs
-#: .././pykolab/setup/setup_ldap.py:286
+#: ../pykolab/setup/setup_ldap.py:441
 #, python-format
 msgid "Adding domain %s to list of domains for this deployment"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:294
+#: ../pykolab/setup/setup_ldap.py:457
 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:302
+#: ../pykolab/setup/setup_ldap.py:465
 msgid "Enabling attribute uniqueness plugin"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:308
+#: ../pykolab/setup/setup_ldap.py:471
 msgid "Enabling referential integrity plugin"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:314
+#: ../pykolab/setup/setup_ldap.py:477
 msgid "Enabling and configuring account policy plugin"
 msgstr ""
 
 #. TODO: Add kolab-admin role
-#: .././pykolab/setup/setup_ldap.py:329
+#: ../pykolab/setup/setup_ldap.py:492
 msgid "Adding the kolab-admin role"
 msgstr ""
 
 #. TODO: User writeable attributes on root_dn
-#: .././pykolab/setup/setup_ldap.py:340
+#: ../pykolab/setup/setup_ldap.py:503
 #, python-format
 msgid "Setting access control to %s"
 msgstr ""
 
-#: .././pykolab/setup/setup_roundcube.py:40
-msgid "Setup Roundcube."
-msgstr ""
-
-#: .././pykolab/setup/setup_roundcube.py:44
-#: .././pykolab/setup/setup_freebusy.py:49
-msgid "MySQL roundcube password"
-msgstr ""
-
-#: .././pykolab/setup/components.py:56
-msgid "Display this help."
-msgstr ""
-
-#: .././pykolab/setup/components.py:122
-msgid "No component selected, continuing for all components"
-msgstr ""
-
-#: .././pykolab/setup/components.py:157 .././pykolab/setup/components.py:162
-msgid "No such component."
-msgstr ""
-
-#: .././pykolab/setup/setup_mta.py:40
+#: ../pykolab/setup/setup_mta.py:40
 msgid "Setup MTA."
 msgstr ""
 
-#: .././pykolab/setup/setup_mta.py:220
+#: ../pykolab/setup/setup_mta.py:224 ../pykolab/setup/setup_php.py:80
 #, python-format
 msgid "Setting key %r to %r"
 msgstr ""
 
-#: .././pykolab/setup/setup_mta.py:248
+#: ../pykolab/setup/setup_mta.py:252
 msgid "Could not write out Postfix configuration file /etc/postfix/master.cf"
 msgstr ""
 
-#: .././pykolab/setup/setup_imap.py:39
-msgid "Setup IMAP."
-msgstr ""
-
-#: .././pykolab/setup/setup_imap.py:82 .././pykolab/setup/setup_imap.py:107
-msgid "Could not write out Cyrus IMAP configuration file /etc/imapd.conf"
-msgstr ""
-
-#: .././pykolab/setup/setup_kolabd.py:38
-msgid "Setup the Kolab daemon."
+#: ../pykolab/setup/setup_mta.py:287
+msgid "Could not write out Amavis configuration file /etc/amavisd/amavisd.conf"
 msgstr ""
 
-#: .././pykolab/setup/setup_mysql.py:39
+#: ../pykolab/setup/setup_mysql.py:39
 msgid "Setup MySQL."
 msgstr ""
 
-#: .././pykolab/setup/setup_mysql.py:53
+#: ../pykolab/setup/setup_mysql.py:53
+msgid ""
+"\n"
+"                    Please supply a root password for MySQL. This password "
+"will\n"
+"                    be the administrative user for this MySQL server, and "
+"it\n"
+"                    should be kept a secret. After this setup process has\n"
+"                    completed, Kolab is going to discard and forget about "
+"this\n"
+"                    password, but you will need it for administrative tasks "
+"in\n"
+"                    MySQL.\n"
+"                "
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:64
 msgid "MySQL root password"
 msgstr ""
 
-#: .././pykolab/setup/setup_freebusy.py:40
-msgid "Setup Free/Busy."
+#: ../pykolab/setup/setup_mysql.py:103
+msgid ""
+"\n"
+"                        Please supply a password for the MySQL user "
+"'kolab'.\n"
+"                        This password will be used by Kolab services, such "
+"as\n"
+"                        the Web Administration Panel.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_freebusy.py:44
-msgid "Free/Busy is not installed on this system"
+#: ../pykolab/setup/setup_mysql.py:111
+msgid "MySQL kolab password"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:45
-#, python-format
-msgid "Cleaning up ACL entries for %s across all folders"
+#: ../pykolab/setup/setup_php.py:42
+msgid "PHP Options"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:60
-#, python-format
-msgid "Cleaning up ACL entries referring to identifier %s"
+#: ../pykolab/setup/setup_php.py:49
+msgid "Specify the timezone for PHP."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:69
-#, python-format
-msgid "Iterating over %d folders"
+#: ../pykolab/setup/setup_php.py:53
+msgid "Setup PHP."
 msgstr ""
 
-#. Set the ACL to '' (effectively deleting the ACL entry)
-#: .././pykolab/imap/__init__.py:82
-#, python-format
-msgid "Removing acl %r for subject %r from folder %r"
+#: ../pykolab/setup/setup_php.py:58
+msgid ""
+"\n"
+"                        Please supply the timezone PHP should be using.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:143
-#, python-format
-msgid "Logging on to Cyrus IMAP server %s"
+#: ../pykolab/setup/setup_php.py:64
+msgid "Timezone ID"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:152
-#, python-format
-msgid "Logging on to Dovecot IMAP server %s"
+#: ../pykolab/setup/setup_roundcube.py:44
+msgid "Setup Roundcube."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:161
-#, python-format
-msgid "Logging on to generic IMAP server %s"
+#: ../pykolab/setup/setup_roundcube.py:48
+msgid ""
+"\n"
+"                    Please supply a password for the MySQL user "
+"'roundcube'.\n"
+"                    This password will be used by the Roundcube webmail\n"
+"                    interface.\n"
+"                "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:179
-#, python-format
-msgid "Reusing existing IMAP server connection to %s"
+#: ../pykolab/setup/setup_syncroton.py:40
+msgid "Setup Syncroton."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:181
-#, python-format
-msgid "Reconnecting to IMAP server %s"
+#: ../pykolab/setup/setup_zpush.py:41
+msgid "Setup zpush."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:197
-msgid "Called imap.disconnect() on a server that "
+#: ../pykolab/setup/setup_zpush.py:45
+msgid "Z-Push is not installed on this system"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:213
+#. start_max = (int)(time.time())
+#: ../pykolab/telemetry.py:588
 #, python-format
-msgid "%r has no attribute %s"
+msgid "Expiring sessions that started before or on %d"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:221 .././pykolab/imap/__init__.py:239
+#: ../pykolab/telemetry.py:601
 #, python-format
-msgid "Creating new shared folder %s"
+msgid "Expiring session ID: %d"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:255
+#: ../pykolab/telemetry.py:620
 #, python-format
-msgid "Creating new mailbox for user %s"
+msgid "Session with ID %d expired from database"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:280
+#: ../pykolab/telemetry.py:646
 #, python-format
-msgid "Creating additional folders for user %s"
+msgid "Operational Error in telemetry database: %s"
+msgstr ""
+
+#: ../pykolab/telemetry.py:652
+msgid "No database available"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:302
+#: ../pykolab/utils.py:57 ../pykolab/utils.py:59
 #, python-format
-msgid "Mailbox already exists: %s"
+msgid "Confirm %s: "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:345
-msgid "Subscribing user to the additional folders"
+#: ../pykolab/utils.py:62
+msgid "Incorrect confirmation. "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:380 .././pykolab/imap/__init__.py:459
+#: ../pykolab/utils.py:67 ../pykolab/utils.py:72
 #, python-format
-msgid "Renaming INBOX from %s to %s"
+msgid "%s: "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:384
+#: ../pykolab/utils.py:69 ../pykolab/utils.py:74
 #, python-format
-msgid "Could not rename INBOX folder %s to %s"
+msgid "%s [%s]: "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:386 .././pykolab/imap/__init__.py:463
-#, python-format
-msgid "Moving INBOX folder %s won't succeed as target folder %s already exists"
+#: ../pykolab/utils.py:119
+msgid "Please answer 'yes' or 'no'."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:399
+#: ../pykolab/utils.py:185
 #, python-format
-msgid "Looking for folder '%s', we found folders: %r"
+msgid "Could not change the permissions on %s"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:422
+#: ../pykolab/wap_client/__init__.py:257
 #, python-format
-msgid "Setting ACL rights %s for subject %s on folder "
+msgid "Requesting %r with params %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:433
+#: ../pykolab/wap_client/__init__.py:263
 #, python-format
-msgid "Removing ACL rights %s for subject %s on folder "
+msgid "Got response: %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:456
-#, python-format
-msgid "Found old INBOX folder %s"
+#. Some data is not JSON
+#: ../pykolab/wap_client/__init__.py:268
+msgid "Response data is not JSON"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:465
-#, python-format
-msgid "Did not find old folder user/%s to rename"
+#: ../pykolab/xml/attendee.py:79 ../pykolab/xml/attendee.py:99
+msgid "Not a valid attendee"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:467
-msgid "Value for user is not a dictionary"
+#: ../pykolab/xml/attendee.py:84
+msgid "No valid delegator references found"
 msgstr ""
 
-#. TODO: Go in fact correct the quota.
-#: .././pykolab/imap/__init__.py:527
-#, python-format
-msgid "Cannot get current IMAP quota for folder %s"
+#: ../pykolab/xml/attendee.py:104
+msgid "No valid delegatee references found"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:540
+#: ../pykolab/xml/attendee.py:140
 #, python-format
-msgid "Quota for %s currently is %s"
+msgid "Invalid cutype %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:546
+#: ../pykolab/xml/attendee.py:151
 #, python-format
-msgid "Adjusting authentication database quota for folder %s to %d"
+msgid "Invalid participant status %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:551
+#: ../pykolab/xml/attendee.py:159
 #, python-format
-msgid "Correcting quota for %s to %s (currently %s)"
+msgid "Invalid role %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:633
+#: ../pykolab/xml/event.py:172
 #, python-format
-msgid "Checking folder: %s"
+msgid "No attendee with email or name %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:638
+#: ../pykolab/xml/event.py:180
 #, python-format
-msgid "Folder has no corresponding user (1): %s"
+msgid "Invalid argument value attendee %r, must be basestring or Attendee"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:641
+#: ../pykolab/xml/event.py:186
 #, python-format
-msgid "Folder has no corresponding user (2): %s"
+msgid "No attendee with email %r"
 msgstr ""
 
-#. We got user identifier only
-#: .././pykolab/imap/__init__.py:656
-msgid "Please don't give us just a user identifier"
+#: ../pykolab/xml/event.py:192
+#, python-format
+msgid "No attendee with name %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:659
-#, python-format
-msgid "Deleting folder %s"
+#: ../pykolab/xml/event.py:338
+msgid "Invalid participant status"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:78
-#, python-format
-msgid "Could not connect to Cyrus IMAP server %r"
+#: ../pykolab/xml/event.py:538
+msgid "Event end needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:101
+#: ../pykolab/xml/event.py:657
 #, python-format
-msgid "Continuing with separator: %r"
+msgid "Invalid status %r"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:106
-msgid "Detected we are running in a Murder topology"
+#: ../pykolab/xml/event.py:678 ../pykolab/xml/event.py:728
+msgid "Event start needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:110
-msgid "This system is not part of a murder topology"
+#: ../pykolab/xml/event.py:764
+#, python-format
+msgid "Invalid status set: %r"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:131
-#, python-format
-msgid "Checking actual backend server for folder %s through annotations"
+#: ../pykolab/xml/event.py:882
+msgid "No sender specified"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:146
-#, python-format
-msgid "Could not get the annotations after %s tries."
+#: ../saslauthd/__init__.py:126 ../saslauthd/__init__.py:134
+msgid "Traceback occurred, please report a bug at http://bugzilla.kolabsys.com"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:150
+#: ../wallace/__init__.py:61
 #, python-format
-msgid "No annotations for %s: %r"
+msgid "Worker process %s initializing"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:157
-#, python-format
-msgid "Server for INBOX folder %s is %s"
+#: ../wallace/__init__.py:80
+msgid "Bind address for Wallace."
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:169
-#, python-format
-msgid "Setting quota for INBOX folder %s to %s"
+#: ../wallace/__init__.py:106
+msgid "Port that Wallace is supposed to use."
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:173
+#: ../wallace/__init__.py:157
 #, python-format
-msgid "Could not set quota for mailfolder %s"
+msgid "Could not bind to socket on port %d on bind "
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:182
-#, python-format
-msgid "Moving INBOX folder %s to %s"
+#: ../wallace/__init__.py:169
+msgid "Could not shut down socket"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:194
-#, python-format
-msgid "Setting annotation %s on folder %s"
+#: ../wallace/__init__.py:226
+msgid "Accepted connection"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:201
+#: ../wallace/__init__.py:389
 #, python-format
-msgid "Could not set annotation %r on mail folder %r: %r"
+msgid "Could not write pid file %s"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:205
+#: ../wallace/module_optout.py:61 ../wallace/module_resources.py:94
 #, python-format
-msgid "Transferring folder %s from %s to %s"
+msgid "Issuing callback after processing to stage %s"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:265
+#: ../wallace/module_optout.py:62 ../wallace/module_resources.py:100
 #, python-format
-msgid "Undeleting %s to %s"
+msgid "Testing cb_action_%s()"
 msgstr ""
 
-#. start_max = (int)(time.time())
-#: .././pykolab/telemetry.py:588
+#: ../wallace/module_optout.py:64 ../wallace/module_resources.py:103
 #, python-format
-msgid "Expiring sessions that started before or on %d"
+msgid "Attempting to execute cb_action_%s()"
 msgstr ""
 
-#: .././pykolab/telemetry.py:601
+#. modules.next_module('optout')
+#: ../wallace/module_optout.py:70
 #, python-format
-msgid "Expiring session ID: %d"
+msgid "Consulting opt-out service for %r, %r"
 msgstr ""
 
-#: .././pykolab/telemetry.py:620
+#: ../wallace/module_optout.py:96
 #, python-format
-msgid "Session with ID %d expired from database"
+msgid "Running opt-out consult from envelope sender '%s "
 msgstr ""
 
-#: .././pykolab/telemetry.py:646
+#: ../wallace/module_optout.py:160
 #, python-format
-msgid "Operational Error in telemetry database: %s"
+msgid "Attempting to execute cb_action_%s(%r, %r)"
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:92
+#: ../wallace/module_optout.py:181
 #, python-format
-msgid "Creating %d Mails"
+msgid "Could not send request to optout_url %s"
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:116
+#: ../wallace/module_resources.py:81
 #, python-format
-msgid "Sending message %s through SMTP targeting user %s@%s"
+msgid "Resource Management called for %r, %r"
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:119
-#, python-format
-msgid "Sending message %s through LMTP targeting user %s@%s"
+#: ../wallace/module_resources.py:139
+msgid "Message is not an iTip message or does not contain any "
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:122
-#, python-format
-msgid "Saving message %s to IMAP (user %s, folder %s)"
+#: ../wallace/module_resources.py:147
+msgid "iTip events attached to this message contain the "
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:125 .././pykolab/tests.old/calendar.py:198
-#: .././pykolab/tests.old/contacts.py:145
-msgid "Somehow ended up NOT sending these messages"
+#: ../wallace/module_resources.py:174
+msgid "Not an iTip message, but sent to resource nonetheless. Reject message"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:146
-#, python-format
-msgid "Creating %d Events"
+#: ../wallace/module_resources.py:182
+msgid "No itips, no resources, pass along"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:177
-#, python-format
-msgid "Creating Calendar item number %d"
+#: ../wallace/module_resources.py:186
+msgid "iTips, but no resources, pass along"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:189
-#: .././pykolab/tests.old/contacts.py:136
+#: ../wallace/module_resources.py:218
 #, python-format
-msgid "Sending UID message %s through SMTP targeting user %s@%s"
+msgid "Resources: %r"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:192
-#: .././pykolab/tests.old/contacts.py:139
+#: ../wallace/module_resources.py:236
 #, python-format
-msgid "Sending UID message %s through LMTP targeting user %s@%s"
+msgid "Checking events in resource folder %r"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:195
-#: .././pykolab/tests.old/contacts.py:142
+#: ../wallace/module_resources.py:243
 #, python-format
-msgid "Saving UID message %s to IMAP (user %s, folder %s)"
+msgid "Mailbox for resource %r doesn't exist"
 msgstr ""
 
-#: .././pykolab/tests.old/zpush/test_000_001.py:47
+#: ../wallace/module_resources.py:256
 #, python-format
-msgid "Could not load %sItem from %s, skipping the testing."
+msgid "Fetching message UID %r from folder %r"
 msgstr ""
 
-#: .././pykolab/tests.old/zpush/test_000_000.py:77
+#: ../wallace/module_resources.py:295
 #, python-format
-msgid "Authentication failure for %s"
+msgid "Event %r conflicts with event "
 msgstr ""
 
-#: .././pykolab/tests.old/contacts.py:105
+#: ../wallace/module_resources.py:308
 #, python-format
-msgid "Creating %d Contacts"
+msgid "start: %r, end: %r, total: %r, messages: %r"
 msgstr ""
 
-#: .././pykolab/tests.old/contacts.py:124
+#: ../wallace/module_resources.py:315
 #, python-format
-msgid "Creating Contact item number %d"
+msgid "Polling for resource %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:207
+#: ../wallace/module_resources.py:319
 #, python-format
-msgid "Adding policy request to instance %s"
+msgid "Resource %r has been popped from the list"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:442
-msgid "Unauthorized access not allowed"
+#: ../wallace/module_resources.py:326
+msgid "Resource is a collection"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:481
-#: .././bin/kolab_smtp_access_policy.py:541
+#: ../wallace/module_resources.py:374 ../wallace/module_resources.py:424
 #, python-format
-msgid "Could not find envelope sender user %s"
+msgid "Adding event to %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:568
+#: ../wallace/module_resources.py:473
 #, python-format
-msgid "%s is unauthorized to send on behalf of %s"
+msgid "Method %r not really interesting for us."
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:578
+#: ../wallace/module_resources.py:481
 #, python-format
-msgid "User %s attempted to use envelope sender address %s "
+msgid "Raw iTip payload: %s"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:638
-#: .././bin/kolab_smtp_access_policy.py:649
-#, python-format
-msgid "Found user %s to be a delegate user of %s"
+#: ../wallace/module_resources.py:491
+msgid "Could not read iTip from message."
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:673
-#, python-format
-msgid "Verifying authenticated sender '%(sender)s' with "
+#: ../wallace/module_resources.py:513
+msgid "iTip event without a start"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:678
-#, python-format
-msgid "Verifying unauthenticated sender '%(sender)s' "
+#. end if c.name == "VEVENT"
+#. end for c in cal.walk()
+#. end if part.get_content_type() == "text/calendar"
+#. end for part in message.walk()
+#. if message.is_multipart()
+#: ../wallace/module_resources.py:543
+msgid "Message is not an iTip message (non-multipart message)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:695
+#: ../wallace/module_resources.py:564
 #, python-format
-msgid "Reproducing verify_recipient(%s, %s) from "
+msgid "Checking if email address %r belongs to a resource (collection)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:712
+#: ../wallace/module_resources.py:575 ../wallace/module_resources.py:649
+#: ../wallace/module_resources.py:699
 #, python-format
-msgid "Using authentication domain %s instead of %s"
+msgid "No resource (collection) records found for %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:722
+#: ../wallace/module_resources.py:583 ../wallace/module_resources.py:657
+#: ../wallace/module_resources.py:707
 #, python-format
-msgid "Domain %s is a primary domain"
+msgid "Resource record(s): %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:730
+#: ../wallace/module_resources.py:589 ../wallace/module_resources.py:664
+#: ../wallace/module_resources.py:714
 #, python-format
-msgid "Checking the recipient for domain %s that is not "
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:792
-msgid "Could not find this user, accepting"
+msgid "Resource record: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:862
-#: .././bin/kolab_smtp_access_policy.py:915
+#: ../wallace/module_resources.py:608
 #, python-format
-msgid "Sender %s is not allowed to send to "
+msgid "Raw itip_events: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:902
+#: ../wallace/module_resources.py:616
 #, python-format
-msgid "Reproducing verify_sender(%r) from cache, "
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:931
-msgid "Sender uses unauthorized envelope sender address"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:948
-msgid "Could not verify sender"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:955
-msgid "Verifying whether sender is allowed to send to "
+msgid "Raw set of attendees: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:969
+#: ../wallace/module_resources.py:624
 #, python-format
-msgid "Result is %r"
+msgid "Raw set of resources: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:974
-msgid "No recipient policy restrictions exist for this sender"
+#: ../wallace/module_resources.py:638
+#, python-format
+msgid "Checking if attendee %r is a resource (collection)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:983
-msgid "Found a recipient policy to apply for this sender."
+#: ../wallace/module_resources.py:671 ../wallace/module_resources.py:717
+msgid "Resource reservation made but no resource records found"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:998
+#: ../wallace/module_resources.py:689
 #, python-format
-msgid "Sender %s not allowed to send to recipient "
+msgid "Checking if resource %r is a resource (collection)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1029
-msgid "Cleaning up the cache"
+#: ../wallace/module_resources.py:721
+msgid "The following resources are being referred to in the "
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1066
+#. This is a nested module
+#: ../wallace/modules.py:96
 #, python-format
-msgid "Operational Error in caching: %s"
+msgid "Module Group: %s"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1117
-#, python-format
-msgid "Caching the policy result with timestamp %d"
+#: ../wallace/modules.py:107 ../wallace/modules.py:112
+msgid "No such module."
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1194
+#: ../wallace/modules.py:118
 #, python-format
-msgid "Returning action DEFER_IF_PERMIT: %s"
+msgid "Holding message in queue for manual review (%s by %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1199
+#: ../wallace/modules.py:121
 #, python-format
-msgid "Returning action DUNNO: %s"
+msgid "Deferring message in %s (by module %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1204
+#: ../wallace/modules.py:131
 #, python-format
-msgid "Returning action HOLD: %s"
+msgid "The time when the message was sent: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1209
+#: ../wallace/modules.py:132
 #, python-format
-msgid "Returning action PERMIT: %s"
+msgid "The time now: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1214
+#: ../wallace/modules.py:133
 #, python-format
-msgid "Returning action REJECT: %s"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1258
-msgid "Starting to loop for new request"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1267
-msgid "End of current request"
+msgid "The time delta: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1271
+#. TODO: Send NDR back to user
+#: ../wallace/modules.py:137
 #, python-format
-msgid "Getting line: %s"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1275
-msgid "Returning request"
+msgid "Message in file %s older then 5 days, deleting"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1332
+#: ../wallace/modules.py:162
 #, python-format
-msgid "Got request instance %s"
+msgid "Rejecting message in %s (by module %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1341
+#: ../wallace/modules.py:180
 #, python-format
-msgid "Request instance %s is in state %s"
+msgid ""
+"This is the email system Wallace at %s.\n"
+"\n"
+"I'm sorry to inform you we could not deliver the attached message\n"
+"to the following recipients:\n"
+"\n"
+"- %s\n"
+"\n"
+"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 ""
 
-#: .././bin/kolab_smtp_access_policy.py:1349
+#: ../wallace/modules.py:195
 #, python-format
-msgid "Request instance %s is not yet in DATA state"
+msgid ""
+"X-Wallace-Module: %s\n"
+"X-Wallace-Result: REJECT\n"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1361
+#: ../wallace/modules.py:248
 #, python-format
-msgid "Request instance %s reached DATA state"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1379
-msgid "Sender access denied"
+msgid "Accepting message in %s (by module %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1381
-msgid "Recipient access denied"
+#: ../wallace/modules.py:316
+#, python-format
+msgid "Module '%s' already registered"
 msgstr ""
diff --git a/po/da.po b/po/da.po
index 58deb58..be7be0e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pykolab 0.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-09 14:25+0100\n"
+"POT-Creation-Date: 2012-08-11 15:04+0100\n"
 "PO-Revision-Date: 2012-05-09 14:25+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,793 +17,907 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .././wallace/__init__.py:37 .././bonnie/__init__.py:35
-#: .././kolabd/__init__.py:46 .././saslauthd/__init__.py:47
-msgid "Daemon Options"
-msgstr ""
-
-#: .././wallace/__init__.py:44 .././bonnie/__init__.py:41
-#: .././kolabd/__init__.py:52 .././saslauthd/__init__.py:53
-msgid "Fork to the background."
-msgstr ""
-
-#: .././wallace/__init__.py:52
-msgid "Bind address for Wallace."
+#: ../bin/kolab_smtp_access_policy.py:206
+#, python-format
+msgid "Adding policy request to instance %s"
 msgstr ""
 
-#: .././wallace/__init__.py:60 .././kolabd/__init__.py:58
-#: .././saslauthd/__init__.py:59
-msgid "Path to the PID file to use."
+#: ../bin/kolab_smtp_access_policy.py:446
+msgid "Unauthorized access not allowed"
 msgstr ""
 
-#: .././wallace/__init__.py:68
-msgid "Port that Wallace is supposed to use."
+#: ../bin/kolab_smtp_access_policy.py:467
+#: ../bin/kolab_smtp_access_policy.py:658
+msgid "Could not find recipient"
 msgstr ""
 
-#: .././wallace/__init__.py:102 .././wallace/__init__.py:126
-#: .././wallace/__init__.py:373 .././wallace/__init__.py:401
+#: ../bin/kolab_smtp_access_policy.py:486
+#: ../bin/kolab_smtp_access_policy.py:586
 #, python-format
-msgid "Number of threads currently running: %d"
+msgid "Could not find envelope sender user %s"
 msgstr ""
 
-#: .././wallace/__init__.py:111 .././wallace/__init__.py:135
+#: ../bin/kolab_smtp_access_policy.py:529
 #, python-format
-msgid "Continuing with %d threads currently running"
+msgid "Obtained authenticated user details for %r: %r"
 msgstr ""
 
-#. TODO: Apply throttling
-#: .././wallace/__init__.py:118
+#: ../bin/kolab_smtp_access_policy.py:608
 #, python-format
-msgid "Creating thread for message in %s"
+msgid "%s is unauthorized to send on behalf of %s"
 msgstr ""
 
-#: .././wallace/__init__.py:142
+#: ../bin/kolab_smtp_access_policy.py:618
 #, python-format
-msgid "Running thread %s for message file %s"
+msgid "User %s attempted to use envelope sender address %s "
 msgstr ""
 
-#: .././wallace/__init__.py:151
+#: ../bin/kolab_smtp_access_policy.py:682
+#: ../bin/kolab_smtp_access_policy.py:693
 #, python-format
-msgid "This message was already in module %s, delegating "
+msgid "Found user %s to be a delegate user of %s"
 msgstr ""
 
-#: .././wallace/__init__.py:160
+#: ../bin/kolab_smtp_access_policy.py:717
 #, python-format
-msgid "It was also in a certain stage: %s, letting "
+msgid "Verifying authenticated sender '%(sender)s' with "
 msgstr ""
 
-#: .././wallace/__init__.py:168 .././wallace/__init__.py:174
-#: .././wallace/__init__.py:184
+#: ../bin/kolab_smtp_access_policy.py:722
 #, python-format
-msgid "Executing module %s"
-msgstr ""
-
-#: .././wallace/__init__.py:211 .././bonnie/__init__.py:67
-#: .././kolabd/__init__.py:85 .././saslauthd/__init__.py:90
-msgid "Interrupted by user"
-msgstr ""
-
-#: .././wallace/__init__.py:215 .././wallace/__init__.py:225
-#: .././kolabd/__init__.py:90 .././kolabd/__init__.py:101
-msgid "Traceback occurred, please report a "
+msgid "Verifying unauthenticated sender '%(sender)s' "
 msgstr ""
 
-#: .././wallace/__init__.py:221 .././bonnie/__init__.py:75
-#: .././kolabd/__init__.py:96 .././saslauthd/__init__.py:98
+#: ../bin/kolab_smtp_access_policy.py:739
 #, python-format
-msgid "Type Error: %s"
-msgstr ""
-
-#: .././wallace/__init__.py:241
-msgid "Picking up deferred messages for wallace"
+msgid "Reproducing verify_recipient(%s, %s) from "
 msgstr ""
 
-#: .././wallace/__init__.py:261
+#: ../bin/kolab_smtp_access_policy.py:756
 #, python-format
-msgid "Picking up deferred messages for module %s"
-msgstr ""
-
-#. Sleep for 300 seconds before reprocessing the deferred queues.
-#. TODO: Consider using queue_run_delay from Postfix, which is where
-#. the default value of 300 seconds comes from.
-#: .././wallace/__init__.py:285
-msgid "Sleeping for 300 seconds"
+msgid "Using authentication domain %s instead of %s"
 msgstr ""
 
-#: .././wallace/__init__.py:310
+#: ../bin/kolab_smtp_access_policy.py:766
 #, python-format
-msgid "Could not bind to socket on port %d on bind "
-msgstr ""
-
-#: .././wallace/__init__.py:320
-msgid "Could not shut down socket"
+msgid "Domain %s is a primary domain"
 msgstr ""
 
-#: .././wallace/__init__.py:394
+#: ../bin/kolab_smtp_access_policy.py:774
 #, python-format
-msgid "Picking up spooled email file %s"
+msgid "Checking the recipient for domain %s that is not "
 msgstr ""
 
-#: .././wallace/__init__.py:424
-msgid "Accepted connection"
+#: ../bin/kolab_smtp_access_policy.py:790
+msgid "This recipient address is related to multiple "
 msgstr ""
 
-#. This is a nested module
-#: .././wallace/modules.py:96
+#: ../bin/kolab_smtp_access_policy.py:799
 #, python-format
-msgid "Module Group: %s"
+msgid "Recipient address %r not found. Allowing since "
 msgstr ""
 
-#: .././wallace/modules.py:107 .././wallace/modules.py:112
-msgid "No such module."
+#: ../bin/kolab_smtp_access_policy.py:827
+msgid "Invalid recipient"
 msgstr ""
 
-#: .././wallace/modules.py:118
-#, python-format
-msgid "Holding message in queue for manual review (%s by %s)"
+#: ../bin/kolab_smtp_access_policy.py:838
+msgid "Could not find this user, accepting"
 msgstr ""
 
-#: .././wallace/modules.py:121
+#: ../bin/kolab_smtp_access_policy.py:901
+#: ../bin/kolab_smtp_access_policy.py:954
 #, python-format
-msgid "Deferring message in %s (by module %s)"
+msgid "Sender %s is not allowed to send to "
 msgstr ""
 
-#: .././wallace/modules.py:131
+#: ../bin/kolab_smtp_access_policy.py:941
 #, python-format
-msgid "The time when the message was sent: %r"
+msgid "Reproducing verify_sender(%r) from cache, "
 msgstr ""
 
-#: .././wallace/modules.py:132
-#, python-format
-msgid "The time now: %r"
+#: ../bin/kolab_smtp_access_policy.py:970
+msgid "Sender uses unauthorized envelope sender address"
 msgstr ""
 
-#: .././wallace/modules.py:133
-#, python-format
-msgid "The time delta: %r"
+#: ../bin/kolab_smtp_access_policy.py:987
+msgid "Could not verify sender"
 msgstr ""
 
-#. TODO: Send NDR back to user
-#: .././wallace/modules.py:137
-#, python-format
-msgid "Message in file %s older then 5 days, deleting"
+#: ../bin/kolab_smtp_access_policy.py:994
+msgid "Verifying whether sender is allowed to send to "
 msgstr ""
 
-#: .././wallace/modules.py:162
+#: ../bin/kolab_smtp_access_policy.py:1008
 #, python-format
-msgid "Rejecting message in %s (by module %s)"
+msgid "Result is %r"
 msgstr ""
 
-#: .././wallace/modules.py:180
-#, python-format
-msgid ""
-"This is the email system Wallace at %s.\n"
-"\n"
-"I'm sorry to inform you we could not deliver the attached message\n"
-"to the following recipients:\n"
-"\n"
-"- %s\n"
-"\n"
-"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"
+#: ../bin/kolab_smtp_access_policy.py:1013
+msgid "No recipient policy restrictions exist for this sender"
 msgstr ""
 
-#: .././wallace/modules.py:195
-#, python-format
-msgid ""
-"X-Wallace-Module: %s\n"
-"X-Wallace-Result: REJECT\n"
+#: ../bin/kolab_smtp_access_policy.py:1022
+msgid "Found a recipient policy to apply for this sender."
 msgstr ""
 
-#: .././wallace/modules.py:248
+#: ../bin/kolab_smtp_access_policy.py:1037
 #, python-format
-msgid "Accepting message in %s (by module %s)"
+msgid "Sender %s not allowed to send to recipient "
 msgstr ""
 
-#: .././wallace/modules.py:316
-#, python-format
-msgid "Module '%s' already registered"
+#: ../bin/kolab_smtp_access_policy.py:1068
+msgid "Cleaning up the cache"
 msgstr ""
 
-#: .././wallace/modules.py:338 .././pykolab/tests/tests.py:183
-#: .././pykolab/cli/commands.py:183 .././pykolab/setup/components.py:243
+#: ../bin/kolab_smtp_access_policy.py:1105
 #, python-format
-msgid "Alias for %s"
+msgid "Operational Error in caching: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:57
+#: ../bin/kolab_smtp_access_policy.py:1156
 #, python-format
-msgid "Issuing callback after processing to stage %s"
+msgid "Caching the policy result with timestamp %d"
 msgstr ""
 
-#: .././wallace/module_optout.py:58
+#: ../bin/kolab_smtp_access_policy.py:1233
 #, python-format
-msgid "Testing cb_action_%s()"
+msgid "Returning action DEFER_IF_PERMIT: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:60
+#: ../bin/kolab_smtp_access_policy.py:1238
 #, python-format
-msgid "Attempting to execute cb_action_%s()"
+msgid "Returning action DUNNO: %s"
 msgstr ""
 
-#. modules.next_module('optout')
-#: .././wallace/module_optout.py:66
+#: ../bin/kolab_smtp_access_policy.py:1243
 #, python-format
-msgid "Consulting opt-out service for %r, %r"
+msgid "Returning action HOLD: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:92
+#: ../bin/kolab_smtp_access_policy.py:1248
 #, python-format
-msgid "Running opt-out consult from envelope sender '%s "
+msgid "Returning action PERMIT: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:156
+#: ../bin/kolab_smtp_access_policy.py:1253
 #, python-format
-msgid "Attempting to execute cb_action_%s(%r, %r)"
+msgid "Returning action REJECT: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:177
-#, python-format
-msgid "Could not send request to optout_url %s"
+#: ../bin/kolab_smtp_access_policy.py:1299
+msgid "Starting to loop for new request"
 msgstr ""
 
-#: .././setup-kolab.py:36 .././kolabtest.py:34 .././kolabd.py:31
-#: .././wallace.py:31 .././bonnie.py:31
-msgid "Cannot load pykolab/constants.py:"
+#: ../bin/kolab_smtp_access_policy.py:1306
+msgid "Timeout for policy request reading exceeded"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:89
-msgid "Could not import caching library, caching disabled"
+#: ../bin/kolab_smtp_access_policy.py:1312
+msgid "End of current request"
 msgstr ""
 
-#. Obtain 'kolabDelegate' from the envelope sender.
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:291
+#: ../bin/kolab_smtp_access_policy.py:1316
 #, python-format
-msgid "Obtaining envelope sender dn for %s"
+msgid "Getting line: %s"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:309
-#, python-format
-msgid ""
-"User %s attempted to use envelope sender address %s without authorization"
+#: ../bin/kolab_smtp_access_policy.py:1320
+msgid "Returning request"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:355
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:358
-#, python-format
-msgid "Found user %s to be a valid delegate user of %s"
+#: ../bin/kolab_smtp_access_policy.py:1346
+msgid "Access Policy Options"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:424
-#: .././bin/kolab_smtp_access_policy.py:1301
-msgid "Access Policy Options"
+#: ../bin/kolab_smtp_access_policy.py:1353
+msgid "SMTP Policy request timeout."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:431
-#: .././bin/kolab_smtp_access_policy.py:1308
+#: ../bin/kolab_smtp_access_policy.py:1359
 msgid "Verify the recipient access policy."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:437
-#: .././bin/kolab_smtp_access_policy.py:1314
+#: ../bin/kolab_smtp_access_policy.py:1365
 msgid "Verify the sender access policy."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:443
-#: .././bin/kolab_smtp_access_policy.py:1320
+#: ../bin/kolab_smtp_access_policy.py:1371
 msgid "Allow unauthenticated senders."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:464
-msgid "Verifying sender."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:468
-msgid "No sender specified."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:469
-msgid "Invalid sender"
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:473
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:521
-msgid "No SASL username in request."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:475
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:524
-msgid "Not allowing unauthenticated senders."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:476
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:525
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:534
-msgid "Access denied"
+#: ../bin/kolab_smtp_access_policy.py:1385
+#, python-format
+msgid "Got request instance %s"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:478
-msgid "Allowing unauthenticated senders."
+#: ../bin/kolab_smtp_access_policy.py:1394
+#, python-format
+msgid "Request instance %s is in state %s"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:484
+#: ../bin/kolab_smtp_access_policy.py:1402
 #, python-format
-msgid "Allowing authenticated sender %s to send as %s."
+msgid "Request instance %s is not yet in DATA state"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:492
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:504
+#: ../bin/kolab_smtp_access_policy.py:1414
 #, python-format
-msgid "Authenticated as sender %s"
+msgid "Request instance %s reached DATA state"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:515
-msgid "Verifying recipient."
+#: ../bin/kolab_smtp_access_policy.py:1432
+msgid "Sender access denied"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:518
-#: .././bin/kolab_smtp_access_policy.py:781
-msgid "Invalid recipient"
+#: ../bin/kolab_smtp_access_policy.py:1434
+msgid "Recipient access denied"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:536
-#: .././bin/kolab_smtp_access_policy.py:1383
+#: ../bin/kolab_smtp_access_policy.py:1436
 msgid "No objections"
 msgstr ""
 
-#: .././play/confmgmt/db.py:59 .././play/conf.py:280
-msgid "Dropping all tables..."
-msgstr ""
-
-#: .././play/confmgmt/db.py:62 .././play/conf.py:283
-msgid "Creating the necessary tables..."
-msgstr ""
-
-#: .././play/confmgmt/db.py:69 .././play/conf.py:290
-#: .././play/roundcube_database/__init__.py:57
-#: .././play/roundcube_database/users.py:114 .././pykolab/telemetry.py:652
-msgid "No database available"
-msgstr ""
-
-#: .././play/confmgmt.py:74
-#, python-format
-msgid "Searching for service with name %s"
-msgstr ""
-
-#: .././play/confmgmt.py:77
-#, python-format
-msgid "Found service %s"
+#: ../conf.py:37 ../kolab.py:34 ../saslauthd.py:33
+msgid "Cannot load pykolab/logger.py:"
 msgstr ""
 
-#: .././play/confmgmt.py:82
-#, python-format
-msgid "Searching for role with name %s"
+#: ../kolabd/__init__.py:49 ../saslauthd/__init__.py:48
+#: ../wallace/__init__.py:65
+msgid "Daemon Options"
 msgstr ""
 
-#: .././play/confmgmt.py:85
-#, python-format
-msgid "Found role %s"
+#: ../kolabd/__init__.py:56 ../saslauthd/__init__.py:55
+#: ../wallace/__init__.py:72
+msgid "Fork to the background."
 msgstr ""
 
-#: .././play/confmgmt.py:89
-#, python-format
-msgid "Searching for file with path %s"
+#: ../kolabd/__init__.py:65 ../saslauthd/__init__.py:64
+#: ../wallace/__init__.py:98
+msgid "Path to the PID file to use."
 msgstr ""
 
-#: .././play/confmgmt.py:92
-#, python-format
-msgid "File with path %s not found, adding to database"
+#: ../kolabd/__init__.py:74 ../saslauthd/__init__.py:73
+#: ../wallace/__init__.py:115
+msgid "Run as user USERNAME"
 msgstr ""
 
-#: .././play/confmgmt.py:97
-#, python-format
-msgid "Adding file with path %s to service with name %s"
+#: ../kolabd/__init__.py:84 ../saslauthd/__init__.py:83
+#: ../wallace/__init__.py:89
+msgid "Run as group GROUPNAME"
 msgstr ""
 
-#: .././play/confmgmt.py:101
+#: ../kolabd/__init__.py:122 ../pykolab/utils.py:151
+#: ../wallace/__init__.py:288
 #, python-format
-msgid "Adding setting with key %s (%r, %r)"
+msgid "Group %s does not exist"
 msgstr ""
 
-#: .././play/confmgmt.py:106
+#: ../kolabd/__init__.py:131 ../wallace/__init__.py:297
 #, python-format
-msgid "Adding setting %s to file with path %s"
+msgid "Switching real and effective group id to %d"
 msgstr ""
 
-#: .././play/confmgmt.py:110
+#: ../kolabd/__init__.py:153 ../pykolab/utils.py:175
+#: ../wallace/__init__.py:319
 #, python-format
-msgid "Adding role with name %s to setting with key %s"
+msgid "User %s does not exist"
 msgstr ""
 
-#: .././play/rolequota/__init__.py:53
-#: .././pykolab/plugins/dynamicquota/__init__.py:50
+#: ../kolabd/__init__.py:163 ../wallace/__init__.py:329
 #, python-format
-msgid "No keyword %s passed to set_user_folder_quota"
+msgid "Switching real and effective user id to %d"
 msgstr ""
 
-#: .././play/roundcube_database/__init__.py:51
-#: .././play/roundcube_database/users.py:108
-#, python-format
-msgid "Operational Error in Roundcube database: %s"
+#: ../kolabd/__init__.py:172 ../wallace/__init__.py:338
+msgid "Could not change real and effective uid and/or gid"
 msgstr ""
 
-#: .././kwap/kwap/controllers/secure.py:25
-msgid "Secure Controller here"
+#: ../kolabd/__init__.py:192 ../saslauthd/__init__.py:122
+#: ../wallace/__init__.py:358
+msgid "Interrupted by user"
 msgstr ""
 
-#: .././kwap/kwap/controllers/root.py:103
-msgid "Wrong credentials"
+#: ../kolabd/__init__.py:197 ../kolabd/__init__.py:208
+#: ../wallace/__init__.py:362 ../wallace/__init__.py:372
+msgid "Traceback occurred, please report a "
 msgstr ""
 
-#: .././kwap/kwap/controllers/root.py:118
+#: ../kolabd/__init__.py:203 ../saslauthd/__init__.py:130
+#: ../wallace/__init__.py:368
 #, python-format
-msgid "Welcome back, %s!"
-msgstr ""
-
-#: .././kwap/kwap/controllers/root.py:128
-msgid "We hope to see you soon!"
-msgstr ""
-
-#: .././saslauthd.py:33 .././kolab.py:34 .././conf.py:37
-msgid "Cannot load pykolab/logger.py:"
-msgstr ""
-
-#: .././bonnie/__init__.py:71 .././bonnie/__init__.py:79
-#: .././saslauthd/__init__.py:94 .././saslauthd/__init__.py:102
-msgid "Traceback occurred, please report a bug at http://bugzilla.kolabsys.com"
+msgid "Type Error: %s"
 msgstr ""
 
-#: .././kolabd/__init__.py:116 .././pykolab/auth/ldap/__init__.py:1291
-#: .././pykolab/cli/cmd_sync.py:33
+#: ../kolabd/__init__.py:223 ../pykolab/auth/ldap/__init__.py:1591
+#: ../pykolab/cli/cmd_sync.py:36
 msgid "Listing domains..."
 msgstr ""
 
-#: .././kolabd/__init__.py:148
+#: ../kolabd/__init__.py:256
 #, python-format
 msgid "added domains: %r, removed domains: %r"
 msgstr ""
 
-#: .././pykolab/__init__.py:50
-msgid "Returning thread local configuration"
-msgstr ""
-
-#: .././pykolab/tests/tests.py:53
-msgid "List tests"
-msgstr ""
-
-#. This is a nested test
-#: .././pykolab/tests/tests.py:86
-#, python-format
-msgid "Test Suite: %s"
-msgstr ""
-
-#: .././pykolab/tests/tests.py:100 .././pykolab/tests/tests.py:105
-msgid "No such test."
-msgstr ""
-
-#: .././pykolab/tests/tests.py:157 .././pykolab/tests/tests.py:161
-#, python-format
-msgid "Test '%s' already registered"
-msgstr ""
-
-#: .././pykolab/tests/tests.py:191 .././pykolab/cli/commands.py:191
-#: .././pykolab/setup/components.py:251
-msgid "Not yet implemented"
-msgstr ""
-
-#: .././pykolab/tests/__init__.py:39
-msgid "Test Options"
-msgstr ""
-
-#: .././pykolab/tests/__init__.py:45
-msgid "Run tests in suite SUITE. Implies a certain set of items being tested."
-msgstr ""
-
-#: .././pykolab/tests/imap/test_login.py:44
-#, python-format
-msgid "Connecting at %s"
+#: ../kolabd.py:31 ../setup-kolab.py:36 ../wallace.py:31
+msgid "Cannot load pykolab/constants.py:"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:46
+#: ../pykolab/auth/__init__.py:94
 #, python-format
-msgid "Connected at %s"
+msgid "Called for domain %r"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:51
+#: ../pykolab/auth/__init__.py:107 ../pykolab/auth/__init__.py:116
 #, python-format
-msgid "Logging in at %s"
+msgid "Using section %s and domain %s"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:53
+#: ../pykolab/auth/__init__.py:121
 #, python-format
-msgid "Logged in at %s"
+msgid "Connecting to Authentication backend for domain %s"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:60
+#: ../pykolab/auth/__init__.py:132
 #, python-format
-msgid "Test failure in %s"
+msgid "Section %s has no option 'auth_mechanism'"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:94
+#: ../pykolab/auth/__init__.py:139
 #, python-format
-msgid "Called for domain %r"
+msgid "Section %s has auth_mechanism: %r"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:107 .././pykolab/auth/__init__.py:116
-#, python-format
-msgid "Using section %s and domain %s"
+#: ../pykolab/auth/__init__.py:148 ../pykolab/auth/__init__.py:157
+msgid "Starting LDAP..."
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:121
+#: ../pykolab/auth/ldap/cache.py:109
 #, python-format
-msgid "Connecting to Authentication backend for domain %s"
+msgid "Inserting cache entry %r"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:132
+#: ../pykolab/auth/ldap/cache.py:122
 #, python-format
-msgid "Section %s has no option 'auth_mechanism'"
+msgid "Updating timestamp for cache entry %r"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:139
+#: ../pykolab/auth/ldap/cache.py:129
 #, python-format
-msgid "Section %s has auth_mechanism: %r"
-msgstr ""
-
-#: .././pykolab/auth/__init__.py:148 .././pykolab/auth/__init__.py:157
-msgid "Starting LDAP..."
+msgid "Updating result_attribute for cache entry %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:51
+#: ../pykolab/auth/ldap/__init__.py:51
 msgid "Python LDAP library does not support persistent search"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:141
+#: ../pykolab/auth/ldap/__init__.py:142
 #, python-format
 msgid "Attempting to authenticate user %s in realm %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:181
+#: ../pykolab/auth/ldap/__init__.py:184
 #, python-format
 msgid "Binding with user_dn %s and password %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:190
+#: ../pykolab/auth/ldap/__init__.py:194
 #, python-format
 msgid "Failed to authenticate as user %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:205
+#: ../pykolab/auth/ldap/__init__.py:211
 msgid "Connecting to LDAP..."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:209
+#: ../pykolab/auth/ldap/__init__.py:215
 #, python-format
 msgid "Attempting to use LDAP URI %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:345
+#: ../pykolab/auth/ldap/__init__.py:357
 #, python-format
 msgid "Finding recipient with filter %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:398
+#: ../pykolab/auth/ldap/__init__.py:425
+#, python-format
+msgid "Finding resource with filter %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:448
+#, python-format
+msgid "Using timestamp %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:480
 #, python-format
 msgid "Applying recipient policy to %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:415
+#: ../pykolab/auth/ldap/__init__.py:497
 #, python-format
 msgid "Using mail attributes: %r, with primary %r and "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:426
+#: ../pykolab/auth/ldap/__init__.py:508
 #, python-format
 msgid "key %r not in entry"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:428
+#: ../pykolab/auth/ldap/__init__.py:510
 #, python-format
 msgid "key %r is the prim. mail attr."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:430
+#: ../pykolab/auth/ldap/__init__.py:512
 msgid "prim. mail pol. is not empty"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:433
+#: ../pykolab/auth/ldap/__init__.py:515
 #, python-format
 msgid "key %r is the sec. mail attr."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:435
+#: ../pykolab/auth/ldap/__init__.py:517
 msgid "sec. mail pol. is not empty"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:438
-#: .././pykolab/auth/ldap/__init__.py:451
+#: ../pykolab/auth/ldap/__init__.py:520 ../pykolab/auth/ldap/__init__.py:533
 #, python-format
 msgid "Attributes %r are not yet available for entry %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:492
+#: ../pykolab/auth/ldap/__init__.py:574
 #, python-format
 msgid "No results for mail address %s found"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:503
+#: ../pykolab/auth/ldap/__init__.py:585
 #, python-format
 msgid "1 result for address %s found, verifying"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:513
+#: ../pykolab/auth/ldap/__init__.py:595
 #, python-format
 msgid "Too bad, primary email address %s "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:524
-#: .././pykolab/auth/ldap/__init__.py:613
+#: ../pykolab/auth/ldap/__init__.py:606 ../pykolab/auth/ldap/__init__.py:695
 msgid "Address assigned to us"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:579
+#: ../pykolab/auth/ldap/__init__.py:661
 #, python-format
 msgid "No results for address %s found"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:590
+#: ../pykolab/auth/ldap/__init__.py:672
 #, python-format
 msgid "1 result for address %s found, "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:601
+#: ../pykolab/auth/ldap/__init__.py:683
 msgid "Too bad, secondary email "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:655
+#: ../pykolab/auth/ldap/__init__.py:710
+msgid "Recipient policy composed the following set of secondary "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:716
+#, python-format
+msgid "Secondary mail addresses that we want is not None: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:727
+msgid "Avoiding the duplication of the primary mail "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:738
+#, python-format
+msgid "Entry is getting secondary mail addresses: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:746
+msgid "Entry did not have any secondary mail "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:772
 #, python-format
 msgid "Entry modifications list: %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:698
+#: ../pykolab/auth/ldap/__init__.py:792
+#, python-format
+msgid "Setting entry attribute %r to %r for %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:828
+#, python-format
+msgid "Could not update dn %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:841
 #, python-format
 msgid "Using filter %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:736
+#: ../pykolab/auth/ldap/__init__.py:879
+#, python-format
+msgid "About to consider the user quota for %r (used: %r, "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:945
 msgid "Invalid bind credentials"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:989
+#: ../pykolab/auth/ldap/__init__.py:1229
 #, python-format
 msgid "Current changelog entry %s with %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:996
+#: ../pykolab/auth/ldap/__init__.py:1242
 #, python-format
 msgid "Result from recipient policy: %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1227
+#: ../pykolab/auth/ldap/__init__.py:1385
+#, python-format
+msgid "Kolab user %s does not have a result attribute %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1527
 #, python-format
 msgid "Finding domain root dn for domain %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1315
+#: ../pykolab/auth/ldap/__init__.py:1615
 msgid "Authentication database DOWN"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1394
+#: ../pykolab/auth/ldap/__init__.py:1699 ../pykolab/auth/ldap/__init__.py:1734
 #, python-format
 msgid "Entry type: %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1492
+#: ../pykolab/auth/ldap/__init__.py:1822
 msgid "LDAP Search Result Data Entry:"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1508
+#: ../pykolab/auth/ldap/__init__.py:1838
 msgid "Entry Change Notification attributes:"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1513
+#: ../pykolab/auth/ldap/__init__.py:1843
 #, python-format
 msgid "Change Type: %r (%r)"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1521
+#: ../pykolab/auth/ldap/__init__.py:1851
 #, python-format
 msgid "Previous DN: %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1575
+#: ../pykolab/auth/ldap/__init__.py:1906
 #, python-format
 msgid "Object %s searched no longer exists"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1583
+#: ../pykolab/auth/ldap/__init__.py:1916
 #, python-format
 msgid "%d results..."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1677
+#: ../pykolab/auth/ldap/__init__.py:2014
 #, python-format
 msgid "Searching with filter %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1721
+#: ../pykolab/auth/ldap/__init__.py:2058
 #, python-format
 msgid "Checking for support for %s on %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/cache.py:109
-#, python-format
-msgid "Inserting cache entry %r"
+#: ../pykolab/cli/cmd_add_domain.py:36 ../pykolab/cli/cmd_create_mailbox.py:36
+#: ../pykolab/cli/cmd_export_mailbox.py:33
+#: ../pykolab/cli/cmd_list_mailboxes.py:39
+msgid "CLI Options"
 msgstr ""
 
-#: .././pykolab/auth/ldap/cache.py:122
-#, python-format
-msgid "Updating timestamp for cache entry %r"
+#: ../pykolab/cli/cmd_add_domain.py:42
+msgid "Add domain as alias for DOMAIN"
 msgstr ""
 
-#: .././pykolab/auth/ldap/cache.py:128
-#, python-format
-msgid "Updating result_attribute for cache entry %r"
+#: ../pykolab/cli/cmd_add_domain.py:47
+msgid "Add a new domain or domain alias."
 msgstr ""
 
-#: .././pykolab/auth/sql/__init__.py:44
-msgid "Connecting to SQL..."
+#: ../pykolab/cli/cmd_add_domain.py:55
+msgid "Could not find credentials with sufficient permissions"
 msgstr ""
 
-#: .././pykolab/utils.py:92
-msgid "Please answer 'yes' or 'no'."
+#: ../pykolab/cli/cmd_add_domain.py:80 ../pykolab/wap_client/__init__.py:113
+msgid "Invalid parent domain"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:87
-#, python-format
-msgid "Setting %s to %r (from defaults)"
+#: ../pykolab/cli/cmd_add_domain.py:86
+msgid "Domain name"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:106
-#, python-format
-msgid "Setting %s to %r (from CLI, verified)"
+#: ../pykolab/cli/cmd_create_mailbox.py:41
+msgid "Set metadata for folder to ANNOTATION=VALUE"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:109
-#, python-format
-msgid "Setting %s to %r (from CLI, not checked)"
+#: ../pykolab/cli/cmd_create_mailbox.py:50
+msgid "Invalid argument"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:150 .././pykolab/conf/__init__.py:207
-#, python-format
-msgid "Setting %s_%s to '****' (from configuration file)"
+#: ../pykolab/cli/cmd_create_mailbox.py:58
+msgid "Invalid argument for metadata"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:152 .././pykolab/conf/__init__.py:209
-#, python-format
-msgid "Setting %s_%s to %r (from configuration file)"
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:45
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:49
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:50
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:55
+msgid "ACI Subject"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:162
-msgid "Setting options from configuration file"
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:48
+#: ../pykolab/cli/cmd_list_mailbox_acls.py:41
+#: ../pykolab/cli/cmd_list_mailbox_metadata.py:41
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:54
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:54
+msgid "Folder name"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:223
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:60
+#: ../pykolab/cli/cmd_list_mailbox_acls.py:52
+#: ../pykolab/cli/cmd_list_mailbox_metadata.py:52
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:67
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:67
 #, python-format
-msgid "Configuration file %s not readable"
+msgid "No such folder %r"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:226
-#, python-format
-msgid "Reading configuration file %s"
+#: ../pykolab/cli/cmd_delete_mailbox.py:46
+msgid "No mailbox specified"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:230
+#: ../pykolab/cli/cmd_export_mailbox.py:38
+msgid "All folders this user has access to"
+msgstr ""
+
+#: ../pykolab/cli/cmd_export_mailbox.py:108
+#, python-format
+msgid "%s is not a directory"
+msgstr ""
+
+#: ../pykolab/cli/cmd_export_mailbox.py:118
+#, python-format
+msgid "ZIP file at %s.zip"
+msgstr ""
+
+#: ../pykolab/cli/cmd_export_mailbox.py:120
+#, python-format
+msgid "No directories found for user %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_mailboxes.py:44
+msgid "Display raw IMAP UTF-7 folder names"
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_mailboxes.py:75
+#, python-format
+msgid "Appending folder search for %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:49
+msgid "Invalid or unqualified email address."
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:57
+#, python-format
+msgid "No recipient found for email address %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:60
+#, python-format
+msgid "Found the following recipient(s): %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:66
+#, python-format
+msgid "Using the following mail attributes: %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:90
+msgid "Found the following recipients:"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:48
+msgid "No target mailbox name specified"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:50
+msgid "No source mailbox name specified"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:62
+#, python-format
+msgid "Source folder %r does not exist"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:66
+#, python-format
+msgid "Target folder %r already exists"
+msgstr ""
+
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:47
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:51
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:56
+msgid "ACI Permissions"
+msgstr ""
+
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:47
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:51
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:56
+msgid "Metadata value"
+msgstr ""
+
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:50
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:55
+msgid "Metadata path"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:41
+#, python-format
+msgid "Found %d domains in %d seconds"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:51
+#, python-format
+msgid "Running for domain %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:57
+#, python-format
+msgid "Synchronizing users for %s took %d seconds"
+msgstr ""
+
+#. This is a nested command
+#. This is a nested component
+#: ../pykolab/cli/commands.py:98 ../pykolab/setup/components.py:90
+#, python-format
+msgid "Command Group: %s"
+msgstr ""
+
+#: ../pykolab/cli/commands.py:109 ../pykolab/cli/commands.py:114
+msgid "No such command."
+msgstr ""
+
+#: ../pykolab/cli/commands.py:165 ../pykolab/setup/components.py:231
+#, python-format
+msgid "Command '%s' already registered"
+msgstr ""
+
+#: ../pykolab/cli/commands.py:190 ../pykolab/setup/components.py:257
+#: ../wallace/modules.py:338
+#, python-format
+msgid "Alias for %s"
+msgstr ""
+
+#: ../pykolab/cli/commands.py:198 ../pykolab/setup/components.py:265
+msgid "Not yet implemented"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:40
+msgid "Unspecified command issue identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:50
+msgid "Invalid command issue identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:60
+#: ../pykolab/cli/telemetry/cmd_examine_session.py:65
+msgid "Invalid session identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:75
+#: ../pykolab/cli/telemetry/cmd_examine_session.py:100
+#, python-format
+msgid "Session by %s on server %s"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_session.py:43
+msgid "Unspecified session identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_list_sessions.py:35
+msgid "List Options"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_list_sessions.py:40
+msgid "Display sessions since ..."
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_list_sessions.py:58
+#, python-format
+msgid "Session for user %s started at %s with ID %s"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:57 ../pykolab/conf/entitlement.py:80
+#: ../pykolab/conf/entitlement.py:98 ../pykolab/conf/entitlement.py:116
+#: ../pykolab/conf/entitlement.py:230 ../pykolab/conf/entitlement.py:246
+#: ../pykolab/conf/entitlement.py:262
+msgid "Invalid entitlement verification "
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:120 ../pykolab/conf/entitlement.py:123
+msgid "Invalid entitlement certificate"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:132
+#, python-format
+msgid "Parsing entitlement file %s"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:141
+#, python-format
+msgid "License file %s not readable!"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:147
+msgid "No entitlement directory found"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:87
+#, python-format
+msgid "Setting %s to %r (from defaults)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:106
+#, python-format
+msgid "Setting %s to %r (from CLI, verified)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:109
+#, python-format
+msgid "Setting %s to %r (from CLI, not checked)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:150 ../pykolab/conf/__init__.py:207
+#, python-format
+msgid "Setting %s_%s to '****' (from configuration file)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:152 ../pykolab/conf/__init__.py:209
+#, python-format
+msgid "Setting %s_%s to %r (from configuration file)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:162
+msgid "Setting options from configuration file"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:223
+#, python-format
+msgid "Configuration file %s not readable"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:226
+#, python-format
+msgid "Reading configuration file %s"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:230
 #, python-format
 msgid "Invalid configuration file %s"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:233
+#: ../pykolab/conf/__init__.py:233
 #, python-format
 msgid "No master configuration section [kolab] in configuration file %s"
 msgstr ""
@@ -811,1088 +925,1335 @@ msgstr ""
 #. #
 #. # Runtime Options
 #. #
-#: .././pykolab/conf/__init__.py:267
+#: ../pykolab/conf/__init__.py:267
 msgid "Runtime Options"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:272
+#: ../pykolab/conf/__init__.py:272
 msgid "Configuration file to use"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:278
+#: ../pykolab/conf/__init__.py:278
 msgid "Set the debugging "
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:286
+#: ../pykolab/conf/__init__.py:286
 msgid "Set the logging level. "
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:294
+#: ../pykolab/conf/__init__.py:294
 msgid "Log file to use"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:300
+#: ../pykolab/conf/__init__.py:300
 msgid "Be quiet."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:306
+#: ../pykolab/conf/__init__.py:306
 msgid "Answer yes to all questions."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:328
+#: ../pykolab/conf/__init__.py:328
 msgid "No command supplied"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:411
+#: ../pykolab/conf/__init__.py:411
 msgid "Insufficient options. Need section, key and value -in that order."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:414
+#: ../pykolab/conf/__init__.py:414
 #, python-format
 msgid "No section '%s' exists."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:445
+#: ../pykolab/conf/__init__.py:445
 #, python-format
 msgid "Setting %s to %r (from the default values for CLI options)"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:514
+#: ../pykolab/conf/__init__.py:514
 #, python-format
 msgid "Could not execute configuration function: %s"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:522
+#: ../pykolab/conf/__init__.py:522
 #, python-format
 msgid "Option %s/%s does not exist in config file %s, pulling from defaults"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:530 .././pykolab/conf/__init__.py:533
+#: ../pykolab/conf/__init__.py:530 ../pykolab/conf/__init__.py:533
 msgid "Option does not exist in defaults."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:531 .././pykolab/conf/__init__.py:534
-msgid "Not available"
-msgstr ""
-
-#: .././pykolab/conf/__init__.py:543
+#: ../pykolab/conf/__init__.py:543
 #, python-format
 msgid "Configuration file %s not readable."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:546
+#: ../pykolab/conf/__init__.py:546
 #, python-format
 msgid "Configuration file %s does not exist."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:551
+#: ../pykolab/conf/__init__.py:551
 msgid ""
 "WARNING: A negative debug level value does not make this program be any more "
 "silent."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:557
+#: ../pykolab/conf/__init__.py:557
 msgid "This program has 9 levels of verbosity. Using the maximum of 9."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:565 .././pykolab/conf/__init__.py:571
+#: ../pykolab/conf/__init__.py:565 ../pykolab/conf/__init__.py:571
 msgid "Cannot start SASL authentication daemon"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:582
+#: ../pykolab/conf/__init__.py:582
 msgid "No imaplib library found."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:592
+#: ../pykolab/conf/__init__.py:592
 msgid "No LMTP class found in the smtplib library."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:602
+#: ../pykolab/conf/__init__.py:602
 msgid "No SMTP class found in the smtplib library."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:616
+#: ../pykolab/conf/__init__.py:616
 #, python-format
 msgid "Found you specified a specific set of items to test: %s"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:624
+#: ../pykolab/conf/__init__.py:624
 #, python-format
 msgid "Selectively selecting: %s"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:57 .././pykolab/conf/entitlement.py:80
-#: .././pykolab/conf/entitlement.py:98 .././pykolab/conf/entitlement.py:116
-#: .././pykolab/conf/entitlement.py:229 .././pykolab/conf/entitlement.py:245
-#: .././pykolab/conf/entitlement.py:261
-msgid "Invalid entitlement verification "
+#: ../pykolab/constants.py.in:40
+msgid "PyKolab is a Kolab Systems product. For more information "
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:120 .././pykolab/conf/entitlement.py:123
-msgid "Invalid entitlement certificate"
+#: ../pykolab/constants.py.in:54
+msgid "WARNING"
+msgstr ""
+
+#: ../pykolab/constants.py.in:54
+msgid "The Fully Qualified "
+msgstr ""
+
+#: ../pykolab/constants.py.in:75
+msgid "389 Directory Server or Red Hat Directory Server"
+msgstr ""
+
+#: ../pykolab/constants.py.in:79 ../pykolab/constants.py.in:83
+msgid "OpenLDAP or compatible"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:132
+#: ../pykolab/imap/cyrus.py:79
 #, python-format
-msgid "Parsing entitlement file %s"
+msgid "Could not connect to Cyrus IMAP server %r"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:141
+#: ../pykolab/imap/cyrus.py:134
 #, python-format
-msgid "License file %s not readable!"
+msgid "Continuing with separator: %r"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:146
-msgid "No entitlement directory found"
+#: ../pykolab/imap/cyrus.py:139
+msgid "Detected we are running in a Murder topology"
 msgstr ""
 
-#: .././pykolab/logger.py:89
+#: ../pykolab/imap/cyrus.py:143
+msgid "This system is not part of a murder topology"
+msgstr ""
+
+#: ../pykolab/imap/cyrus.py:164
 #, python-format
-msgid "Cannot log to file %s: %s"
+msgid "Checking actual backend server for folder %s through annotations"
 msgstr ""
 
-#: .././pykolab/constants.py:40
-msgid "PyKolab is a Kolab Systems product. For more information "
+#: ../pykolab/imap/cyrus.py:179
+#, python-format
+msgid "Could not get the annotations after %s tries."
 msgstr ""
 
-#: .././pykolab/constants.py:54
-msgid "WARNING"
+#: ../pykolab/imap/cyrus.py:183
+#, python-format
+msgid "No annotations for %s: %r"
 msgstr ""
 
-#: .././pykolab/constants.py:54
-msgid "The Fully Qualified "
+#: ../pykolab/imap/cyrus.py:190
+#, python-format
+msgid "Server for INBOX folder %s is %s"
 msgstr ""
 
-#: .././pykolab/constants.py:75
-msgid "389 Directory Server or Red Hat Directory Server"
+#: ../pykolab/imap/cyrus.py:202
+#, python-format
+msgid "Setting quota for folder %s to %s"
 msgstr ""
 
-#: .././pykolab/constants.py:79 .././pykolab/constants.py:83
-msgid "OpenLDAP or compatible"
+#: ../pykolab/imap/cyrus.py:206
+#, python-format
+msgid "Could not set quota for mailfolder %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_list_sessions.py:35
-msgid "List Options"
+#: ../pykolab/imap/cyrus.py:215
+#, python-format
+msgid "Moving INBOX folder %s to %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_list_sessions.py:40
-msgid "Display sessions since ..."
+#: ../pykolab/imap/cyrus.py:227
+#, python-format
+msgid "Setting annotation %s on folder %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_list_sessions.py:58
+#: ../pykolab/imap/cyrus.py:234
 #, python-format
-msgid "Session for user %s started at %s with ID %s"
+msgid "Could not set annotation %r on mail folder %r: %r"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_session.py:43
-msgid "Unspecified session identifier"
+#: ../pykolab/imap/cyrus.py:238
+#, python-format
+msgid "Transferring folder %s from %s to %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_session.py:65
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:60
-msgid "Invalid session identifier"
+#: ../pykolab/imap/cyrus.py:298
+#, python-format
+msgid "Undeleting %s to %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_session.py:100
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:75
+#: ../pykolab/imap/__init__.py:45
 #, python-format
-msgid "Session by %s on server %s"
+msgid "Cleaning up ACL entries for %s across all folders"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:40
-msgid "Unspecified command issue identifier"
+#: ../pykolab/imap/__init__.py:60
+#, python-format
+msgid "Cleaning up ACL entries referring to identifier %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:50
-msgid "Invalid command issue identifier"
+#: ../pykolab/imap/__init__.py:69
+#, python-format
+msgid "Iterating over %d folders"
 msgstr ""
 
-#. This is a nested command
-#. This is a nested component
-#: .././pykolab/cli/commands.py:95 .././pykolab/setup/components.py:88
+#. Set the ACL to '' (effectively deleting the ACL entry)
+#: ../pykolab/imap/__init__.py:82
 #, python-format
-msgid "Command Group: %s"
+msgid "Removing acl %r for subject %r from folder %r"
 msgstr ""
 
-#: .././pykolab/cli/commands.py:106 .././pykolab/cli/commands.py:111
-msgid "No such command."
+#: ../pykolab/imap/__init__.py:143
+#, python-format
+msgid "Logging on to Cyrus IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/commands.py:161 .././pykolab/setup/components.py:217
+#: ../pykolab/imap/__init__.py:152
 #, python-format
-msgid "Command '%s' already registered"
+msgid "Logging on to Dovecot IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_delete_mailbox.py:43
-msgid "No mailbox specified"
+#: ../pykolab/imap/__init__.py:161
+#, python-format
+msgid "Logging on to generic IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_list_mailboxes.py:35
-#: .././pykolab/cli/cmd_export_mailbox.py:33
-msgid "CLI Options"
+#: ../pykolab/imap/__init__.py:179
+#, python-format
+msgid "Reusing existing IMAP server connection to %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_list_mailboxes.py:40
-msgid "Display raw UTF-7 folder names"
+#: ../pykolab/imap/__init__.py:181
+#, python-format
+msgid "Reconnecting to IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:38
-msgid "All folders this user has access to"
+#: ../pykolab/imap/__init__.py:197
+msgid "Called imap.disconnect() on a server that "
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:108
+#: ../pykolab/imap/__init__.py:213
 #, python-format
-msgid "%s is not a directory"
+msgid "%r has no attribute %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:118
+#: ../pykolab/imap/__init__.py:286
+msgid "Private annotations need to be set using the appropriate user account."
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:319 ../pykolab/imap/__init__.py:354
 #, python-format
-msgid "ZIP file at %s.zip"
+msgid "Creating new shared folder %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:120
+#: ../pykolab/imap/__init__.py:376
 #, python-format
-msgid "No directories found for user %s"
+msgid "Creating new mailbox for user %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_sync.py:38
+#: ../pykolab/imap/__init__.py:405
 #, python-format
-msgid "Found %d domains in %d seconds"
+msgid "Creating additional folders for user %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_sync.py:48
+#: ../pykolab/imap/__init__.py:429
 #, python-format
-msgid "Running for domain %s"
+msgid "Mailbox already exists: %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_sync.py:54
+#: ../pykolab/imap/__init__.py:472
+msgid "Subscribing user to the additional folders"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:532 ../pykolab/imap/__init__.py:611
 #, python-format
-msgid "Synchronizing users for %s took %d seconds"
+msgid "Renaming INBOX from %s to %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:536
+#, python-format
+msgid "Could not rename INBOX folder %s to %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:538 ../pykolab/imap/__init__.py:615
+#, python-format
+msgid "Moving INBOX folder %s won't succeed as target folder %s already exists"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:70
+#: ../pykolab/imap/__init__.py:551
+#, python-format
+msgid "Looking for folder '%s', we found folders: %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:574
+#, python-format
+msgid "Setting ACL rights %s for subject %s on folder "
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:585
+#, python-format
+msgid "Removing ACL rights %s for subject %s on folder "
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:608
+#, python-format
+msgid "Found old INBOX folder %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:617
+#, python-format
+msgid "Did not find old folder user/%s to rename"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:619
+msgid "Value for user is not a dictionary"
+msgstr ""
+
+#. TODO: Go in fact correct the quota.
+#: ../pykolab/imap/__init__.py:682
+#, python-format
+msgid "Cannot get current IMAP quota for folder %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:695
+#, python-format
+msgid "Quota for %s currently is %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:701
+#, python-format
+msgid "Adjusting authentication database quota for folder %s to %d"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:706
+#, python-format
+msgid "Correcting quota for %s to %s (currently %s)"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:788
+#, python-format
+msgid "Checking folder: %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:793
+#, python-format
+msgid "Folder has no corresponding user (1): %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:796
+#, python-format
+msgid "Folder has no corresponding user (2): %s"
+msgstr ""
+
+#. We got user identifier only
+#: ../pykolab/imap/__init__.py:811
+msgid "Please don't give us just a user identifier"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:814
+#, python-format
+msgid "Deleting folder %s"
+msgstr ""
+
+#: ../pykolab/__init__.py:50
+msgid "Returning thread local configuration"
+msgstr ""
+
+#: ../pykolab/logger.py:105
+#, python-format
+msgid "Could not change the ownership of log file %s"
+msgstr ""
+
+#: ../pykolab/logger.py:121
+#, python-format
+msgid "Cannot log to file %s: %s"
+msgstr ""
+
+#: ../pykolab/plugins/defaultfolders/__init__.py:47
+#, python-format
+msgid "Plugin %s called without required keyword %s."
+msgstr ""
+
+#: ../pykolab/plugins/defaultfolders/__init__.py:53
+msgid "Could not parse additional_folders"
+msgstr ""
+
+#: ../pykolab/plugins/dynamicquota/__init__.py:58
+#, python-format
+msgid "No keyword %s passed to set_user_folder_quota"
+msgstr ""
+
+#: ../pykolab/plugins/dynamicquota/__init__.py:70
+#, python-format
+msgid "Quota '%s' not an integer!"
+msgstr ""
+
+#: ../pykolab/plugins/__init__.py:70
 #, python-format
 msgid "ImportError for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:74
+#: ../pykolab/plugins/__init__.py:74
 #, python-format
 msgid "RuntimeError for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:78
+#: ../pykolab/plugins/__init__.py:78
 #, python-format
 msgid "Plugin %s failed to load (%s: %s)"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:116 .././pykolab/plugins/__init__.py:118
+#: ../pykolab/plugins/__init__.py:116 ../pykolab/plugins/__init__.py:118
 #, python-format
 msgid "Cannot set defaults for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:120
+#: ../pykolab/plugins/__init__.py:120
 #, python-format
 msgid "Cannot set defaults for plugin %s: Unknown Error"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:123
+#: ../pykolab/plugins/__init__.py:123
 #, python-format
 msgid "Not setting defaults for plugin %s: No function 'set_defaults()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:142
+#: ../pykolab/plugins/__init__.py:142
 #, python-format
 msgid "Cannot set runtime for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:144
+#: ../pykolab/plugins/__init__.py:144
 #, python-format
 msgid "Not setting runtime for plugin %s: No function 'set_runtime()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:163 .././pykolab/plugins/__init__.py:165
+#: ../pykolab/plugins/__init__.py:163 ../pykolab/plugins/__init__.py:165
 #, python-format
 msgid "Cannot add options for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:167
+#: ../pykolab/plugins/__init__.py:167
 #, python-format
 msgid "Not adding options for plugin %s: No function 'add_options()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:187
+#: ../pykolab/plugins/__init__.py:187
 #, python-format
 msgid "Cannot check options for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:189
+#: ../pykolab/plugins/__init__.py:189
 #, python-format
 msgid "Not checking options for plugin %s: No function 'check_options()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:227
+#: ../pykolab/plugins/__init__.py:227
 #, python-format
 msgid "Executing hook %s for plugin %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:231 .././pykolab/plugins/__init__.py:233
+#: ../pykolab/plugins/__init__.py:231 ../pykolab/plugins/__init__.py:233
 #, python-format
 msgid "Cannot execute hook %s for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/defaultfolders/__init__.py:47
-#, python-format
-msgid "Plugin %s called without required keyword %s."
+#: ../pykolab/plugins/recipientpolicy/__init__.py:79
+msgid "Attribute substitution for 'mail' failed in Recipient Policy"
 msgstr ""
 
-#: .././pykolab/plugins/defaultfolders/__init__.py:53
-msgid "Could not parse additional_folders"
+#: ../pykolab/plugins/recipientpolicy/__init__.py:115
+msgid "Could not parse the alternative mail routines"
 msgstr ""
 
-#: .././pykolab/plugins/dynamicquota/__init__.py:56
-#, python-format
-msgid "Quota '%s' not an integer!"
+#: ../pykolab/plugins/recipientpolicy/__init__.py:127
+#: ../pykolab/plugins/recipientpolicy/__init__.py:137
+msgid ""
+"Attribute substitution for 'alternative_mail' failed in Recipient Policy"
 msgstr ""
 
-#: .././pykolab/plugins/dynamicquota/__init__.py:63
-msgid ""
-"The new quota was set to 0, but default quota > 0, returning default quota"
+#: ../pykolab/setup/components.py:58
+msgid "Display this help."
 msgstr ""
 
-#: .././pykolab/plugins/dynamicquota/__init__.py:82
-msgid ""
-"The default quota is larger then the calculated new quota, using the default "
-"quota"
+#: ../pykolab/setup/components.py:149
+msgid "No component selected, continuing for all components"
 msgstr ""
 
-#: .././pykolab/plugins/recipientpolicy/__init__.py:70
-msgid "Attribute substitution for 'mail' failed in Recipient Policy"
+#: ../pykolab/setup/components.py:187 ../pykolab/setup/components.py:192
+msgid "No such component."
 msgstr ""
 
-#: .././pykolab/plugins/recipientpolicy/__init__.py:97
-msgid "Could not parse the alternative mail routines"
+#: ../pykolab/setup/setup_freebusy.py:46
+msgid "Setup Free/Busy."
 msgstr ""
 
-#: .././pykolab/plugins/recipientpolicy/__init__.py:109
-#: .././pykolab/plugins/recipientpolicy/__init__.py:119
-msgid ""
-"Attribute substitution for 'alternative_mail' failed in Recipient Policy"
+#: ../pykolab/setup/setup_freebusy.py:50
+msgid "Free/Busy is not installed on this system"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:40
-msgid "Setup zpush."
+#: ../pykolab/setup/setup_freebusy.py:55
+msgid ""
+"\n"
+"                        Please supply the MySQL password for the "
+"'roundcube'\n"
+"                        user. You have supplied this password earlier, and "
+"it is\n"
+"                        available from the database URI setting in\n"
+"                        /etc/roundcubemail/db.inc.php.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:44
-msgid "Z-Push is not installed on this system"
+#: ../pykolab/setup/setup_freebusy.py:64
+#: ../pykolab/setup/setup_roundcube.py:56
+msgid "MySQL roundcube password"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:70
-#: .././pykolab/setup/setup_roundcube.py:93
-#: .././pykolab/setup/setup_freebusy.py:76
+#: ../pykolab/setup/setup_freebusy.py:92
+#: ../pykolab/setup/setup_roundcube.py:116 ../pykolab/setup/setup_zpush.py:71
 #, python-format
 msgid "Using template file %r"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:77
-#: .././pykolab/setup/setup_roundcube.py:100
-#: .././pykolab/setup/setup_freebusy.py:83
+#: ../pykolab/setup/setup_freebusy.py:99
+#: ../pykolab/setup/setup_roundcube.py:123 ../pykolab/setup/setup_zpush.py:78
 #, python-format
 msgid "Successfully compiled template %r, writing out to %r"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:95 .././pykolab/setup/setup_ldap.py:184
-#: .././pykolab/setup/setup_ldap.py:358
-#: .././pykolab/setup/setup_roundcube.py:159
-#: .././pykolab/setup/setup_imap.py:137 .././pykolab/setup/setup_mysql.py:49
-#: .././pykolab/setup/setup_freebusy.py:101
-msgid "Could not start and configure to start on boot, the "
+#: ../pykolab/setup/setup_freebusy.py:119 ../pykolab/setup/setup_imap.py:143
+#: ../pykolab/setup/setup_ldap.py:288 ../pykolab/setup/setup_ldap.py:521
+#: ../pykolab/setup/setup_mta.py:309 ../pykolab/setup/setup_mysql.py:49
+#: ../pykolab/setup/setup_roundcube.py:191
+#: ../pykolab/setup/setup_syncroton.py:66 ../pykolab/setup/setup_zpush.py:98
+msgid "Could not start and configure to start on boot, the "
+msgstr ""
+
+#: ../pykolab/setup/setup_imap.py:44
+msgid "Setup IMAP."
+msgstr ""
+
+#: ../pykolab/setup/setup_imap.py:88 ../pykolab/setup/setup_imap.py:113
+msgid "Could not write out Cyrus IMAP configuration file /etc/imapd.conf"
+msgstr ""
+
+#: ../pykolab/setup/setup_kolabd.py:43
+msgid "Setup the Kolab daemon."
+msgstr ""
+
+#: ../pykolab/setup/setup_kolabd.py:51
+#, python-format
+msgid ""
+"\n"
+"                            Copying the configuration section for 'example."
+"org' over to\n"
+"                            a section applicable to your domain '%s'.\n"
+"                        "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:43
+msgid "LDAP Options"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:50
+msgid "Specify FQDN (overriding defaults)."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:58
+msgid "Allow anonymous binds (default: no)."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:62
+msgid "Setup LDAP."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:74
+msgid ""
+"\n"
+"                        Please supply a password for the LDAP administrator "
+"user\n"
+"                        'admin', used to login to the graphical console of "
+"389\n"
+"                        Directory server.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:82
+msgid "Administrator password"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:89
+msgid ""
+"\n"
+"                        Please supply a password for the LDAP Directory "
+"Manager\n"
+"                        user, which is the administrator user you will be "
+"using\n"
+"                        to at least initially log in to the Web Admin, and "
+"that\n"
+"                        Kolab uses to perform administrative tasks.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:98
+msgid "Directory Manager password"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:105
+msgid ""
+"\n"
+"                        Please choose the system user and group the service\n"
+"                        should use to run under. These should be existing,\n"
+"                        unprivileged, local system POSIX accounts with no "
+"shell.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:112
+msgid "User"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:43
-msgid "LDAP Options"
+#: ../pykolab/setup/setup_ldap.py:113
+msgid "Group"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:50
-msgid "Specify FQDN (overriding defaults)."
+#: ../pykolab/setup/setup_ldap.py:143
+msgid ""
+"\n"
+"                        This setup procedure plans to set up Kolab Groupware "
+"for\n"
+"                        the following domain name space. This domain name "
+"is\n"
+"                        obtained from the reverse DNS entry on your network\n"
+"                        interface. Please confirm this is the appropriate "
+"domain\n"
+"                        name space.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:54
-msgid "Setup LDAP."
+#: ../pykolab/setup/setup_ldap.py:157
+msgid "Domain name to use"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:66
-msgid "Administrator password"
+#: ../pykolab/setup/setup_ldap.py:162 ../pykolab/setup/setup_ldap.py:187
+msgid ""
+"\n"
+"                                    Invalid input. Please try again.\n"
+"                                "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:72
-msgid "Directory Manager password"
+#: ../pykolab/setup/setup_ldap.py:171
+msgid ""
+"\n"
+"                        The standard root dn we composed for you follows. "
+"Please\n"
+"                        confirm this is the root dn you wish to use.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:77
-msgid "User"
+#: ../pykolab/setup/setup_ldap.py:182
+msgid "Root DN to use"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:78
-msgid "Group"
+#: ../pykolab/setup/setup_ldap.py:234
+msgid ""
+"\n"
+"                    Setup is now going to set up the 389 Directory Server. "
+"This\n"
+"                    may take a little while (during which period there is "
+"no\n"
+"                    output and no progress indication).\n"
+"                "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:143
+#: ../pykolab/setup/setup_ldap.py:241
 msgid "Setting up 389 Directory Server"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:153
+#. TODO: Get the return code and display output if not successful.
+#: ../pykolab/setup/setup_ldap.py:253
 msgid "Setup DS stdout:"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:156
+#: ../pykolab/setup/setup_ldap.py:256
 msgid "Setup DS stderr:"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:175 .././pykolab/setup/setup_mysql.py:97
+#: ../pykolab/setup/setup_ldap.py:279 ../pykolab/setup/setup_mysql.py:129
 msgid "Could not find the Kolab schema file"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:189
+#: ../pykolab/setup/setup_ldap.py:293
+msgid ""
+"\n"
+"                        Please supply a Cyrus Administrator password. This\n"
+"                        password is used by Kolab to execute administrative\n"
+"                        tasks in Cyrus IMAP. You may also need the password\n"
+"                        yourself to troubleshoot Cyrus IMAP and/or perform\n"
+"                        other administrative tasks against Cyrus IMAP "
+"directly.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:303
 msgid "Cyrus Administrator password"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:195
+#: ../pykolab/setup/setup_ldap.py:310
+msgid ""
+"\n"
+"                        Please supply a Kolab Service account password. "
+"This\n"
+"                        account is used by various services such as "
+"Postfix,\n"
+"                        and Roundcube, as anonymous binds to the LDAP "
+"server\n"
+"                        will not be allowed.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:319
 msgid "Kolab Service password"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:204
+#: ../pykolab/setup/setup_ldap.py:329
 msgid "Writing out configuration to kolab.conf"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:218
+#: ../pykolab/setup/setup_ldap.py:343
 msgid "Inserting service users into LDAP."
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:262
+#: ../pykolab/setup/setup_ldap.py:417
 msgid "Writing out cn=kolab,cn=config"
 msgstr ""
 
 #. TODO: Add kolab-admin role
 #. TODO: Assign kolab-admin admin ACLs
-#: .././pykolab/setup/setup_ldap.py:286
+#: ../pykolab/setup/setup_ldap.py:441
 #, python-format
 msgid "Adding domain %s to list of domains for this deployment"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:294
+#: ../pykolab/setup/setup_ldap.py:457
 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:302
+#: ../pykolab/setup/setup_ldap.py:465
 msgid "Enabling attribute uniqueness plugin"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:308
+#: ../pykolab/setup/setup_ldap.py:471
 msgid "Enabling referential integrity plugin"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:314
+#: ../pykolab/setup/setup_ldap.py:477
 msgid "Enabling and configuring account policy plugin"
 msgstr ""
 
 #. TODO: Add kolab-admin role
-#: .././pykolab/setup/setup_ldap.py:329
+#: ../pykolab/setup/setup_ldap.py:492
 msgid "Adding the kolab-admin role"
 msgstr ""
 
 #. TODO: User writeable attributes on root_dn
-#: .././pykolab/setup/setup_ldap.py:340
+#: ../pykolab/setup/setup_ldap.py:503
 #, python-format
 msgid "Setting access control to %s"
 msgstr ""
 
-#: .././pykolab/setup/setup_roundcube.py:40
-msgid "Setup Roundcube."
-msgstr ""
-
-#: .././pykolab/setup/setup_roundcube.py:44
-#: .././pykolab/setup/setup_freebusy.py:49
-msgid "MySQL roundcube password"
-msgstr ""
-
-#: .././pykolab/setup/components.py:56
-msgid "Display this help."
-msgstr ""
-
-#: .././pykolab/setup/components.py:122
-msgid "No component selected, continuing for all components"
-msgstr ""
-
-#: .././pykolab/setup/components.py:157 .././pykolab/setup/components.py:162
-msgid "No such component."
-msgstr ""
-
-#: .././pykolab/setup/setup_mta.py:40
+#: ../pykolab/setup/setup_mta.py:40
 msgid "Setup MTA."
 msgstr ""
 
-#: .././pykolab/setup/setup_mta.py:220
+#: ../pykolab/setup/setup_mta.py:224 ../pykolab/setup/setup_php.py:80
 #, python-format
 msgid "Setting key %r to %r"
 msgstr ""
 
-#: .././pykolab/setup/setup_mta.py:248
+#: ../pykolab/setup/setup_mta.py:252
 msgid "Could not write out Postfix configuration file /etc/postfix/master.cf"
 msgstr ""
 
-#: .././pykolab/setup/setup_imap.py:39
-msgid "Setup IMAP."
-msgstr ""
-
-#: .././pykolab/setup/setup_imap.py:82 .././pykolab/setup/setup_imap.py:107
-msgid "Could not write out Cyrus IMAP configuration file /etc/imapd.conf"
-msgstr ""
-
-#: .././pykolab/setup/setup_kolabd.py:38
-msgid "Setup the Kolab daemon."
+#: ../pykolab/setup/setup_mta.py:287
+msgid "Could not write out Amavis configuration file /etc/amavisd/amavisd.conf"
 msgstr ""
 
-#: .././pykolab/setup/setup_mysql.py:39
+#: ../pykolab/setup/setup_mysql.py:39
 msgid "Setup MySQL."
 msgstr ""
 
-#: .././pykolab/setup/setup_mysql.py:53
+#: ../pykolab/setup/setup_mysql.py:53
+msgid ""
+"\n"
+"                    Please supply a root password for MySQL. This password "
+"will\n"
+"                    be the administrative user for this MySQL server, and "
+"it\n"
+"                    should be kept a secret. After this setup process has\n"
+"                    completed, Kolab is going to discard and forget about "
+"this\n"
+"                    password, but you will need it for administrative tasks "
+"in\n"
+"                    MySQL.\n"
+"                "
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:64
 msgid "MySQL root password"
 msgstr ""
 
-#: .././pykolab/setup/setup_freebusy.py:40
-msgid "Setup Free/Busy."
+#: ../pykolab/setup/setup_mysql.py:103
+msgid ""
+"\n"
+"                        Please supply a password for the MySQL user "
+"'kolab'.\n"
+"                        This password will be used by Kolab services, such "
+"as\n"
+"                        the Web Administration Panel.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_freebusy.py:44
-msgid "Free/Busy is not installed on this system"
+#: ../pykolab/setup/setup_mysql.py:111
+msgid "MySQL kolab password"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:45
-#, python-format
-msgid "Cleaning up ACL entries for %s across all folders"
+#: ../pykolab/setup/setup_php.py:42
+msgid "PHP Options"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:60
-#, python-format
-msgid "Cleaning up ACL entries referring to identifier %s"
+#: ../pykolab/setup/setup_php.py:49
+msgid "Specify the timezone for PHP."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:69
-#, python-format
-msgid "Iterating over %d folders"
+#: ../pykolab/setup/setup_php.py:53
+msgid "Setup PHP."
 msgstr ""
 
-#. Set the ACL to '' (effectively deleting the ACL entry)
-#: .././pykolab/imap/__init__.py:82
-#, python-format
-msgid "Removing acl %r for subject %r from folder %r"
+#: ../pykolab/setup/setup_php.py:58
+msgid ""
+"\n"
+"                        Please supply the timezone PHP should be using.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:143
-#, python-format
-msgid "Logging on to Cyrus IMAP server %s"
+#: ../pykolab/setup/setup_php.py:64
+msgid "Timezone ID"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:152
-#, python-format
-msgid "Logging on to Dovecot IMAP server %s"
+#: ../pykolab/setup/setup_roundcube.py:44
+msgid "Setup Roundcube."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:161
-#, python-format
-msgid "Logging on to generic IMAP server %s"
+#: ../pykolab/setup/setup_roundcube.py:48
+msgid ""
+"\n"
+"                    Please supply a password for the MySQL user "
+"'roundcube'.\n"
+"                    This password will be used by the Roundcube webmail\n"
+"                    interface.\n"
+"                "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:179
-#, python-format
-msgid "Reusing existing IMAP server connection to %s"
+#: ../pykolab/setup/setup_syncroton.py:40
+msgid "Setup Syncroton."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:181
-#, python-format
-msgid "Reconnecting to IMAP server %s"
+#: ../pykolab/setup/setup_zpush.py:41
+msgid "Setup zpush."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:197
-msgid "Called imap.disconnect() on a server that "
+#: ../pykolab/setup/setup_zpush.py:45
+msgid "Z-Push is not installed on this system"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:213
+#. start_max = (int)(time.time())
+#: ../pykolab/telemetry.py:588
 #, python-format
-msgid "%r has no attribute %s"
+msgid "Expiring sessions that started before or on %d"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:221 .././pykolab/imap/__init__.py:239
+#: ../pykolab/telemetry.py:601
 #, python-format
-msgid "Creating new shared folder %s"
+msgid "Expiring session ID: %d"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:255
+#: ../pykolab/telemetry.py:620
 #, python-format
-msgid "Creating new mailbox for user %s"
+msgid "Session with ID %d expired from database"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:280
+#: ../pykolab/telemetry.py:646
 #, python-format
-msgid "Creating additional folders for user %s"
+msgid "Operational Error in telemetry database: %s"
+msgstr ""
+
+#: ../pykolab/telemetry.py:652
+msgid "No database available"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:302
+#: ../pykolab/utils.py:57 ../pykolab/utils.py:59
 #, python-format
-msgid "Mailbox already exists: %s"
+msgid "Confirm %s: "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:345
-msgid "Subscribing user to the additional folders"
+#: ../pykolab/utils.py:62
+msgid "Incorrect confirmation. "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:380 .././pykolab/imap/__init__.py:459
+#: ../pykolab/utils.py:67 ../pykolab/utils.py:72
 #, python-format
-msgid "Renaming INBOX from %s to %s"
+msgid "%s: "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:384
+#: ../pykolab/utils.py:69 ../pykolab/utils.py:74
 #, python-format
-msgid "Could not rename INBOX folder %s to %s"
+msgid "%s [%s]: "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:386 .././pykolab/imap/__init__.py:463
-#, python-format
-msgid "Moving INBOX folder %s won't succeed as target folder %s already exists"
+#: ../pykolab/utils.py:119
+msgid "Please answer 'yes' or 'no'."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:399
+#: ../pykolab/utils.py:185
 #, python-format
-msgid "Looking for folder '%s', we found folders: %r"
+msgid "Could not change the permissions on %s"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:422
+#: ../pykolab/wap_client/__init__.py:257
 #, python-format
-msgid "Setting ACL rights %s for subject %s on folder "
+msgid "Requesting %r with params %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:433
+#: ../pykolab/wap_client/__init__.py:263
 #, python-format
-msgid "Removing ACL rights %s for subject %s on folder "
+msgid "Got response: %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:456
-#, python-format
-msgid "Found old INBOX folder %s"
+#. Some data is not JSON
+#: ../pykolab/wap_client/__init__.py:268
+msgid "Response data is not JSON"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:465
-#, python-format
-msgid "Did not find old folder user/%s to rename"
+#: ../pykolab/xml/attendee.py:79 ../pykolab/xml/attendee.py:99
+msgid "Not a valid attendee"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:467
-msgid "Value for user is not a dictionary"
+#: ../pykolab/xml/attendee.py:84
+msgid "No valid delegator references found"
 msgstr ""
 
-#. TODO: Go in fact correct the quota.
-#: .././pykolab/imap/__init__.py:527
-#, python-format
-msgid "Cannot get current IMAP quota for folder %s"
+#: ../pykolab/xml/attendee.py:104
+msgid "No valid delegatee references found"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:540
+#: ../pykolab/xml/attendee.py:140
 #, python-format
-msgid "Quota for %s currently is %s"
+msgid "Invalid cutype %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:546
+#: ../pykolab/xml/attendee.py:151
 #, python-format
-msgid "Adjusting authentication database quota for folder %s to %d"
+msgid "Invalid participant status %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:551
+#: ../pykolab/xml/attendee.py:159
 #, python-format
-msgid "Correcting quota for %s to %s (currently %s)"
+msgid "Invalid role %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:633
+#: ../pykolab/xml/event.py:172
 #, python-format
-msgid "Checking folder: %s"
+msgid "No attendee with email or name %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:638
+#: ../pykolab/xml/event.py:180
 #, python-format
-msgid "Folder has no corresponding user (1): %s"
+msgid "Invalid argument value attendee %r, must be basestring or Attendee"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:641
+#: ../pykolab/xml/event.py:186
 #, python-format
-msgid "Folder has no corresponding user (2): %s"
+msgid "No attendee with email %r"
 msgstr ""
 
-#. We got user identifier only
-#: .././pykolab/imap/__init__.py:656
-msgid "Please don't give us just a user identifier"
+#: ../pykolab/xml/event.py:192
+#, python-format
+msgid "No attendee with name %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:659
-#, python-format
-msgid "Deleting folder %s"
+#: ../pykolab/xml/event.py:338
+msgid "Invalid participant status"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:78
-#, python-format
-msgid "Could not connect to Cyrus IMAP server %r"
+#: ../pykolab/xml/event.py:538
+msgid "Event end needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:101
+#: ../pykolab/xml/event.py:657
 #, python-format
-msgid "Continuing with separator: %r"
+msgid "Invalid status %r"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:106
-msgid "Detected we are running in a Murder topology"
+#: ../pykolab/xml/event.py:678 ../pykolab/xml/event.py:728
+msgid "Event start needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:110
-msgid "This system is not part of a murder topology"
+#: ../pykolab/xml/event.py:764
+#, python-format
+msgid "Invalid status set: %r"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:131
-#, python-format
-msgid "Checking actual backend server for folder %s through annotations"
+#: ../pykolab/xml/event.py:882
+msgid "No sender specified"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:146
-#, python-format
-msgid "Could not get the annotations after %s tries."
+#: ../saslauthd/__init__.py:126 ../saslauthd/__init__.py:134
+msgid "Traceback occurred, please report a bug at http://bugzilla.kolabsys.com"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:150
+#: ../wallace/__init__.py:61
 #, python-format
-msgid "No annotations for %s: %r"
+msgid "Worker process %s initializing"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:157
-#, python-format
-msgid "Server for INBOX folder %s is %s"
+#: ../wallace/__init__.py:80
+msgid "Bind address for Wallace."
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:169
-#, python-format
-msgid "Setting quota for INBOX folder %s to %s"
+#: ../wallace/__init__.py:106
+msgid "Port that Wallace is supposed to use."
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:173
+#: ../wallace/__init__.py:157
 #, python-format
-msgid "Could not set quota for mailfolder %s"
+msgid "Could not bind to socket on port %d on bind "
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:182
-#, python-format
-msgid "Moving INBOX folder %s to %s"
+#: ../wallace/__init__.py:169
+msgid "Could not shut down socket"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:194
-#, python-format
-msgid "Setting annotation %s on folder %s"
+#: ../wallace/__init__.py:226
+msgid "Accepted connection"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:201
+#: ../wallace/__init__.py:389
 #, python-format
-msgid "Could not set annotation %r on mail folder %r: %r"
+msgid "Could not write pid file %s"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:205
+#: ../wallace/module_optout.py:61 ../wallace/module_resources.py:94
 #, python-format
-msgid "Transferring folder %s from %s to %s"
+msgid "Issuing callback after processing to stage %s"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:265
+#: ../wallace/module_optout.py:62 ../wallace/module_resources.py:100
 #, python-format
-msgid "Undeleting %s to %s"
+msgid "Testing cb_action_%s()"
 msgstr ""
 
-#. start_max = (int)(time.time())
-#: .././pykolab/telemetry.py:588
+#: ../wallace/module_optout.py:64 ../wallace/module_resources.py:103
 #, python-format
-msgid "Expiring sessions that started before or on %d"
+msgid "Attempting to execute cb_action_%s()"
 msgstr ""
 
-#: .././pykolab/telemetry.py:601
+#. modules.next_module('optout')
+#: ../wallace/module_optout.py:70
 #, python-format
-msgid "Expiring session ID: %d"
+msgid "Consulting opt-out service for %r, %r"
 msgstr ""
 
-#: .././pykolab/telemetry.py:620
+#: ../wallace/module_optout.py:96
 #, python-format
-msgid "Session with ID %d expired from database"
+msgid "Running opt-out consult from envelope sender '%s "
 msgstr ""
 
-#: .././pykolab/telemetry.py:646
+#: ../wallace/module_optout.py:160
 #, python-format
-msgid "Operational Error in telemetry database: %s"
+msgid "Attempting to execute cb_action_%s(%r, %r)"
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:92
+#: ../wallace/module_optout.py:181
 #, python-format
-msgid "Creating %d Mails"
+msgid "Could not send request to optout_url %s"
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:116
+#: ../wallace/module_resources.py:81
 #, python-format
-msgid "Sending message %s through SMTP targeting user %s@%s"
+msgid "Resource Management called for %r, %r"
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:119
-#, python-format
-msgid "Sending message %s through LMTP targeting user %s@%s"
+#: ../wallace/module_resources.py:139
+msgid "Message is not an iTip message or does not contain any "
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:122
-#, python-format
-msgid "Saving message %s to IMAP (user %s, folder %s)"
+#: ../wallace/module_resources.py:147
+msgid "iTip events attached to this message contain the "
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:125 .././pykolab/tests.old/calendar.py:198
-#: .././pykolab/tests.old/contacts.py:145
-msgid "Somehow ended up NOT sending these messages"
+#: ../wallace/module_resources.py:174
+msgid "Not an iTip message, but sent to resource nonetheless. Reject message"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:146
-#, python-format
-msgid "Creating %d Events"
+#: ../wallace/module_resources.py:182
+msgid "No itips, no resources, pass along"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:177
-#, python-format
-msgid "Creating Calendar item number %d"
+#: ../wallace/module_resources.py:186
+msgid "iTips, but no resources, pass along"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:189
-#: .././pykolab/tests.old/contacts.py:136
+#: ../wallace/module_resources.py:218
 #, python-format
-msgid "Sending UID message %s through SMTP targeting user %s@%s"
+msgid "Resources: %r"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:192
-#: .././pykolab/tests.old/contacts.py:139
+#: ../wallace/module_resources.py:236
 #, python-format
-msgid "Sending UID message %s through LMTP targeting user %s@%s"
+msgid "Checking events in resource folder %r"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:195
-#: .././pykolab/tests.old/contacts.py:142
+#: ../wallace/module_resources.py:243
 #, python-format
-msgid "Saving UID message %s to IMAP (user %s, folder %s)"
+msgid "Mailbox for resource %r doesn't exist"
 msgstr ""
 
-#: .././pykolab/tests.old/zpush/test_000_001.py:47
+#: ../wallace/module_resources.py:256
 #, python-format
-msgid "Could not load %sItem from %s, skipping the testing."
+msgid "Fetching message UID %r from folder %r"
 msgstr ""
 
-#: .././pykolab/tests.old/zpush/test_000_000.py:77
+#: ../wallace/module_resources.py:295
 #, python-format
-msgid "Authentication failure for %s"
+msgid "Event %r conflicts with event "
 msgstr ""
 
-#: .././pykolab/tests.old/contacts.py:105
+#: ../wallace/module_resources.py:308
 #, python-format
-msgid "Creating %d Contacts"
+msgid "start: %r, end: %r, total: %r, messages: %r"
 msgstr ""
 
-#: .././pykolab/tests.old/contacts.py:124
+#: ../wallace/module_resources.py:315
 #, python-format
-msgid "Creating Contact item number %d"
+msgid "Polling for resource %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:207
+#: ../wallace/module_resources.py:319
 #, python-format
-msgid "Adding policy request to instance %s"
+msgid "Resource %r has been popped from the list"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:442
-msgid "Unauthorized access not allowed"
+#: ../wallace/module_resources.py:326
+msgid "Resource is a collection"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:481
-#: .././bin/kolab_smtp_access_policy.py:541
+#: ../wallace/module_resources.py:374 ../wallace/module_resources.py:424
 #, python-format
-msgid "Could not find envelope sender user %s"
+msgid "Adding event to %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:568
+#: ../wallace/module_resources.py:473
 #, python-format
-msgid "%s is unauthorized to send on behalf of %s"
+msgid "Method %r not really interesting for us."
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:578
+#: ../wallace/module_resources.py:481
 #, python-format
-msgid "User %s attempted to use envelope sender address %s "
+msgid "Raw iTip payload: %s"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:638
-#: .././bin/kolab_smtp_access_policy.py:649
-#, python-format
-msgid "Found user %s to be a delegate user of %s"
+#: ../wallace/module_resources.py:491
+msgid "Could not read iTip from message."
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:673
-#, python-format
-msgid "Verifying authenticated sender '%(sender)s' with "
+#: ../wallace/module_resources.py:513
+msgid "iTip event without a start"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:678
-#, python-format
-msgid "Verifying unauthenticated sender '%(sender)s' "
+#. end if c.name == "VEVENT"
+#. end for c in cal.walk()
+#. end if part.get_content_type() == "text/calendar"
+#. end for part in message.walk()
+#. if message.is_multipart()
+#: ../wallace/module_resources.py:543
+msgid "Message is not an iTip message (non-multipart message)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:695
+#: ../wallace/module_resources.py:564
 #, python-format
-msgid "Reproducing verify_recipient(%s, %s) from "
+msgid "Checking if email address %r belongs to a resource (collection)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:712
+#: ../wallace/module_resources.py:575 ../wallace/module_resources.py:649
+#: ../wallace/module_resources.py:699
 #, python-format
-msgid "Using authentication domain %s instead of %s"
+msgid "No resource (collection) records found for %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:722
+#: ../wallace/module_resources.py:583 ../wallace/module_resources.py:657
+#: ../wallace/module_resources.py:707
 #, python-format
-msgid "Domain %s is a primary domain"
+msgid "Resource record(s): %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:730
+#: ../wallace/module_resources.py:589 ../wallace/module_resources.py:664
+#: ../wallace/module_resources.py:714
 #, python-format
-msgid "Checking the recipient for domain %s that is not "
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:792
-msgid "Could not find this user, accepting"
+msgid "Resource record: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:862
-#: .././bin/kolab_smtp_access_policy.py:915
+#: ../wallace/module_resources.py:608
 #, python-format
-msgid "Sender %s is not allowed to send to "
+msgid "Raw itip_events: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:902
+#: ../wallace/module_resources.py:616
 #, python-format
-msgid "Reproducing verify_sender(%r) from cache, "
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:931
-msgid "Sender uses unauthorized envelope sender address"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:948
-msgid "Could not verify sender"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:955
-msgid "Verifying whether sender is allowed to send to "
+msgid "Raw set of attendees: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:969
+#: ../wallace/module_resources.py:624
 #, python-format
-msgid "Result is %r"
+msgid "Raw set of resources: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:974
-msgid "No recipient policy restrictions exist for this sender"
+#: ../wallace/module_resources.py:638
+#, python-format
+msgid "Checking if attendee %r is a resource (collection)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:983
-msgid "Found a recipient policy to apply for this sender."
+#: ../wallace/module_resources.py:671 ../wallace/module_resources.py:717
+msgid "Resource reservation made but no resource records found"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:998
+#: ../wallace/module_resources.py:689
 #, python-format
-msgid "Sender %s not allowed to send to recipient "
+msgid "Checking if resource %r is a resource (collection)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1029
-msgid "Cleaning up the cache"
+#: ../wallace/module_resources.py:721
+msgid "The following resources are being referred to in the "
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1066
+#. This is a nested module
+#: ../wallace/modules.py:96
 #, python-format
-msgid "Operational Error in caching: %s"
+msgid "Module Group: %s"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1117
-#, python-format
-msgid "Caching the policy result with timestamp %d"
+#: ../wallace/modules.py:107 ../wallace/modules.py:112
+msgid "No such module."
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1194
+#: ../wallace/modules.py:118
 #, python-format
-msgid "Returning action DEFER_IF_PERMIT: %s"
+msgid "Holding message in queue for manual review (%s by %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1199
+#: ../wallace/modules.py:121
 #, python-format
-msgid "Returning action DUNNO: %s"
+msgid "Deferring message in %s (by module %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1204
+#: ../wallace/modules.py:131
 #, python-format
-msgid "Returning action HOLD: %s"
+msgid "The time when the message was sent: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1209
+#: ../wallace/modules.py:132
 #, python-format
-msgid "Returning action PERMIT: %s"
+msgid "The time now: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1214
+#: ../wallace/modules.py:133
 #, python-format
-msgid "Returning action REJECT: %s"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1258
-msgid "Starting to loop for new request"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1267
-msgid "End of current request"
+msgid "The time delta: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1271
+#. TODO: Send NDR back to user
+#: ../wallace/modules.py:137
 #, python-format
-msgid "Getting line: %s"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1275
-msgid "Returning request"
+msgid "Message in file %s older then 5 days, deleting"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1332
+#: ../wallace/modules.py:162
 #, python-format
-msgid "Got request instance %s"
+msgid "Rejecting message in %s (by module %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1341
+#: ../wallace/modules.py:180
 #, python-format
-msgid "Request instance %s is in state %s"
+msgid ""
+"This is the email system Wallace at %s.\n"
+"\n"
+"I'm sorry to inform you we could not deliver the attached message\n"
+"to the following recipients:\n"
+"\n"
+"- %s\n"
+"\n"
+"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 ""
 
-#: .././bin/kolab_smtp_access_policy.py:1349
+#: ../wallace/modules.py:195
 #, python-format
-msgid "Request instance %s is not yet in DATA state"
+msgid ""
+"X-Wallace-Module: %s\n"
+"X-Wallace-Result: REJECT\n"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1361
+#: ../wallace/modules.py:248
 #, python-format
-msgid "Request instance %s reached DATA state"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1379
-msgid "Sender access denied"
+msgid "Accepting message in %s (by module %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1381
-msgid "Recipient access denied"
+#: ../wallace/modules.py:316
+#, python-format
+msgid "Module '%s' already registered"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index 398d769..c86ab65 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pykolab 0.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-09 14:25+0100\n"
+"POT-Creation-Date: 2012-08-11 15:04+0100\n"
 "PO-Revision-Date: 2012-05-09 14:25+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,793 +17,907 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .././wallace/__init__.py:37 .././bonnie/__init__.py:35
-#: .././kolabd/__init__.py:46 .././saslauthd/__init__.py:47
-msgid "Daemon Options"
-msgstr ""
-
-#: .././wallace/__init__.py:44 .././bonnie/__init__.py:41
-#: .././kolabd/__init__.py:52 .././saslauthd/__init__.py:53
-msgid "Fork to the background."
-msgstr ""
-
-#: .././wallace/__init__.py:52
-msgid "Bind address for Wallace."
+#: ../bin/kolab_smtp_access_policy.py:206
+#, python-format
+msgid "Adding policy request to instance %s"
 msgstr ""
 
-#: .././wallace/__init__.py:60 .././kolabd/__init__.py:58
-#: .././saslauthd/__init__.py:59
-msgid "Path to the PID file to use."
+#: ../bin/kolab_smtp_access_policy.py:446
+msgid "Unauthorized access not allowed"
 msgstr ""
 
-#: .././wallace/__init__.py:68
-msgid "Port that Wallace is supposed to use."
+#: ../bin/kolab_smtp_access_policy.py:467
+#: ../bin/kolab_smtp_access_policy.py:658
+msgid "Could not find recipient"
 msgstr ""
 
-#: .././wallace/__init__.py:102 .././wallace/__init__.py:126
-#: .././wallace/__init__.py:373 .././wallace/__init__.py:401
+#: ../bin/kolab_smtp_access_policy.py:486
+#: ../bin/kolab_smtp_access_policy.py:586
 #, python-format
-msgid "Number of threads currently running: %d"
+msgid "Could not find envelope sender user %s"
 msgstr ""
 
-#: .././wallace/__init__.py:111 .././wallace/__init__.py:135
+#: ../bin/kolab_smtp_access_policy.py:529
 #, python-format
-msgid "Continuing with %d threads currently running"
+msgid "Obtained authenticated user details for %r: %r"
 msgstr ""
 
-#. TODO: Apply throttling
-#: .././wallace/__init__.py:118
+#: ../bin/kolab_smtp_access_policy.py:608
 #, python-format
-msgid "Creating thread for message in %s"
+msgid "%s is unauthorized to send on behalf of %s"
 msgstr ""
 
-#: .././wallace/__init__.py:142
+#: ../bin/kolab_smtp_access_policy.py:618
 #, python-format
-msgid "Running thread %s for message file %s"
+msgid "User %s attempted to use envelope sender address %s "
 msgstr ""
 
-#: .././wallace/__init__.py:151
+#: ../bin/kolab_smtp_access_policy.py:682
+#: ../bin/kolab_smtp_access_policy.py:693
 #, python-format
-msgid "This message was already in module %s, delegating "
+msgid "Found user %s to be a delegate user of %s"
 msgstr ""
 
-#: .././wallace/__init__.py:160
+#: ../bin/kolab_smtp_access_policy.py:717
 #, python-format
-msgid "It was also in a certain stage: %s, letting "
+msgid "Verifying authenticated sender '%(sender)s' with "
 msgstr ""
 
-#: .././wallace/__init__.py:168 .././wallace/__init__.py:174
-#: .././wallace/__init__.py:184
+#: ../bin/kolab_smtp_access_policy.py:722
 #, python-format
-msgid "Executing module %s"
-msgstr ""
-
-#: .././wallace/__init__.py:211 .././bonnie/__init__.py:67
-#: .././kolabd/__init__.py:85 .././saslauthd/__init__.py:90
-msgid "Interrupted by user"
-msgstr ""
-
-#: .././wallace/__init__.py:215 .././wallace/__init__.py:225
-#: .././kolabd/__init__.py:90 .././kolabd/__init__.py:101
-msgid "Traceback occurred, please report a "
+msgid "Verifying unauthenticated sender '%(sender)s' "
 msgstr ""
 
-#: .././wallace/__init__.py:221 .././bonnie/__init__.py:75
-#: .././kolabd/__init__.py:96 .././saslauthd/__init__.py:98
+#: ../bin/kolab_smtp_access_policy.py:739
 #, python-format
-msgid "Type Error: %s"
-msgstr ""
-
-#: .././wallace/__init__.py:241
-msgid "Picking up deferred messages for wallace"
+msgid "Reproducing verify_recipient(%s, %s) from "
 msgstr ""
 
-#: .././wallace/__init__.py:261
+#: ../bin/kolab_smtp_access_policy.py:756
 #, python-format
-msgid "Picking up deferred messages for module %s"
-msgstr ""
-
-#. Sleep for 300 seconds before reprocessing the deferred queues.
-#. TODO: Consider using queue_run_delay from Postfix, which is where
-#. the default value of 300 seconds comes from.
-#: .././wallace/__init__.py:285
-msgid "Sleeping for 300 seconds"
+msgid "Using authentication domain %s instead of %s"
 msgstr ""
 
-#: .././wallace/__init__.py:310
+#: ../bin/kolab_smtp_access_policy.py:766
 #, python-format
-msgid "Could not bind to socket on port %d on bind "
-msgstr ""
-
-#: .././wallace/__init__.py:320
-msgid "Could not shut down socket"
+msgid "Domain %s is a primary domain"
 msgstr ""
 
-#: .././wallace/__init__.py:394
+#: ../bin/kolab_smtp_access_policy.py:774
 #, python-format
-msgid "Picking up spooled email file %s"
+msgid "Checking the recipient for domain %s that is not "
 msgstr ""
 
-#: .././wallace/__init__.py:424
-msgid "Accepted connection"
+#: ../bin/kolab_smtp_access_policy.py:790
+msgid "This recipient address is related to multiple "
 msgstr ""
 
-#. This is a nested module
-#: .././wallace/modules.py:96
+#: ../bin/kolab_smtp_access_policy.py:799
 #, python-format
-msgid "Module Group: %s"
+msgid "Recipient address %r not found. Allowing since "
 msgstr ""
 
-#: .././wallace/modules.py:107 .././wallace/modules.py:112
-msgid "No such module."
+#: ../bin/kolab_smtp_access_policy.py:827
+msgid "Invalid recipient"
 msgstr ""
 
-#: .././wallace/modules.py:118
-#, python-format
-msgid "Holding message in queue for manual review (%s by %s)"
+#: ../bin/kolab_smtp_access_policy.py:838
+msgid "Could not find this user, accepting"
 msgstr ""
 
-#: .././wallace/modules.py:121
+#: ../bin/kolab_smtp_access_policy.py:901
+#: ../bin/kolab_smtp_access_policy.py:954
 #, python-format
-msgid "Deferring message in %s (by module %s)"
+msgid "Sender %s is not allowed to send to "
 msgstr ""
 
-#: .././wallace/modules.py:131
+#: ../bin/kolab_smtp_access_policy.py:941
 #, python-format
-msgid "The time when the message was sent: %r"
+msgid "Reproducing verify_sender(%r) from cache, "
 msgstr ""
 
-#: .././wallace/modules.py:132
-#, python-format
-msgid "The time now: %r"
+#: ../bin/kolab_smtp_access_policy.py:970
+msgid "Sender uses unauthorized envelope sender address"
 msgstr ""
 
-#: .././wallace/modules.py:133
-#, python-format
-msgid "The time delta: %r"
+#: ../bin/kolab_smtp_access_policy.py:987
+msgid "Could not verify sender"
 msgstr ""
 
-#. TODO: Send NDR back to user
-#: .././wallace/modules.py:137
-#, python-format
-msgid "Message in file %s older then 5 days, deleting"
+#: ../bin/kolab_smtp_access_policy.py:994
+msgid "Verifying whether sender is allowed to send to "
 msgstr ""
 
-#: .././wallace/modules.py:162
+#: ../bin/kolab_smtp_access_policy.py:1008
 #, python-format
-msgid "Rejecting message in %s (by module %s)"
+msgid "Result is %r"
 msgstr ""
 
-#: .././wallace/modules.py:180
-#, python-format
-msgid ""
-"This is the email system Wallace at %s.\n"
-"\n"
-"I'm sorry to inform you we could not deliver the attached message\n"
-"to the following recipients:\n"
-"\n"
-"- %s\n"
-"\n"
-"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"
+#: ../bin/kolab_smtp_access_policy.py:1013
+msgid "No recipient policy restrictions exist for this sender"
 msgstr ""
 
-#: .././wallace/modules.py:195
-#, python-format
-msgid ""
-"X-Wallace-Module: %s\n"
-"X-Wallace-Result: REJECT\n"
+#: ../bin/kolab_smtp_access_policy.py:1022
+msgid "Found a recipient policy to apply for this sender."
 msgstr ""
 
-#: .././wallace/modules.py:248
+#: ../bin/kolab_smtp_access_policy.py:1037
 #, python-format
-msgid "Accepting message in %s (by module %s)"
+msgid "Sender %s not allowed to send to recipient "
 msgstr ""
 
-#: .././wallace/modules.py:316
-#, python-format
-msgid "Module '%s' already registered"
+#: ../bin/kolab_smtp_access_policy.py:1068
+msgid "Cleaning up the cache"
 msgstr ""
 
-#: .././wallace/modules.py:338 .././pykolab/tests/tests.py:183
-#: .././pykolab/cli/commands.py:183 .././pykolab/setup/components.py:243
+#: ../bin/kolab_smtp_access_policy.py:1105
 #, python-format
-msgid "Alias for %s"
+msgid "Operational Error in caching: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:57
+#: ../bin/kolab_smtp_access_policy.py:1156
 #, python-format
-msgid "Issuing callback after processing to stage %s"
+msgid "Caching the policy result with timestamp %d"
 msgstr ""
 
-#: .././wallace/module_optout.py:58
+#: ../bin/kolab_smtp_access_policy.py:1233
 #, python-format
-msgid "Testing cb_action_%s()"
+msgid "Returning action DEFER_IF_PERMIT: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:60
+#: ../bin/kolab_smtp_access_policy.py:1238
 #, python-format
-msgid "Attempting to execute cb_action_%s()"
+msgid "Returning action DUNNO: %s"
 msgstr ""
 
-#. modules.next_module('optout')
-#: .././wallace/module_optout.py:66
+#: ../bin/kolab_smtp_access_policy.py:1243
 #, python-format
-msgid "Consulting opt-out service for %r, %r"
+msgid "Returning action HOLD: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:92
+#: ../bin/kolab_smtp_access_policy.py:1248
 #, python-format
-msgid "Running opt-out consult from envelope sender '%s "
+msgid "Returning action PERMIT: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:156
+#: ../bin/kolab_smtp_access_policy.py:1253
 #, python-format
-msgid "Attempting to execute cb_action_%s(%r, %r)"
+msgid "Returning action REJECT: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:177
-#, python-format
-msgid "Could not send request to optout_url %s"
+#: ../bin/kolab_smtp_access_policy.py:1299
+msgid "Starting to loop for new request"
 msgstr ""
 
-#: .././setup-kolab.py:36 .././kolabtest.py:34 .././kolabd.py:31
-#: .././wallace.py:31 .././bonnie.py:31
-msgid "Cannot load pykolab/constants.py:"
+#: ../bin/kolab_smtp_access_policy.py:1306
+msgid "Timeout for policy request reading exceeded"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:89
-msgid "Could not import caching library, caching disabled"
+#: ../bin/kolab_smtp_access_policy.py:1312
+msgid "End of current request"
 msgstr ""
 
-#. Obtain 'kolabDelegate' from the envelope sender.
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:291
+#: ../bin/kolab_smtp_access_policy.py:1316
 #, python-format
-msgid "Obtaining envelope sender dn for %s"
+msgid "Getting line: %s"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:309
-#, python-format
-msgid ""
-"User %s attempted to use envelope sender address %s without authorization"
+#: ../bin/kolab_smtp_access_policy.py:1320
+msgid "Returning request"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:355
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:358
-#, python-format
-msgid "Found user %s to be a valid delegate user of %s"
+#: ../bin/kolab_smtp_access_policy.py:1346
+msgid "Access Policy Options"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:424
-#: .././bin/kolab_smtp_access_policy.py:1301
-msgid "Access Policy Options"
+#: ../bin/kolab_smtp_access_policy.py:1353
+msgid "SMTP Policy request timeout."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:431
-#: .././bin/kolab_smtp_access_policy.py:1308
+#: ../bin/kolab_smtp_access_policy.py:1359
 msgid "Verify the recipient access policy."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:437
-#: .././bin/kolab_smtp_access_policy.py:1314
+#: ../bin/kolab_smtp_access_policy.py:1365
 msgid "Verify the sender access policy."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:443
-#: .././bin/kolab_smtp_access_policy.py:1320
+#: ../bin/kolab_smtp_access_policy.py:1371
 msgid "Allow unauthenticated senders."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:464
-msgid "Verifying sender."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:468
-msgid "No sender specified."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:469
-msgid "Invalid sender"
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:473
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:521
-msgid "No SASL username in request."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:475
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:524
-msgid "Not allowing unauthenticated senders."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:476
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:525
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:534
-msgid "Access denied"
+#: ../bin/kolab_smtp_access_policy.py:1385
+#, python-format
+msgid "Got request instance %s"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:478
-msgid "Allowing unauthenticated senders."
+#: ../bin/kolab_smtp_access_policy.py:1394
+#, python-format
+msgid "Request instance %s is in state %s"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:484
+#: ../bin/kolab_smtp_access_policy.py:1402
 #, python-format
-msgid "Allowing authenticated sender %s to send as %s."
+msgid "Request instance %s is not yet in DATA state"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:492
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:504
+#: ../bin/kolab_smtp_access_policy.py:1414
 #, python-format
-msgid "Authenticated as sender %s"
+msgid "Request instance %s reached DATA state"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:515
-msgid "Verifying recipient."
+#: ../bin/kolab_smtp_access_policy.py:1432
+msgid "Sender access denied"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:518
-#: .././bin/kolab_smtp_access_policy.py:781
-msgid "Invalid recipient"
+#: ../bin/kolab_smtp_access_policy.py:1434
+msgid "Recipient access denied"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:536
-#: .././bin/kolab_smtp_access_policy.py:1383
+#: ../bin/kolab_smtp_access_policy.py:1436
 msgid "No objections"
 msgstr ""
 
-#: .././play/confmgmt/db.py:59 .././play/conf.py:280
-msgid "Dropping all tables..."
-msgstr ""
-
-#: .././play/confmgmt/db.py:62 .././play/conf.py:283
-msgid "Creating the necessary tables..."
-msgstr ""
-
-#: .././play/confmgmt/db.py:69 .././play/conf.py:290
-#: .././play/roundcube_database/__init__.py:57
-#: .././play/roundcube_database/users.py:114 .././pykolab/telemetry.py:652
-msgid "No database available"
-msgstr ""
-
-#: .././play/confmgmt.py:74
-#, python-format
-msgid "Searching for service with name %s"
-msgstr ""
-
-#: .././play/confmgmt.py:77
-#, python-format
-msgid "Found service %s"
+#: ../conf.py:37 ../kolab.py:34 ../saslauthd.py:33
+msgid "Cannot load pykolab/logger.py:"
 msgstr ""
 
-#: .././play/confmgmt.py:82
-#, python-format
-msgid "Searching for role with name %s"
+#: ../kolabd/__init__.py:49 ../saslauthd/__init__.py:48
+#: ../wallace/__init__.py:65
+msgid "Daemon Options"
 msgstr ""
 
-#: .././play/confmgmt.py:85
-#, python-format
-msgid "Found role %s"
+#: ../kolabd/__init__.py:56 ../saslauthd/__init__.py:55
+#: ../wallace/__init__.py:72
+msgid "Fork to the background."
 msgstr ""
 
-#: .././play/confmgmt.py:89
-#, python-format
-msgid "Searching for file with path %s"
+#: ../kolabd/__init__.py:65 ../saslauthd/__init__.py:64
+#: ../wallace/__init__.py:98
+msgid "Path to the PID file to use."
 msgstr ""
 
-#: .././play/confmgmt.py:92
-#, python-format
-msgid "File with path %s not found, adding to database"
+#: ../kolabd/__init__.py:74 ../saslauthd/__init__.py:73
+#: ../wallace/__init__.py:115
+msgid "Run as user USERNAME"
 msgstr ""
 
-#: .././play/confmgmt.py:97
-#, python-format
-msgid "Adding file with path %s to service with name %s"
+#: ../kolabd/__init__.py:84 ../saslauthd/__init__.py:83
+#: ../wallace/__init__.py:89
+msgid "Run as group GROUPNAME"
 msgstr ""
 
-#: .././play/confmgmt.py:101
+#: ../kolabd/__init__.py:122 ../pykolab/utils.py:151
+#: ../wallace/__init__.py:288
 #, python-format
-msgid "Adding setting with key %s (%r, %r)"
+msgid "Group %s does not exist"
 msgstr ""
 
-#: .././play/confmgmt.py:106
+#: ../kolabd/__init__.py:131 ../wallace/__init__.py:297
 #, python-format
-msgid "Adding setting %s to file with path %s"
+msgid "Switching real and effective group id to %d"
 msgstr ""
 
-#: .././play/confmgmt.py:110
+#: ../kolabd/__init__.py:153 ../pykolab/utils.py:175
+#: ../wallace/__init__.py:319
 #, python-format
-msgid "Adding role with name %s to setting with key %s"
+msgid "User %s does not exist"
 msgstr ""
 
-#: .././play/rolequota/__init__.py:53
-#: .././pykolab/plugins/dynamicquota/__init__.py:50
+#: ../kolabd/__init__.py:163 ../wallace/__init__.py:329
 #, python-format
-msgid "No keyword %s passed to set_user_folder_quota"
+msgid "Switching real and effective user id to %d"
 msgstr ""
 
-#: .././play/roundcube_database/__init__.py:51
-#: .././play/roundcube_database/users.py:108
-#, python-format
-msgid "Operational Error in Roundcube database: %s"
+#: ../kolabd/__init__.py:172 ../wallace/__init__.py:338
+msgid "Could not change real and effective uid and/or gid"
 msgstr ""
 
-#: .././kwap/kwap/controllers/secure.py:25
-msgid "Secure Controller here"
+#: ../kolabd/__init__.py:192 ../saslauthd/__init__.py:122
+#: ../wallace/__init__.py:358
+msgid "Interrupted by user"
 msgstr ""
 
-#: .././kwap/kwap/controllers/root.py:103
-msgid "Wrong credentials"
+#: ../kolabd/__init__.py:197 ../kolabd/__init__.py:208
+#: ../wallace/__init__.py:362 ../wallace/__init__.py:372
+msgid "Traceback occurred, please report a "
 msgstr ""
 
-#: .././kwap/kwap/controllers/root.py:118
+#: ../kolabd/__init__.py:203 ../saslauthd/__init__.py:130
+#: ../wallace/__init__.py:368
 #, python-format
-msgid "Welcome back, %s!"
-msgstr ""
-
-#: .././kwap/kwap/controllers/root.py:128
-msgid "We hope to see you soon!"
-msgstr ""
-
-#: .././saslauthd.py:33 .././kolab.py:34 .././conf.py:37
-msgid "Cannot load pykolab/logger.py:"
-msgstr ""
-
-#: .././bonnie/__init__.py:71 .././bonnie/__init__.py:79
-#: .././saslauthd/__init__.py:94 .././saslauthd/__init__.py:102
-msgid "Traceback occurred, please report a bug at http://bugzilla.kolabsys.com"
+msgid "Type Error: %s"
 msgstr ""
 
-#: .././kolabd/__init__.py:116 .././pykolab/auth/ldap/__init__.py:1291
-#: .././pykolab/cli/cmd_sync.py:33
+#: ../kolabd/__init__.py:223 ../pykolab/auth/ldap/__init__.py:1591
+#: ../pykolab/cli/cmd_sync.py:36
 msgid "Listing domains..."
 msgstr ""
 
-#: .././kolabd/__init__.py:148
+#: ../kolabd/__init__.py:256
 #, python-format
 msgid "added domains: %r, removed domains: %r"
 msgstr ""
 
-#: .././pykolab/__init__.py:50
-msgid "Returning thread local configuration"
-msgstr ""
-
-#: .././pykolab/tests/tests.py:53
-msgid "List tests"
-msgstr ""
-
-#. This is a nested test
-#: .././pykolab/tests/tests.py:86
-#, python-format
-msgid "Test Suite: %s"
-msgstr ""
-
-#: .././pykolab/tests/tests.py:100 .././pykolab/tests/tests.py:105
-msgid "No such test."
-msgstr ""
-
-#: .././pykolab/tests/tests.py:157 .././pykolab/tests/tests.py:161
-#, python-format
-msgid "Test '%s' already registered"
-msgstr ""
-
-#: .././pykolab/tests/tests.py:191 .././pykolab/cli/commands.py:191
-#: .././pykolab/setup/components.py:251
-msgid "Not yet implemented"
-msgstr ""
-
-#: .././pykolab/tests/__init__.py:39
-msgid "Test Options"
-msgstr ""
-
-#: .././pykolab/tests/__init__.py:45
-msgid "Run tests in suite SUITE. Implies a certain set of items being tested."
-msgstr ""
-
-#: .././pykolab/tests/imap/test_login.py:44
-#, python-format
-msgid "Connecting at %s"
+#: ../kolabd.py:31 ../setup-kolab.py:36 ../wallace.py:31
+msgid "Cannot load pykolab/constants.py:"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:46
+#: ../pykolab/auth/__init__.py:94
 #, python-format
-msgid "Connected at %s"
+msgid "Called for domain %r"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:51
+#: ../pykolab/auth/__init__.py:107 ../pykolab/auth/__init__.py:116
 #, python-format
-msgid "Logging in at %s"
+msgid "Using section %s and domain %s"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:53
+#: ../pykolab/auth/__init__.py:121
 #, python-format
-msgid "Logged in at %s"
+msgid "Connecting to Authentication backend for domain %s"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:60
+#: ../pykolab/auth/__init__.py:132
 #, python-format
-msgid "Test failure in %s"
+msgid "Section %s has no option 'auth_mechanism'"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:94
+#: ../pykolab/auth/__init__.py:139
 #, python-format
-msgid "Called for domain %r"
+msgid "Section %s has auth_mechanism: %r"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:107 .././pykolab/auth/__init__.py:116
-#, python-format
-msgid "Using section %s and domain %s"
+#: ../pykolab/auth/__init__.py:148 ../pykolab/auth/__init__.py:157
+msgid "Starting LDAP..."
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:121
+#: ../pykolab/auth/ldap/cache.py:109
 #, python-format
-msgid "Connecting to Authentication backend for domain %s"
+msgid "Inserting cache entry %r"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:132
+#: ../pykolab/auth/ldap/cache.py:122
 #, python-format
-msgid "Section %s has no option 'auth_mechanism'"
+msgid "Updating timestamp for cache entry %r"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:139
+#: ../pykolab/auth/ldap/cache.py:129
 #, python-format
-msgid "Section %s has auth_mechanism: %r"
-msgstr ""
-
-#: .././pykolab/auth/__init__.py:148 .././pykolab/auth/__init__.py:157
-msgid "Starting LDAP..."
+msgid "Updating result_attribute for cache entry %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:51
+#: ../pykolab/auth/ldap/__init__.py:51
 msgid "Python LDAP library does not support persistent search"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:141
+#: ../pykolab/auth/ldap/__init__.py:142
 #, python-format
 msgid "Attempting to authenticate user %s in realm %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:181
+#: ../pykolab/auth/ldap/__init__.py:184
 #, python-format
 msgid "Binding with user_dn %s and password %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:190
+#: ../pykolab/auth/ldap/__init__.py:194
 #, python-format
 msgid "Failed to authenticate as user %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:205
+#: ../pykolab/auth/ldap/__init__.py:211
 msgid "Connecting to LDAP..."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:209
+#: ../pykolab/auth/ldap/__init__.py:215
 #, python-format
 msgid "Attempting to use LDAP URI %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:345
+#: ../pykolab/auth/ldap/__init__.py:357
 #, python-format
 msgid "Finding recipient with filter %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:398
+#: ../pykolab/auth/ldap/__init__.py:425
+#, python-format
+msgid "Finding resource with filter %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:448
+#, python-format
+msgid "Using timestamp %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:480
 #, python-format
 msgid "Applying recipient policy to %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:415
+#: ../pykolab/auth/ldap/__init__.py:497
 #, python-format
 msgid "Using mail attributes: %r, with primary %r and "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:426
+#: ../pykolab/auth/ldap/__init__.py:508
 #, python-format
 msgid "key %r not in entry"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:428
+#: ../pykolab/auth/ldap/__init__.py:510
 #, python-format
 msgid "key %r is the prim. mail attr."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:430
+#: ../pykolab/auth/ldap/__init__.py:512
 msgid "prim. mail pol. is not empty"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:433
+#: ../pykolab/auth/ldap/__init__.py:515
 #, python-format
 msgid "key %r is the sec. mail attr."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:435
+#: ../pykolab/auth/ldap/__init__.py:517
 msgid "sec. mail pol. is not empty"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:438
-#: .././pykolab/auth/ldap/__init__.py:451
+#: ../pykolab/auth/ldap/__init__.py:520 ../pykolab/auth/ldap/__init__.py:533
 #, python-format
 msgid "Attributes %r are not yet available for entry %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:492
+#: ../pykolab/auth/ldap/__init__.py:574
 #, python-format
 msgid "No results for mail address %s found"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:503
+#: ../pykolab/auth/ldap/__init__.py:585
 #, python-format
 msgid "1 result for address %s found, verifying"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:513
+#: ../pykolab/auth/ldap/__init__.py:595
 #, python-format
 msgid "Too bad, primary email address %s "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:524
-#: .././pykolab/auth/ldap/__init__.py:613
+#: ../pykolab/auth/ldap/__init__.py:606 ../pykolab/auth/ldap/__init__.py:695
 msgid "Address assigned to us"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:579
+#: ../pykolab/auth/ldap/__init__.py:661
 #, python-format
 msgid "No results for address %s found"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:590
+#: ../pykolab/auth/ldap/__init__.py:672
 #, python-format
 msgid "1 result for address %s found, "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:601
+#: ../pykolab/auth/ldap/__init__.py:683
 msgid "Too bad, secondary email "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:655
+#: ../pykolab/auth/ldap/__init__.py:710
+msgid "Recipient policy composed the following set of secondary "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:716
+#, python-format
+msgid "Secondary mail addresses that we want is not None: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:727
+msgid "Avoiding the duplication of the primary mail "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:738
+#, python-format
+msgid "Entry is getting secondary mail addresses: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:746
+msgid "Entry did not have any secondary mail "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:772
 #, python-format
 msgid "Entry modifications list: %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:698
+#: ../pykolab/auth/ldap/__init__.py:792
+#, python-format
+msgid "Setting entry attribute %r to %r for %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:828
+#, python-format
+msgid "Could not update dn %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:841
 #, python-format
 msgid "Using filter %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:736
+#: ../pykolab/auth/ldap/__init__.py:879
+#, python-format
+msgid "About to consider the user quota for %r (used: %r, "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:945
 msgid "Invalid bind credentials"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:989
+#: ../pykolab/auth/ldap/__init__.py:1229
 #, python-format
 msgid "Current changelog entry %s with %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:996
+#: ../pykolab/auth/ldap/__init__.py:1242
 #, python-format
 msgid "Result from recipient policy: %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1227
+#: ../pykolab/auth/ldap/__init__.py:1385
+#, python-format
+msgid "Kolab user %s does not have a result attribute %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1527
 #, python-format
 msgid "Finding domain root dn for domain %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1315
+#: ../pykolab/auth/ldap/__init__.py:1615
 msgid "Authentication database DOWN"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1394
+#: ../pykolab/auth/ldap/__init__.py:1699 ../pykolab/auth/ldap/__init__.py:1734
 #, python-format
 msgid "Entry type: %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1492
+#: ../pykolab/auth/ldap/__init__.py:1822
 msgid "LDAP Search Result Data Entry:"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1508
+#: ../pykolab/auth/ldap/__init__.py:1838
 msgid "Entry Change Notification attributes:"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1513
+#: ../pykolab/auth/ldap/__init__.py:1843
 #, python-format
 msgid "Change Type: %r (%r)"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1521
+#: ../pykolab/auth/ldap/__init__.py:1851
 #, python-format
 msgid "Previous DN: %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1575
+#: ../pykolab/auth/ldap/__init__.py:1906
 #, python-format
 msgid "Object %s searched no longer exists"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1583
+#: ../pykolab/auth/ldap/__init__.py:1916
 #, python-format
 msgid "%d results..."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1677
+#: ../pykolab/auth/ldap/__init__.py:2014
 #, python-format
 msgid "Searching with filter %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1721
+#: ../pykolab/auth/ldap/__init__.py:2058
 #, python-format
 msgid "Checking for support for %s on %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/cache.py:109
-#, python-format
-msgid "Inserting cache entry %r"
+#: ../pykolab/cli/cmd_add_domain.py:36 ../pykolab/cli/cmd_create_mailbox.py:36
+#: ../pykolab/cli/cmd_export_mailbox.py:33
+#: ../pykolab/cli/cmd_list_mailboxes.py:39
+msgid "CLI Options"
 msgstr ""
 
-#: .././pykolab/auth/ldap/cache.py:122
-#, python-format
-msgid "Updating timestamp for cache entry %r"
+#: ../pykolab/cli/cmd_add_domain.py:42
+msgid "Add domain as alias for DOMAIN"
 msgstr ""
 
-#: .././pykolab/auth/ldap/cache.py:128
-#, python-format
-msgid "Updating result_attribute for cache entry %r"
+#: ../pykolab/cli/cmd_add_domain.py:47
+msgid "Add a new domain or domain alias."
 msgstr ""
 
-#: .././pykolab/auth/sql/__init__.py:44
-msgid "Connecting to SQL..."
+#: ../pykolab/cli/cmd_add_domain.py:55
+msgid "Could not find credentials with sufficient permissions"
 msgstr ""
 
-#: .././pykolab/utils.py:92
-msgid "Please answer 'yes' or 'no'."
+#: ../pykolab/cli/cmd_add_domain.py:80 ../pykolab/wap_client/__init__.py:113
+msgid "Invalid parent domain"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:87
-#, python-format
-msgid "Setting %s to %r (from defaults)"
+#: ../pykolab/cli/cmd_add_domain.py:86
+msgid "Domain name"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:106
-#, python-format
-msgid "Setting %s to %r (from CLI, verified)"
+#: ../pykolab/cli/cmd_create_mailbox.py:41
+msgid "Set metadata for folder to ANNOTATION=VALUE"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:109
-#, python-format
-msgid "Setting %s to %r (from CLI, not checked)"
+#: ../pykolab/cli/cmd_create_mailbox.py:50
+msgid "Invalid argument"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:150 .././pykolab/conf/__init__.py:207
-#, python-format
-msgid "Setting %s_%s to '****' (from configuration file)"
+#: ../pykolab/cli/cmd_create_mailbox.py:58
+msgid "Invalid argument for metadata"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:152 .././pykolab/conf/__init__.py:209
-#, python-format
-msgid "Setting %s_%s to %r (from configuration file)"
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:45
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:49
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:50
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:55
+msgid "ACI Subject"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:162
-msgid "Setting options from configuration file"
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:48
+#: ../pykolab/cli/cmd_list_mailbox_acls.py:41
+#: ../pykolab/cli/cmd_list_mailbox_metadata.py:41
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:54
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:54
+msgid "Folder name"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:223
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:60
+#: ../pykolab/cli/cmd_list_mailbox_acls.py:52
+#: ../pykolab/cli/cmd_list_mailbox_metadata.py:52
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:67
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:67
 #, python-format
-msgid "Configuration file %s not readable"
+msgid "No such folder %r"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:226
-#, python-format
-msgid "Reading configuration file %s"
+#: ../pykolab/cli/cmd_delete_mailbox.py:46
+msgid "No mailbox specified"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:230
+#: ../pykolab/cli/cmd_export_mailbox.py:38
+msgid "All folders this user has access to"
+msgstr ""
+
+#: ../pykolab/cli/cmd_export_mailbox.py:108
+#, python-format
+msgid "%s is not a directory"
+msgstr ""
+
+#: ../pykolab/cli/cmd_export_mailbox.py:118
+#, python-format
+msgid "ZIP file at %s.zip"
+msgstr ""
+
+#: ../pykolab/cli/cmd_export_mailbox.py:120
+#, python-format
+msgid "No directories found for user %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_mailboxes.py:44
+msgid "Display raw IMAP UTF-7 folder names"
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_mailboxes.py:75
+#, python-format
+msgid "Appending folder search for %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:49
+msgid "Invalid or unqualified email address."
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:57
+#, python-format
+msgid "No recipient found for email address %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:60
+#, python-format
+msgid "Found the following recipient(s): %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:66
+#, python-format
+msgid "Using the following mail attributes: %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:90
+msgid "Found the following recipients:"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:48
+msgid "No target mailbox name specified"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:50
+msgid "No source mailbox name specified"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:62
+#, python-format
+msgid "Source folder %r does not exist"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:66
+#, python-format
+msgid "Target folder %r already exists"
+msgstr ""
+
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:47
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:51
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:56
+msgid "ACI Permissions"
+msgstr ""
+
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:47
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:51
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:56
+msgid "Metadata value"
+msgstr ""
+
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:50
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:55
+msgid "Metadata path"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:41
+#, python-format
+msgid "Found %d domains in %d seconds"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:51
+#, python-format
+msgid "Running for domain %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:57
+#, python-format
+msgid "Synchronizing users for %s took %d seconds"
+msgstr ""
+
+#. This is a nested command
+#. This is a nested component
+#: ../pykolab/cli/commands.py:98 ../pykolab/setup/components.py:90
+#, python-format
+msgid "Command Group: %s"
+msgstr ""
+
+#: ../pykolab/cli/commands.py:109 ../pykolab/cli/commands.py:114
+msgid "No such command."
+msgstr ""
+
+#: ../pykolab/cli/commands.py:165 ../pykolab/setup/components.py:231
+#, python-format
+msgid "Command '%s' already registered"
+msgstr ""
+
+#: ../pykolab/cli/commands.py:190 ../pykolab/setup/components.py:257
+#: ../wallace/modules.py:338
+#, python-format
+msgid "Alias for %s"
+msgstr ""
+
+#: ../pykolab/cli/commands.py:198 ../pykolab/setup/components.py:265
+msgid "Not yet implemented"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:40
+msgid "Unspecified command issue identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:50
+msgid "Invalid command issue identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:60
+#: ../pykolab/cli/telemetry/cmd_examine_session.py:65
+msgid "Invalid session identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:75
+#: ../pykolab/cli/telemetry/cmd_examine_session.py:100
+#, python-format
+msgid "Session by %s on server %s"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_session.py:43
+msgid "Unspecified session identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_list_sessions.py:35
+msgid "List Options"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_list_sessions.py:40
+msgid "Display sessions since ..."
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_list_sessions.py:58
+#, python-format
+msgid "Session for user %s started at %s with ID %s"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:57 ../pykolab/conf/entitlement.py:80
+#: ../pykolab/conf/entitlement.py:98 ../pykolab/conf/entitlement.py:116
+#: ../pykolab/conf/entitlement.py:230 ../pykolab/conf/entitlement.py:246
+#: ../pykolab/conf/entitlement.py:262
+msgid "Invalid entitlement verification "
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:120 ../pykolab/conf/entitlement.py:123
+msgid "Invalid entitlement certificate"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:132
+#, python-format
+msgid "Parsing entitlement file %s"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:141
+#, python-format
+msgid "License file %s not readable!"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:147
+msgid "No entitlement directory found"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:87
+#, python-format
+msgid "Setting %s to %r (from defaults)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:106
+#, python-format
+msgid "Setting %s to %r (from CLI, verified)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:109
+#, python-format
+msgid "Setting %s to %r (from CLI, not checked)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:150 ../pykolab/conf/__init__.py:207
+#, python-format
+msgid "Setting %s_%s to '****' (from configuration file)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:152 ../pykolab/conf/__init__.py:209
+#, python-format
+msgid "Setting %s_%s to %r (from configuration file)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:162
+msgid "Setting options from configuration file"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:223
+#, python-format
+msgid "Configuration file %s not readable"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:226
+#, python-format
+msgid "Reading configuration file %s"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:230
 #, python-format
 msgid "Invalid configuration file %s"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:233
+#: ../pykolab/conf/__init__.py:233
 #, python-format
 msgid "No master configuration section [kolab] in configuration file %s"
 msgstr ""
@@ -811,1088 +925,1335 @@ msgstr ""
 #. #
 #. # Runtime Options
 #. #
-#: .././pykolab/conf/__init__.py:267
+#: ../pykolab/conf/__init__.py:267
 msgid "Runtime Options"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:272
+#: ../pykolab/conf/__init__.py:272
 msgid "Configuration file to use"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:278
+#: ../pykolab/conf/__init__.py:278
 msgid "Set the debugging "
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:286
+#: ../pykolab/conf/__init__.py:286
 msgid "Set the logging level. "
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:294
+#: ../pykolab/conf/__init__.py:294
 msgid "Log file to use"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:300
+#: ../pykolab/conf/__init__.py:300
 msgid "Be quiet."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:306
+#: ../pykolab/conf/__init__.py:306
 msgid "Answer yes to all questions."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:328
+#: ../pykolab/conf/__init__.py:328
 msgid "No command supplied"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:411
+#: ../pykolab/conf/__init__.py:411
 msgid "Insufficient options. Need section, key and value -in that order."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:414
+#: ../pykolab/conf/__init__.py:414
 #, python-format
 msgid "No section '%s' exists."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:445
+#: ../pykolab/conf/__init__.py:445
 #, python-format
 msgid "Setting %s to %r (from the default values for CLI options)"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:514
+#: ../pykolab/conf/__init__.py:514
 #, python-format
 msgid "Could not execute configuration function: %s"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:522
+#: ../pykolab/conf/__init__.py:522
 #, python-format
 msgid "Option %s/%s does not exist in config file %s, pulling from defaults"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:530 .././pykolab/conf/__init__.py:533
+#: ../pykolab/conf/__init__.py:530 ../pykolab/conf/__init__.py:533
 msgid "Option does not exist in defaults."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:531 .././pykolab/conf/__init__.py:534
-msgid "Not available"
-msgstr ""
-
-#: .././pykolab/conf/__init__.py:543
+#: ../pykolab/conf/__init__.py:543
 #, python-format
 msgid "Configuration file %s not readable."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:546
+#: ../pykolab/conf/__init__.py:546
 #, python-format
 msgid "Configuration file %s does not exist."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:551
+#: ../pykolab/conf/__init__.py:551
 msgid ""
 "WARNING: A negative debug level value does not make this program be any more "
 "silent."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:557
+#: ../pykolab/conf/__init__.py:557
 msgid "This program has 9 levels of verbosity. Using the maximum of 9."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:565 .././pykolab/conf/__init__.py:571
+#: ../pykolab/conf/__init__.py:565 ../pykolab/conf/__init__.py:571
 msgid "Cannot start SASL authentication daemon"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:582
+#: ../pykolab/conf/__init__.py:582
 msgid "No imaplib library found."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:592
+#: ../pykolab/conf/__init__.py:592
 msgid "No LMTP class found in the smtplib library."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:602
+#: ../pykolab/conf/__init__.py:602
 msgid "No SMTP class found in the smtplib library."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:616
+#: ../pykolab/conf/__init__.py:616
 #, python-format
 msgid "Found you specified a specific set of items to test: %s"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:624
+#: ../pykolab/conf/__init__.py:624
 #, python-format
 msgid "Selectively selecting: %s"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:57 .././pykolab/conf/entitlement.py:80
-#: .././pykolab/conf/entitlement.py:98 .././pykolab/conf/entitlement.py:116
-#: .././pykolab/conf/entitlement.py:229 .././pykolab/conf/entitlement.py:245
-#: .././pykolab/conf/entitlement.py:261
-msgid "Invalid entitlement verification "
+#: ../pykolab/constants.py.in:40
+msgid "PyKolab is a Kolab Systems product. For more information "
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:120 .././pykolab/conf/entitlement.py:123
-msgid "Invalid entitlement certificate"
+#: ../pykolab/constants.py.in:54
+msgid "WARNING"
+msgstr ""
+
+#: ../pykolab/constants.py.in:54
+msgid "The Fully Qualified "
+msgstr ""
+
+#: ../pykolab/constants.py.in:75
+msgid "389 Directory Server or Red Hat Directory Server"
+msgstr ""
+
+#: ../pykolab/constants.py.in:79 ../pykolab/constants.py.in:83
+msgid "OpenLDAP or compatible"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:132
+#: ../pykolab/imap/cyrus.py:79
 #, python-format
-msgid "Parsing entitlement file %s"
+msgid "Could not connect to Cyrus IMAP server %r"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:141
+#: ../pykolab/imap/cyrus.py:134
 #, python-format
-msgid "License file %s not readable!"
+msgid "Continuing with separator: %r"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:146
-msgid "No entitlement directory found"
+#: ../pykolab/imap/cyrus.py:139
+msgid "Detected we are running in a Murder topology"
 msgstr ""
 
-#: .././pykolab/logger.py:89
+#: ../pykolab/imap/cyrus.py:143
+msgid "This system is not part of a murder topology"
+msgstr ""
+
+#: ../pykolab/imap/cyrus.py:164
 #, python-format
-msgid "Cannot log to file %s: %s"
+msgid "Checking actual backend server for folder %s through annotations"
 msgstr ""
 
-#: .././pykolab/constants.py:40
-msgid "PyKolab is a Kolab Systems product. For more information "
+#: ../pykolab/imap/cyrus.py:179
+#, python-format
+msgid "Could not get the annotations after %s tries."
 msgstr ""
 
-#: .././pykolab/constants.py:54
-msgid "WARNING"
+#: ../pykolab/imap/cyrus.py:183
+#, python-format
+msgid "No annotations for %s: %r"
 msgstr ""
 
-#: .././pykolab/constants.py:54
-msgid "The Fully Qualified "
+#: ../pykolab/imap/cyrus.py:190
+#, python-format
+msgid "Server for INBOX folder %s is %s"
 msgstr ""
 
-#: .././pykolab/constants.py:75
-msgid "389 Directory Server or Red Hat Directory Server"
+#: ../pykolab/imap/cyrus.py:202
+#, python-format
+msgid "Setting quota for folder %s to %s"
 msgstr ""
 
-#: .././pykolab/constants.py:79 .././pykolab/constants.py:83
-msgid "OpenLDAP or compatible"
+#: ../pykolab/imap/cyrus.py:206
+#, python-format
+msgid "Could not set quota for mailfolder %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_list_sessions.py:35
-msgid "List Options"
+#: ../pykolab/imap/cyrus.py:215
+#, python-format
+msgid "Moving INBOX folder %s to %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_list_sessions.py:40
-msgid "Display sessions since ..."
+#: ../pykolab/imap/cyrus.py:227
+#, python-format
+msgid "Setting annotation %s on folder %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_list_sessions.py:58
+#: ../pykolab/imap/cyrus.py:234
 #, python-format
-msgid "Session for user %s started at %s with ID %s"
+msgid "Could not set annotation %r on mail folder %r: %r"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_session.py:43
-msgid "Unspecified session identifier"
+#: ../pykolab/imap/cyrus.py:238
+#, python-format
+msgid "Transferring folder %s from %s to %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_session.py:65
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:60
-msgid "Invalid session identifier"
+#: ../pykolab/imap/cyrus.py:298
+#, python-format
+msgid "Undeleting %s to %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_session.py:100
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:75
+#: ../pykolab/imap/__init__.py:45
 #, python-format
-msgid "Session by %s on server %s"
+msgid "Cleaning up ACL entries for %s across all folders"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:40
-msgid "Unspecified command issue identifier"
+#: ../pykolab/imap/__init__.py:60
+#, python-format
+msgid "Cleaning up ACL entries referring to identifier %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:50
-msgid "Invalid command issue identifier"
+#: ../pykolab/imap/__init__.py:69
+#, python-format
+msgid "Iterating over %d folders"
 msgstr ""
 
-#. This is a nested command
-#. This is a nested component
-#: .././pykolab/cli/commands.py:95 .././pykolab/setup/components.py:88
+#. Set the ACL to '' (effectively deleting the ACL entry)
+#: ../pykolab/imap/__init__.py:82
 #, python-format
-msgid "Command Group: %s"
+msgid "Removing acl %r for subject %r from folder %r"
 msgstr ""
 
-#: .././pykolab/cli/commands.py:106 .././pykolab/cli/commands.py:111
-msgid "No such command."
+#: ../pykolab/imap/__init__.py:143
+#, python-format
+msgid "Logging on to Cyrus IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/commands.py:161 .././pykolab/setup/components.py:217
+#: ../pykolab/imap/__init__.py:152
 #, python-format
-msgid "Command '%s' already registered"
+msgid "Logging on to Dovecot IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_delete_mailbox.py:43
-msgid "No mailbox specified"
+#: ../pykolab/imap/__init__.py:161
+#, python-format
+msgid "Logging on to generic IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_list_mailboxes.py:35
-#: .././pykolab/cli/cmd_export_mailbox.py:33
-msgid "CLI Options"
+#: ../pykolab/imap/__init__.py:179
+#, python-format
+msgid "Reusing existing IMAP server connection to %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_list_mailboxes.py:40
-msgid "Display raw UTF-7 folder names"
+#: ../pykolab/imap/__init__.py:181
+#, python-format
+msgid "Reconnecting to IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:38
-msgid "All folders this user has access to"
+#: ../pykolab/imap/__init__.py:197
+msgid "Called imap.disconnect() on a server that "
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:108
+#: ../pykolab/imap/__init__.py:213
 #, python-format
-msgid "%s is not a directory"
+msgid "%r has no attribute %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:118
+#: ../pykolab/imap/__init__.py:286
+msgid "Private annotations need to be set using the appropriate user account."
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:319 ../pykolab/imap/__init__.py:354
 #, python-format
-msgid "ZIP file at %s.zip"
+msgid "Creating new shared folder %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:120
+#: ../pykolab/imap/__init__.py:376
 #, python-format
-msgid "No directories found for user %s"
+msgid "Creating new mailbox for user %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_sync.py:38
+#: ../pykolab/imap/__init__.py:405
 #, python-format
-msgid "Found %d domains in %d seconds"
+msgid "Creating additional folders for user %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_sync.py:48
+#: ../pykolab/imap/__init__.py:429
 #, python-format
-msgid "Running for domain %s"
+msgid "Mailbox already exists: %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_sync.py:54
+#: ../pykolab/imap/__init__.py:472
+msgid "Subscribing user to the additional folders"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:532 ../pykolab/imap/__init__.py:611
 #, python-format
-msgid "Synchronizing users for %s took %d seconds"
+msgid "Renaming INBOX from %s to %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:536
+#, python-format
+msgid "Could not rename INBOX folder %s to %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:538 ../pykolab/imap/__init__.py:615
+#, python-format
+msgid "Moving INBOX folder %s won't succeed as target folder %s already exists"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:70
+#: ../pykolab/imap/__init__.py:551
+#, python-format
+msgid "Looking for folder '%s', we found folders: %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:574
+#, python-format
+msgid "Setting ACL rights %s for subject %s on folder "
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:585
+#, python-format
+msgid "Removing ACL rights %s for subject %s on folder "
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:608
+#, python-format
+msgid "Found old INBOX folder %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:617
+#, python-format
+msgid "Did not find old folder user/%s to rename"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:619
+msgid "Value for user is not a dictionary"
+msgstr ""
+
+#. TODO: Go in fact correct the quota.
+#: ../pykolab/imap/__init__.py:682
+#, python-format
+msgid "Cannot get current IMAP quota for folder %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:695
+#, python-format
+msgid "Quota for %s currently is %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:701
+#, python-format
+msgid "Adjusting authentication database quota for folder %s to %d"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:706
+#, python-format
+msgid "Correcting quota for %s to %s (currently %s)"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:788
+#, python-format
+msgid "Checking folder: %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:793
+#, python-format
+msgid "Folder has no corresponding user (1): %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:796
+#, python-format
+msgid "Folder has no corresponding user (2): %s"
+msgstr ""
+
+#. We got user identifier only
+#: ../pykolab/imap/__init__.py:811
+msgid "Please don't give us just a user identifier"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:814
+#, python-format
+msgid "Deleting folder %s"
+msgstr ""
+
+#: ../pykolab/__init__.py:50
+msgid "Returning thread local configuration"
+msgstr ""
+
+#: ../pykolab/logger.py:105
+#, python-format
+msgid "Could not change the ownership of log file %s"
+msgstr ""
+
+#: ../pykolab/logger.py:121
+#, python-format
+msgid "Cannot log to file %s: %s"
+msgstr ""
+
+#: ../pykolab/plugins/defaultfolders/__init__.py:47
+#, python-format
+msgid "Plugin %s called without required keyword %s."
+msgstr ""
+
+#: ../pykolab/plugins/defaultfolders/__init__.py:53
+msgid "Could not parse additional_folders"
+msgstr ""
+
+#: ../pykolab/plugins/dynamicquota/__init__.py:58
+#, python-format
+msgid "No keyword %s passed to set_user_folder_quota"
+msgstr ""
+
+#: ../pykolab/plugins/dynamicquota/__init__.py:70
+#, python-format
+msgid "Quota '%s' not an integer!"
+msgstr ""
+
+#: ../pykolab/plugins/__init__.py:70
 #, python-format
 msgid "ImportError for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:74
+#: ../pykolab/plugins/__init__.py:74
 #, python-format
 msgid "RuntimeError for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:78
+#: ../pykolab/plugins/__init__.py:78
 #, python-format
 msgid "Plugin %s failed to load (%s: %s)"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:116 .././pykolab/plugins/__init__.py:118
+#: ../pykolab/plugins/__init__.py:116 ../pykolab/plugins/__init__.py:118
 #, python-format
 msgid "Cannot set defaults for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:120
+#: ../pykolab/plugins/__init__.py:120
 #, python-format
 msgid "Cannot set defaults for plugin %s: Unknown Error"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:123
+#: ../pykolab/plugins/__init__.py:123
 #, python-format
 msgid "Not setting defaults for plugin %s: No function 'set_defaults()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:142
+#: ../pykolab/plugins/__init__.py:142
 #, python-format
 msgid "Cannot set runtime for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:144
+#: ../pykolab/plugins/__init__.py:144
 #, python-format
 msgid "Not setting runtime for plugin %s: No function 'set_runtime()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:163 .././pykolab/plugins/__init__.py:165
+#: ../pykolab/plugins/__init__.py:163 ../pykolab/plugins/__init__.py:165
 #, python-format
 msgid "Cannot add options for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:167
+#: ../pykolab/plugins/__init__.py:167
 #, python-format
 msgid "Not adding options for plugin %s: No function 'add_options()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:187
+#: ../pykolab/plugins/__init__.py:187
 #, python-format
 msgid "Cannot check options for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:189
+#: ../pykolab/plugins/__init__.py:189
 #, python-format
 msgid "Not checking options for plugin %s: No function 'check_options()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:227
+#: ../pykolab/plugins/__init__.py:227
 #, python-format
 msgid "Executing hook %s for plugin %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:231 .././pykolab/plugins/__init__.py:233
+#: ../pykolab/plugins/__init__.py:231 ../pykolab/plugins/__init__.py:233
 #, python-format
 msgid "Cannot execute hook %s for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/defaultfolders/__init__.py:47
-#, python-format
-msgid "Plugin %s called without required keyword %s."
+#: ../pykolab/plugins/recipientpolicy/__init__.py:79
+msgid "Attribute substitution for 'mail' failed in Recipient Policy"
 msgstr ""
 
-#: .././pykolab/plugins/defaultfolders/__init__.py:53
-msgid "Could not parse additional_folders"
+#: ../pykolab/plugins/recipientpolicy/__init__.py:115
+msgid "Could not parse the alternative mail routines"
 msgstr ""
 
-#: .././pykolab/plugins/dynamicquota/__init__.py:56
-#, python-format
-msgid "Quota '%s' not an integer!"
+#: ../pykolab/plugins/recipientpolicy/__init__.py:127
+#: ../pykolab/plugins/recipientpolicy/__init__.py:137
+msgid ""
+"Attribute substitution for 'alternative_mail' failed in Recipient Policy"
 msgstr ""
 
-#: .././pykolab/plugins/dynamicquota/__init__.py:63
-msgid ""
-"The new quota was set to 0, but default quota > 0, returning default quota"
+#: ../pykolab/setup/components.py:58
+msgid "Display this help."
 msgstr ""
 
-#: .././pykolab/plugins/dynamicquota/__init__.py:82
-msgid ""
-"The default quota is larger then the calculated new quota, using the default "
-"quota"
+#: ../pykolab/setup/components.py:149
+msgid "No component selected, continuing for all components"
 msgstr ""
 
-#: .././pykolab/plugins/recipientpolicy/__init__.py:70
-msgid "Attribute substitution for 'mail' failed in Recipient Policy"
+#: ../pykolab/setup/components.py:187 ../pykolab/setup/components.py:192
+msgid "No such component."
 msgstr ""
 
-#: .././pykolab/plugins/recipientpolicy/__init__.py:97
-msgid "Could not parse the alternative mail routines"
+#: ../pykolab/setup/setup_freebusy.py:46
+msgid "Setup Free/Busy."
 msgstr ""
 
-#: .././pykolab/plugins/recipientpolicy/__init__.py:109
-#: .././pykolab/plugins/recipientpolicy/__init__.py:119
-msgid ""
-"Attribute substitution for 'alternative_mail' failed in Recipient Policy"
+#: ../pykolab/setup/setup_freebusy.py:50
+msgid "Free/Busy is not installed on this system"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:40
-msgid "Setup zpush."
+#: ../pykolab/setup/setup_freebusy.py:55
+msgid ""
+"\n"
+"                        Please supply the MySQL password for the "
+"'roundcube'\n"
+"                        user. You have supplied this password earlier, and "
+"it is\n"
+"                        available from the database URI setting in\n"
+"                        /etc/roundcubemail/db.inc.php.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:44
-msgid "Z-Push is not installed on this system"
+#: ../pykolab/setup/setup_freebusy.py:64
+#: ../pykolab/setup/setup_roundcube.py:56
+msgid "MySQL roundcube password"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:70
-#: .././pykolab/setup/setup_roundcube.py:93
-#: .././pykolab/setup/setup_freebusy.py:76
+#: ../pykolab/setup/setup_freebusy.py:92
+#: ../pykolab/setup/setup_roundcube.py:116 ../pykolab/setup/setup_zpush.py:71
 #, python-format
 msgid "Using template file %r"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:77
-#: .././pykolab/setup/setup_roundcube.py:100
-#: .././pykolab/setup/setup_freebusy.py:83
+#: ../pykolab/setup/setup_freebusy.py:99
+#: ../pykolab/setup/setup_roundcube.py:123 ../pykolab/setup/setup_zpush.py:78
 #, python-format
 msgid "Successfully compiled template %r, writing out to %r"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:95 .././pykolab/setup/setup_ldap.py:184
-#: .././pykolab/setup/setup_ldap.py:358
-#: .././pykolab/setup/setup_roundcube.py:159
-#: .././pykolab/setup/setup_imap.py:137 .././pykolab/setup/setup_mysql.py:49
-#: .././pykolab/setup/setup_freebusy.py:101
-msgid "Could not start and configure to start on boot, the "
+#: ../pykolab/setup/setup_freebusy.py:119 ../pykolab/setup/setup_imap.py:143
+#: ../pykolab/setup/setup_ldap.py:288 ../pykolab/setup/setup_ldap.py:521
+#: ../pykolab/setup/setup_mta.py:309 ../pykolab/setup/setup_mysql.py:49
+#: ../pykolab/setup/setup_roundcube.py:191
+#: ../pykolab/setup/setup_syncroton.py:66 ../pykolab/setup/setup_zpush.py:98
+msgid "Could not start and configure to start on boot, the "
+msgstr ""
+
+#: ../pykolab/setup/setup_imap.py:44
+msgid "Setup IMAP."
+msgstr ""
+
+#: ../pykolab/setup/setup_imap.py:88 ../pykolab/setup/setup_imap.py:113
+msgid "Could not write out Cyrus IMAP configuration file /etc/imapd.conf"
+msgstr ""
+
+#: ../pykolab/setup/setup_kolabd.py:43
+msgid "Setup the Kolab daemon."
+msgstr ""
+
+#: ../pykolab/setup/setup_kolabd.py:51
+#, python-format
+msgid ""
+"\n"
+"                            Copying the configuration section for 'example."
+"org' over to\n"
+"                            a section applicable to your domain '%s'.\n"
+"                        "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:43
+msgid "LDAP Options"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:50
+msgid "Specify FQDN (overriding defaults)."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:58
+msgid "Allow anonymous binds (default: no)."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:62
+msgid "Setup LDAP."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:74
+msgid ""
+"\n"
+"                        Please supply a password for the LDAP administrator "
+"user\n"
+"                        'admin', used to login to the graphical console of "
+"389\n"
+"                        Directory server.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:82
+msgid "Administrator password"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:89
+msgid ""
+"\n"
+"                        Please supply a password for the LDAP Directory "
+"Manager\n"
+"                        user, which is the administrator user you will be "
+"using\n"
+"                        to at least initially log in to the Web Admin, and "
+"that\n"
+"                        Kolab uses to perform administrative tasks.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:98
+msgid "Directory Manager password"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:105
+msgid ""
+"\n"
+"                        Please choose the system user and group the service\n"
+"                        should use to run under. These should be existing,\n"
+"                        unprivileged, local system POSIX accounts with no "
+"shell.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:112
+msgid "User"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:43
-msgid "LDAP Options"
+#: ../pykolab/setup/setup_ldap.py:113
+msgid "Group"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:50
-msgid "Specify FQDN (overriding defaults)."
+#: ../pykolab/setup/setup_ldap.py:143
+msgid ""
+"\n"
+"                        This setup procedure plans to set up Kolab Groupware "
+"for\n"
+"                        the following domain name space. This domain name "
+"is\n"
+"                        obtained from the reverse DNS entry on your network\n"
+"                        interface. Please confirm this is the appropriate "
+"domain\n"
+"                        name space.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:54
-msgid "Setup LDAP."
+#: ../pykolab/setup/setup_ldap.py:157
+msgid "Domain name to use"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:66
-msgid "Administrator password"
+#: ../pykolab/setup/setup_ldap.py:162 ../pykolab/setup/setup_ldap.py:187
+msgid ""
+"\n"
+"                                    Invalid input. Please try again.\n"
+"                                "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:72
-msgid "Directory Manager password"
+#: ../pykolab/setup/setup_ldap.py:171
+msgid ""
+"\n"
+"                        The standard root dn we composed for you follows. "
+"Please\n"
+"                        confirm this is the root dn you wish to use.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:77
-msgid "User"
+#: ../pykolab/setup/setup_ldap.py:182
+msgid "Root DN to use"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:78
-msgid "Group"
+#: ../pykolab/setup/setup_ldap.py:234
+msgid ""
+"\n"
+"                    Setup is now going to set up the 389 Directory Server. "
+"This\n"
+"                    may take a little while (during which period there is "
+"no\n"
+"                    output and no progress indication).\n"
+"                "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:143
+#: ../pykolab/setup/setup_ldap.py:241
 msgid "Setting up 389 Directory Server"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:153
+#. TODO: Get the return code and display output if not successful.
+#: ../pykolab/setup/setup_ldap.py:253
 msgid "Setup DS stdout:"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:156
+#: ../pykolab/setup/setup_ldap.py:256
 msgid "Setup DS stderr:"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:175 .././pykolab/setup/setup_mysql.py:97
+#: ../pykolab/setup/setup_ldap.py:279 ../pykolab/setup/setup_mysql.py:129
 msgid "Could not find the Kolab schema file"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:189
+#: ../pykolab/setup/setup_ldap.py:293
+msgid ""
+"\n"
+"                        Please supply a Cyrus Administrator password. This\n"
+"                        password is used by Kolab to execute administrative\n"
+"                        tasks in Cyrus IMAP. You may also need the password\n"
+"                        yourself to troubleshoot Cyrus IMAP and/or perform\n"
+"                        other administrative tasks against Cyrus IMAP "
+"directly.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:303
 msgid "Cyrus Administrator password"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:195
+#: ../pykolab/setup/setup_ldap.py:310
+msgid ""
+"\n"
+"                        Please supply a Kolab Service account password. "
+"This\n"
+"                        account is used by various services such as "
+"Postfix,\n"
+"                        and Roundcube, as anonymous binds to the LDAP "
+"server\n"
+"                        will not be allowed.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:319
 msgid "Kolab Service password"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:204
+#: ../pykolab/setup/setup_ldap.py:329
 msgid "Writing out configuration to kolab.conf"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:218
+#: ../pykolab/setup/setup_ldap.py:343
 msgid "Inserting service users into LDAP."
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:262
+#: ../pykolab/setup/setup_ldap.py:417
 msgid "Writing out cn=kolab,cn=config"
 msgstr ""
 
 #. TODO: Add kolab-admin role
 #. TODO: Assign kolab-admin admin ACLs
-#: .././pykolab/setup/setup_ldap.py:286
+#: ../pykolab/setup/setup_ldap.py:441
 #, python-format
 msgid "Adding domain %s to list of domains for this deployment"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:294
+#: ../pykolab/setup/setup_ldap.py:457
 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:302
+#: ../pykolab/setup/setup_ldap.py:465
 msgid "Enabling attribute uniqueness plugin"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:308
+#: ../pykolab/setup/setup_ldap.py:471
 msgid "Enabling referential integrity plugin"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:314
+#: ../pykolab/setup/setup_ldap.py:477
 msgid "Enabling and configuring account policy plugin"
 msgstr ""
 
 #. TODO: Add kolab-admin role
-#: .././pykolab/setup/setup_ldap.py:329
+#: ../pykolab/setup/setup_ldap.py:492
 msgid "Adding the kolab-admin role"
 msgstr ""
 
 #. TODO: User writeable attributes on root_dn
-#: .././pykolab/setup/setup_ldap.py:340
+#: ../pykolab/setup/setup_ldap.py:503
 #, python-format
 msgid "Setting access control to %s"
 msgstr ""
 
-#: .././pykolab/setup/setup_roundcube.py:40
-msgid "Setup Roundcube."
-msgstr ""
-
-#: .././pykolab/setup/setup_roundcube.py:44
-#: .././pykolab/setup/setup_freebusy.py:49
-msgid "MySQL roundcube password"
-msgstr ""
-
-#: .././pykolab/setup/components.py:56
-msgid "Display this help."
-msgstr ""
-
-#: .././pykolab/setup/components.py:122
-msgid "No component selected, continuing for all components"
-msgstr ""
-
-#: .././pykolab/setup/components.py:157 .././pykolab/setup/components.py:162
-msgid "No such component."
-msgstr ""
-
-#: .././pykolab/setup/setup_mta.py:40
+#: ../pykolab/setup/setup_mta.py:40
 msgid "Setup MTA."
 msgstr ""
 
-#: .././pykolab/setup/setup_mta.py:220
+#: ../pykolab/setup/setup_mta.py:224 ../pykolab/setup/setup_php.py:80
 #, python-format
 msgid "Setting key %r to %r"
 msgstr ""
 
-#: .././pykolab/setup/setup_mta.py:248
+#: ../pykolab/setup/setup_mta.py:252
 msgid "Could not write out Postfix configuration file /etc/postfix/master.cf"
 msgstr ""
 
-#: .././pykolab/setup/setup_imap.py:39
-msgid "Setup IMAP."
-msgstr ""
-
-#: .././pykolab/setup/setup_imap.py:82 .././pykolab/setup/setup_imap.py:107
-msgid "Could not write out Cyrus IMAP configuration file /etc/imapd.conf"
-msgstr ""
-
-#: .././pykolab/setup/setup_kolabd.py:38
-msgid "Setup the Kolab daemon."
+#: ../pykolab/setup/setup_mta.py:287
+msgid "Could not write out Amavis configuration file /etc/amavisd/amavisd.conf"
 msgstr ""
 
-#: .././pykolab/setup/setup_mysql.py:39
+#: ../pykolab/setup/setup_mysql.py:39
 msgid "Setup MySQL."
 msgstr ""
 
-#: .././pykolab/setup/setup_mysql.py:53
+#: ../pykolab/setup/setup_mysql.py:53
+msgid ""
+"\n"
+"                    Please supply a root password for MySQL. This password "
+"will\n"
+"                    be the administrative user for this MySQL server, and "
+"it\n"
+"                    should be kept a secret. After this setup process has\n"
+"                    completed, Kolab is going to discard and forget about "
+"this\n"
+"                    password, but you will need it for administrative tasks "
+"in\n"
+"                    MySQL.\n"
+"                "
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:64
 msgid "MySQL root password"
 msgstr ""
 
-#: .././pykolab/setup/setup_freebusy.py:40
-msgid "Setup Free/Busy."
+#: ../pykolab/setup/setup_mysql.py:103
+msgid ""
+"\n"
+"                        Please supply a password for the MySQL user "
+"'kolab'.\n"
+"                        This password will be used by Kolab services, such "
+"as\n"
+"                        the Web Administration Panel.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_freebusy.py:44
-msgid "Free/Busy is not installed on this system"
+#: ../pykolab/setup/setup_mysql.py:111
+msgid "MySQL kolab password"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:45
-#, python-format
-msgid "Cleaning up ACL entries for %s across all folders"
+#: ../pykolab/setup/setup_php.py:42
+msgid "PHP Options"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:60
-#, python-format
-msgid "Cleaning up ACL entries referring to identifier %s"
+#: ../pykolab/setup/setup_php.py:49
+msgid "Specify the timezone for PHP."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:69
-#, python-format
-msgid "Iterating over %d folders"
+#: ../pykolab/setup/setup_php.py:53
+msgid "Setup PHP."
 msgstr ""
 
-#. Set the ACL to '' (effectively deleting the ACL entry)
-#: .././pykolab/imap/__init__.py:82
-#, python-format
-msgid "Removing acl %r for subject %r from folder %r"
+#: ../pykolab/setup/setup_php.py:58
+msgid ""
+"\n"
+"                        Please supply the timezone PHP should be using.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:143
-#, python-format
-msgid "Logging on to Cyrus IMAP server %s"
+#: ../pykolab/setup/setup_php.py:64
+msgid "Timezone ID"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:152
-#, python-format
-msgid "Logging on to Dovecot IMAP server %s"
+#: ../pykolab/setup/setup_roundcube.py:44
+msgid "Setup Roundcube."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:161
-#, python-format
-msgid "Logging on to generic IMAP server %s"
+#: ../pykolab/setup/setup_roundcube.py:48
+msgid ""
+"\n"
+"                    Please supply a password for the MySQL user "
+"'roundcube'.\n"
+"                    This password will be used by the Roundcube webmail\n"
+"                    interface.\n"
+"                "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:179
-#, python-format
-msgid "Reusing existing IMAP server connection to %s"
+#: ../pykolab/setup/setup_syncroton.py:40
+msgid "Setup Syncroton."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:181
-#, python-format
-msgid "Reconnecting to IMAP server %s"
+#: ../pykolab/setup/setup_zpush.py:41
+msgid "Setup zpush."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:197
-msgid "Called imap.disconnect() on a server that "
+#: ../pykolab/setup/setup_zpush.py:45
+msgid "Z-Push is not installed on this system"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:213
+#. start_max = (int)(time.time())
+#: ../pykolab/telemetry.py:588
 #, python-format
-msgid "%r has no attribute %s"
+msgid "Expiring sessions that started before or on %d"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:221 .././pykolab/imap/__init__.py:239
+#: ../pykolab/telemetry.py:601
 #, python-format
-msgid "Creating new shared folder %s"
+msgid "Expiring session ID: %d"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:255
+#: ../pykolab/telemetry.py:620
 #, python-format
-msgid "Creating new mailbox for user %s"
+msgid "Session with ID %d expired from database"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:280
+#: ../pykolab/telemetry.py:646
 #, python-format
-msgid "Creating additional folders for user %s"
+msgid "Operational Error in telemetry database: %s"
+msgstr ""
+
+#: ../pykolab/telemetry.py:652
+msgid "No database available"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:302
+#: ../pykolab/utils.py:57 ../pykolab/utils.py:59
 #, python-format
-msgid "Mailbox already exists: %s"
+msgid "Confirm %s: "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:345
-msgid "Subscribing user to the additional folders"
+#: ../pykolab/utils.py:62
+msgid "Incorrect confirmation. "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:380 .././pykolab/imap/__init__.py:459
+#: ../pykolab/utils.py:67 ../pykolab/utils.py:72
 #, python-format
-msgid "Renaming INBOX from %s to %s"
+msgid "%s: "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:384
+#: ../pykolab/utils.py:69 ../pykolab/utils.py:74
 #, python-format
-msgid "Could not rename INBOX folder %s to %s"
+msgid "%s [%s]: "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:386 .././pykolab/imap/__init__.py:463
-#, python-format
-msgid "Moving INBOX folder %s won't succeed as target folder %s already exists"
+#: ../pykolab/utils.py:119
+msgid "Please answer 'yes' or 'no'."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:399
+#: ../pykolab/utils.py:185
 #, python-format
-msgid "Looking for folder '%s', we found folders: %r"
+msgid "Could not change the permissions on %s"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:422
+#: ../pykolab/wap_client/__init__.py:257
 #, python-format
-msgid "Setting ACL rights %s for subject %s on folder "
+msgid "Requesting %r with params %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:433
+#: ../pykolab/wap_client/__init__.py:263
 #, python-format
-msgid "Removing ACL rights %s for subject %s on folder "
+msgid "Got response: %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:456
-#, python-format
-msgid "Found old INBOX folder %s"
+#. Some data is not JSON
+#: ../pykolab/wap_client/__init__.py:268
+msgid "Response data is not JSON"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:465
-#, python-format
-msgid "Did not find old folder user/%s to rename"
+#: ../pykolab/xml/attendee.py:79 ../pykolab/xml/attendee.py:99
+msgid "Not a valid attendee"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:467
-msgid "Value for user is not a dictionary"
+#: ../pykolab/xml/attendee.py:84
+msgid "No valid delegator references found"
 msgstr ""
 
-#. TODO: Go in fact correct the quota.
-#: .././pykolab/imap/__init__.py:527
-#, python-format
-msgid "Cannot get current IMAP quota for folder %s"
+#: ../pykolab/xml/attendee.py:104
+msgid "No valid delegatee references found"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:540
+#: ../pykolab/xml/attendee.py:140
 #, python-format
-msgid "Quota for %s currently is %s"
+msgid "Invalid cutype %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:546
+#: ../pykolab/xml/attendee.py:151
 #, python-format
-msgid "Adjusting authentication database quota for folder %s to %d"
+msgid "Invalid participant status %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:551
+#: ../pykolab/xml/attendee.py:159
 #, python-format
-msgid "Correcting quota for %s to %s (currently %s)"
+msgid "Invalid role %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:633
+#: ../pykolab/xml/event.py:172
 #, python-format
-msgid "Checking folder: %s"
+msgid "No attendee with email or name %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:638
+#: ../pykolab/xml/event.py:180
 #, python-format
-msgid "Folder has no corresponding user (1): %s"
+msgid "Invalid argument value attendee %r, must be basestring or Attendee"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:641
+#: ../pykolab/xml/event.py:186
 #, python-format
-msgid "Folder has no corresponding user (2): %s"
+msgid "No attendee with email %r"
 msgstr ""
 
-#. We got user identifier only
-#: .././pykolab/imap/__init__.py:656
-msgid "Please don't give us just a user identifier"
+#: ../pykolab/xml/event.py:192
+#, python-format
+msgid "No attendee with name %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:659
-#, python-format
-msgid "Deleting folder %s"
+#: ../pykolab/xml/event.py:338
+msgid "Invalid participant status"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:78
-#, python-format
-msgid "Could not connect to Cyrus IMAP server %r"
+#: ../pykolab/xml/event.py:538
+msgid "Event end needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:101
+#: ../pykolab/xml/event.py:657
 #, python-format
-msgid "Continuing with separator: %r"
+msgid "Invalid status %r"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:106
-msgid "Detected we are running in a Murder topology"
+#: ../pykolab/xml/event.py:678 ../pykolab/xml/event.py:728
+msgid "Event start needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:110
-msgid "This system is not part of a murder topology"
+#: ../pykolab/xml/event.py:764
+#, python-format
+msgid "Invalid status set: %r"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:131
-#, python-format
-msgid "Checking actual backend server for folder %s through annotations"
+#: ../pykolab/xml/event.py:882
+msgid "No sender specified"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:146
-#, python-format
-msgid "Could not get the annotations after %s tries."
+#: ../saslauthd/__init__.py:126 ../saslauthd/__init__.py:134
+msgid "Traceback occurred, please report a bug at http://bugzilla.kolabsys.com"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:150
+#: ../wallace/__init__.py:61
 #, python-format
-msgid "No annotations for %s: %r"
+msgid "Worker process %s initializing"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:157
-#, python-format
-msgid "Server for INBOX folder %s is %s"
+#: ../wallace/__init__.py:80
+msgid "Bind address for Wallace."
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:169
-#, python-format
-msgid "Setting quota for INBOX folder %s to %s"
+#: ../wallace/__init__.py:106
+msgid "Port that Wallace is supposed to use."
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:173
+#: ../wallace/__init__.py:157
 #, python-format
-msgid "Could not set quota for mailfolder %s"
+msgid "Could not bind to socket on port %d on bind "
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:182
-#, python-format
-msgid "Moving INBOX folder %s to %s"
+#: ../wallace/__init__.py:169
+msgid "Could not shut down socket"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:194
-#, python-format
-msgid "Setting annotation %s on folder %s"
+#: ../wallace/__init__.py:226
+msgid "Accepted connection"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:201
+#: ../wallace/__init__.py:389
 #, python-format
-msgid "Could not set annotation %r on mail folder %r: %r"
+msgid "Could not write pid file %s"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:205
+#: ../wallace/module_optout.py:61 ../wallace/module_resources.py:94
 #, python-format
-msgid "Transferring folder %s from %s to %s"
+msgid "Issuing callback after processing to stage %s"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:265
+#: ../wallace/module_optout.py:62 ../wallace/module_resources.py:100
 #, python-format
-msgid "Undeleting %s to %s"
+msgid "Testing cb_action_%s()"
 msgstr ""
 
-#. start_max = (int)(time.time())
-#: .././pykolab/telemetry.py:588
+#: ../wallace/module_optout.py:64 ../wallace/module_resources.py:103
 #, python-format
-msgid "Expiring sessions that started before or on %d"
+msgid "Attempting to execute cb_action_%s()"
 msgstr ""
 
-#: .././pykolab/telemetry.py:601
+#. modules.next_module('optout')
+#: ../wallace/module_optout.py:70
 #, python-format
-msgid "Expiring session ID: %d"
+msgid "Consulting opt-out service for %r, %r"
 msgstr ""
 
-#: .././pykolab/telemetry.py:620
+#: ../wallace/module_optout.py:96
 #, python-format
-msgid "Session with ID %d expired from database"
+msgid "Running opt-out consult from envelope sender '%s "
 msgstr ""
 
-#: .././pykolab/telemetry.py:646
+#: ../wallace/module_optout.py:160
 #, python-format
-msgid "Operational Error in telemetry database: %s"
+msgid "Attempting to execute cb_action_%s(%r, %r)"
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:92
+#: ../wallace/module_optout.py:181
 #, python-format
-msgid "Creating %d Mails"
+msgid "Could not send request to optout_url %s"
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:116
+#: ../wallace/module_resources.py:81
 #, python-format
-msgid "Sending message %s through SMTP targeting user %s@%s"
+msgid "Resource Management called for %r, %r"
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:119
-#, python-format
-msgid "Sending message %s through LMTP targeting user %s@%s"
+#: ../wallace/module_resources.py:139
+msgid "Message is not an iTip message or does not contain any "
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:122
-#, python-format
-msgid "Saving message %s to IMAP (user %s, folder %s)"
+#: ../wallace/module_resources.py:147
+msgid "iTip events attached to this message contain the "
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:125 .././pykolab/tests.old/calendar.py:198
-#: .././pykolab/tests.old/contacts.py:145
-msgid "Somehow ended up NOT sending these messages"
+#: ../wallace/module_resources.py:174
+msgid "Not an iTip message, but sent to resource nonetheless. Reject message"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:146
-#, python-format
-msgid "Creating %d Events"
+#: ../wallace/module_resources.py:182
+msgid "No itips, no resources, pass along"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:177
-#, python-format
-msgid "Creating Calendar item number %d"
+#: ../wallace/module_resources.py:186
+msgid "iTips, but no resources, pass along"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:189
-#: .././pykolab/tests.old/contacts.py:136
+#: ../wallace/module_resources.py:218
 #, python-format
-msgid "Sending UID message %s through SMTP targeting user %s@%s"
+msgid "Resources: %r"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:192
-#: .././pykolab/tests.old/contacts.py:139
+#: ../wallace/module_resources.py:236
 #, python-format
-msgid "Sending UID message %s through LMTP targeting user %s@%s"
+msgid "Checking events in resource folder %r"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:195
-#: .././pykolab/tests.old/contacts.py:142
+#: ../wallace/module_resources.py:243
 #, python-format
-msgid "Saving UID message %s to IMAP (user %s, folder %s)"
+msgid "Mailbox for resource %r doesn't exist"
 msgstr ""
 
-#: .././pykolab/tests.old/zpush/test_000_001.py:47
+#: ../wallace/module_resources.py:256
 #, python-format
-msgid "Could not load %sItem from %s, skipping the testing."
+msgid "Fetching message UID %r from folder %r"
 msgstr ""
 
-#: .././pykolab/tests.old/zpush/test_000_000.py:77
+#: ../wallace/module_resources.py:295
 #, python-format
-msgid "Authentication failure for %s"
+msgid "Event %r conflicts with event "
 msgstr ""
 
-#: .././pykolab/tests.old/contacts.py:105
+#: ../wallace/module_resources.py:308
 #, python-format
-msgid "Creating %d Contacts"
+msgid "start: %r, end: %r, total: %r, messages: %r"
 msgstr ""
 
-#: .././pykolab/tests.old/contacts.py:124
+#: ../wallace/module_resources.py:315
 #, python-format
-msgid "Creating Contact item number %d"
+msgid "Polling for resource %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:207
+#: ../wallace/module_resources.py:319
 #, python-format
-msgid "Adding policy request to instance %s"
+msgid "Resource %r has been popped from the list"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:442
-msgid "Unauthorized access not allowed"
+#: ../wallace/module_resources.py:326
+msgid "Resource is a collection"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:481
-#: .././bin/kolab_smtp_access_policy.py:541
+#: ../wallace/module_resources.py:374 ../wallace/module_resources.py:424
 #, python-format
-msgid "Could not find envelope sender user %s"
+msgid "Adding event to %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:568
+#: ../wallace/module_resources.py:473
 #, python-format
-msgid "%s is unauthorized to send on behalf of %s"
+msgid "Method %r not really interesting for us."
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:578
+#: ../wallace/module_resources.py:481
 #, python-format
-msgid "User %s attempted to use envelope sender address %s "
+msgid "Raw iTip payload: %s"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:638
-#: .././bin/kolab_smtp_access_policy.py:649
-#, python-format
-msgid "Found user %s to be a delegate user of %s"
+#: ../wallace/module_resources.py:491
+msgid "Could not read iTip from message."
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:673
-#, python-format
-msgid "Verifying authenticated sender '%(sender)s' with "
+#: ../wallace/module_resources.py:513
+msgid "iTip event without a start"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:678
-#, python-format
-msgid "Verifying unauthenticated sender '%(sender)s' "
+#. end if c.name == "VEVENT"
+#. end for c in cal.walk()
+#. end if part.get_content_type() == "text/calendar"
+#. end for part in message.walk()
+#. if message.is_multipart()
+#: ../wallace/module_resources.py:543
+msgid "Message is not an iTip message (non-multipart message)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:695
+#: ../wallace/module_resources.py:564
 #, python-format
-msgid "Reproducing verify_recipient(%s, %s) from "
+msgid "Checking if email address %r belongs to a resource (collection)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:712
+#: ../wallace/module_resources.py:575 ../wallace/module_resources.py:649
+#: ../wallace/module_resources.py:699
 #, python-format
-msgid "Using authentication domain %s instead of %s"
+msgid "No resource (collection) records found for %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:722
+#: ../wallace/module_resources.py:583 ../wallace/module_resources.py:657
+#: ../wallace/module_resources.py:707
 #, python-format
-msgid "Domain %s is a primary domain"
+msgid "Resource record(s): %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:730
+#: ../wallace/module_resources.py:589 ../wallace/module_resources.py:664
+#: ../wallace/module_resources.py:714
 #, python-format
-msgid "Checking the recipient for domain %s that is not "
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:792
-msgid "Could not find this user, accepting"
+msgid "Resource record: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:862
-#: .././bin/kolab_smtp_access_policy.py:915
+#: ../wallace/module_resources.py:608
 #, python-format
-msgid "Sender %s is not allowed to send to "
+msgid "Raw itip_events: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:902
+#: ../wallace/module_resources.py:616
 #, python-format
-msgid "Reproducing verify_sender(%r) from cache, "
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:931
-msgid "Sender uses unauthorized envelope sender address"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:948
-msgid "Could not verify sender"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:955
-msgid "Verifying whether sender is allowed to send to "
+msgid "Raw set of attendees: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:969
+#: ../wallace/module_resources.py:624
 #, python-format
-msgid "Result is %r"
+msgid "Raw set of resources: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:974
-msgid "No recipient policy restrictions exist for this sender"
+#: ../wallace/module_resources.py:638
+#, python-format
+msgid "Checking if attendee %r is a resource (collection)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:983
-msgid "Found a recipient policy to apply for this sender."
+#: ../wallace/module_resources.py:671 ../wallace/module_resources.py:717
+msgid "Resource reservation made but no resource records found"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:998
+#: ../wallace/module_resources.py:689
 #, python-format
-msgid "Sender %s not allowed to send to recipient "
+msgid "Checking if resource %r is a resource (collection)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1029
-msgid "Cleaning up the cache"
+#: ../wallace/module_resources.py:721
+msgid "The following resources are being referred to in the "
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1066
+#. This is a nested module
+#: ../wallace/modules.py:96
 #, python-format
-msgid "Operational Error in caching: %s"
+msgid "Module Group: %s"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1117
-#, python-format
-msgid "Caching the policy result with timestamp %d"
+#: ../wallace/modules.py:107 ../wallace/modules.py:112
+msgid "No such module."
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1194
+#: ../wallace/modules.py:118
 #, python-format
-msgid "Returning action DEFER_IF_PERMIT: %s"
+msgid "Holding message in queue for manual review (%s by %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1199
+#: ../wallace/modules.py:121
 #, python-format
-msgid "Returning action DUNNO: %s"
+msgid "Deferring message in %s (by module %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1204
+#: ../wallace/modules.py:131
 #, python-format
-msgid "Returning action HOLD: %s"
+msgid "The time when the message was sent: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1209
+#: ../wallace/modules.py:132
 #, python-format
-msgid "Returning action PERMIT: %s"
+msgid "The time now: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1214
+#: ../wallace/modules.py:133
 #, python-format
-msgid "Returning action REJECT: %s"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1258
-msgid "Starting to loop for new request"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1267
-msgid "End of current request"
+msgid "The time delta: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1271
+#. TODO: Send NDR back to user
+#: ../wallace/modules.py:137
 #, python-format
-msgid "Getting line: %s"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1275
-msgid "Returning request"
+msgid "Message in file %s older then 5 days, deleting"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1332
+#: ../wallace/modules.py:162
 #, python-format
-msgid "Got request instance %s"
+msgid "Rejecting message in %s (by module %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1341
+#: ../wallace/modules.py:180
 #, python-format
-msgid "Request instance %s is in state %s"
+msgid ""
+"This is the email system Wallace at %s.\n"
+"\n"
+"I'm sorry to inform you we could not deliver the attached message\n"
+"to the following recipients:\n"
+"\n"
+"- %s\n"
+"\n"
+"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 ""
 
-#: .././bin/kolab_smtp_access_policy.py:1349
+#: ../wallace/modules.py:195
 #, python-format
-msgid "Request instance %s is not yet in DATA state"
+msgid ""
+"X-Wallace-Module: %s\n"
+"X-Wallace-Result: REJECT\n"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1361
+#: ../wallace/modules.py:248
 #, python-format
-msgid "Request instance %s reached DATA state"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1379
-msgid "Sender access denied"
+msgid "Accepting message in %s (by module %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1381
-msgid "Recipient access denied"
+#: ../wallace/modules.py:316
+#, python-format
+msgid "Module '%s' already registered"
 msgstr ""
diff --git a/po/el.po b/po/el.po
index da6a146..39cec30 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pykolab 0.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-09 14:25+0100\n"
+"POT-Creation-Date: 2012-08-11 15:04+0100\n"
 "PO-Revision-Date: 2012-05-09 14:25+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,793 +17,907 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .././wallace/__init__.py:37 .././bonnie/__init__.py:35
-#: .././kolabd/__init__.py:46 .././saslauthd/__init__.py:47
-msgid "Daemon Options"
-msgstr ""
-
-#: .././wallace/__init__.py:44 .././bonnie/__init__.py:41
-#: .././kolabd/__init__.py:52 .././saslauthd/__init__.py:53
-msgid "Fork to the background."
-msgstr ""
-
-#: .././wallace/__init__.py:52
-msgid "Bind address for Wallace."
+#: ../bin/kolab_smtp_access_policy.py:206
+#, python-format
+msgid "Adding policy request to instance %s"
 msgstr ""
 
-#: .././wallace/__init__.py:60 .././kolabd/__init__.py:58
-#: .././saslauthd/__init__.py:59
-msgid "Path to the PID file to use."
+#: ../bin/kolab_smtp_access_policy.py:446
+msgid "Unauthorized access not allowed"
 msgstr ""
 
-#: .././wallace/__init__.py:68
-msgid "Port that Wallace is supposed to use."
+#: ../bin/kolab_smtp_access_policy.py:467
+#: ../bin/kolab_smtp_access_policy.py:658
+msgid "Could not find recipient"
 msgstr ""
 
-#: .././wallace/__init__.py:102 .././wallace/__init__.py:126
-#: .././wallace/__init__.py:373 .././wallace/__init__.py:401
+#: ../bin/kolab_smtp_access_policy.py:486
+#: ../bin/kolab_smtp_access_policy.py:586
 #, python-format
-msgid "Number of threads currently running: %d"
+msgid "Could not find envelope sender user %s"
 msgstr ""
 
-#: .././wallace/__init__.py:111 .././wallace/__init__.py:135
+#: ../bin/kolab_smtp_access_policy.py:529
 #, python-format
-msgid "Continuing with %d threads currently running"
+msgid "Obtained authenticated user details for %r: %r"
 msgstr ""
 
-#. TODO: Apply throttling
-#: .././wallace/__init__.py:118
+#: ../bin/kolab_smtp_access_policy.py:608
 #, python-format
-msgid "Creating thread for message in %s"
+msgid "%s is unauthorized to send on behalf of %s"
 msgstr ""
 
-#: .././wallace/__init__.py:142
+#: ../bin/kolab_smtp_access_policy.py:618
 #, python-format
-msgid "Running thread %s for message file %s"
+msgid "User %s attempted to use envelope sender address %s "
 msgstr ""
 
-#: .././wallace/__init__.py:151
+#: ../bin/kolab_smtp_access_policy.py:682
+#: ../bin/kolab_smtp_access_policy.py:693
 #, python-format
-msgid "This message was already in module %s, delegating "
+msgid "Found user %s to be a delegate user of %s"
 msgstr ""
 
-#: .././wallace/__init__.py:160
+#: ../bin/kolab_smtp_access_policy.py:717
 #, python-format
-msgid "It was also in a certain stage: %s, letting "
+msgid "Verifying authenticated sender '%(sender)s' with "
 msgstr ""
 
-#: .././wallace/__init__.py:168 .././wallace/__init__.py:174
-#: .././wallace/__init__.py:184
+#: ../bin/kolab_smtp_access_policy.py:722
 #, python-format
-msgid "Executing module %s"
-msgstr ""
-
-#: .././wallace/__init__.py:211 .././bonnie/__init__.py:67
-#: .././kolabd/__init__.py:85 .././saslauthd/__init__.py:90
-msgid "Interrupted by user"
-msgstr ""
-
-#: .././wallace/__init__.py:215 .././wallace/__init__.py:225
-#: .././kolabd/__init__.py:90 .././kolabd/__init__.py:101
-msgid "Traceback occurred, please report a "
+msgid "Verifying unauthenticated sender '%(sender)s' "
 msgstr ""
 
-#: .././wallace/__init__.py:221 .././bonnie/__init__.py:75
-#: .././kolabd/__init__.py:96 .././saslauthd/__init__.py:98
+#: ../bin/kolab_smtp_access_policy.py:739
 #, python-format
-msgid "Type Error: %s"
-msgstr ""
-
-#: .././wallace/__init__.py:241
-msgid "Picking up deferred messages for wallace"
+msgid "Reproducing verify_recipient(%s, %s) from "
 msgstr ""
 
-#: .././wallace/__init__.py:261
+#: ../bin/kolab_smtp_access_policy.py:756
 #, python-format
-msgid "Picking up deferred messages for module %s"
-msgstr ""
-
-#. Sleep for 300 seconds before reprocessing the deferred queues.
-#. TODO: Consider using queue_run_delay from Postfix, which is where
-#. the default value of 300 seconds comes from.
-#: .././wallace/__init__.py:285
-msgid "Sleeping for 300 seconds"
+msgid "Using authentication domain %s instead of %s"
 msgstr ""
 
-#: .././wallace/__init__.py:310
+#: ../bin/kolab_smtp_access_policy.py:766
 #, python-format
-msgid "Could not bind to socket on port %d on bind "
-msgstr ""
-
-#: .././wallace/__init__.py:320
-msgid "Could not shut down socket"
+msgid "Domain %s is a primary domain"
 msgstr ""
 
-#: .././wallace/__init__.py:394
+#: ../bin/kolab_smtp_access_policy.py:774
 #, python-format
-msgid "Picking up spooled email file %s"
+msgid "Checking the recipient for domain %s that is not "
 msgstr ""
 
-#: .././wallace/__init__.py:424
-msgid "Accepted connection"
+#: ../bin/kolab_smtp_access_policy.py:790
+msgid "This recipient address is related to multiple "
 msgstr ""
 
-#. This is a nested module
-#: .././wallace/modules.py:96
+#: ../bin/kolab_smtp_access_policy.py:799
 #, python-format
-msgid "Module Group: %s"
+msgid "Recipient address %r not found. Allowing since "
 msgstr ""
 
-#: .././wallace/modules.py:107 .././wallace/modules.py:112
-msgid "No such module."
+#: ../bin/kolab_smtp_access_policy.py:827
+msgid "Invalid recipient"
 msgstr ""
 
-#: .././wallace/modules.py:118
-#, python-format
-msgid "Holding message in queue for manual review (%s by %s)"
+#: ../bin/kolab_smtp_access_policy.py:838
+msgid "Could not find this user, accepting"
 msgstr ""
 
-#: .././wallace/modules.py:121
+#: ../bin/kolab_smtp_access_policy.py:901
+#: ../bin/kolab_smtp_access_policy.py:954
 #, python-format
-msgid "Deferring message in %s (by module %s)"
+msgid "Sender %s is not allowed to send to "
 msgstr ""
 
-#: .././wallace/modules.py:131
+#: ../bin/kolab_smtp_access_policy.py:941
 #, python-format
-msgid "The time when the message was sent: %r"
+msgid "Reproducing verify_sender(%r) from cache, "
 msgstr ""
 
-#: .././wallace/modules.py:132
-#, python-format
-msgid "The time now: %r"
+#: ../bin/kolab_smtp_access_policy.py:970
+msgid "Sender uses unauthorized envelope sender address"
 msgstr ""
 
-#: .././wallace/modules.py:133
-#, python-format
-msgid "The time delta: %r"
+#: ../bin/kolab_smtp_access_policy.py:987
+msgid "Could not verify sender"
 msgstr ""
 
-#. TODO: Send NDR back to user
-#: .././wallace/modules.py:137
-#, python-format
-msgid "Message in file %s older then 5 days, deleting"
+#: ../bin/kolab_smtp_access_policy.py:994
+msgid "Verifying whether sender is allowed to send to "
 msgstr ""
 
-#: .././wallace/modules.py:162
+#: ../bin/kolab_smtp_access_policy.py:1008
 #, python-format
-msgid "Rejecting message in %s (by module %s)"
+msgid "Result is %r"
 msgstr ""
 
-#: .././wallace/modules.py:180
-#, python-format
-msgid ""
-"This is the email system Wallace at %s.\n"
-"\n"
-"I'm sorry to inform you we could not deliver the attached message\n"
-"to the following recipients:\n"
-"\n"
-"- %s\n"
-"\n"
-"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"
+#: ../bin/kolab_smtp_access_policy.py:1013
+msgid "No recipient policy restrictions exist for this sender"
 msgstr ""
 
-#: .././wallace/modules.py:195
-#, python-format
-msgid ""
-"X-Wallace-Module: %s\n"
-"X-Wallace-Result: REJECT\n"
+#: ../bin/kolab_smtp_access_policy.py:1022
+msgid "Found a recipient policy to apply for this sender."
 msgstr ""
 
-#: .././wallace/modules.py:248
+#: ../bin/kolab_smtp_access_policy.py:1037
 #, python-format
-msgid "Accepting message in %s (by module %s)"
+msgid "Sender %s not allowed to send to recipient "
 msgstr ""
 
-#: .././wallace/modules.py:316
-#, python-format
-msgid "Module '%s' already registered"
+#: ../bin/kolab_smtp_access_policy.py:1068
+msgid "Cleaning up the cache"
 msgstr ""
 
-#: .././wallace/modules.py:338 .././pykolab/tests/tests.py:183
-#: .././pykolab/cli/commands.py:183 .././pykolab/setup/components.py:243
+#: ../bin/kolab_smtp_access_policy.py:1105
 #, python-format
-msgid "Alias for %s"
+msgid "Operational Error in caching: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:57
+#: ../bin/kolab_smtp_access_policy.py:1156
 #, python-format
-msgid "Issuing callback after processing to stage %s"
+msgid "Caching the policy result with timestamp %d"
 msgstr ""
 
-#: .././wallace/module_optout.py:58
+#: ../bin/kolab_smtp_access_policy.py:1233
 #, python-format
-msgid "Testing cb_action_%s()"
+msgid "Returning action DEFER_IF_PERMIT: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:60
+#: ../bin/kolab_smtp_access_policy.py:1238
 #, python-format
-msgid "Attempting to execute cb_action_%s()"
+msgid "Returning action DUNNO: %s"
 msgstr ""
 
-#. modules.next_module('optout')
-#: .././wallace/module_optout.py:66
+#: ../bin/kolab_smtp_access_policy.py:1243
 #, python-format
-msgid "Consulting opt-out service for %r, %r"
+msgid "Returning action HOLD: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:92
+#: ../bin/kolab_smtp_access_policy.py:1248
 #, python-format
-msgid "Running opt-out consult from envelope sender '%s "
+msgid "Returning action PERMIT: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:156
+#: ../bin/kolab_smtp_access_policy.py:1253
 #, python-format
-msgid "Attempting to execute cb_action_%s(%r, %r)"
+msgid "Returning action REJECT: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:177
-#, python-format
-msgid "Could not send request to optout_url %s"
+#: ../bin/kolab_smtp_access_policy.py:1299
+msgid "Starting to loop for new request"
 msgstr ""
 
-#: .././setup-kolab.py:36 .././kolabtest.py:34 .././kolabd.py:31
-#: .././wallace.py:31 .././bonnie.py:31
-msgid "Cannot load pykolab/constants.py:"
+#: ../bin/kolab_smtp_access_policy.py:1306
+msgid "Timeout for policy request reading exceeded"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:89
-msgid "Could not import caching library, caching disabled"
+#: ../bin/kolab_smtp_access_policy.py:1312
+msgid "End of current request"
 msgstr ""
 
-#. Obtain 'kolabDelegate' from the envelope sender.
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:291
+#: ../bin/kolab_smtp_access_policy.py:1316
 #, python-format
-msgid "Obtaining envelope sender dn for %s"
+msgid "Getting line: %s"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:309
-#, python-format
-msgid ""
-"User %s attempted to use envelope sender address %s without authorization"
+#: ../bin/kolab_smtp_access_policy.py:1320
+msgid "Returning request"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:355
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:358
-#, python-format
-msgid "Found user %s to be a valid delegate user of %s"
+#: ../bin/kolab_smtp_access_policy.py:1346
+msgid "Access Policy Options"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:424
-#: .././bin/kolab_smtp_access_policy.py:1301
-msgid "Access Policy Options"
+#: ../bin/kolab_smtp_access_policy.py:1353
+msgid "SMTP Policy request timeout."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:431
-#: .././bin/kolab_smtp_access_policy.py:1308
+#: ../bin/kolab_smtp_access_policy.py:1359
 msgid "Verify the recipient access policy."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:437
-#: .././bin/kolab_smtp_access_policy.py:1314
+#: ../bin/kolab_smtp_access_policy.py:1365
 msgid "Verify the sender access policy."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:443
-#: .././bin/kolab_smtp_access_policy.py:1320
+#: ../bin/kolab_smtp_access_policy.py:1371
 msgid "Allow unauthenticated senders."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:464
-msgid "Verifying sender."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:468
-msgid "No sender specified."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:469
-msgid "Invalid sender"
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:473
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:521
-msgid "No SASL username in request."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:475
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:524
-msgid "Not allowing unauthenticated senders."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:476
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:525
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:534
-msgid "Access denied"
+#: ../bin/kolab_smtp_access_policy.py:1385
+#, python-format
+msgid "Got request instance %s"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:478
-msgid "Allowing unauthenticated senders."
+#: ../bin/kolab_smtp_access_policy.py:1394
+#, python-format
+msgid "Request instance %s is in state %s"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:484
+#: ../bin/kolab_smtp_access_policy.py:1402
 #, python-format
-msgid "Allowing authenticated sender %s to send as %s."
+msgid "Request instance %s is not yet in DATA state"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:492
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:504
+#: ../bin/kolab_smtp_access_policy.py:1414
 #, python-format
-msgid "Authenticated as sender %s"
+msgid "Request instance %s reached DATA state"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:515
-msgid "Verifying recipient."
+#: ../bin/kolab_smtp_access_policy.py:1432
+msgid "Sender access denied"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:518
-#: .././bin/kolab_smtp_access_policy.py:781
-msgid "Invalid recipient"
+#: ../bin/kolab_smtp_access_policy.py:1434
+msgid "Recipient access denied"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:536
-#: .././bin/kolab_smtp_access_policy.py:1383
+#: ../bin/kolab_smtp_access_policy.py:1436
 msgid "No objections"
 msgstr ""
 
-#: .././play/confmgmt/db.py:59 .././play/conf.py:280
-msgid "Dropping all tables..."
-msgstr ""
-
-#: .././play/confmgmt/db.py:62 .././play/conf.py:283
-msgid "Creating the necessary tables..."
-msgstr ""
-
-#: .././play/confmgmt/db.py:69 .././play/conf.py:290
-#: .././play/roundcube_database/__init__.py:57
-#: .././play/roundcube_database/users.py:114 .././pykolab/telemetry.py:652
-msgid "No database available"
-msgstr ""
-
-#: .././play/confmgmt.py:74
-#, python-format
-msgid "Searching for service with name %s"
-msgstr ""
-
-#: .././play/confmgmt.py:77
-#, python-format
-msgid "Found service %s"
+#: ../conf.py:37 ../kolab.py:34 ../saslauthd.py:33
+msgid "Cannot load pykolab/logger.py:"
 msgstr ""
 
-#: .././play/confmgmt.py:82
-#, python-format
-msgid "Searching for role with name %s"
+#: ../kolabd/__init__.py:49 ../saslauthd/__init__.py:48
+#: ../wallace/__init__.py:65
+msgid "Daemon Options"
 msgstr ""
 
-#: .././play/confmgmt.py:85
-#, python-format
-msgid "Found role %s"
+#: ../kolabd/__init__.py:56 ../saslauthd/__init__.py:55
+#: ../wallace/__init__.py:72
+msgid "Fork to the background."
 msgstr ""
 
-#: .././play/confmgmt.py:89
-#, python-format
-msgid "Searching for file with path %s"
+#: ../kolabd/__init__.py:65 ../saslauthd/__init__.py:64
+#: ../wallace/__init__.py:98
+msgid "Path to the PID file to use."
 msgstr ""
 
-#: .././play/confmgmt.py:92
-#, python-format
-msgid "File with path %s not found, adding to database"
+#: ../kolabd/__init__.py:74 ../saslauthd/__init__.py:73
+#: ../wallace/__init__.py:115
+msgid "Run as user USERNAME"
 msgstr ""
 
-#: .././play/confmgmt.py:97
-#, python-format
-msgid "Adding file with path %s to service with name %s"
+#: ../kolabd/__init__.py:84 ../saslauthd/__init__.py:83
+#: ../wallace/__init__.py:89
+msgid "Run as group GROUPNAME"
 msgstr ""
 
-#: .././play/confmgmt.py:101
+#: ../kolabd/__init__.py:122 ../pykolab/utils.py:151
+#: ../wallace/__init__.py:288
 #, python-format
-msgid "Adding setting with key %s (%r, %r)"
+msgid "Group %s does not exist"
 msgstr ""
 
-#: .././play/confmgmt.py:106
+#: ../kolabd/__init__.py:131 ../wallace/__init__.py:297
 #, python-format
-msgid "Adding setting %s to file with path %s"
+msgid "Switching real and effective group id to %d"
 msgstr ""
 
-#: .././play/confmgmt.py:110
+#: ../kolabd/__init__.py:153 ../pykolab/utils.py:175
+#: ../wallace/__init__.py:319
 #, python-format
-msgid "Adding role with name %s to setting with key %s"
+msgid "User %s does not exist"
 msgstr ""
 
-#: .././play/rolequota/__init__.py:53
-#: .././pykolab/plugins/dynamicquota/__init__.py:50
+#: ../kolabd/__init__.py:163 ../wallace/__init__.py:329
 #, python-format
-msgid "No keyword %s passed to set_user_folder_quota"
+msgid "Switching real and effective user id to %d"
 msgstr ""
 
-#: .././play/roundcube_database/__init__.py:51
-#: .././play/roundcube_database/users.py:108
-#, python-format
-msgid "Operational Error in Roundcube database: %s"
+#: ../kolabd/__init__.py:172 ../wallace/__init__.py:338
+msgid "Could not change real and effective uid and/or gid"
 msgstr ""
 
-#: .././kwap/kwap/controllers/secure.py:25
-msgid "Secure Controller here"
+#: ../kolabd/__init__.py:192 ../saslauthd/__init__.py:122
+#: ../wallace/__init__.py:358
+msgid "Interrupted by user"
 msgstr ""
 
-#: .././kwap/kwap/controllers/root.py:103
-msgid "Wrong credentials"
+#: ../kolabd/__init__.py:197 ../kolabd/__init__.py:208
+#: ../wallace/__init__.py:362 ../wallace/__init__.py:372
+msgid "Traceback occurred, please report a "
 msgstr ""
 
-#: .././kwap/kwap/controllers/root.py:118
+#: ../kolabd/__init__.py:203 ../saslauthd/__init__.py:130
+#: ../wallace/__init__.py:368
 #, python-format
-msgid "Welcome back, %s!"
-msgstr ""
-
-#: .././kwap/kwap/controllers/root.py:128
-msgid "We hope to see you soon!"
-msgstr ""
-
-#: .././saslauthd.py:33 .././kolab.py:34 .././conf.py:37
-msgid "Cannot load pykolab/logger.py:"
-msgstr ""
-
-#: .././bonnie/__init__.py:71 .././bonnie/__init__.py:79
-#: .././saslauthd/__init__.py:94 .././saslauthd/__init__.py:102
-msgid "Traceback occurred, please report a bug at http://bugzilla.kolabsys.com"
+msgid "Type Error: %s"
 msgstr ""
 
-#: .././kolabd/__init__.py:116 .././pykolab/auth/ldap/__init__.py:1291
-#: .././pykolab/cli/cmd_sync.py:33
+#: ../kolabd/__init__.py:223 ../pykolab/auth/ldap/__init__.py:1591
+#: ../pykolab/cli/cmd_sync.py:36
 msgid "Listing domains..."
 msgstr ""
 
-#: .././kolabd/__init__.py:148
+#: ../kolabd/__init__.py:256
 #, python-format
 msgid "added domains: %r, removed domains: %r"
 msgstr ""
 
-#: .././pykolab/__init__.py:50
-msgid "Returning thread local configuration"
-msgstr ""
-
-#: .././pykolab/tests/tests.py:53
-msgid "List tests"
-msgstr ""
-
-#. This is a nested test
-#: .././pykolab/tests/tests.py:86
-#, python-format
-msgid "Test Suite: %s"
-msgstr ""
-
-#: .././pykolab/tests/tests.py:100 .././pykolab/tests/tests.py:105
-msgid "No such test."
-msgstr ""
-
-#: .././pykolab/tests/tests.py:157 .././pykolab/tests/tests.py:161
-#, python-format
-msgid "Test '%s' already registered"
-msgstr ""
-
-#: .././pykolab/tests/tests.py:191 .././pykolab/cli/commands.py:191
-#: .././pykolab/setup/components.py:251
-msgid "Not yet implemented"
-msgstr ""
-
-#: .././pykolab/tests/__init__.py:39
-msgid "Test Options"
-msgstr ""
-
-#: .././pykolab/tests/__init__.py:45
-msgid "Run tests in suite SUITE. Implies a certain set of items being tested."
-msgstr ""
-
-#: .././pykolab/tests/imap/test_login.py:44
-#, python-format
-msgid "Connecting at %s"
+#: ../kolabd.py:31 ../setup-kolab.py:36 ../wallace.py:31
+msgid "Cannot load pykolab/constants.py:"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:46
+#: ../pykolab/auth/__init__.py:94
 #, python-format
-msgid "Connected at %s"
+msgid "Called for domain %r"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:51
+#: ../pykolab/auth/__init__.py:107 ../pykolab/auth/__init__.py:116
 #, python-format
-msgid "Logging in at %s"
+msgid "Using section %s and domain %s"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:53
+#: ../pykolab/auth/__init__.py:121
 #, python-format
-msgid "Logged in at %s"
+msgid "Connecting to Authentication backend for domain %s"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:60
+#: ../pykolab/auth/__init__.py:132
 #, python-format
-msgid "Test failure in %s"
+msgid "Section %s has no option 'auth_mechanism'"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:94
+#: ../pykolab/auth/__init__.py:139
 #, python-format
-msgid "Called for domain %r"
+msgid "Section %s has auth_mechanism: %r"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:107 .././pykolab/auth/__init__.py:116
-#, python-format
-msgid "Using section %s and domain %s"
+#: ../pykolab/auth/__init__.py:148 ../pykolab/auth/__init__.py:157
+msgid "Starting LDAP..."
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:121
+#: ../pykolab/auth/ldap/cache.py:109
 #, python-format
-msgid "Connecting to Authentication backend for domain %s"
+msgid "Inserting cache entry %r"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:132
+#: ../pykolab/auth/ldap/cache.py:122
 #, python-format
-msgid "Section %s has no option 'auth_mechanism'"
+msgid "Updating timestamp for cache entry %r"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:139
+#: ../pykolab/auth/ldap/cache.py:129
 #, python-format
-msgid "Section %s has auth_mechanism: %r"
-msgstr ""
-
-#: .././pykolab/auth/__init__.py:148 .././pykolab/auth/__init__.py:157
-msgid "Starting LDAP..."
+msgid "Updating result_attribute for cache entry %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:51
+#: ../pykolab/auth/ldap/__init__.py:51
 msgid "Python LDAP library does not support persistent search"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:141
+#: ../pykolab/auth/ldap/__init__.py:142
 #, python-format
 msgid "Attempting to authenticate user %s in realm %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:181
+#: ../pykolab/auth/ldap/__init__.py:184
 #, python-format
 msgid "Binding with user_dn %s and password %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:190
+#: ../pykolab/auth/ldap/__init__.py:194
 #, python-format
 msgid "Failed to authenticate as user %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:205
+#: ../pykolab/auth/ldap/__init__.py:211
 msgid "Connecting to LDAP..."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:209
+#: ../pykolab/auth/ldap/__init__.py:215
 #, python-format
 msgid "Attempting to use LDAP URI %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:345
+#: ../pykolab/auth/ldap/__init__.py:357
 #, python-format
 msgid "Finding recipient with filter %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:398
+#: ../pykolab/auth/ldap/__init__.py:425
+#, python-format
+msgid "Finding resource with filter %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:448
+#, python-format
+msgid "Using timestamp %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:480
 #, python-format
 msgid "Applying recipient policy to %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:415
+#: ../pykolab/auth/ldap/__init__.py:497
 #, python-format
 msgid "Using mail attributes: %r, with primary %r and "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:426
+#: ../pykolab/auth/ldap/__init__.py:508
 #, python-format
 msgid "key %r not in entry"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:428
+#: ../pykolab/auth/ldap/__init__.py:510
 #, python-format
 msgid "key %r is the prim. mail attr."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:430
+#: ../pykolab/auth/ldap/__init__.py:512
 msgid "prim. mail pol. is not empty"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:433
+#: ../pykolab/auth/ldap/__init__.py:515
 #, python-format
 msgid "key %r is the sec. mail attr."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:435
+#: ../pykolab/auth/ldap/__init__.py:517
 msgid "sec. mail pol. is not empty"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:438
-#: .././pykolab/auth/ldap/__init__.py:451
+#: ../pykolab/auth/ldap/__init__.py:520 ../pykolab/auth/ldap/__init__.py:533
 #, python-format
 msgid "Attributes %r are not yet available for entry %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:492
+#: ../pykolab/auth/ldap/__init__.py:574
 #, python-format
 msgid "No results for mail address %s found"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:503
+#: ../pykolab/auth/ldap/__init__.py:585
 #, python-format
 msgid "1 result for address %s found, verifying"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:513
+#: ../pykolab/auth/ldap/__init__.py:595
 #, python-format
 msgid "Too bad, primary email address %s "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:524
-#: .././pykolab/auth/ldap/__init__.py:613
+#: ../pykolab/auth/ldap/__init__.py:606 ../pykolab/auth/ldap/__init__.py:695
 msgid "Address assigned to us"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:579
+#: ../pykolab/auth/ldap/__init__.py:661
 #, python-format
 msgid "No results for address %s found"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:590
+#: ../pykolab/auth/ldap/__init__.py:672
 #, python-format
 msgid "1 result for address %s found, "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:601
+#: ../pykolab/auth/ldap/__init__.py:683
 msgid "Too bad, secondary email "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:655
+#: ../pykolab/auth/ldap/__init__.py:710
+msgid "Recipient policy composed the following set of secondary "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:716
+#, python-format
+msgid "Secondary mail addresses that we want is not None: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:727
+msgid "Avoiding the duplication of the primary mail "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:738
+#, python-format
+msgid "Entry is getting secondary mail addresses: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:746
+msgid "Entry did not have any secondary mail "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:772
 #, python-format
 msgid "Entry modifications list: %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:698
+#: ../pykolab/auth/ldap/__init__.py:792
+#, python-format
+msgid "Setting entry attribute %r to %r for %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:828
+#, python-format
+msgid "Could not update dn %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:841
 #, python-format
 msgid "Using filter %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:736
+#: ../pykolab/auth/ldap/__init__.py:879
+#, python-format
+msgid "About to consider the user quota for %r (used: %r, "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:945
 msgid "Invalid bind credentials"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:989
+#: ../pykolab/auth/ldap/__init__.py:1229
 #, python-format
 msgid "Current changelog entry %s with %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:996
+#: ../pykolab/auth/ldap/__init__.py:1242
 #, python-format
 msgid "Result from recipient policy: %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1227
+#: ../pykolab/auth/ldap/__init__.py:1385
+#, python-format
+msgid "Kolab user %s does not have a result attribute %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1527
 #, python-format
 msgid "Finding domain root dn for domain %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1315
+#: ../pykolab/auth/ldap/__init__.py:1615
 msgid "Authentication database DOWN"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1394
+#: ../pykolab/auth/ldap/__init__.py:1699 ../pykolab/auth/ldap/__init__.py:1734
 #, python-format
 msgid "Entry type: %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1492
+#: ../pykolab/auth/ldap/__init__.py:1822
 msgid "LDAP Search Result Data Entry:"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1508
+#: ../pykolab/auth/ldap/__init__.py:1838
 msgid "Entry Change Notification attributes:"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1513
+#: ../pykolab/auth/ldap/__init__.py:1843
 #, python-format
 msgid "Change Type: %r (%r)"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1521
+#: ../pykolab/auth/ldap/__init__.py:1851
 #, python-format
 msgid "Previous DN: %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1575
+#: ../pykolab/auth/ldap/__init__.py:1906
 #, python-format
 msgid "Object %s searched no longer exists"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1583
+#: ../pykolab/auth/ldap/__init__.py:1916
 #, python-format
 msgid "%d results..."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1677
+#: ../pykolab/auth/ldap/__init__.py:2014
 #, python-format
 msgid "Searching with filter %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1721
+#: ../pykolab/auth/ldap/__init__.py:2058
 #, python-format
 msgid "Checking for support for %s on %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/cache.py:109
-#, python-format
-msgid "Inserting cache entry %r"
+#: ../pykolab/cli/cmd_add_domain.py:36 ../pykolab/cli/cmd_create_mailbox.py:36
+#: ../pykolab/cli/cmd_export_mailbox.py:33
+#: ../pykolab/cli/cmd_list_mailboxes.py:39
+msgid "CLI Options"
 msgstr ""
 
-#: .././pykolab/auth/ldap/cache.py:122
-#, python-format
-msgid "Updating timestamp for cache entry %r"
+#: ../pykolab/cli/cmd_add_domain.py:42
+msgid "Add domain as alias for DOMAIN"
 msgstr ""
 
-#: .././pykolab/auth/ldap/cache.py:128
-#, python-format
-msgid "Updating result_attribute for cache entry %r"
+#: ../pykolab/cli/cmd_add_domain.py:47
+msgid "Add a new domain or domain alias."
 msgstr ""
 
-#: .././pykolab/auth/sql/__init__.py:44
-msgid "Connecting to SQL..."
+#: ../pykolab/cli/cmd_add_domain.py:55
+msgid "Could not find credentials with sufficient permissions"
 msgstr ""
 
-#: .././pykolab/utils.py:92
-msgid "Please answer 'yes' or 'no'."
+#: ../pykolab/cli/cmd_add_domain.py:80 ../pykolab/wap_client/__init__.py:113
+msgid "Invalid parent domain"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:87
-#, python-format
-msgid "Setting %s to %r (from defaults)"
+#: ../pykolab/cli/cmd_add_domain.py:86
+msgid "Domain name"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:106
-#, python-format
-msgid "Setting %s to %r (from CLI, verified)"
+#: ../pykolab/cli/cmd_create_mailbox.py:41
+msgid "Set metadata for folder to ANNOTATION=VALUE"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:109
-#, python-format
-msgid "Setting %s to %r (from CLI, not checked)"
+#: ../pykolab/cli/cmd_create_mailbox.py:50
+msgid "Invalid argument"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:150 .././pykolab/conf/__init__.py:207
-#, python-format
-msgid "Setting %s_%s to '****' (from configuration file)"
+#: ../pykolab/cli/cmd_create_mailbox.py:58
+msgid "Invalid argument for metadata"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:152 .././pykolab/conf/__init__.py:209
-#, python-format
-msgid "Setting %s_%s to %r (from configuration file)"
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:45
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:49
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:50
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:55
+msgid "ACI Subject"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:162
-msgid "Setting options from configuration file"
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:48
+#: ../pykolab/cli/cmd_list_mailbox_acls.py:41
+#: ../pykolab/cli/cmd_list_mailbox_metadata.py:41
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:54
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:54
+msgid "Folder name"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:223
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:60
+#: ../pykolab/cli/cmd_list_mailbox_acls.py:52
+#: ../pykolab/cli/cmd_list_mailbox_metadata.py:52
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:67
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:67
 #, python-format
-msgid "Configuration file %s not readable"
+msgid "No such folder %r"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:226
-#, python-format
-msgid "Reading configuration file %s"
+#: ../pykolab/cli/cmd_delete_mailbox.py:46
+msgid "No mailbox specified"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:230
+#: ../pykolab/cli/cmd_export_mailbox.py:38
+msgid "All folders this user has access to"
+msgstr ""
+
+#: ../pykolab/cli/cmd_export_mailbox.py:108
+#, python-format
+msgid "%s is not a directory"
+msgstr ""
+
+#: ../pykolab/cli/cmd_export_mailbox.py:118
+#, python-format
+msgid "ZIP file at %s.zip"
+msgstr ""
+
+#: ../pykolab/cli/cmd_export_mailbox.py:120
+#, python-format
+msgid "No directories found for user %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_mailboxes.py:44
+msgid "Display raw IMAP UTF-7 folder names"
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_mailboxes.py:75
+#, python-format
+msgid "Appending folder search for %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:49
+msgid "Invalid or unqualified email address."
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:57
+#, python-format
+msgid "No recipient found for email address %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:60
+#, python-format
+msgid "Found the following recipient(s): %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:66
+#, python-format
+msgid "Using the following mail attributes: %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:90
+msgid "Found the following recipients:"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:48
+msgid "No target mailbox name specified"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:50
+msgid "No source mailbox name specified"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:62
+#, python-format
+msgid "Source folder %r does not exist"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:66
+#, python-format
+msgid "Target folder %r already exists"
+msgstr ""
+
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:47
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:51
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:56
+msgid "ACI Permissions"
+msgstr ""
+
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:47
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:51
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:56
+msgid "Metadata value"
+msgstr ""
+
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:50
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:55
+msgid "Metadata path"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:41
+#, python-format
+msgid "Found %d domains in %d seconds"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:51
+#, python-format
+msgid "Running for domain %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:57
+#, python-format
+msgid "Synchronizing users for %s took %d seconds"
+msgstr ""
+
+#. This is a nested command
+#. This is a nested component
+#: ../pykolab/cli/commands.py:98 ../pykolab/setup/components.py:90
+#, python-format
+msgid "Command Group: %s"
+msgstr ""
+
+#: ../pykolab/cli/commands.py:109 ../pykolab/cli/commands.py:114
+msgid "No such command."
+msgstr ""
+
+#: ../pykolab/cli/commands.py:165 ../pykolab/setup/components.py:231
+#, python-format
+msgid "Command '%s' already registered"
+msgstr ""
+
+#: ../pykolab/cli/commands.py:190 ../pykolab/setup/components.py:257
+#: ../wallace/modules.py:338
+#, python-format
+msgid "Alias for %s"
+msgstr ""
+
+#: ../pykolab/cli/commands.py:198 ../pykolab/setup/components.py:265
+msgid "Not yet implemented"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:40
+msgid "Unspecified command issue identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:50
+msgid "Invalid command issue identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:60
+#: ../pykolab/cli/telemetry/cmd_examine_session.py:65
+msgid "Invalid session identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:75
+#: ../pykolab/cli/telemetry/cmd_examine_session.py:100
+#, python-format
+msgid "Session by %s on server %s"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_session.py:43
+msgid "Unspecified session identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_list_sessions.py:35
+msgid "List Options"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_list_sessions.py:40
+msgid "Display sessions since ..."
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_list_sessions.py:58
+#, python-format
+msgid "Session for user %s started at %s with ID %s"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:57 ../pykolab/conf/entitlement.py:80
+#: ../pykolab/conf/entitlement.py:98 ../pykolab/conf/entitlement.py:116
+#: ../pykolab/conf/entitlement.py:230 ../pykolab/conf/entitlement.py:246
+#: ../pykolab/conf/entitlement.py:262
+msgid "Invalid entitlement verification "
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:120 ../pykolab/conf/entitlement.py:123
+msgid "Invalid entitlement certificate"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:132
+#, python-format
+msgid "Parsing entitlement file %s"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:141
+#, python-format
+msgid "License file %s not readable!"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:147
+msgid "No entitlement directory found"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:87
+#, python-format
+msgid "Setting %s to %r (from defaults)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:106
+#, python-format
+msgid "Setting %s to %r (from CLI, verified)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:109
+#, python-format
+msgid "Setting %s to %r (from CLI, not checked)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:150 ../pykolab/conf/__init__.py:207
+#, python-format
+msgid "Setting %s_%s to '****' (from configuration file)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:152 ../pykolab/conf/__init__.py:209
+#, python-format
+msgid "Setting %s_%s to %r (from configuration file)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:162
+msgid "Setting options from configuration file"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:223
+#, python-format
+msgid "Configuration file %s not readable"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:226
+#, python-format
+msgid "Reading configuration file %s"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:230
 #, python-format
 msgid "Invalid configuration file %s"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:233
+#: ../pykolab/conf/__init__.py:233
 #, python-format
 msgid "No master configuration section [kolab] in configuration file %s"
 msgstr ""
@@ -811,1088 +925,1335 @@ msgstr ""
 #. #
 #. # Runtime Options
 #. #
-#: .././pykolab/conf/__init__.py:267
+#: ../pykolab/conf/__init__.py:267
 msgid "Runtime Options"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:272
+#: ../pykolab/conf/__init__.py:272
 msgid "Configuration file to use"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:278
+#: ../pykolab/conf/__init__.py:278
 msgid "Set the debugging "
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:286
+#: ../pykolab/conf/__init__.py:286
 msgid "Set the logging level. "
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:294
+#: ../pykolab/conf/__init__.py:294
 msgid "Log file to use"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:300
+#: ../pykolab/conf/__init__.py:300
 msgid "Be quiet."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:306
+#: ../pykolab/conf/__init__.py:306
 msgid "Answer yes to all questions."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:328
+#: ../pykolab/conf/__init__.py:328
 msgid "No command supplied"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:411
+#: ../pykolab/conf/__init__.py:411
 msgid "Insufficient options. Need section, key and value -in that order."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:414
+#: ../pykolab/conf/__init__.py:414
 #, python-format
 msgid "No section '%s' exists."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:445
+#: ../pykolab/conf/__init__.py:445
 #, python-format
 msgid "Setting %s to %r (from the default values for CLI options)"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:514
+#: ../pykolab/conf/__init__.py:514
 #, python-format
 msgid "Could not execute configuration function: %s"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:522
+#: ../pykolab/conf/__init__.py:522
 #, python-format
 msgid "Option %s/%s does not exist in config file %s, pulling from defaults"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:530 .././pykolab/conf/__init__.py:533
+#: ../pykolab/conf/__init__.py:530 ../pykolab/conf/__init__.py:533
 msgid "Option does not exist in defaults."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:531 .././pykolab/conf/__init__.py:534
-msgid "Not available"
-msgstr ""
-
-#: .././pykolab/conf/__init__.py:543
+#: ../pykolab/conf/__init__.py:543
 #, python-format
 msgid "Configuration file %s not readable."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:546
+#: ../pykolab/conf/__init__.py:546
 #, python-format
 msgid "Configuration file %s does not exist."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:551
+#: ../pykolab/conf/__init__.py:551
 msgid ""
 "WARNING: A negative debug level value does not make this program be any more "
 "silent."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:557
+#: ../pykolab/conf/__init__.py:557
 msgid "This program has 9 levels of verbosity. Using the maximum of 9."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:565 .././pykolab/conf/__init__.py:571
+#: ../pykolab/conf/__init__.py:565 ../pykolab/conf/__init__.py:571
 msgid "Cannot start SASL authentication daemon"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:582
+#: ../pykolab/conf/__init__.py:582
 msgid "No imaplib library found."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:592
+#: ../pykolab/conf/__init__.py:592
 msgid "No LMTP class found in the smtplib library."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:602
+#: ../pykolab/conf/__init__.py:602
 msgid "No SMTP class found in the smtplib library."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:616
+#: ../pykolab/conf/__init__.py:616
 #, python-format
 msgid "Found you specified a specific set of items to test: %s"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:624
+#: ../pykolab/conf/__init__.py:624
 #, python-format
 msgid "Selectively selecting: %s"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:57 .././pykolab/conf/entitlement.py:80
-#: .././pykolab/conf/entitlement.py:98 .././pykolab/conf/entitlement.py:116
-#: .././pykolab/conf/entitlement.py:229 .././pykolab/conf/entitlement.py:245
-#: .././pykolab/conf/entitlement.py:261
-msgid "Invalid entitlement verification "
+#: ../pykolab/constants.py.in:40
+msgid "PyKolab is a Kolab Systems product. For more information "
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:120 .././pykolab/conf/entitlement.py:123
-msgid "Invalid entitlement certificate"
+#: ../pykolab/constants.py.in:54
+msgid "WARNING"
+msgstr ""
+
+#: ../pykolab/constants.py.in:54
+msgid "The Fully Qualified "
+msgstr ""
+
+#: ../pykolab/constants.py.in:75
+msgid "389 Directory Server or Red Hat Directory Server"
+msgstr ""
+
+#: ../pykolab/constants.py.in:79 ../pykolab/constants.py.in:83
+msgid "OpenLDAP or compatible"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:132
+#: ../pykolab/imap/cyrus.py:79
 #, python-format
-msgid "Parsing entitlement file %s"
+msgid "Could not connect to Cyrus IMAP server %r"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:141
+#: ../pykolab/imap/cyrus.py:134
 #, python-format
-msgid "License file %s not readable!"
+msgid "Continuing with separator: %r"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:146
-msgid "No entitlement directory found"
+#: ../pykolab/imap/cyrus.py:139
+msgid "Detected we are running in a Murder topology"
 msgstr ""
 
-#: .././pykolab/logger.py:89
+#: ../pykolab/imap/cyrus.py:143
+msgid "This system is not part of a murder topology"
+msgstr ""
+
+#: ../pykolab/imap/cyrus.py:164
 #, python-format
-msgid "Cannot log to file %s: %s"
+msgid "Checking actual backend server for folder %s through annotations"
 msgstr ""
 
-#: .././pykolab/constants.py:40
-msgid "PyKolab is a Kolab Systems product. For more information "
+#: ../pykolab/imap/cyrus.py:179
+#, python-format
+msgid "Could not get the annotations after %s tries."
 msgstr ""
 
-#: .././pykolab/constants.py:54
-msgid "WARNING"
+#: ../pykolab/imap/cyrus.py:183
+#, python-format
+msgid "No annotations for %s: %r"
 msgstr ""
 
-#: .././pykolab/constants.py:54
-msgid "The Fully Qualified "
+#: ../pykolab/imap/cyrus.py:190
+#, python-format
+msgid "Server for INBOX folder %s is %s"
 msgstr ""
 
-#: .././pykolab/constants.py:75
-msgid "389 Directory Server or Red Hat Directory Server"
+#: ../pykolab/imap/cyrus.py:202
+#, python-format
+msgid "Setting quota for folder %s to %s"
 msgstr ""
 
-#: .././pykolab/constants.py:79 .././pykolab/constants.py:83
-msgid "OpenLDAP or compatible"
+#: ../pykolab/imap/cyrus.py:206
+#, python-format
+msgid "Could not set quota for mailfolder %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_list_sessions.py:35
-msgid "List Options"
+#: ../pykolab/imap/cyrus.py:215
+#, python-format
+msgid "Moving INBOX folder %s to %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_list_sessions.py:40
-msgid "Display sessions since ..."
+#: ../pykolab/imap/cyrus.py:227
+#, python-format
+msgid "Setting annotation %s on folder %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_list_sessions.py:58
+#: ../pykolab/imap/cyrus.py:234
 #, python-format
-msgid "Session for user %s started at %s with ID %s"
+msgid "Could not set annotation %r on mail folder %r: %r"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_session.py:43
-msgid "Unspecified session identifier"
+#: ../pykolab/imap/cyrus.py:238
+#, python-format
+msgid "Transferring folder %s from %s to %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_session.py:65
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:60
-msgid "Invalid session identifier"
+#: ../pykolab/imap/cyrus.py:298
+#, python-format
+msgid "Undeleting %s to %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_session.py:100
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:75
+#: ../pykolab/imap/__init__.py:45
 #, python-format
-msgid "Session by %s on server %s"
+msgid "Cleaning up ACL entries for %s across all folders"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:40
-msgid "Unspecified command issue identifier"
+#: ../pykolab/imap/__init__.py:60
+#, python-format
+msgid "Cleaning up ACL entries referring to identifier %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:50
-msgid "Invalid command issue identifier"
+#: ../pykolab/imap/__init__.py:69
+#, python-format
+msgid "Iterating over %d folders"
 msgstr ""
 
-#. This is a nested command
-#. This is a nested component
-#: .././pykolab/cli/commands.py:95 .././pykolab/setup/components.py:88
+#. Set the ACL to '' (effectively deleting the ACL entry)
+#: ../pykolab/imap/__init__.py:82
 #, python-format
-msgid "Command Group: %s"
+msgid "Removing acl %r for subject %r from folder %r"
 msgstr ""
 
-#: .././pykolab/cli/commands.py:106 .././pykolab/cli/commands.py:111
-msgid "No such command."
+#: ../pykolab/imap/__init__.py:143
+#, python-format
+msgid "Logging on to Cyrus IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/commands.py:161 .././pykolab/setup/components.py:217
+#: ../pykolab/imap/__init__.py:152
 #, python-format
-msgid "Command '%s' already registered"
+msgid "Logging on to Dovecot IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_delete_mailbox.py:43
-msgid "No mailbox specified"
+#: ../pykolab/imap/__init__.py:161
+#, python-format
+msgid "Logging on to generic IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_list_mailboxes.py:35
-#: .././pykolab/cli/cmd_export_mailbox.py:33
-msgid "CLI Options"
+#: ../pykolab/imap/__init__.py:179
+#, python-format
+msgid "Reusing existing IMAP server connection to %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_list_mailboxes.py:40
-msgid "Display raw UTF-7 folder names"
+#: ../pykolab/imap/__init__.py:181
+#, python-format
+msgid "Reconnecting to IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:38
-msgid "All folders this user has access to"
+#: ../pykolab/imap/__init__.py:197
+msgid "Called imap.disconnect() on a server that "
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:108
+#: ../pykolab/imap/__init__.py:213
 #, python-format
-msgid "%s is not a directory"
+msgid "%r has no attribute %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:118
+#: ../pykolab/imap/__init__.py:286
+msgid "Private annotations need to be set using the appropriate user account."
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:319 ../pykolab/imap/__init__.py:354
 #, python-format
-msgid "ZIP file at %s.zip"
+msgid "Creating new shared folder %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:120
+#: ../pykolab/imap/__init__.py:376
 #, python-format
-msgid "No directories found for user %s"
+msgid "Creating new mailbox for user %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_sync.py:38
+#: ../pykolab/imap/__init__.py:405
 #, python-format
-msgid "Found %d domains in %d seconds"
+msgid "Creating additional folders for user %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_sync.py:48
+#: ../pykolab/imap/__init__.py:429
 #, python-format
-msgid "Running for domain %s"
+msgid "Mailbox already exists: %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_sync.py:54
+#: ../pykolab/imap/__init__.py:472
+msgid "Subscribing user to the additional folders"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:532 ../pykolab/imap/__init__.py:611
 #, python-format
-msgid "Synchronizing users for %s took %d seconds"
+msgid "Renaming INBOX from %s to %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:536
+#, python-format
+msgid "Could not rename INBOX folder %s to %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:538 ../pykolab/imap/__init__.py:615
+#, python-format
+msgid "Moving INBOX folder %s won't succeed as target folder %s already exists"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:70
+#: ../pykolab/imap/__init__.py:551
+#, python-format
+msgid "Looking for folder '%s', we found folders: %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:574
+#, python-format
+msgid "Setting ACL rights %s for subject %s on folder "
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:585
+#, python-format
+msgid "Removing ACL rights %s for subject %s on folder "
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:608
+#, python-format
+msgid "Found old INBOX folder %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:617
+#, python-format
+msgid "Did not find old folder user/%s to rename"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:619
+msgid "Value for user is not a dictionary"
+msgstr ""
+
+#. TODO: Go in fact correct the quota.
+#: ../pykolab/imap/__init__.py:682
+#, python-format
+msgid "Cannot get current IMAP quota for folder %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:695
+#, python-format
+msgid "Quota for %s currently is %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:701
+#, python-format
+msgid "Adjusting authentication database quota for folder %s to %d"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:706
+#, python-format
+msgid "Correcting quota for %s to %s (currently %s)"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:788
+#, python-format
+msgid "Checking folder: %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:793
+#, python-format
+msgid "Folder has no corresponding user (1): %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:796
+#, python-format
+msgid "Folder has no corresponding user (2): %s"
+msgstr ""
+
+#. We got user identifier only
+#: ../pykolab/imap/__init__.py:811
+msgid "Please don't give us just a user identifier"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:814
+#, python-format
+msgid "Deleting folder %s"
+msgstr ""
+
+#: ../pykolab/__init__.py:50
+msgid "Returning thread local configuration"
+msgstr ""
+
+#: ../pykolab/logger.py:105
+#, python-format
+msgid "Could not change the ownership of log file %s"
+msgstr ""
+
+#: ../pykolab/logger.py:121
+#, python-format
+msgid "Cannot log to file %s: %s"
+msgstr ""
+
+#: ../pykolab/plugins/defaultfolders/__init__.py:47
+#, python-format
+msgid "Plugin %s called without required keyword %s."
+msgstr ""
+
+#: ../pykolab/plugins/defaultfolders/__init__.py:53
+msgid "Could not parse additional_folders"
+msgstr ""
+
+#: ../pykolab/plugins/dynamicquota/__init__.py:58
+#, python-format
+msgid "No keyword %s passed to set_user_folder_quota"
+msgstr ""
+
+#: ../pykolab/plugins/dynamicquota/__init__.py:70
+#, python-format
+msgid "Quota '%s' not an integer!"
+msgstr ""
+
+#: ../pykolab/plugins/__init__.py:70
 #, python-format
 msgid "ImportError for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:74
+#: ../pykolab/plugins/__init__.py:74
 #, python-format
 msgid "RuntimeError for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:78
+#: ../pykolab/plugins/__init__.py:78
 #, python-format
 msgid "Plugin %s failed to load (%s: %s)"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:116 .././pykolab/plugins/__init__.py:118
+#: ../pykolab/plugins/__init__.py:116 ../pykolab/plugins/__init__.py:118
 #, python-format
 msgid "Cannot set defaults for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:120
+#: ../pykolab/plugins/__init__.py:120
 #, python-format
 msgid "Cannot set defaults for plugin %s: Unknown Error"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:123
+#: ../pykolab/plugins/__init__.py:123
 #, python-format
 msgid "Not setting defaults for plugin %s: No function 'set_defaults()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:142
+#: ../pykolab/plugins/__init__.py:142
 #, python-format
 msgid "Cannot set runtime for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:144
+#: ../pykolab/plugins/__init__.py:144
 #, python-format
 msgid "Not setting runtime for plugin %s: No function 'set_runtime()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:163 .././pykolab/plugins/__init__.py:165
+#: ../pykolab/plugins/__init__.py:163 ../pykolab/plugins/__init__.py:165
 #, python-format
 msgid "Cannot add options for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:167
+#: ../pykolab/plugins/__init__.py:167
 #, python-format
 msgid "Not adding options for plugin %s: No function 'add_options()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:187
+#: ../pykolab/plugins/__init__.py:187
 #, python-format
 msgid "Cannot check options for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:189
+#: ../pykolab/plugins/__init__.py:189
 #, python-format
 msgid "Not checking options for plugin %s: No function 'check_options()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:227
+#: ../pykolab/plugins/__init__.py:227
 #, python-format
 msgid "Executing hook %s for plugin %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:231 .././pykolab/plugins/__init__.py:233
+#: ../pykolab/plugins/__init__.py:231 ../pykolab/plugins/__init__.py:233
 #, python-format
 msgid "Cannot execute hook %s for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/defaultfolders/__init__.py:47
-#, python-format
-msgid "Plugin %s called without required keyword %s."
+#: ../pykolab/plugins/recipientpolicy/__init__.py:79
+msgid "Attribute substitution for 'mail' failed in Recipient Policy"
 msgstr ""
 
-#: .././pykolab/plugins/defaultfolders/__init__.py:53
-msgid "Could not parse additional_folders"
+#: ../pykolab/plugins/recipientpolicy/__init__.py:115
+msgid "Could not parse the alternative mail routines"
 msgstr ""
 
-#: .././pykolab/plugins/dynamicquota/__init__.py:56
-#, python-format
-msgid "Quota '%s' not an integer!"
+#: ../pykolab/plugins/recipientpolicy/__init__.py:127
+#: ../pykolab/plugins/recipientpolicy/__init__.py:137
+msgid ""
+"Attribute substitution for 'alternative_mail' failed in Recipient Policy"
 msgstr ""
 
-#: .././pykolab/plugins/dynamicquota/__init__.py:63
-msgid ""
-"The new quota was set to 0, but default quota > 0, returning default quota"
+#: ../pykolab/setup/components.py:58
+msgid "Display this help."
 msgstr ""
 
-#: .././pykolab/plugins/dynamicquota/__init__.py:82
-msgid ""
-"The default quota is larger then the calculated new quota, using the default "
-"quota"
+#: ../pykolab/setup/components.py:149
+msgid "No component selected, continuing for all components"
 msgstr ""
 
-#: .././pykolab/plugins/recipientpolicy/__init__.py:70
-msgid "Attribute substitution for 'mail' failed in Recipient Policy"
+#: ../pykolab/setup/components.py:187 ../pykolab/setup/components.py:192
+msgid "No such component."
 msgstr ""
 
-#: .././pykolab/plugins/recipientpolicy/__init__.py:97
-msgid "Could not parse the alternative mail routines"
+#: ../pykolab/setup/setup_freebusy.py:46
+msgid "Setup Free/Busy."
 msgstr ""
 
-#: .././pykolab/plugins/recipientpolicy/__init__.py:109
-#: .././pykolab/plugins/recipientpolicy/__init__.py:119
-msgid ""
-"Attribute substitution for 'alternative_mail' failed in Recipient Policy"
+#: ../pykolab/setup/setup_freebusy.py:50
+msgid "Free/Busy is not installed on this system"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:40
-msgid "Setup zpush."
+#: ../pykolab/setup/setup_freebusy.py:55
+msgid ""
+"\n"
+"                        Please supply the MySQL password for the "
+"'roundcube'\n"
+"                        user. You have supplied this password earlier, and "
+"it is\n"
+"                        available from the database URI setting in\n"
+"                        /etc/roundcubemail/db.inc.php.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:44
-msgid "Z-Push is not installed on this system"
+#: ../pykolab/setup/setup_freebusy.py:64
+#: ../pykolab/setup/setup_roundcube.py:56
+msgid "MySQL roundcube password"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:70
-#: .././pykolab/setup/setup_roundcube.py:93
-#: .././pykolab/setup/setup_freebusy.py:76
+#: ../pykolab/setup/setup_freebusy.py:92
+#: ../pykolab/setup/setup_roundcube.py:116 ../pykolab/setup/setup_zpush.py:71
 #, python-format
 msgid "Using template file %r"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:77
-#: .././pykolab/setup/setup_roundcube.py:100
-#: .././pykolab/setup/setup_freebusy.py:83
+#: ../pykolab/setup/setup_freebusy.py:99
+#: ../pykolab/setup/setup_roundcube.py:123 ../pykolab/setup/setup_zpush.py:78
 #, python-format
 msgid "Successfully compiled template %r, writing out to %r"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:95 .././pykolab/setup/setup_ldap.py:184
-#: .././pykolab/setup/setup_ldap.py:358
-#: .././pykolab/setup/setup_roundcube.py:159
-#: .././pykolab/setup/setup_imap.py:137 .././pykolab/setup/setup_mysql.py:49
-#: .././pykolab/setup/setup_freebusy.py:101
-msgid "Could not start and configure to start on boot, the "
+#: ../pykolab/setup/setup_freebusy.py:119 ../pykolab/setup/setup_imap.py:143
+#: ../pykolab/setup/setup_ldap.py:288 ../pykolab/setup/setup_ldap.py:521
+#: ../pykolab/setup/setup_mta.py:309 ../pykolab/setup/setup_mysql.py:49
+#: ../pykolab/setup/setup_roundcube.py:191
+#: ../pykolab/setup/setup_syncroton.py:66 ../pykolab/setup/setup_zpush.py:98
+msgid "Could not start and configure to start on boot, the "
+msgstr ""
+
+#: ../pykolab/setup/setup_imap.py:44
+msgid "Setup IMAP."
+msgstr ""
+
+#: ../pykolab/setup/setup_imap.py:88 ../pykolab/setup/setup_imap.py:113
+msgid "Could not write out Cyrus IMAP configuration file /etc/imapd.conf"
+msgstr ""
+
+#: ../pykolab/setup/setup_kolabd.py:43
+msgid "Setup the Kolab daemon."
+msgstr ""
+
+#: ../pykolab/setup/setup_kolabd.py:51
+#, python-format
+msgid ""
+"\n"
+"                            Copying the configuration section for 'example."
+"org' over to\n"
+"                            a section applicable to your domain '%s'.\n"
+"                        "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:43
+msgid "LDAP Options"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:50
+msgid "Specify FQDN (overriding defaults)."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:58
+msgid "Allow anonymous binds (default: no)."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:62
+msgid "Setup LDAP."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:74
+msgid ""
+"\n"
+"                        Please supply a password for the LDAP administrator "
+"user\n"
+"                        'admin', used to login to the graphical console of "
+"389\n"
+"                        Directory server.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:82
+msgid "Administrator password"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:89
+msgid ""
+"\n"
+"                        Please supply a password for the LDAP Directory "
+"Manager\n"
+"                        user, which is the administrator user you will be "
+"using\n"
+"                        to at least initially log in to the Web Admin, and "
+"that\n"
+"                        Kolab uses to perform administrative tasks.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:98
+msgid "Directory Manager password"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:105
+msgid ""
+"\n"
+"                        Please choose the system user and group the service\n"
+"                        should use to run under. These should be existing,\n"
+"                        unprivileged, local system POSIX accounts with no "
+"shell.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:112
+msgid "User"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:43
-msgid "LDAP Options"
+#: ../pykolab/setup/setup_ldap.py:113
+msgid "Group"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:50
-msgid "Specify FQDN (overriding defaults)."
+#: ../pykolab/setup/setup_ldap.py:143
+msgid ""
+"\n"
+"                        This setup procedure plans to set up Kolab Groupware "
+"for\n"
+"                        the following domain name space. This domain name "
+"is\n"
+"                        obtained from the reverse DNS entry on your network\n"
+"                        interface. Please confirm this is the appropriate "
+"domain\n"
+"                        name space.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:54
-msgid "Setup LDAP."
+#: ../pykolab/setup/setup_ldap.py:157
+msgid "Domain name to use"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:66
-msgid "Administrator password"
+#: ../pykolab/setup/setup_ldap.py:162 ../pykolab/setup/setup_ldap.py:187
+msgid ""
+"\n"
+"                                    Invalid input. Please try again.\n"
+"                                "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:72
-msgid "Directory Manager password"
+#: ../pykolab/setup/setup_ldap.py:171
+msgid ""
+"\n"
+"                        The standard root dn we composed for you follows. "
+"Please\n"
+"                        confirm this is the root dn you wish to use.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:77
-msgid "User"
+#: ../pykolab/setup/setup_ldap.py:182
+msgid "Root DN to use"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:78
-msgid "Group"
+#: ../pykolab/setup/setup_ldap.py:234
+msgid ""
+"\n"
+"                    Setup is now going to set up the 389 Directory Server. "
+"This\n"
+"                    may take a little while (during which period there is "
+"no\n"
+"                    output and no progress indication).\n"
+"                "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:143
+#: ../pykolab/setup/setup_ldap.py:241
 msgid "Setting up 389 Directory Server"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:153
+#. TODO: Get the return code and display output if not successful.
+#: ../pykolab/setup/setup_ldap.py:253
 msgid "Setup DS stdout:"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:156
+#: ../pykolab/setup/setup_ldap.py:256
 msgid "Setup DS stderr:"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:175 .././pykolab/setup/setup_mysql.py:97
+#: ../pykolab/setup/setup_ldap.py:279 ../pykolab/setup/setup_mysql.py:129
 msgid "Could not find the Kolab schema file"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:189
+#: ../pykolab/setup/setup_ldap.py:293
+msgid ""
+"\n"
+"                        Please supply a Cyrus Administrator password. This\n"
+"                        password is used by Kolab to execute administrative\n"
+"                        tasks in Cyrus IMAP. You may also need the password\n"
+"                        yourself to troubleshoot Cyrus IMAP and/or perform\n"
+"                        other administrative tasks against Cyrus IMAP "
+"directly.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:303
 msgid "Cyrus Administrator password"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:195
+#: ../pykolab/setup/setup_ldap.py:310
+msgid ""
+"\n"
+"                        Please supply a Kolab Service account password. "
+"This\n"
+"                        account is used by various services such as "
+"Postfix,\n"
+"                        and Roundcube, as anonymous binds to the LDAP "
+"server\n"
+"                        will not be allowed.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:319
 msgid "Kolab Service password"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:204
+#: ../pykolab/setup/setup_ldap.py:329
 msgid "Writing out configuration to kolab.conf"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:218
+#: ../pykolab/setup/setup_ldap.py:343
 msgid "Inserting service users into LDAP."
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:262
+#: ../pykolab/setup/setup_ldap.py:417
 msgid "Writing out cn=kolab,cn=config"
 msgstr ""
 
 #. TODO: Add kolab-admin role
 #. TODO: Assign kolab-admin admin ACLs
-#: .././pykolab/setup/setup_ldap.py:286
+#: ../pykolab/setup/setup_ldap.py:441
 #, python-format
 msgid "Adding domain %s to list of domains for this deployment"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:294
+#: ../pykolab/setup/setup_ldap.py:457
 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:302
+#: ../pykolab/setup/setup_ldap.py:465
 msgid "Enabling attribute uniqueness plugin"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:308
+#: ../pykolab/setup/setup_ldap.py:471
 msgid "Enabling referential integrity plugin"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:314
+#: ../pykolab/setup/setup_ldap.py:477
 msgid "Enabling and configuring account policy plugin"
 msgstr ""
 
 #. TODO: Add kolab-admin role
-#: .././pykolab/setup/setup_ldap.py:329
+#: ../pykolab/setup/setup_ldap.py:492
 msgid "Adding the kolab-admin role"
 msgstr ""
 
 #. TODO: User writeable attributes on root_dn
-#: .././pykolab/setup/setup_ldap.py:340
+#: ../pykolab/setup/setup_ldap.py:503
 #, python-format
 msgid "Setting access control to %s"
 msgstr ""
 
-#: .././pykolab/setup/setup_roundcube.py:40
-msgid "Setup Roundcube."
-msgstr ""
-
-#: .././pykolab/setup/setup_roundcube.py:44
-#: .././pykolab/setup/setup_freebusy.py:49
-msgid "MySQL roundcube password"
-msgstr ""
-
-#: .././pykolab/setup/components.py:56
-msgid "Display this help."
-msgstr ""
-
-#: .././pykolab/setup/components.py:122
-msgid "No component selected, continuing for all components"
-msgstr ""
-
-#: .././pykolab/setup/components.py:157 .././pykolab/setup/components.py:162
-msgid "No such component."
-msgstr ""
-
-#: .././pykolab/setup/setup_mta.py:40
+#: ../pykolab/setup/setup_mta.py:40
 msgid "Setup MTA."
 msgstr ""
 
-#: .././pykolab/setup/setup_mta.py:220
+#: ../pykolab/setup/setup_mta.py:224 ../pykolab/setup/setup_php.py:80
 #, python-format
 msgid "Setting key %r to %r"
 msgstr ""
 
-#: .././pykolab/setup/setup_mta.py:248
+#: ../pykolab/setup/setup_mta.py:252
 msgid "Could not write out Postfix configuration file /etc/postfix/master.cf"
 msgstr ""
 
-#: .././pykolab/setup/setup_imap.py:39
-msgid "Setup IMAP."
-msgstr ""
-
-#: .././pykolab/setup/setup_imap.py:82 .././pykolab/setup/setup_imap.py:107
-msgid "Could not write out Cyrus IMAP configuration file /etc/imapd.conf"
-msgstr ""
-
-#: .././pykolab/setup/setup_kolabd.py:38
-msgid "Setup the Kolab daemon."
+#: ../pykolab/setup/setup_mta.py:287
+msgid "Could not write out Amavis configuration file /etc/amavisd/amavisd.conf"
 msgstr ""
 
-#: .././pykolab/setup/setup_mysql.py:39
+#: ../pykolab/setup/setup_mysql.py:39
 msgid "Setup MySQL."
 msgstr ""
 
-#: .././pykolab/setup/setup_mysql.py:53
+#: ../pykolab/setup/setup_mysql.py:53
+msgid ""
+"\n"
+"                    Please supply a root password for MySQL. This password "
+"will\n"
+"                    be the administrative user for this MySQL server, and "
+"it\n"
+"                    should be kept a secret. After this setup process has\n"
+"                    completed, Kolab is going to discard and forget about "
+"this\n"
+"                    password, but you will need it for administrative tasks "
+"in\n"
+"                    MySQL.\n"
+"                "
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:64
 msgid "MySQL root password"
 msgstr ""
 
-#: .././pykolab/setup/setup_freebusy.py:40
-msgid "Setup Free/Busy."
+#: ../pykolab/setup/setup_mysql.py:103
+msgid ""
+"\n"
+"                        Please supply a password for the MySQL user "
+"'kolab'.\n"
+"                        This password will be used by Kolab services, such "
+"as\n"
+"                        the Web Administration Panel.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_freebusy.py:44
-msgid "Free/Busy is not installed on this system"
+#: ../pykolab/setup/setup_mysql.py:111
+msgid "MySQL kolab password"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:45
-#, python-format
-msgid "Cleaning up ACL entries for %s across all folders"
+#: ../pykolab/setup/setup_php.py:42
+msgid "PHP Options"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:60
-#, python-format
-msgid "Cleaning up ACL entries referring to identifier %s"
+#: ../pykolab/setup/setup_php.py:49
+msgid "Specify the timezone for PHP."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:69
-#, python-format
-msgid "Iterating over %d folders"
+#: ../pykolab/setup/setup_php.py:53
+msgid "Setup PHP."
 msgstr ""
 
-#. Set the ACL to '' (effectively deleting the ACL entry)
-#: .././pykolab/imap/__init__.py:82
-#, python-format
-msgid "Removing acl %r for subject %r from folder %r"
+#: ../pykolab/setup/setup_php.py:58
+msgid ""
+"\n"
+"                        Please supply the timezone PHP should be using.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:143
-#, python-format
-msgid "Logging on to Cyrus IMAP server %s"
+#: ../pykolab/setup/setup_php.py:64
+msgid "Timezone ID"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:152
-#, python-format
-msgid "Logging on to Dovecot IMAP server %s"
+#: ../pykolab/setup/setup_roundcube.py:44
+msgid "Setup Roundcube."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:161
-#, python-format
-msgid "Logging on to generic IMAP server %s"
+#: ../pykolab/setup/setup_roundcube.py:48
+msgid ""
+"\n"
+"                    Please supply a password for the MySQL user "
+"'roundcube'.\n"
+"                    This password will be used by the Roundcube webmail\n"
+"                    interface.\n"
+"                "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:179
-#, python-format
-msgid "Reusing existing IMAP server connection to %s"
+#: ../pykolab/setup/setup_syncroton.py:40
+msgid "Setup Syncroton."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:181
-#, python-format
-msgid "Reconnecting to IMAP server %s"
+#: ../pykolab/setup/setup_zpush.py:41
+msgid "Setup zpush."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:197
-msgid "Called imap.disconnect() on a server that "
+#: ../pykolab/setup/setup_zpush.py:45
+msgid "Z-Push is not installed on this system"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:213
+#. start_max = (int)(time.time())
+#: ../pykolab/telemetry.py:588
 #, python-format
-msgid "%r has no attribute %s"
+msgid "Expiring sessions that started before or on %d"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:221 .././pykolab/imap/__init__.py:239
+#: ../pykolab/telemetry.py:601
 #, python-format
-msgid "Creating new shared folder %s"
+msgid "Expiring session ID: %d"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:255
+#: ../pykolab/telemetry.py:620
 #, python-format
-msgid "Creating new mailbox for user %s"
+msgid "Session with ID %d expired from database"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:280
+#: ../pykolab/telemetry.py:646
 #, python-format
-msgid "Creating additional folders for user %s"
+msgid "Operational Error in telemetry database: %s"
+msgstr ""
+
+#: ../pykolab/telemetry.py:652
+msgid "No database available"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:302
+#: ../pykolab/utils.py:57 ../pykolab/utils.py:59
 #, python-format
-msgid "Mailbox already exists: %s"
+msgid "Confirm %s: "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:345
-msgid "Subscribing user to the additional folders"
+#: ../pykolab/utils.py:62
+msgid "Incorrect confirmation. "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:380 .././pykolab/imap/__init__.py:459
+#: ../pykolab/utils.py:67 ../pykolab/utils.py:72
 #, python-format
-msgid "Renaming INBOX from %s to %s"
+msgid "%s: "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:384
+#: ../pykolab/utils.py:69 ../pykolab/utils.py:74
 #, python-format
-msgid "Could not rename INBOX folder %s to %s"
+msgid "%s [%s]: "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:386 .././pykolab/imap/__init__.py:463
-#, python-format
-msgid "Moving INBOX folder %s won't succeed as target folder %s already exists"
+#: ../pykolab/utils.py:119
+msgid "Please answer 'yes' or 'no'."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:399
+#: ../pykolab/utils.py:185
 #, python-format
-msgid "Looking for folder '%s', we found folders: %r"
+msgid "Could not change the permissions on %s"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:422
+#: ../pykolab/wap_client/__init__.py:257
 #, python-format
-msgid "Setting ACL rights %s for subject %s on folder "
+msgid "Requesting %r with params %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:433
+#: ../pykolab/wap_client/__init__.py:263
 #, python-format
-msgid "Removing ACL rights %s for subject %s on folder "
+msgid "Got response: %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:456
-#, python-format
-msgid "Found old INBOX folder %s"
+#. Some data is not JSON
+#: ../pykolab/wap_client/__init__.py:268
+msgid "Response data is not JSON"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:465
-#, python-format
-msgid "Did not find old folder user/%s to rename"
+#: ../pykolab/xml/attendee.py:79 ../pykolab/xml/attendee.py:99
+msgid "Not a valid attendee"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:467
-msgid "Value for user is not a dictionary"
+#: ../pykolab/xml/attendee.py:84
+msgid "No valid delegator references found"
 msgstr ""
 
-#. TODO: Go in fact correct the quota.
-#: .././pykolab/imap/__init__.py:527
-#, python-format
-msgid "Cannot get current IMAP quota for folder %s"
+#: ../pykolab/xml/attendee.py:104
+msgid "No valid delegatee references found"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:540
+#: ../pykolab/xml/attendee.py:140
 #, python-format
-msgid "Quota for %s currently is %s"
+msgid "Invalid cutype %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:546
+#: ../pykolab/xml/attendee.py:151
 #, python-format
-msgid "Adjusting authentication database quota for folder %s to %d"
+msgid "Invalid participant status %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:551
+#: ../pykolab/xml/attendee.py:159
 #, python-format
-msgid "Correcting quota for %s to %s (currently %s)"
+msgid "Invalid role %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:633
+#: ../pykolab/xml/event.py:172
 #, python-format
-msgid "Checking folder: %s"
+msgid "No attendee with email or name %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:638
+#: ../pykolab/xml/event.py:180
 #, python-format
-msgid "Folder has no corresponding user (1): %s"
+msgid "Invalid argument value attendee %r, must be basestring or Attendee"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:641
+#: ../pykolab/xml/event.py:186
 #, python-format
-msgid "Folder has no corresponding user (2): %s"
+msgid "No attendee with email %r"
 msgstr ""
 
-#. We got user identifier only
-#: .././pykolab/imap/__init__.py:656
-msgid "Please don't give us just a user identifier"
+#: ../pykolab/xml/event.py:192
+#, python-format
+msgid "No attendee with name %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:659
-#, python-format
-msgid "Deleting folder %s"
+#: ../pykolab/xml/event.py:338
+msgid "Invalid participant status"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:78
-#, python-format
-msgid "Could not connect to Cyrus IMAP server %r"
+#: ../pykolab/xml/event.py:538
+msgid "Event end needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:101
+#: ../pykolab/xml/event.py:657
 #, python-format
-msgid "Continuing with separator: %r"
+msgid "Invalid status %r"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:106
-msgid "Detected we are running in a Murder topology"
+#: ../pykolab/xml/event.py:678 ../pykolab/xml/event.py:728
+msgid "Event start needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:110
-msgid "This system is not part of a murder topology"
+#: ../pykolab/xml/event.py:764
+#, python-format
+msgid "Invalid status set: %r"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:131
-#, python-format
-msgid "Checking actual backend server for folder %s through annotations"
+#: ../pykolab/xml/event.py:882
+msgid "No sender specified"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:146
-#, python-format
-msgid "Could not get the annotations after %s tries."
+#: ../saslauthd/__init__.py:126 ../saslauthd/__init__.py:134
+msgid "Traceback occurred, please report a bug at http://bugzilla.kolabsys.com"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:150
+#: ../wallace/__init__.py:61
 #, python-format
-msgid "No annotations for %s: %r"
+msgid "Worker process %s initializing"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:157
-#, python-format
-msgid "Server for INBOX folder %s is %s"
+#: ../wallace/__init__.py:80
+msgid "Bind address for Wallace."
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:169
-#, python-format
-msgid "Setting quota for INBOX folder %s to %s"
+#: ../wallace/__init__.py:106
+msgid "Port that Wallace is supposed to use."
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:173
+#: ../wallace/__init__.py:157
 #, python-format
-msgid "Could not set quota for mailfolder %s"
+msgid "Could not bind to socket on port %d on bind "
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:182
-#, python-format
-msgid "Moving INBOX folder %s to %s"
+#: ../wallace/__init__.py:169
+msgid "Could not shut down socket"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:194
-#, python-format
-msgid "Setting annotation %s on folder %s"
+#: ../wallace/__init__.py:226
+msgid "Accepted connection"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:201
+#: ../wallace/__init__.py:389
 #, python-format
-msgid "Could not set annotation %r on mail folder %r: %r"
+msgid "Could not write pid file %s"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:205
+#: ../wallace/module_optout.py:61 ../wallace/module_resources.py:94
 #, python-format
-msgid "Transferring folder %s from %s to %s"
+msgid "Issuing callback after processing to stage %s"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:265
+#: ../wallace/module_optout.py:62 ../wallace/module_resources.py:100
 #, python-format
-msgid "Undeleting %s to %s"
+msgid "Testing cb_action_%s()"
 msgstr ""
 
-#. start_max = (int)(time.time())
-#: .././pykolab/telemetry.py:588
+#: ../wallace/module_optout.py:64 ../wallace/module_resources.py:103
 #, python-format
-msgid "Expiring sessions that started before or on %d"
+msgid "Attempting to execute cb_action_%s()"
 msgstr ""
 
-#: .././pykolab/telemetry.py:601
+#. modules.next_module('optout')
+#: ../wallace/module_optout.py:70
 #, python-format
-msgid "Expiring session ID: %d"
+msgid "Consulting opt-out service for %r, %r"
 msgstr ""
 
-#: .././pykolab/telemetry.py:620
+#: ../wallace/module_optout.py:96
 #, python-format
-msgid "Session with ID %d expired from database"
+msgid "Running opt-out consult from envelope sender '%s "
 msgstr ""
 
-#: .././pykolab/telemetry.py:646
+#: ../wallace/module_optout.py:160
 #, python-format
-msgid "Operational Error in telemetry database: %s"
+msgid "Attempting to execute cb_action_%s(%r, %r)"
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:92
+#: ../wallace/module_optout.py:181
 #, python-format
-msgid "Creating %d Mails"
+msgid "Could not send request to optout_url %s"
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:116
+#: ../wallace/module_resources.py:81
 #, python-format
-msgid "Sending message %s through SMTP targeting user %s@%s"
+msgid "Resource Management called for %r, %r"
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:119
-#, python-format
-msgid "Sending message %s through LMTP targeting user %s@%s"
+#: ../wallace/module_resources.py:139
+msgid "Message is not an iTip message or does not contain any "
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:122
-#, python-format
-msgid "Saving message %s to IMAP (user %s, folder %s)"
+#: ../wallace/module_resources.py:147
+msgid "iTip events attached to this message contain the "
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:125 .././pykolab/tests.old/calendar.py:198
-#: .././pykolab/tests.old/contacts.py:145
-msgid "Somehow ended up NOT sending these messages"
+#: ../wallace/module_resources.py:174
+msgid "Not an iTip message, but sent to resource nonetheless. Reject message"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:146
-#, python-format
-msgid "Creating %d Events"
+#: ../wallace/module_resources.py:182
+msgid "No itips, no resources, pass along"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:177
-#, python-format
-msgid "Creating Calendar item number %d"
+#: ../wallace/module_resources.py:186
+msgid "iTips, but no resources, pass along"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:189
-#: .././pykolab/tests.old/contacts.py:136
+#: ../wallace/module_resources.py:218
 #, python-format
-msgid "Sending UID message %s through SMTP targeting user %s@%s"
+msgid "Resources: %r"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:192
-#: .././pykolab/tests.old/contacts.py:139
+#: ../wallace/module_resources.py:236
 #, python-format
-msgid "Sending UID message %s through LMTP targeting user %s@%s"
+msgid "Checking events in resource folder %r"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:195
-#: .././pykolab/tests.old/contacts.py:142
+#: ../wallace/module_resources.py:243
 #, python-format
-msgid "Saving UID message %s to IMAP (user %s, folder %s)"
+msgid "Mailbox for resource %r doesn't exist"
 msgstr ""
 
-#: .././pykolab/tests.old/zpush/test_000_001.py:47
+#: ../wallace/module_resources.py:256
 #, python-format
-msgid "Could not load %sItem from %s, skipping the testing."
+msgid "Fetching message UID %r from folder %r"
 msgstr ""
 
-#: .././pykolab/tests.old/zpush/test_000_000.py:77
+#: ../wallace/module_resources.py:295
 #, python-format
-msgid "Authentication failure for %s"
+msgid "Event %r conflicts with event "
 msgstr ""
 
-#: .././pykolab/tests.old/contacts.py:105
+#: ../wallace/module_resources.py:308
 #, python-format
-msgid "Creating %d Contacts"
+msgid "start: %r, end: %r, total: %r, messages: %r"
 msgstr ""
 
-#: .././pykolab/tests.old/contacts.py:124
+#: ../wallace/module_resources.py:315
 #, python-format
-msgid "Creating Contact item number %d"
+msgid "Polling for resource %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:207
+#: ../wallace/module_resources.py:319
 #, python-format
-msgid "Adding policy request to instance %s"
+msgid "Resource %r has been popped from the list"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:442
-msgid "Unauthorized access not allowed"
+#: ../wallace/module_resources.py:326
+msgid "Resource is a collection"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:481
-#: .././bin/kolab_smtp_access_policy.py:541
+#: ../wallace/module_resources.py:374 ../wallace/module_resources.py:424
 #, python-format
-msgid "Could not find envelope sender user %s"
+msgid "Adding event to %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:568
+#: ../wallace/module_resources.py:473
 #, python-format
-msgid "%s is unauthorized to send on behalf of %s"
+msgid "Method %r not really interesting for us."
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:578
+#: ../wallace/module_resources.py:481
 #, python-format
-msgid "User %s attempted to use envelope sender address %s "
+msgid "Raw iTip payload: %s"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:638
-#: .././bin/kolab_smtp_access_policy.py:649
-#, python-format
-msgid "Found user %s to be a delegate user of %s"
+#: ../wallace/module_resources.py:491
+msgid "Could not read iTip from message."
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:673
-#, python-format
-msgid "Verifying authenticated sender '%(sender)s' with "
+#: ../wallace/module_resources.py:513
+msgid "iTip event without a start"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:678
-#, python-format
-msgid "Verifying unauthenticated sender '%(sender)s' "
+#. end if c.name == "VEVENT"
+#. end for c in cal.walk()
+#. end if part.get_content_type() == "text/calendar"
+#. end for part in message.walk()
+#. if message.is_multipart()
+#: ../wallace/module_resources.py:543
+msgid "Message is not an iTip message (non-multipart message)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:695
+#: ../wallace/module_resources.py:564
 #, python-format
-msgid "Reproducing verify_recipient(%s, %s) from "
+msgid "Checking if email address %r belongs to a resource (collection)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:712
+#: ../wallace/module_resources.py:575 ../wallace/module_resources.py:649
+#: ../wallace/module_resources.py:699
 #, python-format
-msgid "Using authentication domain %s instead of %s"
+msgid "No resource (collection) records found for %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:722
+#: ../wallace/module_resources.py:583 ../wallace/module_resources.py:657
+#: ../wallace/module_resources.py:707
 #, python-format
-msgid "Domain %s is a primary domain"
+msgid "Resource record(s): %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:730
+#: ../wallace/module_resources.py:589 ../wallace/module_resources.py:664
+#: ../wallace/module_resources.py:714
 #, python-format
-msgid "Checking the recipient for domain %s that is not "
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:792
-msgid "Could not find this user, accepting"
+msgid "Resource record: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:862
-#: .././bin/kolab_smtp_access_policy.py:915
+#: ../wallace/module_resources.py:608
 #, python-format
-msgid "Sender %s is not allowed to send to "
+msgid "Raw itip_events: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:902
+#: ../wallace/module_resources.py:616
 #, python-format
-msgid "Reproducing verify_sender(%r) from cache, "
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:931
-msgid "Sender uses unauthorized envelope sender address"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:948
-msgid "Could not verify sender"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:955
-msgid "Verifying whether sender is allowed to send to "
+msgid "Raw set of attendees: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:969
+#: ../wallace/module_resources.py:624
 #, python-format
-msgid "Result is %r"
+msgid "Raw set of resources: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:974
-msgid "No recipient policy restrictions exist for this sender"
+#: ../wallace/module_resources.py:638
+#, python-format
+msgid "Checking if attendee %r is a resource (collection)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:983
-msgid "Found a recipient policy to apply for this sender."
+#: ../wallace/module_resources.py:671 ../wallace/module_resources.py:717
+msgid "Resource reservation made but no resource records found"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:998
+#: ../wallace/module_resources.py:689
 #, python-format
-msgid "Sender %s not allowed to send to recipient "
+msgid "Checking if resource %r is a resource (collection)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1029
-msgid "Cleaning up the cache"
+#: ../wallace/module_resources.py:721
+msgid "The following resources are being referred to in the "
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1066
+#. This is a nested module
+#: ../wallace/modules.py:96
 #, python-format
-msgid "Operational Error in caching: %s"
+msgid "Module Group: %s"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1117
-#, python-format
-msgid "Caching the policy result with timestamp %d"
+#: ../wallace/modules.py:107 ../wallace/modules.py:112
+msgid "No such module."
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1194
+#: ../wallace/modules.py:118
 #, python-format
-msgid "Returning action DEFER_IF_PERMIT: %s"
+msgid "Holding message in queue for manual review (%s by %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1199
+#: ../wallace/modules.py:121
 #, python-format
-msgid "Returning action DUNNO: %s"
+msgid "Deferring message in %s (by module %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1204
+#: ../wallace/modules.py:131
 #, python-format
-msgid "Returning action HOLD: %s"
+msgid "The time when the message was sent: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1209
+#: ../wallace/modules.py:132
 #, python-format
-msgid "Returning action PERMIT: %s"
+msgid "The time now: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1214
+#: ../wallace/modules.py:133
 #, python-format
-msgid "Returning action REJECT: %s"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1258
-msgid "Starting to loop for new request"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1267
-msgid "End of current request"
+msgid "The time delta: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1271
+#. TODO: Send NDR back to user
+#: ../wallace/modules.py:137
 #, python-format
-msgid "Getting line: %s"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1275
-msgid "Returning request"
+msgid "Message in file %s older then 5 days, deleting"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1332
+#: ../wallace/modules.py:162
 #, python-format
-msgid "Got request instance %s"
+msgid "Rejecting message in %s (by module %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1341
+#: ../wallace/modules.py:180
 #, python-format
-msgid "Request instance %s is in state %s"
+msgid ""
+"This is the email system Wallace at %s.\n"
+"\n"
+"I'm sorry to inform you we could not deliver the attached message\n"
+"to the following recipients:\n"
+"\n"
+"- %s\n"
+"\n"
+"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 ""
 
-#: .././bin/kolab_smtp_access_policy.py:1349
+#: ../wallace/modules.py:195
 #, python-format
-msgid "Request instance %s is not yet in DATA state"
+msgid ""
+"X-Wallace-Module: %s\n"
+"X-Wallace-Result: REJECT\n"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1361
+#: ../wallace/modules.py:248
 #, python-format
-msgid "Request instance %s reached DATA state"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1379
-msgid "Sender access denied"
+msgid "Accepting message in %s (by module %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1381
-msgid "Recipient access denied"
+#: ../wallace/modules.py:316
+#, python-format
+msgid "Module '%s' already registered"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index e0c4698..2f1048f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pykolab 0.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-09 14:25+0100\n"
+"POT-Creation-Date: 2012-08-11 15:04+0100\n"
 "PO-Revision-Date: 2012-05-09 14:25+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,793 +17,907 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .././wallace/__init__.py:37 .././bonnie/__init__.py:35
-#: .././kolabd/__init__.py:46 .././saslauthd/__init__.py:47
-msgid "Daemon Options"
-msgstr ""
-
-#: .././wallace/__init__.py:44 .././bonnie/__init__.py:41
-#: .././kolabd/__init__.py:52 .././saslauthd/__init__.py:53
-msgid "Fork to the background."
-msgstr ""
-
-#: .././wallace/__init__.py:52
-msgid "Bind address for Wallace."
+#: ../bin/kolab_smtp_access_policy.py:206
+#, python-format
+msgid "Adding policy request to instance %s"
 msgstr ""
 
-#: .././wallace/__init__.py:60 .././kolabd/__init__.py:58
-#: .././saslauthd/__init__.py:59
-msgid "Path to the PID file to use."
+#: ../bin/kolab_smtp_access_policy.py:446
+msgid "Unauthorized access not allowed"
 msgstr ""
 
-#: .././wallace/__init__.py:68
-msgid "Port that Wallace is supposed to use."
+#: ../bin/kolab_smtp_access_policy.py:467
+#: ../bin/kolab_smtp_access_policy.py:658
+msgid "Could not find recipient"
 msgstr ""
 
-#: .././wallace/__init__.py:102 .././wallace/__init__.py:126
-#: .././wallace/__init__.py:373 .././wallace/__init__.py:401
+#: ../bin/kolab_smtp_access_policy.py:486
+#: ../bin/kolab_smtp_access_policy.py:586
 #, python-format
-msgid "Number of threads currently running: %d"
+msgid "Could not find envelope sender user %s"
 msgstr ""
 
-#: .././wallace/__init__.py:111 .././wallace/__init__.py:135
+#: ../bin/kolab_smtp_access_policy.py:529
 #, python-format
-msgid "Continuing with %d threads currently running"
+msgid "Obtained authenticated user details for %r: %r"
 msgstr ""
 
-#. TODO: Apply throttling
-#: .././wallace/__init__.py:118
+#: ../bin/kolab_smtp_access_policy.py:608
 #, python-format
-msgid "Creating thread for message in %s"
+msgid "%s is unauthorized to send on behalf of %s"
 msgstr ""
 
-#: .././wallace/__init__.py:142
+#: ../bin/kolab_smtp_access_policy.py:618
 #, python-format
-msgid "Running thread %s for message file %s"
+msgid "User %s attempted to use envelope sender address %s "
 msgstr ""
 
-#: .././wallace/__init__.py:151
+#: ../bin/kolab_smtp_access_policy.py:682
+#: ../bin/kolab_smtp_access_policy.py:693
 #, python-format
-msgid "This message was already in module %s, delegating "
+msgid "Found user %s to be a delegate user of %s"
 msgstr ""
 
-#: .././wallace/__init__.py:160
+#: ../bin/kolab_smtp_access_policy.py:717
 #, python-format
-msgid "It was also in a certain stage: %s, letting "
+msgid "Verifying authenticated sender '%(sender)s' with "
 msgstr ""
 
-#: .././wallace/__init__.py:168 .././wallace/__init__.py:174
-#: .././wallace/__init__.py:184
+#: ../bin/kolab_smtp_access_policy.py:722
 #, python-format
-msgid "Executing module %s"
-msgstr ""
-
-#: .././wallace/__init__.py:211 .././bonnie/__init__.py:67
-#: .././kolabd/__init__.py:85 .././saslauthd/__init__.py:90
-msgid "Interrupted by user"
-msgstr ""
-
-#: .././wallace/__init__.py:215 .././wallace/__init__.py:225
-#: .././kolabd/__init__.py:90 .././kolabd/__init__.py:101
-msgid "Traceback occurred, please report a "
+msgid "Verifying unauthenticated sender '%(sender)s' "
 msgstr ""
 
-#: .././wallace/__init__.py:221 .././bonnie/__init__.py:75
-#: .././kolabd/__init__.py:96 .././saslauthd/__init__.py:98
+#: ../bin/kolab_smtp_access_policy.py:739
 #, python-format
-msgid "Type Error: %s"
-msgstr ""
-
-#: .././wallace/__init__.py:241
-msgid "Picking up deferred messages for wallace"
+msgid "Reproducing verify_recipient(%s, %s) from "
 msgstr ""
 
-#: .././wallace/__init__.py:261
+#: ../bin/kolab_smtp_access_policy.py:756
 #, python-format
-msgid "Picking up deferred messages for module %s"
-msgstr ""
-
-#. Sleep for 300 seconds before reprocessing the deferred queues.
-#. TODO: Consider using queue_run_delay from Postfix, which is where
-#. the default value of 300 seconds comes from.
-#: .././wallace/__init__.py:285
-msgid "Sleeping for 300 seconds"
+msgid "Using authentication domain %s instead of %s"
 msgstr ""
 
-#: .././wallace/__init__.py:310
+#: ../bin/kolab_smtp_access_policy.py:766
 #, python-format
-msgid "Could not bind to socket on port %d on bind "
-msgstr ""
-
-#: .././wallace/__init__.py:320
-msgid "Could not shut down socket"
+msgid "Domain %s is a primary domain"
 msgstr ""
 
-#: .././wallace/__init__.py:394
+#: ../bin/kolab_smtp_access_policy.py:774
 #, python-format
-msgid "Picking up spooled email file %s"
+msgid "Checking the recipient for domain %s that is not "
 msgstr ""
 
-#: .././wallace/__init__.py:424
-msgid "Accepted connection"
+#: ../bin/kolab_smtp_access_policy.py:790
+msgid "This recipient address is related to multiple "
 msgstr ""
 
-#. This is a nested module
-#: .././wallace/modules.py:96
+#: ../bin/kolab_smtp_access_policy.py:799
 #, python-format
-msgid "Module Group: %s"
+msgid "Recipient address %r not found. Allowing since "
 msgstr ""
 
-#: .././wallace/modules.py:107 .././wallace/modules.py:112
-msgid "No such module."
+#: ../bin/kolab_smtp_access_policy.py:827
+msgid "Invalid recipient"
 msgstr ""
 
-#: .././wallace/modules.py:118
-#, python-format
-msgid "Holding message in queue for manual review (%s by %s)"
+#: ../bin/kolab_smtp_access_policy.py:838
+msgid "Could not find this user, accepting"
 msgstr ""
 
-#: .././wallace/modules.py:121
+#: ../bin/kolab_smtp_access_policy.py:901
+#: ../bin/kolab_smtp_access_policy.py:954
 #, python-format
-msgid "Deferring message in %s (by module %s)"
+msgid "Sender %s is not allowed to send to "
 msgstr ""
 
-#: .././wallace/modules.py:131
+#: ../bin/kolab_smtp_access_policy.py:941
 #, python-format
-msgid "The time when the message was sent: %r"
+msgid "Reproducing verify_sender(%r) from cache, "
 msgstr ""
 
-#: .././wallace/modules.py:132
-#, python-format
-msgid "The time now: %r"
+#: ../bin/kolab_smtp_access_policy.py:970
+msgid "Sender uses unauthorized envelope sender address"
 msgstr ""
 
-#: .././wallace/modules.py:133
-#, python-format
-msgid "The time delta: %r"
+#: ../bin/kolab_smtp_access_policy.py:987
+msgid "Could not verify sender"
 msgstr ""
 
-#. TODO: Send NDR back to user
-#: .././wallace/modules.py:137
-#, python-format
-msgid "Message in file %s older then 5 days, deleting"
+#: ../bin/kolab_smtp_access_policy.py:994
+msgid "Verifying whether sender is allowed to send to "
 msgstr ""
 
-#: .././wallace/modules.py:162
+#: ../bin/kolab_smtp_access_policy.py:1008
 #, python-format
-msgid "Rejecting message in %s (by module %s)"
+msgid "Result is %r"
 msgstr ""
 
-#: .././wallace/modules.py:180
-#, python-format
-msgid ""
-"This is the email system Wallace at %s.\n"
-"\n"
-"I'm sorry to inform you we could not deliver the attached message\n"
-"to the following recipients:\n"
-"\n"
-"- %s\n"
-"\n"
-"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"
+#: ../bin/kolab_smtp_access_policy.py:1013
+msgid "No recipient policy restrictions exist for this sender"
 msgstr ""
 
-#: .././wallace/modules.py:195
-#, python-format
-msgid ""
-"X-Wallace-Module: %s\n"
-"X-Wallace-Result: REJECT\n"
+#: ../bin/kolab_smtp_access_policy.py:1022
+msgid "Found a recipient policy to apply for this sender."
 msgstr ""
 
-#: .././wallace/modules.py:248
+#: ../bin/kolab_smtp_access_policy.py:1037
 #, python-format
-msgid "Accepting message in %s (by module %s)"
+msgid "Sender %s not allowed to send to recipient "
 msgstr ""
 
-#: .././wallace/modules.py:316
-#, python-format
-msgid "Module '%s' already registered"
+#: ../bin/kolab_smtp_access_policy.py:1068
+msgid "Cleaning up the cache"
 msgstr ""
 
-#: .././wallace/modules.py:338 .././pykolab/tests/tests.py:183
-#: .././pykolab/cli/commands.py:183 .././pykolab/setup/components.py:243
+#: ../bin/kolab_smtp_access_policy.py:1105
 #, python-format
-msgid "Alias for %s"
+msgid "Operational Error in caching: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:57
+#: ../bin/kolab_smtp_access_policy.py:1156
 #, python-format
-msgid "Issuing callback after processing to stage %s"
+msgid "Caching the policy result with timestamp %d"
 msgstr ""
 
-#: .././wallace/module_optout.py:58
+#: ../bin/kolab_smtp_access_policy.py:1233
 #, python-format
-msgid "Testing cb_action_%s()"
+msgid "Returning action DEFER_IF_PERMIT: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:60
+#: ../bin/kolab_smtp_access_policy.py:1238
 #, python-format
-msgid "Attempting to execute cb_action_%s()"
+msgid "Returning action DUNNO: %s"
 msgstr ""
 
-#. modules.next_module('optout')
-#: .././wallace/module_optout.py:66
+#: ../bin/kolab_smtp_access_policy.py:1243
 #, python-format
-msgid "Consulting opt-out service for %r, %r"
+msgid "Returning action HOLD: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:92
+#: ../bin/kolab_smtp_access_policy.py:1248
 #, python-format
-msgid "Running opt-out consult from envelope sender '%s "
+msgid "Returning action PERMIT: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:156
+#: ../bin/kolab_smtp_access_policy.py:1253
 #, python-format
-msgid "Attempting to execute cb_action_%s(%r, %r)"
+msgid "Returning action REJECT: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:177
-#, python-format
-msgid "Could not send request to optout_url %s"
+#: ../bin/kolab_smtp_access_policy.py:1299
+msgid "Starting to loop for new request"
 msgstr ""
 
-#: .././setup-kolab.py:36 .././kolabtest.py:34 .././kolabd.py:31
-#: .././wallace.py:31 .././bonnie.py:31
-msgid "Cannot load pykolab/constants.py:"
+#: ../bin/kolab_smtp_access_policy.py:1306
+msgid "Timeout for policy request reading exceeded"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:89
-msgid "Could not import caching library, caching disabled"
+#: ../bin/kolab_smtp_access_policy.py:1312
+msgid "End of current request"
 msgstr ""
 
-#. Obtain 'kolabDelegate' from the envelope sender.
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:291
+#: ../bin/kolab_smtp_access_policy.py:1316
 #, python-format
-msgid "Obtaining envelope sender dn for %s"
+msgid "Getting line: %s"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:309
-#, python-format
-msgid ""
-"User %s attempted to use envelope sender address %s without authorization"
+#: ../bin/kolab_smtp_access_policy.py:1320
+msgid "Returning request"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:355
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:358
-#, python-format
-msgid "Found user %s to be a valid delegate user of %s"
+#: ../bin/kolab_smtp_access_policy.py:1346
+msgid "Access Policy Options"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:424
-#: .././bin/kolab_smtp_access_policy.py:1301
-msgid "Access Policy Options"
+#: ../bin/kolab_smtp_access_policy.py:1353
+msgid "SMTP Policy request timeout."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:431
-#: .././bin/kolab_smtp_access_policy.py:1308
+#: ../bin/kolab_smtp_access_policy.py:1359
 msgid "Verify the recipient access policy."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:437
-#: .././bin/kolab_smtp_access_policy.py:1314
+#: ../bin/kolab_smtp_access_policy.py:1365
 msgid "Verify the sender access policy."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:443
-#: .././bin/kolab_smtp_access_policy.py:1320
+#: ../bin/kolab_smtp_access_policy.py:1371
 msgid "Allow unauthenticated senders."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:464
-msgid "Verifying sender."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:468
-msgid "No sender specified."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:469
-msgid "Invalid sender"
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:473
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:521
-msgid "No SASL username in request."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:475
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:524
-msgid "Not allowing unauthenticated senders."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:476
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:525
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:534
-msgid "Access denied"
+#: ../bin/kolab_smtp_access_policy.py:1385
+#, python-format
+msgid "Got request instance %s"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:478
-msgid "Allowing unauthenticated senders."
+#: ../bin/kolab_smtp_access_policy.py:1394
+#, python-format
+msgid "Request instance %s is in state %s"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:484
+#: ../bin/kolab_smtp_access_policy.py:1402
 #, python-format
-msgid "Allowing authenticated sender %s to send as %s."
+msgid "Request instance %s is not yet in DATA state"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:492
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:504
+#: ../bin/kolab_smtp_access_policy.py:1414
 #, python-format
-msgid "Authenticated as sender %s"
+msgid "Request instance %s reached DATA state"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:515
-msgid "Verifying recipient."
+#: ../bin/kolab_smtp_access_policy.py:1432
+msgid "Sender access denied"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:518
-#: .././bin/kolab_smtp_access_policy.py:781
-msgid "Invalid recipient"
+#: ../bin/kolab_smtp_access_policy.py:1434
+msgid "Recipient access denied"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:536
-#: .././bin/kolab_smtp_access_policy.py:1383
+#: ../bin/kolab_smtp_access_policy.py:1436
 msgid "No objections"
 msgstr ""
 
-#: .././play/confmgmt/db.py:59 .././play/conf.py:280
-msgid "Dropping all tables..."
-msgstr ""
-
-#: .././play/confmgmt/db.py:62 .././play/conf.py:283
-msgid "Creating the necessary tables..."
-msgstr ""
-
-#: .././play/confmgmt/db.py:69 .././play/conf.py:290
-#: .././play/roundcube_database/__init__.py:57
-#: .././play/roundcube_database/users.py:114 .././pykolab/telemetry.py:652
-msgid "No database available"
-msgstr ""
-
-#: .././play/confmgmt.py:74
-#, python-format
-msgid "Searching for service with name %s"
-msgstr ""
-
-#: .././play/confmgmt.py:77
-#, python-format
-msgid "Found service %s"
+#: ../conf.py:37 ../kolab.py:34 ../saslauthd.py:33
+msgid "Cannot load pykolab/logger.py:"
 msgstr ""
 
-#: .././play/confmgmt.py:82
-#, python-format
-msgid "Searching for role with name %s"
+#: ../kolabd/__init__.py:49 ../saslauthd/__init__.py:48
+#: ../wallace/__init__.py:65
+msgid "Daemon Options"
 msgstr ""
 
-#: .././play/confmgmt.py:85
-#, python-format
-msgid "Found role %s"
+#: ../kolabd/__init__.py:56 ../saslauthd/__init__.py:55
+#: ../wallace/__init__.py:72
+msgid "Fork to the background."
 msgstr ""
 
-#: .././play/confmgmt.py:89
-#, python-format
-msgid "Searching for file with path %s"
+#: ../kolabd/__init__.py:65 ../saslauthd/__init__.py:64
+#: ../wallace/__init__.py:98
+msgid "Path to the PID file to use."
 msgstr ""
 
-#: .././play/confmgmt.py:92
-#, python-format
-msgid "File with path %s not found, adding to database"
+#: ../kolabd/__init__.py:74 ../saslauthd/__init__.py:73
+#: ../wallace/__init__.py:115
+msgid "Run as user USERNAME"
 msgstr ""
 
-#: .././play/confmgmt.py:97
-#, python-format
-msgid "Adding file with path %s to service with name %s"
+#: ../kolabd/__init__.py:84 ../saslauthd/__init__.py:83
+#: ../wallace/__init__.py:89
+msgid "Run as group GROUPNAME"
 msgstr ""
 
-#: .././play/confmgmt.py:101
+#: ../kolabd/__init__.py:122 ../pykolab/utils.py:151
+#: ../wallace/__init__.py:288
 #, python-format
-msgid "Adding setting with key %s (%r, %r)"
+msgid "Group %s does not exist"
 msgstr ""
 
-#: .././play/confmgmt.py:106
+#: ../kolabd/__init__.py:131 ../wallace/__init__.py:297
 #, python-format
-msgid "Adding setting %s to file with path %s"
+msgid "Switching real and effective group id to %d"
 msgstr ""
 
-#: .././play/confmgmt.py:110
+#: ../kolabd/__init__.py:153 ../pykolab/utils.py:175
+#: ../wallace/__init__.py:319
 #, python-format
-msgid "Adding role with name %s to setting with key %s"
+msgid "User %s does not exist"
 msgstr ""
 
-#: .././play/rolequota/__init__.py:53
-#: .././pykolab/plugins/dynamicquota/__init__.py:50
+#: ../kolabd/__init__.py:163 ../wallace/__init__.py:329
 #, python-format
-msgid "No keyword %s passed to set_user_folder_quota"
+msgid "Switching real and effective user id to %d"
 msgstr ""
 
-#: .././play/roundcube_database/__init__.py:51
-#: .././play/roundcube_database/users.py:108
-#, python-format
-msgid "Operational Error in Roundcube database: %s"
+#: ../kolabd/__init__.py:172 ../wallace/__init__.py:338
+msgid "Could not change real and effective uid and/or gid"
 msgstr ""
 
-#: .././kwap/kwap/controllers/secure.py:25
-msgid "Secure Controller here"
+#: ../kolabd/__init__.py:192 ../saslauthd/__init__.py:122
+#: ../wallace/__init__.py:358
+msgid "Interrupted by user"
 msgstr ""
 
-#: .././kwap/kwap/controllers/root.py:103
-msgid "Wrong credentials"
+#: ../kolabd/__init__.py:197 ../kolabd/__init__.py:208
+#: ../wallace/__init__.py:362 ../wallace/__init__.py:372
+msgid "Traceback occurred, please report a "
 msgstr ""
 
-#: .././kwap/kwap/controllers/root.py:118
+#: ../kolabd/__init__.py:203 ../saslauthd/__init__.py:130
+#: ../wallace/__init__.py:368
 #, python-format
-msgid "Welcome back, %s!"
-msgstr ""
-
-#: .././kwap/kwap/controllers/root.py:128
-msgid "We hope to see you soon!"
-msgstr ""
-
-#: .././saslauthd.py:33 .././kolab.py:34 .././conf.py:37
-msgid "Cannot load pykolab/logger.py:"
-msgstr ""
-
-#: .././bonnie/__init__.py:71 .././bonnie/__init__.py:79
-#: .././saslauthd/__init__.py:94 .././saslauthd/__init__.py:102
-msgid "Traceback occurred, please report a bug at http://bugzilla.kolabsys.com"
+msgid "Type Error: %s"
 msgstr ""
 
-#: .././kolabd/__init__.py:116 .././pykolab/auth/ldap/__init__.py:1291
-#: .././pykolab/cli/cmd_sync.py:33
+#: ../kolabd/__init__.py:223 ../pykolab/auth/ldap/__init__.py:1591
+#: ../pykolab/cli/cmd_sync.py:36
 msgid "Listing domains..."
 msgstr ""
 
-#: .././kolabd/__init__.py:148
+#: ../kolabd/__init__.py:256
 #, python-format
 msgid "added domains: %r, removed domains: %r"
 msgstr ""
 
-#: .././pykolab/__init__.py:50
-msgid "Returning thread local configuration"
-msgstr ""
-
-#: .././pykolab/tests/tests.py:53
-msgid "List tests"
-msgstr ""
-
-#. This is a nested test
-#: .././pykolab/tests/tests.py:86
-#, python-format
-msgid "Test Suite: %s"
-msgstr ""
-
-#: .././pykolab/tests/tests.py:100 .././pykolab/tests/tests.py:105
-msgid "No such test."
-msgstr ""
-
-#: .././pykolab/tests/tests.py:157 .././pykolab/tests/tests.py:161
-#, python-format
-msgid "Test '%s' already registered"
-msgstr ""
-
-#: .././pykolab/tests/tests.py:191 .././pykolab/cli/commands.py:191
-#: .././pykolab/setup/components.py:251
-msgid "Not yet implemented"
-msgstr ""
-
-#: .././pykolab/tests/__init__.py:39
-msgid "Test Options"
-msgstr ""
-
-#: .././pykolab/tests/__init__.py:45
-msgid "Run tests in suite SUITE. Implies a certain set of items being tested."
-msgstr ""
-
-#: .././pykolab/tests/imap/test_login.py:44
-#, python-format
-msgid "Connecting at %s"
+#: ../kolabd.py:31 ../setup-kolab.py:36 ../wallace.py:31
+msgid "Cannot load pykolab/constants.py:"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:46
+#: ../pykolab/auth/__init__.py:94
 #, python-format
-msgid "Connected at %s"
+msgid "Called for domain %r"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:51
+#: ../pykolab/auth/__init__.py:107 ../pykolab/auth/__init__.py:116
 #, python-format
-msgid "Logging in at %s"
+msgid "Using section %s and domain %s"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:53
+#: ../pykolab/auth/__init__.py:121
 #, python-format
-msgid "Logged in at %s"
+msgid "Connecting to Authentication backend for domain %s"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:60
+#: ../pykolab/auth/__init__.py:132
 #, python-format
-msgid "Test failure in %s"
+msgid "Section %s has no option 'auth_mechanism'"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:94
+#: ../pykolab/auth/__init__.py:139
 #, python-format
-msgid "Called for domain %r"
+msgid "Section %s has auth_mechanism: %r"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:107 .././pykolab/auth/__init__.py:116
-#, python-format
-msgid "Using section %s and domain %s"
+#: ../pykolab/auth/__init__.py:148 ../pykolab/auth/__init__.py:157
+msgid "Starting LDAP..."
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:121
+#: ../pykolab/auth/ldap/cache.py:109
 #, python-format
-msgid "Connecting to Authentication backend for domain %s"
+msgid "Inserting cache entry %r"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:132
+#: ../pykolab/auth/ldap/cache.py:122
 #, python-format
-msgid "Section %s has no option 'auth_mechanism'"
+msgid "Updating timestamp for cache entry %r"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:139
+#: ../pykolab/auth/ldap/cache.py:129
 #, python-format
-msgid "Section %s has auth_mechanism: %r"
-msgstr ""
-
-#: .././pykolab/auth/__init__.py:148 .././pykolab/auth/__init__.py:157
-msgid "Starting LDAP..."
+msgid "Updating result_attribute for cache entry %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:51
+#: ../pykolab/auth/ldap/__init__.py:51
 msgid "Python LDAP library does not support persistent search"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:141
+#: ../pykolab/auth/ldap/__init__.py:142
 #, python-format
 msgid "Attempting to authenticate user %s in realm %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:181
+#: ../pykolab/auth/ldap/__init__.py:184
 #, python-format
 msgid "Binding with user_dn %s and password %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:190
+#: ../pykolab/auth/ldap/__init__.py:194
 #, python-format
 msgid "Failed to authenticate as user %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:205
+#: ../pykolab/auth/ldap/__init__.py:211
 msgid "Connecting to LDAP..."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:209
+#: ../pykolab/auth/ldap/__init__.py:215
 #, python-format
 msgid "Attempting to use LDAP URI %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:345
+#: ../pykolab/auth/ldap/__init__.py:357
 #, python-format
 msgid "Finding recipient with filter %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:398
+#: ../pykolab/auth/ldap/__init__.py:425
+#, python-format
+msgid "Finding resource with filter %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:448
+#, python-format
+msgid "Using timestamp %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:480
 #, python-format
 msgid "Applying recipient policy to %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:415
+#: ../pykolab/auth/ldap/__init__.py:497
 #, python-format
 msgid "Using mail attributes: %r, with primary %r and "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:426
+#: ../pykolab/auth/ldap/__init__.py:508
 #, python-format
 msgid "key %r not in entry"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:428
+#: ../pykolab/auth/ldap/__init__.py:510
 #, python-format
 msgid "key %r is the prim. mail attr."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:430
+#: ../pykolab/auth/ldap/__init__.py:512
 msgid "prim. mail pol. is not empty"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:433
+#: ../pykolab/auth/ldap/__init__.py:515
 #, python-format
 msgid "key %r is the sec. mail attr."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:435
+#: ../pykolab/auth/ldap/__init__.py:517
 msgid "sec. mail pol. is not empty"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:438
-#: .././pykolab/auth/ldap/__init__.py:451
+#: ../pykolab/auth/ldap/__init__.py:520 ../pykolab/auth/ldap/__init__.py:533
 #, python-format
 msgid "Attributes %r are not yet available for entry %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:492
+#: ../pykolab/auth/ldap/__init__.py:574
 #, python-format
 msgid "No results for mail address %s found"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:503
+#: ../pykolab/auth/ldap/__init__.py:585
 #, python-format
 msgid "1 result for address %s found, verifying"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:513
+#: ../pykolab/auth/ldap/__init__.py:595
 #, python-format
 msgid "Too bad, primary email address %s "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:524
-#: .././pykolab/auth/ldap/__init__.py:613
+#: ../pykolab/auth/ldap/__init__.py:606 ../pykolab/auth/ldap/__init__.py:695
 msgid "Address assigned to us"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:579
+#: ../pykolab/auth/ldap/__init__.py:661
 #, python-format
 msgid "No results for address %s found"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:590
+#: ../pykolab/auth/ldap/__init__.py:672
 #, python-format
 msgid "1 result for address %s found, "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:601
+#: ../pykolab/auth/ldap/__init__.py:683
 msgid "Too bad, secondary email "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:655
+#: ../pykolab/auth/ldap/__init__.py:710
+msgid "Recipient policy composed the following set of secondary "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:716
+#, python-format
+msgid "Secondary mail addresses that we want is not None: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:727
+msgid "Avoiding the duplication of the primary mail "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:738
+#, python-format
+msgid "Entry is getting secondary mail addresses: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:746
+msgid "Entry did not have any secondary mail "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:772
 #, python-format
 msgid "Entry modifications list: %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:698
+#: ../pykolab/auth/ldap/__init__.py:792
+#, python-format
+msgid "Setting entry attribute %r to %r for %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:828
+#, python-format
+msgid "Could not update dn %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:841
 #, python-format
 msgid "Using filter %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:736
+#: ../pykolab/auth/ldap/__init__.py:879
+#, python-format
+msgid "About to consider the user quota for %r (used: %r, "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:945
 msgid "Invalid bind credentials"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:989
+#: ../pykolab/auth/ldap/__init__.py:1229
 #, python-format
 msgid "Current changelog entry %s with %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:996
+#: ../pykolab/auth/ldap/__init__.py:1242
 #, python-format
 msgid "Result from recipient policy: %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1227
+#: ../pykolab/auth/ldap/__init__.py:1385
+#, python-format
+msgid "Kolab user %s does not have a result attribute %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1527
 #, python-format
 msgid "Finding domain root dn for domain %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1315
+#: ../pykolab/auth/ldap/__init__.py:1615
 msgid "Authentication database DOWN"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1394
+#: ../pykolab/auth/ldap/__init__.py:1699 ../pykolab/auth/ldap/__init__.py:1734
 #, python-format
 msgid "Entry type: %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1492
+#: ../pykolab/auth/ldap/__init__.py:1822
 msgid "LDAP Search Result Data Entry:"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1508
+#: ../pykolab/auth/ldap/__init__.py:1838
 msgid "Entry Change Notification attributes:"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1513
+#: ../pykolab/auth/ldap/__init__.py:1843
 #, python-format
 msgid "Change Type: %r (%r)"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1521
+#: ../pykolab/auth/ldap/__init__.py:1851
 #, python-format
 msgid "Previous DN: %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1575
+#: ../pykolab/auth/ldap/__init__.py:1906
 #, python-format
 msgid "Object %s searched no longer exists"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1583
+#: ../pykolab/auth/ldap/__init__.py:1916
 #, python-format
 msgid "%d results..."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1677
+#: ../pykolab/auth/ldap/__init__.py:2014
 #, python-format
 msgid "Searching with filter %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1721
+#: ../pykolab/auth/ldap/__init__.py:2058
 #, python-format
 msgid "Checking for support for %s on %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/cache.py:109
-#, python-format
-msgid "Inserting cache entry %r"
+#: ../pykolab/cli/cmd_add_domain.py:36 ../pykolab/cli/cmd_create_mailbox.py:36
+#: ../pykolab/cli/cmd_export_mailbox.py:33
+#: ../pykolab/cli/cmd_list_mailboxes.py:39
+msgid "CLI Options"
 msgstr ""
 
-#: .././pykolab/auth/ldap/cache.py:122
-#, python-format
-msgid "Updating timestamp for cache entry %r"
+#: ../pykolab/cli/cmd_add_domain.py:42
+msgid "Add domain as alias for DOMAIN"
 msgstr ""
 
-#: .././pykolab/auth/ldap/cache.py:128
-#, python-format
-msgid "Updating result_attribute for cache entry %r"
+#: ../pykolab/cli/cmd_add_domain.py:47
+msgid "Add a new domain or domain alias."
 msgstr ""
 
-#: .././pykolab/auth/sql/__init__.py:44
-msgid "Connecting to SQL..."
+#: ../pykolab/cli/cmd_add_domain.py:55
+msgid "Could not find credentials with sufficient permissions"
 msgstr ""
 
-#: .././pykolab/utils.py:92
-msgid "Please answer 'yes' or 'no'."
+#: ../pykolab/cli/cmd_add_domain.py:80 ../pykolab/wap_client/__init__.py:113
+msgid "Invalid parent domain"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:87
-#, python-format
-msgid "Setting %s to %r (from defaults)"
+#: ../pykolab/cli/cmd_add_domain.py:86
+msgid "Domain name"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:106
-#, python-format
-msgid "Setting %s to %r (from CLI, verified)"
+#: ../pykolab/cli/cmd_create_mailbox.py:41
+msgid "Set metadata for folder to ANNOTATION=VALUE"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:109
-#, python-format
-msgid "Setting %s to %r (from CLI, not checked)"
+#: ../pykolab/cli/cmd_create_mailbox.py:50
+msgid "Invalid argument"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:150 .././pykolab/conf/__init__.py:207
-#, python-format
-msgid "Setting %s_%s to '****' (from configuration file)"
+#: ../pykolab/cli/cmd_create_mailbox.py:58
+msgid "Invalid argument for metadata"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:152 .././pykolab/conf/__init__.py:209
-#, python-format
-msgid "Setting %s_%s to %r (from configuration file)"
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:45
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:49
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:50
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:55
+msgid "ACI Subject"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:162
-msgid "Setting options from configuration file"
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:48
+#: ../pykolab/cli/cmd_list_mailbox_acls.py:41
+#: ../pykolab/cli/cmd_list_mailbox_metadata.py:41
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:54
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:54
+msgid "Folder name"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:223
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:60
+#: ../pykolab/cli/cmd_list_mailbox_acls.py:52
+#: ../pykolab/cli/cmd_list_mailbox_metadata.py:52
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:67
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:67
 #, python-format
-msgid "Configuration file %s not readable"
+msgid "No such folder %r"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:226
-#, python-format
-msgid "Reading configuration file %s"
+#: ../pykolab/cli/cmd_delete_mailbox.py:46
+msgid "No mailbox specified"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:230
+#: ../pykolab/cli/cmd_export_mailbox.py:38
+msgid "All folders this user has access to"
+msgstr ""
+
+#: ../pykolab/cli/cmd_export_mailbox.py:108
+#, python-format
+msgid "%s is not a directory"
+msgstr ""
+
+#: ../pykolab/cli/cmd_export_mailbox.py:118
+#, python-format
+msgid "ZIP file at %s.zip"
+msgstr ""
+
+#: ../pykolab/cli/cmd_export_mailbox.py:120
+#, python-format
+msgid "No directories found for user %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_mailboxes.py:44
+msgid "Display raw IMAP UTF-7 folder names"
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_mailboxes.py:75
+#, python-format
+msgid "Appending folder search for %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:49
+msgid "Invalid or unqualified email address."
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:57
+#, python-format
+msgid "No recipient found for email address %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:60
+#, python-format
+msgid "Found the following recipient(s): %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:66
+#, python-format
+msgid "Using the following mail attributes: %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:90
+msgid "Found the following recipients:"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:48
+msgid "No target mailbox name specified"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:50
+msgid "No source mailbox name specified"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:62
+#, python-format
+msgid "Source folder %r does not exist"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:66
+#, python-format
+msgid "Target folder %r already exists"
+msgstr ""
+
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:47
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:51
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:56
+msgid "ACI Permissions"
+msgstr ""
+
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:47
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:51
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:56
+msgid "Metadata value"
+msgstr ""
+
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:50
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:55
+msgid "Metadata path"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:41
+#, python-format
+msgid "Found %d domains in %d seconds"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:51
+#, python-format
+msgid "Running for domain %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:57
+#, python-format
+msgid "Synchronizing users for %s took %d seconds"
+msgstr ""
+
+#. This is a nested command
+#. This is a nested component
+#: ../pykolab/cli/commands.py:98 ../pykolab/setup/components.py:90
+#, python-format
+msgid "Command Group: %s"
+msgstr ""
+
+#: ../pykolab/cli/commands.py:109 ../pykolab/cli/commands.py:114
+msgid "No such command."
+msgstr ""
+
+#: ../pykolab/cli/commands.py:165 ../pykolab/setup/components.py:231
+#, python-format
+msgid "Command '%s' already registered"
+msgstr ""
+
+#: ../pykolab/cli/commands.py:190 ../pykolab/setup/components.py:257
+#: ../wallace/modules.py:338
+#, python-format
+msgid "Alias for %s"
+msgstr ""
+
+#: ../pykolab/cli/commands.py:198 ../pykolab/setup/components.py:265
+msgid "Not yet implemented"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:40
+msgid "Unspecified command issue identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:50
+msgid "Invalid command issue identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:60
+#: ../pykolab/cli/telemetry/cmd_examine_session.py:65
+msgid "Invalid session identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:75
+#: ../pykolab/cli/telemetry/cmd_examine_session.py:100
+#, python-format
+msgid "Session by %s on server %s"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_session.py:43
+msgid "Unspecified session identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_list_sessions.py:35
+msgid "List Options"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_list_sessions.py:40
+msgid "Display sessions since ..."
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_list_sessions.py:58
+#, python-format
+msgid "Session for user %s started at %s with ID %s"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:57 ../pykolab/conf/entitlement.py:80
+#: ../pykolab/conf/entitlement.py:98 ../pykolab/conf/entitlement.py:116
+#: ../pykolab/conf/entitlement.py:230 ../pykolab/conf/entitlement.py:246
+#: ../pykolab/conf/entitlement.py:262
+msgid "Invalid entitlement verification "
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:120 ../pykolab/conf/entitlement.py:123
+msgid "Invalid entitlement certificate"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:132
+#, python-format
+msgid "Parsing entitlement file %s"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:141
+#, python-format
+msgid "License file %s not readable!"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:147
+msgid "No entitlement directory found"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:87
+#, python-format
+msgid "Setting %s to %r (from defaults)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:106
+#, python-format
+msgid "Setting %s to %r (from CLI, verified)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:109
+#, python-format
+msgid "Setting %s to %r (from CLI, not checked)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:150 ../pykolab/conf/__init__.py:207
+#, python-format
+msgid "Setting %s_%s to '****' (from configuration file)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:152 ../pykolab/conf/__init__.py:209
+#, python-format
+msgid "Setting %s_%s to %r (from configuration file)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:162
+msgid "Setting options from configuration file"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:223
+#, python-format
+msgid "Configuration file %s not readable"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:226
+#, python-format
+msgid "Reading configuration file %s"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:230
 #, python-format
 msgid "Invalid configuration file %s"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:233
+#: ../pykolab/conf/__init__.py:233
 #, python-format
 msgid "No master configuration section [kolab] in configuration file %s"
 msgstr ""
@@ -811,1088 +925,1335 @@ msgstr ""
 #. #
 #. # Runtime Options
 #. #
-#: .././pykolab/conf/__init__.py:267
+#: ../pykolab/conf/__init__.py:267
 msgid "Runtime Options"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:272
+#: ../pykolab/conf/__init__.py:272
 msgid "Configuration file to use"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:278
+#: ../pykolab/conf/__init__.py:278
 msgid "Set the debugging "
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:286
+#: ../pykolab/conf/__init__.py:286
 msgid "Set the logging level. "
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:294
+#: ../pykolab/conf/__init__.py:294
 msgid "Log file to use"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:300
+#: ../pykolab/conf/__init__.py:300
 msgid "Be quiet."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:306
+#: ../pykolab/conf/__init__.py:306
 msgid "Answer yes to all questions."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:328
+#: ../pykolab/conf/__init__.py:328
 msgid "No command supplied"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:411
+#: ../pykolab/conf/__init__.py:411
 msgid "Insufficient options. Need section, key and value -in that order."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:414
+#: ../pykolab/conf/__init__.py:414
 #, python-format
 msgid "No section '%s' exists."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:445
+#: ../pykolab/conf/__init__.py:445
 #, python-format
 msgid "Setting %s to %r (from the default values for CLI options)"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:514
+#: ../pykolab/conf/__init__.py:514
 #, python-format
 msgid "Could not execute configuration function: %s"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:522
+#: ../pykolab/conf/__init__.py:522
 #, python-format
 msgid "Option %s/%s does not exist in config file %s, pulling from defaults"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:530 .././pykolab/conf/__init__.py:533
+#: ../pykolab/conf/__init__.py:530 ../pykolab/conf/__init__.py:533
 msgid "Option does not exist in defaults."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:531 .././pykolab/conf/__init__.py:534
-msgid "Not available"
-msgstr ""
-
-#: .././pykolab/conf/__init__.py:543
+#: ../pykolab/conf/__init__.py:543
 #, python-format
 msgid "Configuration file %s not readable."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:546
+#: ../pykolab/conf/__init__.py:546
 #, python-format
 msgid "Configuration file %s does not exist."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:551
+#: ../pykolab/conf/__init__.py:551
 msgid ""
 "WARNING: A negative debug level value does not make this program be any more "
 "silent."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:557
+#: ../pykolab/conf/__init__.py:557
 msgid "This program has 9 levels of verbosity. Using the maximum of 9."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:565 .././pykolab/conf/__init__.py:571
+#: ../pykolab/conf/__init__.py:565 ../pykolab/conf/__init__.py:571
 msgid "Cannot start SASL authentication daemon"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:582
+#: ../pykolab/conf/__init__.py:582
 msgid "No imaplib library found."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:592
+#: ../pykolab/conf/__init__.py:592
 msgid "No LMTP class found in the smtplib library."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:602
+#: ../pykolab/conf/__init__.py:602
 msgid "No SMTP class found in the smtplib library."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:616
+#: ../pykolab/conf/__init__.py:616
 #, python-format
 msgid "Found you specified a specific set of items to test: %s"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:624
+#: ../pykolab/conf/__init__.py:624
 #, python-format
 msgid "Selectively selecting: %s"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:57 .././pykolab/conf/entitlement.py:80
-#: .././pykolab/conf/entitlement.py:98 .././pykolab/conf/entitlement.py:116
-#: .././pykolab/conf/entitlement.py:229 .././pykolab/conf/entitlement.py:245
-#: .././pykolab/conf/entitlement.py:261
-msgid "Invalid entitlement verification "
+#: ../pykolab/constants.py.in:40
+msgid "PyKolab is a Kolab Systems product. For more information "
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:120 .././pykolab/conf/entitlement.py:123
-msgid "Invalid entitlement certificate"
+#: ../pykolab/constants.py.in:54
+msgid "WARNING"
+msgstr ""
+
+#: ../pykolab/constants.py.in:54
+msgid "The Fully Qualified "
+msgstr ""
+
+#: ../pykolab/constants.py.in:75
+msgid "389 Directory Server or Red Hat Directory Server"
+msgstr ""
+
+#: ../pykolab/constants.py.in:79 ../pykolab/constants.py.in:83
+msgid "OpenLDAP or compatible"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:132
+#: ../pykolab/imap/cyrus.py:79
 #, python-format
-msgid "Parsing entitlement file %s"
+msgid "Could not connect to Cyrus IMAP server %r"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:141
+#: ../pykolab/imap/cyrus.py:134
 #, python-format
-msgid "License file %s not readable!"
+msgid "Continuing with separator: %r"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:146
-msgid "No entitlement directory found"
+#: ../pykolab/imap/cyrus.py:139
+msgid "Detected we are running in a Murder topology"
 msgstr ""
 
-#: .././pykolab/logger.py:89
+#: ../pykolab/imap/cyrus.py:143
+msgid "This system is not part of a murder topology"
+msgstr ""
+
+#: ../pykolab/imap/cyrus.py:164
 #, python-format
-msgid "Cannot log to file %s: %s"
+msgid "Checking actual backend server for folder %s through annotations"
 msgstr ""
 
-#: .././pykolab/constants.py:40
-msgid "PyKolab is a Kolab Systems product. For more information "
+#: ../pykolab/imap/cyrus.py:179
+#, python-format
+msgid "Could not get the annotations after %s tries."
 msgstr ""
 
-#: .././pykolab/constants.py:54
-msgid "WARNING"
+#: ../pykolab/imap/cyrus.py:183
+#, python-format
+msgid "No annotations for %s: %r"
 msgstr ""
 
-#: .././pykolab/constants.py:54
-msgid "The Fully Qualified "
+#: ../pykolab/imap/cyrus.py:190
+#, python-format
+msgid "Server for INBOX folder %s is %s"
 msgstr ""
 
-#: .././pykolab/constants.py:75
-msgid "389 Directory Server or Red Hat Directory Server"
+#: ../pykolab/imap/cyrus.py:202
+#, python-format
+msgid "Setting quota for folder %s to %s"
 msgstr ""
 
-#: .././pykolab/constants.py:79 .././pykolab/constants.py:83
-msgid "OpenLDAP or compatible"
+#: ../pykolab/imap/cyrus.py:206
+#, python-format
+msgid "Could not set quota for mailfolder %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_list_sessions.py:35
-msgid "List Options"
+#: ../pykolab/imap/cyrus.py:215
+#, python-format
+msgid "Moving INBOX folder %s to %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_list_sessions.py:40
-msgid "Display sessions since ..."
+#: ../pykolab/imap/cyrus.py:227
+#, python-format
+msgid "Setting annotation %s on folder %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_list_sessions.py:58
+#: ../pykolab/imap/cyrus.py:234
 #, python-format
-msgid "Session for user %s started at %s with ID %s"
+msgid "Could not set annotation %r on mail folder %r: %r"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_session.py:43
-msgid "Unspecified session identifier"
+#: ../pykolab/imap/cyrus.py:238
+#, python-format
+msgid "Transferring folder %s from %s to %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_session.py:65
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:60
-msgid "Invalid session identifier"
+#: ../pykolab/imap/cyrus.py:298
+#, python-format
+msgid "Undeleting %s to %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_session.py:100
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:75
+#: ../pykolab/imap/__init__.py:45
 #, python-format
-msgid "Session by %s on server %s"
+msgid "Cleaning up ACL entries for %s across all folders"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:40
-msgid "Unspecified command issue identifier"
+#: ../pykolab/imap/__init__.py:60
+#, python-format
+msgid "Cleaning up ACL entries referring to identifier %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:50
-msgid "Invalid command issue identifier"
+#: ../pykolab/imap/__init__.py:69
+#, python-format
+msgid "Iterating over %d folders"
 msgstr ""
 
-#. This is a nested command
-#. This is a nested component
-#: .././pykolab/cli/commands.py:95 .././pykolab/setup/components.py:88
+#. Set the ACL to '' (effectively deleting the ACL entry)
+#: ../pykolab/imap/__init__.py:82
 #, python-format
-msgid "Command Group: %s"
+msgid "Removing acl %r for subject %r from folder %r"
 msgstr ""
 
-#: .././pykolab/cli/commands.py:106 .././pykolab/cli/commands.py:111
-msgid "No such command."
+#: ../pykolab/imap/__init__.py:143
+#, python-format
+msgid "Logging on to Cyrus IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/commands.py:161 .././pykolab/setup/components.py:217
+#: ../pykolab/imap/__init__.py:152
 #, python-format
-msgid "Command '%s' already registered"
+msgid "Logging on to Dovecot IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_delete_mailbox.py:43
-msgid "No mailbox specified"
+#: ../pykolab/imap/__init__.py:161
+#, python-format
+msgid "Logging on to generic IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_list_mailboxes.py:35
-#: .././pykolab/cli/cmd_export_mailbox.py:33
-msgid "CLI Options"
+#: ../pykolab/imap/__init__.py:179
+#, python-format
+msgid "Reusing existing IMAP server connection to %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_list_mailboxes.py:40
-msgid "Display raw UTF-7 folder names"
+#: ../pykolab/imap/__init__.py:181
+#, python-format
+msgid "Reconnecting to IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:38
-msgid "All folders this user has access to"
+#: ../pykolab/imap/__init__.py:197
+msgid "Called imap.disconnect() on a server that "
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:108
+#: ../pykolab/imap/__init__.py:213
 #, python-format
-msgid "%s is not a directory"
+msgid "%r has no attribute %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:118
+#: ../pykolab/imap/__init__.py:286
+msgid "Private annotations need to be set using the appropriate user account."
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:319 ../pykolab/imap/__init__.py:354
 #, python-format
-msgid "ZIP file at %s.zip"
+msgid "Creating new shared folder %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:120
+#: ../pykolab/imap/__init__.py:376
 #, python-format
-msgid "No directories found for user %s"
+msgid "Creating new mailbox for user %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_sync.py:38
+#: ../pykolab/imap/__init__.py:405
 #, python-format
-msgid "Found %d domains in %d seconds"
+msgid "Creating additional folders for user %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_sync.py:48
+#: ../pykolab/imap/__init__.py:429
 #, python-format
-msgid "Running for domain %s"
+msgid "Mailbox already exists: %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_sync.py:54
+#: ../pykolab/imap/__init__.py:472
+msgid "Subscribing user to the additional folders"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:532 ../pykolab/imap/__init__.py:611
 #, python-format
-msgid "Synchronizing users for %s took %d seconds"
+msgid "Renaming INBOX from %s to %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:536
+#, python-format
+msgid "Could not rename INBOX folder %s to %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:538 ../pykolab/imap/__init__.py:615
+#, python-format
+msgid "Moving INBOX folder %s won't succeed as target folder %s already exists"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:70
+#: ../pykolab/imap/__init__.py:551
+#, python-format
+msgid "Looking for folder '%s', we found folders: %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:574
+#, python-format
+msgid "Setting ACL rights %s for subject %s on folder "
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:585
+#, python-format
+msgid "Removing ACL rights %s for subject %s on folder "
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:608
+#, python-format
+msgid "Found old INBOX folder %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:617
+#, python-format
+msgid "Did not find old folder user/%s to rename"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:619
+msgid "Value for user is not a dictionary"
+msgstr ""
+
+#. TODO: Go in fact correct the quota.
+#: ../pykolab/imap/__init__.py:682
+#, python-format
+msgid "Cannot get current IMAP quota for folder %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:695
+#, python-format
+msgid "Quota for %s currently is %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:701
+#, python-format
+msgid "Adjusting authentication database quota for folder %s to %d"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:706
+#, python-format
+msgid "Correcting quota for %s to %s (currently %s)"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:788
+#, python-format
+msgid "Checking folder: %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:793
+#, python-format
+msgid "Folder has no corresponding user (1): %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:796
+#, python-format
+msgid "Folder has no corresponding user (2): %s"
+msgstr ""
+
+#. We got user identifier only
+#: ../pykolab/imap/__init__.py:811
+msgid "Please don't give us just a user identifier"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:814
+#, python-format
+msgid "Deleting folder %s"
+msgstr ""
+
+#: ../pykolab/__init__.py:50
+msgid "Returning thread local configuration"
+msgstr ""
+
+#: ../pykolab/logger.py:105
+#, python-format
+msgid "Could not change the ownership of log file %s"
+msgstr ""
+
+#: ../pykolab/logger.py:121
+#, python-format
+msgid "Cannot log to file %s: %s"
+msgstr ""
+
+#: ../pykolab/plugins/defaultfolders/__init__.py:47
+#, python-format
+msgid "Plugin %s called without required keyword %s."
+msgstr ""
+
+#: ../pykolab/plugins/defaultfolders/__init__.py:53
+msgid "Could not parse additional_folders"
+msgstr ""
+
+#: ../pykolab/plugins/dynamicquota/__init__.py:58
+#, python-format
+msgid "No keyword %s passed to set_user_folder_quota"
+msgstr ""
+
+#: ../pykolab/plugins/dynamicquota/__init__.py:70
+#, python-format
+msgid "Quota '%s' not an integer!"
+msgstr ""
+
+#: ../pykolab/plugins/__init__.py:70
 #, python-format
 msgid "ImportError for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:74
+#: ../pykolab/plugins/__init__.py:74
 #, python-format
 msgid "RuntimeError for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:78
+#: ../pykolab/plugins/__init__.py:78
 #, python-format
 msgid "Plugin %s failed to load (%s: %s)"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:116 .././pykolab/plugins/__init__.py:118
+#: ../pykolab/plugins/__init__.py:116 ../pykolab/plugins/__init__.py:118
 #, python-format
 msgid "Cannot set defaults for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:120
+#: ../pykolab/plugins/__init__.py:120
 #, python-format
 msgid "Cannot set defaults for plugin %s: Unknown Error"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:123
+#: ../pykolab/plugins/__init__.py:123
 #, python-format
 msgid "Not setting defaults for plugin %s: No function 'set_defaults()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:142
+#: ../pykolab/plugins/__init__.py:142
 #, python-format
 msgid "Cannot set runtime for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:144
+#: ../pykolab/plugins/__init__.py:144
 #, python-format
 msgid "Not setting runtime for plugin %s: No function 'set_runtime()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:163 .././pykolab/plugins/__init__.py:165
+#: ../pykolab/plugins/__init__.py:163 ../pykolab/plugins/__init__.py:165
 #, python-format
 msgid "Cannot add options for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:167
+#: ../pykolab/plugins/__init__.py:167
 #, python-format
 msgid "Not adding options for plugin %s: No function 'add_options()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:187
+#: ../pykolab/plugins/__init__.py:187
 #, python-format
 msgid "Cannot check options for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:189
+#: ../pykolab/plugins/__init__.py:189
 #, python-format
 msgid "Not checking options for plugin %s: No function 'check_options()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:227
+#: ../pykolab/plugins/__init__.py:227
 #, python-format
 msgid "Executing hook %s for plugin %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:231 .././pykolab/plugins/__init__.py:233
+#: ../pykolab/plugins/__init__.py:231 ../pykolab/plugins/__init__.py:233
 #, python-format
 msgid "Cannot execute hook %s for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/defaultfolders/__init__.py:47
-#, python-format
-msgid "Plugin %s called without required keyword %s."
+#: ../pykolab/plugins/recipientpolicy/__init__.py:79
+msgid "Attribute substitution for 'mail' failed in Recipient Policy"
 msgstr ""
 
-#: .././pykolab/plugins/defaultfolders/__init__.py:53
-msgid "Could not parse additional_folders"
+#: ../pykolab/plugins/recipientpolicy/__init__.py:115
+msgid "Could not parse the alternative mail routines"
 msgstr ""
 
-#: .././pykolab/plugins/dynamicquota/__init__.py:56
-#, python-format
-msgid "Quota '%s' not an integer!"
+#: ../pykolab/plugins/recipientpolicy/__init__.py:127
+#: ../pykolab/plugins/recipientpolicy/__init__.py:137
+msgid ""
+"Attribute substitution for 'alternative_mail' failed in Recipient Policy"
 msgstr ""
 
-#: .././pykolab/plugins/dynamicquota/__init__.py:63
-msgid ""
-"The new quota was set to 0, but default quota > 0, returning default quota"
+#: ../pykolab/setup/components.py:58
+msgid "Display this help."
 msgstr ""
 
-#: .././pykolab/plugins/dynamicquota/__init__.py:82
-msgid ""
-"The default quota is larger then the calculated new quota, using the default "
-"quota"
+#: ../pykolab/setup/components.py:149
+msgid "No component selected, continuing for all components"
 msgstr ""
 
-#: .././pykolab/plugins/recipientpolicy/__init__.py:70
-msgid "Attribute substitution for 'mail' failed in Recipient Policy"
+#: ../pykolab/setup/components.py:187 ../pykolab/setup/components.py:192
+msgid "No such component."
 msgstr ""
 
-#: .././pykolab/plugins/recipientpolicy/__init__.py:97
-msgid "Could not parse the alternative mail routines"
+#: ../pykolab/setup/setup_freebusy.py:46
+msgid "Setup Free/Busy."
 msgstr ""
 
-#: .././pykolab/plugins/recipientpolicy/__init__.py:109
-#: .././pykolab/plugins/recipientpolicy/__init__.py:119
-msgid ""
-"Attribute substitution for 'alternative_mail' failed in Recipient Policy"
+#: ../pykolab/setup/setup_freebusy.py:50
+msgid "Free/Busy is not installed on this system"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:40
-msgid "Setup zpush."
+#: ../pykolab/setup/setup_freebusy.py:55
+msgid ""
+"\n"
+"                        Please supply the MySQL password for the "
+"'roundcube'\n"
+"                        user. You have supplied this password earlier, and "
+"it is\n"
+"                        available from the database URI setting in\n"
+"                        /etc/roundcubemail/db.inc.php.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:44
-msgid "Z-Push is not installed on this system"
+#: ../pykolab/setup/setup_freebusy.py:64
+#: ../pykolab/setup/setup_roundcube.py:56
+msgid "MySQL roundcube password"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:70
-#: .././pykolab/setup/setup_roundcube.py:93
-#: .././pykolab/setup/setup_freebusy.py:76
+#: ../pykolab/setup/setup_freebusy.py:92
+#: ../pykolab/setup/setup_roundcube.py:116 ../pykolab/setup/setup_zpush.py:71
 #, python-format
 msgid "Using template file %r"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:77
-#: .././pykolab/setup/setup_roundcube.py:100
-#: .././pykolab/setup/setup_freebusy.py:83
+#: ../pykolab/setup/setup_freebusy.py:99
+#: ../pykolab/setup/setup_roundcube.py:123 ../pykolab/setup/setup_zpush.py:78
 #, python-format
 msgid "Successfully compiled template %r, writing out to %r"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:95 .././pykolab/setup/setup_ldap.py:184
-#: .././pykolab/setup/setup_ldap.py:358
-#: .././pykolab/setup/setup_roundcube.py:159
-#: .././pykolab/setup/setup_imap.py:137 .././pykolab/setup/setup_mysql.py:49
-#: .././pykolab/setup/setup_freebusy.py:101
-msgid "Could not start and configure to start on boot, the "
+#: ../pykolab/setup/setup_freebusy.py:119 ../pykolab/setup/setup_imap.py:143
+#: ../pykolab/setup/setup_ldap.py:288 ../pykolab/setup/setup_ldap.py:521
+#: ../pykolab/setup/setup_mta.py:309 ../pykolab/setup/setup_mysql.py:49
+#: ../pykolab/setup/setup_roundcube.py:191
+#: ../pykolab/setup/setup_syncroton.py:66 ../pykolab/setup/setup_zpush.py:98
+msgid "Could not start and configure to start on boot, the "
+msgstr ""
+
+#: ../pykolab/setup/setup_imap.py:44
+msgid "Setup IMAP."
+msgstr ""
+
+#: ../pykolab/setup/setup_imap.py:88 ../pykolab/setup/setup_imap.py:113
+msgid "Could not write out Cyrus IMAP configuration file /etc/imapd.conf"
+msgstr ""
+
+#: ../pykolab/setup/setup_kolabd.py:43
+msgid "Setup the Kolab daemon."
+msgstr ""
+
+#: ../pykolab/setup/setup_kolabd.py:51
+#, python-format
+msgid ""
+"\n"
+"                            Copying the configuration section for 'example."
+"org' over to\n"
+"                            a section applicable to your domain '%s'.\n"
+"                        "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:43
+msgid "LDAP Options"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:50
+msgid "Specify FQDN (overriding defaults)."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:58
+msgid "Allow anonymous binds (default: no)."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:62
+msgid "Setup LDAP."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:74
+msgid ""
+"\n"
+"                        Please supply a password for the LDAP administrator "
+"user\n"
+"                        'admin', used to login to the graphical console of "
+"389\n"
+"                        Directory server.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:82
+msgid "Administrator password"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:89
+msgid ""
+"\n"
+"                        Please supply a password for the LDAP Directory "
+"Manager\n"
+"                        user, which is the administrator user you will be "
+"using\n"
+"                        to at least initially log in to the Web Admin, and "
+"that\n"
+"                        Kolab uses to perform administrative tasks.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:98
+msgid "Directory Manager password"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:105
+msgid ""
+"\n"
+"                        Please choose the system user and group the service\n"
+"                        should use to run under. These should be existing,\n"
+"                        unprivileged, local system POSIX accounts with no "
+"shell.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:112
+msgid "User"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:43
-msgid "LDAP Options"
+#: ../pykolab/setup/setup_ldap.py:113
+msgid "Group"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:50
-msgid "Specify FQDN (overriding defaults)."
+#: ../pykolab/setup/setup_ldap.py:143
+msgid ""
+"\n"
+"                        This setup procedure plans to set up Kolab Groupware "
+"for\n"
+"                        the following domain name space. This domain name "
+"is\n"
+"                        obtained from the reverse DNS entry on your network\n"
+"                        interface. Please confirm this is the appropriate "
+"domain\n"
+"                        name space.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:54
-msgid "Setup LDAP."
+#: ../pykolab/setup/setup_ldap.py:157
+msgid "Domain name to use"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:66
-msgid "Administrator password"
+#: ../pykolab/setup/setup_ldap.py:162 ../pykolab/setup/setup_ldap.py:187
+msgid ""
+"\n"
+"                                    Invalid input. Please try again.\n"
+"                                "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:72
-msgid "Directory Manager password"
+#: ../pykolab/setup/setup_ldap.py:171
+msgid ""
+"\n"
+"                        The standard root dn we composed for you follows. "
+"Please\n"
+"                        confirm this is the root dn you wish to use.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:77
-msgid "User"
+#: ../pykolab/setup/setup_ldap.py:182
+msgid "Root DN to use"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:78
-msgid "Group"
+#: ../pykolab/setup/setup_ldap.py:234
+msgid ""
+"\n"
+"                    Setup is now going to set up the 389 Directory Server. "
+"This\n"
+"                    may take a little while (during which period there is "
+"no\n"
+"                    output and no progress indication).\n"
+"                "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:143
+#: ../pykolab/setup/setup_ldap.py:241
 msgid "Setting up 389 Directory Server"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:153
+#. TODO: Get the return code and display output if not successful.
+#: ../pykolab/setup/setup_ldap.py:253
 msgid "Setup DS stdout:"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:156
+#: ../pykolab/setup/setup_ldap.py:256
 msgid "Setup DS stderr:"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:175 .././pykolab/setup/setup_mysql.py:97
+#: ../pykolab/setup/setup_ldap.py:279 ../pykolab/setup/setup_mysql.py:129
 msgid "Could not find the Kolab schema file"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:189
+#: ../pykolab/setup/setup_ldap.py:293
+msgid ""
+"\n"
+"                        Please supply a Cyrus Administrator password. This\n"
+"                        password is used by Kolab to execute administrative\n"
+"                        tasks in Cyrus IMAP. You may also need the password\n"
+"                        yourself to troubleshoot Cyrus IMAP and/or perform\n"
+"                        other administrative tasks against Cyrus IMAP "
+"directly.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:303
 msgid "Cyrus Administrator password"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:195
+#: ../pykolab/setup/setup_ldap.py:310
+msgid ""
+"\n"
+"                        Please supply a Kolab Service account password. "
+"This\n"
+"                        account is used by various services such as "
+"Postfix,\n"
+"                        and Roundcube, as anonymous binds to the LDAP "
+"server\n"
+"                        will not be allowed.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:319
 msgid "Kolab Service password"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:204
+#: ../pykolab/setup/setup_ldap.py:329
 msgid "Writing out configuration to kolab.conf"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:218
+#: ../pykolab/setup/setup_ldap.py:343
 msgid "Inserting service users into LDAP."
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:262
+#: ../pykolab/setup/setup_ldap.py:417
 msgid "Writing out cn=kolab,cn=config"
 msgstr ""
 
 #. TODO: Add kolab-admin role
 #. TODO: Assign kolab-admin admin ACLs
-#: .././pykolab/setup/setup_ldap.py:286
+#: ../pykolab/setup/setup_ldap.py:441
 #, python-format
 msgid "Adding domain %s to list of domains for this deployment"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:294
+#: ../pykolab/setup/setup_ldap.py:457
 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:302
+#: ../pykolab/setup/setup_ldap.py:465
 msgid "Enabling attribute uniqueness plugin"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:308
+#: ../pykolab/setup/setup_ldap.py:471
 msgid "Enabling referential integrity plugin"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:314
+#: ../pykolab/setup/setup_ldap.py:477
 msgid "Enabling and configuring account policy plugin"
 msgstr ""
 
 #. TODO: Add kolab-admin role
-#: .././pykolab/setup/setup_ldap.py:329
+#: ../pykolab/setup/setup_ldap.py:492
 msgid "Adding the kolab-admin role"
 msgstr ""
 
 #. TODO: User writeable attributes on root_dn
-#: .././pykolab/setup/setup_ldap.py:340
+#: ../pykolab/setup/setup_ldap.py:503
 #, python-format
 msgid "Setting access control to %s"
 msgstr ""
 
-#: .././pykolab/setup/setup_roundcube.py:40
-msgid "Setup Roundcube."
-msgstr ""
-
-#: .././pykolab/setup/setup_roundcube.py:44
-#: .././pykolab/setup/setup_freebusy.py:49
-msgid "MySQL roundcube password"
-msgstr ""
-
-#: .././pykolab/setup/components.py:56
-msgid "Display this help."
-msgstr ""
-
-#: .././pykolab/setup/components.py:122
-msgid "No component selected, continuing for all components"
-msgstr ""
-
-#: .././pykolab/setup/components.py:157 .././pykolab/setup/components.py:162
-msgid "No such component."
-msgstr ""
-
-#: .././pykolab/setup/setup_mta.py:40
+#: ../pykolab/setup/setup_mta.py:40
 msgid "Setup MTA."
 msgstr ""
 
-#: .././pykolab/setup/setup_mta.py:220
+#: ../pykolab/setup/setup_mta.py:224 ../pykolab/setup/setup_php.py:80
 #, python-format
 msgid "Setting key %r to %r"
 msgstr ""
 
-#: .././pykolab/setup/setup_mta.py:248
+#: ../pykolab/setup/setup_mta.py:252
 msgid "Could not write out Postfix configuration file /etc/postfix/master.cf"
 msgstr ""
 
-#: .././pykolab/setup/setup_imap.py:39
-msgid "Setup IMAP."
-msgstr ""
-
-#: .././pykolab/setup/setup_imap.py:82 .././pykolab/setup/setup_imap.py:107
-msgid "Could not write out Cyrus IMAP configuration file /etc/imapd.conf"
-msgstr ""
-
-#: .././pykolab/setup/setup_kolabd.py:38
-msgid "Setup the Kolab daemon."
+#: ../pykolab/setup/setup_mta.py:287
+msgid "Could not write out Amavis configuration file /etc/amavisd/amavisd.conf"
 msgstr ""
 
-#: .././pykolab/setup/setup_mysql.py:39
+#: ../pykolab/setup/setup_mysql.py:39
 msgid "Setup MySQL."
 msgstr ""
 
-#: .././pykolab/setup/setup_mysql.py:53
+#: ../pykolab/setup/setup_mysql.py:53
+msgid ""
+"\n"
+"                    Please supply a root password for MySQL. This password "
+"will\n"
+"                    be the administrative user for this MySQL server, and "
+"it\n"
+"                    should be kept a secret. After this setup process has\n"
+"                    completed, Kolab is going to discard and forget about "
+"this\n"
+"                    password, but you will need it for administrative tasks "
+"in\n"
+"                    MySQL.\n"
+"                "
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:64
 msgid "MySQL root password"
 msgstr ""
 
-#: .././pykolab/setup/setup_freebusy.py:40
-msgid "Setup Free/Busy."
+#: ../pykolab/setup/setup_mysql.py:103
+msgid ""
+"\n"
+"                        Please supply a password for the MySQL user "
+"'kolab'.\n"
+"                        This password will be used by Kolab services, such "
+"as\n"
+"                        the Web Administration Panel.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_freebusy.py:44
-msgid "Free/Busy is not installed on this system"
+#: ../pykolab/setup/setup_mysql.py:111
+msgid "MySQL kolab password"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:45
-#, python-format
-msgid "Cleaning up ACL entries for %s across all folders"
+#: ../pykolab/setup/setup_php.py:42
+msgid "PHP Options"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:60
-#, python-format
-msgid "Cleaning up ACL entries referring to identifier %s"
+#: ../pykolab/setup/setup_php.py:49
+msgid "Specify the timezone for PHP."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:69
-#, python-format
-msgid "Iterating over %d folders"
+#: ../pykolab/setup/setup_php.py:53
+msgid "Setup PHP."
 msgstr ""
 
-#. Set the ACL to '' (effectively deleting the ACL entry)
-#: .././pykolab/imap/__init__.py:82
-#, python-format
-msgid "Removing acl %r for subject %r from folder %r"
+#: ../pykolab/setup/setup_php.py:58
+msgid ""
+"\n"
+"                        Please supply the timezone PHP should be using.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:143
-#, python-format
-msgid "Logging on to Cyrus IMAP server %s"
+#: ../pykolab/setup/setup_php.py:64
+msgid "Timezone ID"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:152
-#, python-format
-msgid "Logging on to Dovecot IMAP server %s"
+#: ../pykolab/setup/setup_roundcube.py:44
+msgid "Setup Roundcube."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:161
-#, python-format
-msgid "Logging on to generic IMAP server %s"
+#: ../pykolab/setup/setup_roundcube.py:48
+msgid ""
+"\n"
+"                    Please supply a password for the MySQL user "
+"'roundcube'.\n"
+"                    This password will be used by the Roundcube webmail\n"
+"                    interface.\n"
+"                "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:179
-#, python-format
-msgid "Reusing existing IMAP server connection to %s"
+#: ../pykolab/setup/setup_syncroton.py:40
+msgid "Setup Syncroton."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:181
-#, python-format
-msgid "Reconnecting to IMAP server %s"
+#: ../pykolab/setup/setup_zpush.py:41
+msgid "Setup zpush."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:197
-msgid "Called imap.disconnect() on a server that "
+#: ../pykolab/setup/setup_zpush.py:45
+msgid "Z-Push is not installed on this system"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:213
+#. start_max = (int)(time.time())
+#: ../pykolab/telemetry.py:588
 #, python-format
-msgid "%r has no attribute %s"
+msgid "Expiring sessions that started before or on %d"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:221 .././pykolab/imap/__init__.py:239
+#: ../pykolab/telemetry.py:601
 #, python-format
-msgid "Creating new shared folder %s"
+msgid "Expiring session ID: %d"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:255
+#: ../pykolab/telemetry.py:620
 #, python-format
-msgid "Creating new mailbox for user %s"
+msgid "Session with ID %d expired from database"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:280
+#: ../pykolab/telemetry.py:646
 #, python-format
-msgid "Creating additional folders for user %s"
+msgid "Operational Error in telemetry database: %s"
+msgstr ""
+
+#: ../pykolab/telemetry.py:652
+msgid "No database available"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:302
+#: ../pykolab/utils.py:57 ../pykolab/utils.py:59
 #, python-format
-msgid "Mailbox already exists: %s"
+msgid "Confirm %s: "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:345
-msgid "Subscribing user to the additional folders"
+#: ../pykolab/utils.py:62
+msgid "Incorrect confirmation. "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:380 .././pykolab/imap/__init__.py:459
+#: ../pykolab/utils.py:67 ../pykolab/utils.py:72
 #, python-format
-msgid "Renaming INBOX from %s to %s"
+msgid "%s: "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:384
+#: ../pykolab/utils.py:69 ../pykolab/utils.py:74
 #, python-format
-msgid "Could not rename INBOX folder %s to %s"
+msgid "%s [%s]: "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:386 .././pykolab/imap/__init__.py:463
-#, python-format
-msgid "Moving INBOX folder %s won't succeed as target folder %s already exists"
+#: ../pykolab/utils.py:119
+msgid "Please answer 'yes' or 'no'."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:399
+#: ../pykolab/utils.py:185
 #, python-format
-msgid "Looking for folder '%s', we found folders: %r"
+msgid "Could not change the permissions on %s"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:422
+#: ../pykolab/wap_client/__init__.py:257
 #, python-format
-msgid "Setting ACL rights %s for subject %s on folder "
+msgid "Requesting %r with params %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:433
+#: ../pykolab/wap_client/__init__.py:263
 #, python-format
-msgid "Removing ACL rights %s for subject %s on folder "
+msgid "Got response: %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:456
-#, python-format
-msgid "Found old INBOX folder %s"
+#. Some data is not JSON
+#: ../pykolab/wap_client/__init__.py:268
+msgid "Response data is not JSON"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:465
-#, python-format
-msgid "Did not find old folder user/%s to rename"
+#: ../pykolab/xml/attendee.py:79 ../pykolab/xml/attendee.py:99
+msgid "Not a valid attendee"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:467
-msgid "Value for user is not a dictionary"
+#: ../pykolab/xml/attendee.py:84
+msgid "No valid delegator references found"
 msgstr ""
 
-#. TODO: Go in fact correct the quota.
-#: .././pykolab/imap/__init__.py:527
-#, python-format
-msgid "Cannot get current IMAP quota for folder %s"
+#: ../pykolab/xml/attendee.py:104
+msgid "No valid delegatee references found"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:540
+#: ../pykolab/xml/attendee.py:140
 #, python-format
-msgid "Quota for %s currently is %s"
+msgid "Invalid cutype %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:546
+#: ../pykolab/xml/attendee.py:151
 #, python-format
-msgid "Adjusting authentication database quota for folder %s to %d"
+msgid "Invalid participant status %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:551
+#: ../pykolab/xml/attendee.py:159
 #, python-format
-msgid "Correcting quota for %s to %s (currently %s)"
+msgid "Invalid role %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:633
+#: ../pykolab/xml/event.py:172
 #, python-format
-msgid "Checking folder: %s"
+msgid "No attendee with email or name %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:638
+#: ../pykolab/xml/event.py:180
 #, python-format
-msgid "Folder has no corresponding user (1): %s"
+msgid "Invalid argument value attendee %r, must be basestring or Attendee"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:641
+#: ../pykolab/xml/event.py:186
 #, python-format
-msgid "Folder has no corresponding user (2): %s"
+msgid "No attendee with email %r"
 msgstr ""
 
-#. We got user identifier only
-#: .././pykolab/imap/__init__.py:656
-msgid "Please don't give us just a user identifier"
+#: ../pykolab/xml/event.py:192
+#, python-format
+msgid "No attendee with name %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:659
-#, python-format
-msgid "Deleting folder %s"
+#: ../pykolab/xml/event.py:338
+msgid "Invalid participant status"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:78
-#, python-format
-msgid "Could not connect to Cyrus IMAP server %r"
+#: ../pykolab/xml/event.py:538
+msgid "Event end needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:101
+#: ../pykolab/xml/event.py:657
 #, python-format
-msgid "Continuing with separator: %r"
+msgid "Invalid status %r"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:106
-msgid "Detected we are running in a Murder topology"
+#: ../pykolab/xml/event.py:678 ../pykolab/xml/event.py:728
+msgid "Event start needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:110
-msgid "This system is not part of a murder topology"
+#: ../pykolab/xml/event.py:764
+#, python-format
+msgid "Invalid status set: %r"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:131
-#, python-format
-msgid "Checking actual backend server for folder %s through annotations"
+#: ../pykolab/xml/event.py:882
+msgid "No sender specified"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:146
-#, python-format
-msgid "Could not get the annotations after %s tries."
+#: ../saslauthd/__init__.py:126 ../saslauthd/__init__.py:134
+msgid "Traceback occurred, please report a bug at http://bugzilla.kolabsys.com"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:150
+#: ../wallace/__init__.py:61
 #, python-format
-msgid "No annotations for %s: %r"
+msgid "Worker process %s initializing"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:157
-#, python-format
-msgid "Server for INBOX folder %s is %s"
+#: ../wallace/__init__.py:80
+msgid "Bind address for Wallace."
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:169
-#, python-format
-msgid "Setting quota for INBOX folder %s to %s"
+#: ../wallace/__init__.py:106
+msgid "Port that Wallace is supposed to use."
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:173
+#: ../wallace/__init__.py:157
 #, python-format
-msgid "Could not set quota for mailfolder %s"
+msgid "Could not bind to socket on port %d on bind "
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:182
-#, python-format
-msgid "Moving INBOX folder %s to %s"
+#: ../wallace/__init__.py:169
+msgid "Could not shut down socket"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:194
-#, python-format
-msgid "Setting annotation %s on folder %s"
+#: ../wallace/__init__.py:226
+msgid "Accepted connection"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:201
+#: ../wallace/__init__.py:389
 #, python-format
-msgid "Could not set annotation %r on mail folder %r: %r"
+msgid "Could not write pid file %s"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:205
+#: ../wallace/module_optout.py:61 ../wallace/module_resources.py:94
 #, python-format
-msgid "Transferring folder %s from %s to %s"
+msgid "Issuing callback after processing to stage %s"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:265
+#: ../wallace/module_optout.py:62 ../wallace/module_resources.py:100
 #, python-format
-msgid "Undeleting %s to %s"
+msgid "Testing cb_action_%s()"
 msgstr ""
 
-#. start_max = (int)(time.time())
-#: .././pykolab/telemetry.py:588
+#: ../wallace/module_optout.py:64 ../wallace/module_resources.py:103
 #, python-format
-msgid "Expiring sessions that started before or on %d"
+msgid "Attempting to execute cb_action_%s()"
 msgstr ""
 
-#: .././pykolab/telemetry.py:601
+#. modules.next_module('optout')
+#: ../wallace/module_optout.py:70
 #, python-format
-msgid "Expiring session ID: %d"
+msgid "Consulting opt-out service for %r, %r"
 msgstr ""
 
-#: .././pykolab/telemetry.py:620
+#: ../wallace/module_optout.py:96
 #, python-format
-msgid "Session with ID %d expired from database"
+msgid "Running opt-out consult from envelope sender '%s "
 msgstr ""
 
-#: .././pykolab/telemetry.py:646
+#: ../wallace/module_optout.py:160
 #, python-format
-msgid "Operational Error in telemetry database: %s"
+msgid "Attempting to execute cb_action_%s(%r, %r)"
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:92
+#: ../wallace/module_optout.py:181
 #, python-format
-msgid "Creating %d Mails"
+msgid "Could not send request to optout_url %s"
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:116
+#: ../wallace/module_resources.py:81
 #, python-format
-msgid "Sending message %s through SMTP targeting user %s@%s"
+msgid "Resource Management called for %r, %r"
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:119
-#, python-format
-msgid "Sending message %s through LMTP targeting user %s@%s"
+#: ../wallace/module_resources.py:139
+msgid "Message is not an iTip message or does not contain any "
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:122
-#, python-format
-msgid "Saving message %s to IMAP (user %s, folder %s)"
+#: ../wallace/module_resources.py:147
+msgid "iTip events attached to this message contain the "
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:125 .././pykolab/tests.old/calendar.py:198
-#: .././pykolab/tests.old/contacts.py:145
-msgid "Somehow ended up NOT sending these messages"
+#: ../wallace/module_resources.py:174
+msgid "Not an iTip message, but sent to resource nonetheless. Reject message"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:146
-#, python-format
-msgid "Creating %d Events"
+#: ../wallace/module_resources.py:182
+msgid "No itips, no resources, pass along"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:177
-#, python-format
-msgid "Creating Calendar item number %d"
+#: ../wallace/module_resources.py:186
+msgid "iTips, but no resources, pass along"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:189
-#: .././pykolab/tests.old/contacts.py:136
+#: ../wallace/module_resources.py:218
 #, python-format
-msgid "Sending UID message %s through SMTP targeting user %s@%s"
+msgid "Resources: %r"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:192
-#: .././pykolab/tests.old/contacts.py:139
+#: ../wallace/module_resources.py:236
 #, python-format
-msgid "Sending UID message %s through LMTP targeting user %s@%s"
+msgid "Checking events in resource folder %r"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:195
-#: .././pykolab/tests.old/contacts.py:142
+#: ../wallace/module_resources.py:243
 #, python-format
-msgid "Saving UID message %s to IMAP (user %s, folder %s)"
+msgid "Mailbox for resource %r doesn't exist"
 msgstr ""
 
-#: .././pykolab/tests.old/zpush/test_000_001.py:47
+#: ../wallace/module_resources.py:256
 #, python-format
-msgid "Could not load %sItem from %s, skipping the testing."
+msgid "Fetching message UID %r from folder %r"
 msgstr ""
 
-#: .././pykolab/tests.old/zpush/test_000_000.py:77
+#: ../wallace/module_resources.py:295
 #, python-format
-msgid "Authentication failure for %s"
+msgid "Event %r conflicts with event "
 msgstr ""
 
-#: .././pykolab/tests.old/contacts.py:105
+#: ../wallace/module_resources.py:308
 #, python-format
-msgid "Creating %d Contacts"
+msgid "start: %r, end: %r, total: %r, messages: %r"
 msgstr ""
 
-#: .././pykolab/tests.old/contacts.py:124
+#: ../wallace/module_resources.py:315
 #, python-format
-msgid "Creating Contact item number %d"
+msgid "Polling for resource %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:207
+#: ../wallace/module_resources.py:319
 #, python-format
-msgid "Adding policy request to instance %s"
+msgid "Resource %r has been popped from the list"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:442
-msgid "Unauthorized access not allowed"
+#: ../wallace/module_resources.py:326
+msgid "Resource is a collection"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:481
-#: .././bin/kolab_smtp_access_policy.py:541
+#: ../wallace/module_resources.py:374 ../wallace/module_resources.py:424
 #, python-format
-msgid "Could not find envelope sender user %s"
+msgid "Adding event to %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:568
+#: ../wallace/module_resources.py:473
 #, python-format
-msgid "%s is unauthorized to send on behalf of %s"
+msgid "Method %r not really interesting for us."
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:578
+#: ../wallace/module_resources.py:481
 #, python-format
-msgid "User %s attempted to use envelope sender address %s "
+msgid "Raw iTip payload: %s"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:638
-#: .././bin/kolab_smtp_access_policy.py:649
-#, python-format
-msgid "Found user %s to be a delegate user of %s"
+#: ../wallace/module_resources.py:491
+msgid "Could not read iTip from message."
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:673
-#, python-format
-msgid "Verifying authenticated sender '%(sender)s' with "
+#: ../wallace/module_resources.py:513
+msgid "iTip event without a start"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:678
-#, python-format
-msgid "Verifying unauthenticated sender '%(sender)s' "
+#. end if c.name == "VEVENT"
+#. end for c in cal.walk()
+#. end if part.get_content_type() == "text/calendar"
+#. end for part in message.walk()
+#. if message.is_multipart()
+#: ../wallace/module_resources.py:543
+msgid "Message is not an iTip message (non-multipart message)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:695
+#: ../wallace/module_resources.py:564
 #, python-format
-msgid "Reproducing verify_recipient(%s, %s) from "
+msgid "Checking if email address %r belongs to a resource (collection)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:712
+#: ../wallace/module_resources.py:575 ../wallace/module_resources.py:649
+#: ../wallace/module_resources.py:699
 #, python-format
-msgid "Using authentication domain %s instead of %s"
+msgid "No resource (collection) records found for %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:722
+#: ../wallace/module_resources.py:583 ../wallace/module_resources.py:657
+#: ../wallace/module_resources.py:707
 #, python-format
-msgid "Domain %s is a primary domain"
+msgid "Resource record(s): %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:730
+#: ../wallace/module_resources.py:589 ../wallace/module_resources.py:664
+#: ../wallace/module_resources.py:714
 #, python-format
-msgid "Checking the recipient for domain %s that is not "
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:792
-msgid "Could not find this user, accepting"
+msgid "Resource record: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:862
-#: .././bin/kolab_smtp_access_policy.py:915
+#: ../wallace/module_resources.py:608
 #, python-format
-msgid "Sender %s is not allowed to send to "
+msgid "Raw itip_events: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:902
+#: ../wallace/module_resources.py:616
 #, python-format
-msgid "Reproducing verify_sender(%r) from cache, "
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:931
-msgid "Sender uses unauthorized envelope sender address"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:948
-msgid "Could not verify sender"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:955
-msgid "Verifying whether sender is allowed to send to "
+msgid "Raw set of attendees: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:969
+#: ../wallace/module_resources.py:624
 #, python-format
-msgid "Result is %r"
+msgid "Raw set of resources: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:974
-msgid "No recipient policy restrictions exist for this sender"
+#: ../wallace/module_resources.py:638
+#, python-format
+msgid "Checking if attendee %r is a resource (collection)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:983
-msgid "Found a recipient policy to apply for this sender."
+#: ../wallace/module_resources.py:671 ../wallace/module_resources.py:717
+msgid "Resource reservation made but no resource records found"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:998
+#: ../wallace/module_resources.py:689
 #, python-format
-msgid "Sender %s not allowed to send to recipient "
+msgid "Checking if resource %r is a resource (collection)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1029
-msgid "Cleaning up the cache"
+#: ../wallace/module_resources.py:721
+msgid "The following resources are being referred to in the "
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1066
+#. This is a nested module
+#: ../wallace/modules.py:96
 #, python-format
-msgid "Operational Error in caching: %s"
+msgid "Module Group: %s"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1117
-#, python-format
-msgid "Caching the policy result with timestamp %d"
+#: ../wallace/modules.py:107 ../wallace/modules.py:112
+msgid "No such module."
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1194
+#: ../wallace/modules.py:118
 #, python-format
-msgid "Returning action DEFER_IF_PERMIT: %s"
+msgid "Holding message in queue for manual review (%s by %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1199
+#: ../wallace/modules.py:121
 #, python-format
-msgid "Returning action DUNNO: %s"
+msgid "Deferring message in %s (by module %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1204
+#: ../wallace/modules.py:131
 #, python-format
-msgid "Returning action HOLD: %s"
+msgid "The time when the message was sent: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1209
+#: ../wallace/modules.py:132
 #, python-format
-msgid "Returning action PERMIT: %s"
+msgid "The time now: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1214
+#: ../wallace/modules.py:133
 #, python-format
-msgid "Returning action REJECT: %s"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1258
-msgid "Starting to loop for new request"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1267
-msgid "End of current request"
+msgid "The time delta: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1271
+#. TODO: Send NDR back to user
+#: ../wallace/modules.py:137
 #, python-format
-msgid "Getting line: %s"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1275
-msgid "Returning request"
+msgid "Message in file %s older then 5 days, deleting"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1332
+#: ../wallace/modules.py:162
 #, python-format
-msgid "Got request instance %s"
+msgid "Rejecting message in %s (by module %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1341
+#: ../wallace/modules.py:180
 #, python-format
-msgid "Request instance %s is in state %s"
+msgid ""
+"This is the email system Wallace at %s.\n"
+"\n"
+"I'm sorry to inform you we could not deliver the attached message\n"
+"to the following recipients:\n"
+"\n"
+"- %s\n"
+"\n"
+"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 ""
 
-#: .././bin/kolab_smtp_access_policy.py:1349
+#: ../wallace/modules.py:195
 #, python-format
-msgid "Request instance %s is not yet in DATA state"
+msgid ""
+"X-Wallace-Module: %s\n"
+"X-Wallace-Result: REJECT\n"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1361
+#: ../wallace/modules.py:248
 #, python-format
-msgid "Request instance %s reached DATA state"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1379
-msgid "Sender access denied"
+msgid "Accepting message in %s (by module %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1381
-msgid "Recipient access denied"
+#: ../wallace/modules.py:316
+#, python-format
+msgid "Module '%s' already registered"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 2200fa0..94a8abb 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pykolab 0.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-09 14:25+0100\n"
+"POT-Creation-Date: 2012-08-11 15:04+0100\n"
 "PO-Revision-Date: 2012-05-09 14:25+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,793 +17,907 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .././wallace/__init__.py:37 .././bonnie/__init__.py:35
-#: .././kolabd/__init__.py:46 .././saslauthd/__init__.py:47
-msgid "Daemon Options"
-msgstr ""
-
-#: .././wallace/__init__.py:44 .././bonnie/__init__.py:41
-#: .././kolabd/__init__.py:52 .././saslauthd/__init__.py:53
-msgid "Fork to the background."
-msgstr ""
-
-#: .././wallace/__init__.py:52
-msgid "Bind address for Wallace."
+#: ../bin/kolab_smtp_access_policy.py:206
+#, python-format
+msgid "Adding policy request to instance %s"
 msgstr ""
 
-#: .././wallace/__init__.py:60 .././kolabd/__init__.py:58
-#: .././saslauthd/__init__.py:59
-msgid "Path to the PID file to use."
+#: ../bin/kolab_smtp_access_policy.py:446
+msgid "Unauthorized access not allowed"
 msgstr ""
 
-#: .././wallace/__init__.py:68
-msgid "Port that Wallace is supposed to use."
+#: ../bin/kolab_smtp_access_policy.py:467
+#: ../bin/kolab_smtp_access_policy.py:658
+msgid "Could not find recipient"
 msgstr ""
 
-#: .././wallace/__init__.py:102 .././wallace/__init__.py:126
-#: .././wallace/__init__.py:373 .././wallace/__init__.py:401
+#: ../bin/kolab_smtp_access_policy.py:486
+#: ../bin/kolab_smtp_access_policy.py:586
 #, python-format
-msgid "Number of threads currently running: %d"
+msgid "Could not find envelope sender user %s"
 msgstr ""
 
-#: .././wallace/__init__.py:111 .././wallace/__init__.py:135
+#: ../bin/kolab_smtp_access_policy.py:529
 #, python-format
-msgid "Continuing with %d threads currently running"
+msgid "Obtained authenticated user details for %r: %r"
 msgstr ""
 
-#. TODO: Apply throttling
-#: .././wallace/__init__.py:118
+#: ../bin/kolab_smtp_access_policy.py:608
 #, python-format
-msgid "Creating thread for message in %s"
+msgid "%s is unauthorized to send on behalf of %s"
 msgstr ""
 
-#: .././wallace/__init__.py:142
+#: ../bin/kolab_smtp_access_policy.py:618
 #, python-format
-msgid "Running thread %s for message file %s"
+msgid "User %s attempted to use envelope sender address %s "
 msgstr ""
 
-#: .././wallace/__init__.py:151
+#: ../bin/kolab_smtp_access_policy.py:682
+#: ../bin/kolab_smtp_access_policy.py:693
 #, python-format
-msgid "This message was already in module %s, delegating "
+msgid "Found user %s to be a delegate user of %s"
 msgstr ""
 
-#: .././wallace/__init__.py:160
+#: ../bin/kolab_smtp_access_policy.py:717
 #, python-format
-msgid "It was also in a certain stage: %s, letting "
+msgid "Verifying authenticated sender '%(sender)s' with "
 msgstr ""
 
-#: .././wallace/__init__.py:168 .././wallace/__init__.py:174
-#: .././wallace/__init__.py:184
+#: ../bin/kolab_smtp_access_policy.py:722
 #, python-format
-msgid "Executing module %s"
-msgstr ""
-
-#: .././wallace/__init__.py:211 .././bonnie/__init__.py:67
-#: .././kolabd/__init__.py:85 .././saslauthd/__init__.py:90
-msgid "Interrupted by user"
-msgstr ""
-
-#: .././wallace/__init__.py:215 .././wallace/__init__.py:225
-#: .././kolabd/__init__.py:90 .././kolabd/__init__.py:101
-msgid "Traceback occurred, please report a "
+msgid "Verifying unauthenticated sender '%(sender)s' "
 msgstr ""
 
-#: .././wallace/__init__.py:221 .././bonnie/__init__.py:75
-#: .././kolabd/__init__.py:96 .././saslauthd/__init__.py:98
+#: ../bin/kolab_smtp_access_policy.py:739
 #, python-format
-msgid "Type Error: %s"
-msgstr ""
-
-#: .././wallace/__init__.py:241
-msgid "Picking up deferred messages for wallace"
+msgid "Reproducing verify_recipient(%s, %s) from "
 msgstr ""
 
-#: .././wallace/__init__.py:261
+#: ../bin/kolab_smtp_access_policy.py:756
 #, python-format
-msgid "Picking up deferred messages for module %s"
-msgstr ""
-
-#. Sleep for 300 seconds before reprocessing the deferred queues.
-#. TODO: Consider using queue_run_delay from Postfix, which is where
-#. the default value of 300 seconds comes from.
-#: .././wallace/__init__.py:285
-msgid "Sleeping for 300 seconds"
+msgid "Using authentication domain %s instead of %s"
 msgstr ""
 
-#: .././wallace/__init__.py:310
+#: ../bin/kolab_smtp_access_policy.py:766
 #, python-format
-msgid "Could not bind to socket on port %d on bind "
-msgstr ""
-
-#: .././wallace/__init__.py:320
-msgid "Could not shut down socket"
+msgid "Domain %s is a primary domain"
 msgstr ""
 
-#: .././wallace/__init__.py:394
+#: ../bin/kolab_smtp_access_policy.py:774
 #, python-format
-msgid "Picking up spooled email file %s"
+msgid "Checking the recipient for domain %s that is not "
 msgstr ""
 
-#: .././wallace/__init__.py:424
-msgid "Accepted connection"
+#: ../bin/kolab_smtp_access_policy.py:790
+msgid "This recipient address is related to multiple "
 msgstr ""
 
-#. This is a nested module
-#: .././wallace/modules.py:96
+#: ../bin/kolab_smtp_access_policy.py:799
 #, python-format
-msgid "Module Group: %s"
+msgid "Recipient address %r not found. Allowing since "
 msgstr ""
 
-#: .././wallace/modules.py:107 .././wallace/modules.py:112
-msgid "No such module."
+#: ../bin/kolab_smtp_access_policy.py:827
+msgid "Invalid recipient"
 msgstr ""
 
-#: .././wallace/modules.py:118
-#, python-format
-msgid "Holding message in queue for manual review (%s by %s)"
+#: ../bin/kolab_smtp_access_policy.py:838
+msgid "Could not find this user, accepting"
 msgstr ""
 
-#: .././wallace/modules.py:121
+#: ../bin/kolab_smtp_access_policy.py:901
+#: ../bin/kolab_smtp_access_policy.py:954
 #, python-format
-msgid "Deferring message in %s (by module %s)"
+msgid "Sender %s is not allowed to send to "
 msgstr ""
 
-#: .././wallace/modules.py:131
+#: ../bin/kolab_smtp_access_policy.py:941
 #, python-format
-msgid "The time when the message was sent: %r"
+msgid "Reproducing verify_sender(%r) from cache, "
 msgstr ""
 
-#: .././wallace/modules.py:132
-#, python-format
-msgid "The time now: %r"
+#: ../bin/kolab_smtp_access_policy.py:970
+msgid "Sender uses unauthorized envelope sender address"
 msgstr ""
 
-#: .././wallace/modules.py:133
-#, python-format
-msgid "The time delta: %r"
+#: ../bin/kolab_smtp_access_policy.py:987
+msgid "Could not verify sender"
 msgstr ""
 
-#. TODO: Send NDR back to user
-#: .././wallace/modules.py:137
-#, python-format
-msgid "Message in file %s older then 5 days, deleting"
+#: ../bin/kolab_smtp_access_policy.py:994
+msgid "Verifying whether sender is allowed to send to "
 msgstr ""
 
-#: .././wallace/modules.py:162
+#: ../bin/kolab_smtp_access_policy.py:1008
 #, python-format
-msgid "Rejecting message in %s (by module %s)"
+msgid "Result is %r"
 msgstr ""
 
-#: .././wallace/modules.py:180
-#, python-format
-msgid ""
-"This is the email system Wallace at %s.\n"
-"\n"
-"I'm sorry to inform you we could not deliver the attached message\n"
-"to the following recipients:\n"
-"\n"
-"- %s\n"
-"\n"
-"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"
+#: ../bin/kolab_smtp_access_policy.py:1013
+msgid "No recipient policy restrictions exist for this sender"
 msgstr ""
 
-#: .././wallace/modules.py:195
-#, python-format
-msgid ""
-"X-Wallace-Module: %s\n"
-"X-Wallace-Result: REJECT\n"
+#: ../bin/kolab_smtp_access_policy.py:1022
+msgid "Found a recipient policy to apply for this sender."
 msgstr ""
 
-#: .././wallace/modules.py:248
+#: ../bin/kolab_smtp_access_policy.py:1037
 #, python-format
-msgid "Accepting message in %s (by module %s)"
+msgid "Sender %s not allowed to send to recipient "
 msgstr ""
 
-#: .././wallace/modules.py:316
-#, python-format
-msgid "Module '%s' already registered"
+#: ../bin/kolab_smtp_access_policy.py:1068
+msgid "Cleaning up the cache"
 msgstr ""
 
-#: .././wallace/modules.py:338 .././pykolab/tests/tests.py:183
-#: .././pykolab/cli/commands.py:183 .././pykolab/setup/components.py:243
+#: ../bin/kolab_smtp_access_policy.py:1105
 #, python-format
-msgid "Alias for %s"
+msgid "Operational Error in caching: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:57
+#: ../bin/kolab_smtp_access_policy.py:1156
 #, python-format
-msgid "Issuing callback after processing to stage %s"
+msgid "Caching the policy result with timestamp %d"
 msgstr ""
 
-#: .././wallace/module_optout.py:58
+#: ../bin/kolab_smtp_access_policy.py:1233
 #, python-format
-msgid "Testing cb_action_%s()"
+msgid "Returning action DEFER_IF_PERMIT: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:60
+#: ../bin/kolab_smtp_access_policy.py:1238
 #, python-format
-msgid "Attempting to execute cb_action_%s()"
+msgid "Returning action DUNNO: %s"
 msgstr ""
 
-#. modules.next_module('optout')
-#: .././wallace/module_optout.py:66
+#: ../bin/kolab_smtp_access_policy.py:1243
 #, python-format
-msgid "Consulting opt-out service for %r, %r"
+msgid "Returning action HOLD: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:92
+#: ../bin/kolab_smtp_access_policy.py:1248
 #, python-format
-msgid "Running opt-out consult from envelope sender '%s "
+msgid "Returning action PERMIT: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:156
+#: ../bin/kolab_smtp_access_policy.py:1253
 #, python-format
-msgid "Attempting to execute cb_action_%s(%r, %r)"
+msgid "Returning action REJECT: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:177
-#, python-format
-msgid "Could not send request to optout_url %s"
+#: ../bin/kolab_smtp_access_policy.py:1299
+msgid "Starting to loop for new request"
 msgstr ""
 
-#: .././setup-kolab.py:36 .././kolabtest.py:34 .././kolabd.py:31
-#: .././wallace.py:31 .././bonnie.py:31
-msgid "Cannot load pykolab/constants.py:"
+#: ../bin/kolab_smtp_access_policy.py:1306
+msgid "Timeout for policy request reading exceeded"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:89
-msgid "Could not import caching library, caching disabled"
+#: ../bin/kolab_smtp_access_policy.py:1312
+msgid "End of current request"
 msgstr ""
 
-#. Obtain 'kolabDelegate' from the envelope sender.
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:291
+#: ../bin/kolab_smtp_access_policy.py:1316
 #, python-format
-msgid "Obtaining envelope sender dn for %s"
+msgid "Getting line: %s"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:309
-#, python-format
-msgid ""
-"User %s attempted to use envelope sender address %s without authorization"
+#: ../bin/kolab_smtp_access_policy.py:1320
+msgid "Returning request"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:355
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:358
-#, python-format
-msgid "Found user %s to be a valid delegate user of %s"
+#: ../bin/kolab_smtp_access_policy.py:1346
+msgid "Access Policy Options"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:424
-#: .././bin/kolab_smtp_access_policy.py:1301
-msgid "Access Policy Options"
+#: ../bin/kolab_smtp_access_policy.py:1353
+msgid "SMTP Policy request timeout."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:431
-#: .././bin/kolab_smtp_access_policy.py:1308
+#: ../bin/kolab_smtp_access_policy.py:1359
 msgid "Verify the recipient access policy."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:437
-#: .././bin/kolab_smtp_access_policy.py:1314
+#: ../bin/kolab_smtp_access_policy.py:1365
 msgid "Verify the sender access policy."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:443
-#: .././bin/kolab_smtp_access_policy.py:1320
+#: ../bin/kolab_smtp_access_policy.py:1371
 msgid "Allow unauthenticated senders."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:464
-msgid "Verifying sender."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:468
-msgid "No sender specified."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:469
-msgid "Invalid sender"
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:473
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:521
-msgid "No SASL username in request."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:475
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:524
-msgid "Not allowing unauthenticated senders."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:476
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:525
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:534
-msgid "Access denied"
+#: ../bin/kolab_smtp_access_policy.py:1385
+#, python-format
+msgid "Got request instance %s"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:478
-msgid "Allowing unauthenticated senders."
+#: ../bin/kolab_smtp_access_policy.py:1394
+#, python-format
+msgid "Request instance %s is in state %s"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:484
+#: ../bin/kolab_smtp_access_policy.py:1402
 #, python-format
-msgid "Allowing authenticated sender %s to send as %s."
+msgid "Request instance %s is not yet in DATA state"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:492
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:504
+#: ../bin/kolab_smtp_access_policy.py:1414
 #, python-format
-msgid "Authenticated as sender %s"
+msgid "Request instance %s reached DATA state"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:515
-msgid "Verifying recipient."
+#: ../bin/kolab_smtp_access_policy.py:1432
+msgid "Sender access denied"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:518
-#: .././bin/kolab_smtp_access_policy.py:781
-msgid "Invalid recipient"
+#: ../bin/kolab_smtp_access_policy.py:1434
+msgid "Recipient access denied"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:536
-#: .././bin/kolab_smtp_access_policy.py:1383
+#: ../bin/kolab_smtp_access_policy.py:1436
 msgid "No objections"
 msgstr ""
 
-#: .././play/confmgmt/db.py:59 .././play/conf.py:280
-msgid "Dropping all tables..."
-msgstr ""
-
-#: .././play/confmgmt/db.py:62 .././play/conf.py:283
-msgid "Creating the necessary tables..."
-msgstr ""
-
-#: .././play/confmgmt/db.py:69 .././play/conf.py:290
-#: .././play/roundcube_database/__init__.py:57
-#: .././play/roundcube_database/users.py:114 .././pykolab/telemetry.py:652
-msgid "No database available"
-msgstr ""
-
-#: .././play/confmgmt.py:74
-#, python-format
-msgid "Searching for service with name %s"
-msgstr ""
-
-#: .././play/confmgmt.py:77
-#, python-format
-msgid "Found service %s"
+#: ../conf.py:37 ../kolab.py:34 ../saslauthd.py:33
+msgid "Cannot load pykolab/logger.py:"
 msgstr ""
 
-#: .././play/confmgmt.py:82
-#, python-format
-msgid "Searching for role with name %s"
+#: ../kolabd/__init__.py:49 ../saslauthd/__init__.py:48
+#: ../wallace/__init__.py:65
+msgid "Daemon Options"
 msgstr ""
 
-#: .././play/confmgmt.py:85
-#, python-format
-msgid "Found role %s"
+#: ../kolabd/__init__.py:56 ../saslauthd/__init__.py:55
+#: ../wallace/__init__.py:72
+msgid "Fork to the background."
 msgstr ""
 
-#: .././play/confmgmt.py:89
-#, python-format
-msgid "Searching for file with path %s"
+#: ../kolabd/__init__.py:65 ../saslauthd/__init__.py:64
+#: ../wallace/__init__.py:98
+msgid "Path to the PID file to use."
 msgstr ""
 
-#: .././play/confmgmt.py:92
-#, python-format
-msgid "File with path %s not found, adding to database"
+#: ../kolabd/__init__.py:74 ../saslauthd/__init__.py:73
+#: ../wallace/__init__.py:115
+msgid "Run as user USERNAME"
 msgstr ""
 
-#: .././play/confmgmt.py:97
-#, python-format
-msgid "Adding file with path %s to service with name %s"
+#: ../kolabd/__init__.py:84 ../saslauthd/__init__.py:83
+#: ../wallace/__init__.py:89
+msgid "Run as group GROUPNAME"
 msgstr ""
 
-#: .././play/confmgmt.py:101
+#: ../kolabd/__init__.py:122 ../pykolab/utils.py:151
+#: ../wallace/__init__.py:288
 #, python-format
-msgid "Adding setting with key %s (%r, %r)"
+msgid "Group %s does not exist"
 msgstr ""
 
-#: .././play/confmgmt.py:106
+#: ../kolabd/__init__.py:131 ../wallace/__init__.py:297
 #, python-format
-msgid "Adding setting %s to file with path %s"
+msgid "Switching real and effective group id to %d"
 msgstr ""
 
-#: .././play/confmgmt.py:110
+#: ../kolabd/__init__.py:153 ../pykolab/utils.py:175
+#: ../wallace/__init__.py:319
 #, python-format
-msgid "Adding role with name %s to setting with key %s"
+msgid "User %s does not exist"
 msgstr ""
 
-#: .././play/rolequota/__init__.py:53
-#: .././pykolab/plugins/dynamicquota/__init__.py:50
+#: ../kolabd/__init__.py:163 ../wallace/__init__.py:329
 #, python-format
-msgid "No keyword %s passed to set_user_folder_quota"
+msgid "Switching real and effective user id to %d"
 msgstr ""
 
-#: .././play/roundcube_database/__init__.py:51
-#: .././play/roundcube_database/users.py:108
-#, python-format
-msgid "Operational Error in Roundcube database: %s"
+#: ../kolabd/__init__.py:172 ../wallace/__init__.py:338
+msgid "Could not change real and effective uid and/or gid"
 msgstr ""
 
-#: .././kwap/kwap/controllers/secure.py:25
-msgid "Secure Controller here"
+#: ../kolabd/__init__.py:192 ../saslauthd/__init__.py:122
+#: ../wallace/__init__.py:358
+msgid "Interrupted by user"
 msgstr ""
 
-#: .././kwap/kwap/controllers/root.py:103
-msgid "Wrong credentials"
+#: ../kolabd/__init__.py:197 ../kolabd/__init__.py:208
+#: ../wallace/__init__.py:362 ../wallace/__init__.py:372
+msgid "Traceback occurred, please report a "
 msgstr ""
 
-#: .././kwap/kwap/controllers/root.py:118
+#: ../kolabd/__init__.py:203 ../saslauthd/__init__.py:130
+#: ../wallace/__init__.py:368
 #, python-format
-msgid "Welcome back, %s!"
-msgstr ""
-
-#: .././kwap/kwap/controllers/root.py:128
-msgid "We hope to see you soon!"
-msgstr ""
-
-#: .././saslauthd.py:33 .././kolab.py:34 .././conf.py:37
-msgid "Cannot load pykolab/logger.py:"
-msgstr ""
-
-#: .././bonnie/__init__.py:71 .././bonnie/__init__.py:79
-#: .././saslauthd/__init__.py:94 .././saslauthd/__init__.py:102
-msgid "Traceback occurred, please report a bug at http://bugzilla.kolabsys.com"
+msgid "Type Error: %s"
 msgstr ""
 
-#: .././kolabd/__init__.py:116 .././pykolab/auth/ldap/__init__.py:1291
-#: .././pykolab/cli/cmd_sync.py:33
+#: ../kolabd/__init__.py:223 ../pykolab/auth/ldap/__init__.py:1591
+#: ../pykolab/cli/cmd_sync.py:36
 msgid "Listing domains..."
 msgstr ""
 
-#: .././kolabd/__init__.py:148
+#: ../kolabd/__init__.py:256
 #, python-format
 msgid "added domains: %r, removed domains: %r"
 msgstr ""
 
-#: .././pykolab/__init__.py:50
-msgid "Returning thread local configuration"
-msgstr ""
-
-#: .././pykolab/tests/tests.py:53
-msgid "List tests"
-msgstr ""
-
-#. This is a nested test
-#: .././pykolab/tests/tests.py:86
-#, python-format
-msgid "Test Suite: %s"
-msgstr ""
-
-#: .././pykolab/tests/tests.py:100 .././pykolab/tests/tests.py:105
-msgid "No such test."
-msgstr ""
-
-#: .././pykolab/tests/tests.py:157 .././pykolab/tests/tests.py:161
-#, python-format
-msgid "Test '%s' already registered"
-msgstr ""
-
-#: .././pykolab/tests/tests.py:191 .././pykolab/cli/commands.py:191
-#: .././pykolab/setup/components.py:251
-msgid "Not yet implemented"
-msgstr ""
-
-#: .././pykolab/tests/__init__.py:39
-msgid "Test Options"
-msgstr ""
-
-#: .././pykolab/tests/__init__.py:45
-msgid "Run tests in suite SUITE. Implies a certain set of items being tested."
-msgstr ""
-
-#: .././pykolab/tests/imap/test_login.py:44
-#, python-format
-msgid "Connecting at %s"
+#: ../kolabd.py:31 ../setup-kolab.py:36 ../wallace.py:31
+msgid "Cannot load pykolab/constants.py:"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:46
+#: ../pykolab/auth/__init__.py:94
 #, python-format
-msgid "Connected at %s"
+msgid "Called for domain %r"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:51
+#: ../pykolab/auth/__init__.py:107 ../pykolab/auth/__init__.py:116
 #, python-format
-msgid "Logging in at %s"
+msgid "Using section %s and domain %s"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:53
+#: ../pykolab/auth/__init__.py:121
 #, python-format
-msgid "Logged in at %s"
+msgid "Connecting to Authentication backend for domain %s"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:60
+#: ../pykolab/auth/__init__.py:132
 #, python-format
-msgid "Test failure in %s"
+msgid "Section %s has no option 'auth_mechanism'"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:94
+#: ../pykolab/auth/__init__.py:139
 #, python-format
-msgid "Called for domain %r"
+msgid "Section %s has auth_mechanism: %r"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:107 .././pykolab/auth/__init__.py:116
-#, python-format
-msgid "Using section %s and domain %s"
+#: ../pykolab/auth/__init__.py:148 ../pykolab/auth/__init__.py:157
+msgid "Starting LDAP..."
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:121
+#: ../pykolab/auth/ldap/cache.py:109
 #, python-format
-msgid "Connecting to Authentication backend for domain %s"
+msgid "Inserting cache entry %r"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:132
+#: ../pykolab/auth/ldap/cache.py:122
 #, python-format
-msgid "Section %s has no option 'auth_mechanism'"
+msgid "Updating timestamp for cache entry %r"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:139
+#: ../pykolab/auth/ldap/cache.py:129
 #, python-format
-msgid "Section %s has auth_mechanism: %r"
-msgstr ""
-
-#: .././pykolab/auth/__init__.py:148 .././pykolab/auth/__init__.py:157
-msgid "Starting LDAP..."
+msgid "Updating result_attribute for cache entry %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:51
+#: ../pykolab/auth/ldap/__init__.py:51
 msgid "Python LDAP library does not support persistent search"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:141
+#: ../pykolab/auth/ldap/__init__.py:142
 #, python-format
 msgid "Attempting to authenticate user %s in realm %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:181
+#: ../pykolab/auth/ldap/__init__.py:184
 #, python-format
 msgid "Binding with user_dn %s and password %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:190
+#: ../pykolab/auth/ldap/__init__.py:194
 #, python-format
 msgid "Failed to authenticate as user %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:205
+#: ../pykolab/auth/ldap/__init__.py:211
 msgid "Connecting to LDAP..."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:209
+#: ../pykolab/auth/ldap/__init__.py:215
 #, python-format
 msgid "Attempting to use LDAP URI %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:345
+#: ../pykolab/auth/ldap/__init__.py:357
 #, python-format
 msgid "Finding recipient with filter %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:398
+#: ../pykolab/auth/ldap/__init__.py:425
+#, python-format
+msgid "Finding resource with filter %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:448
+#, python-format
+msgid "Using timestamp %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:480
 #, python-format
 msgid "Applying recipient policy to %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:415
+#: ../pykolab/auth/ldap/__init__.py:497
 #, python-format
 msgid "Using mail attributes: %r, with primary %r and "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:426
+#: ../pykolab/auth/ldap/__init__.py:508
 #, python-format
 msgid "key %r not in entry"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:428
+#: ../pykolab/auth/ldap/__init__.py:510
 #, python-format
 msgid "key %r is the prim. mail attr."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:430
+#: ../pykolab/auth/ldap/__init__.py:512
 msgid "prim. mail pol. is not empty"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:433
+#: ../pykolab/auth/ldap/__init__.py:515
 #, python-format
 msgid "key %r is the sec. mail attr."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:435
+#: ../pykolab/auth/ldap/__init__.py:517
 msgid "sec. mail pol. is not empty"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:438
-#: .././pykolab/auth/ldap/__init__.py:451
+#: ../pykolab/auth/ldap/__init__.py:520 ../pykolab/auth/ldap/__init__.py:533
 #, python-format
 msgid "Attributes %r are not yet available for entry %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:492
+#: ../pykolab/auth/ldap/__init__.py:574
 #, python-format
 msgid "No results for mail address %s found"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:503
+#: ../pykolab/auth/ldap/__init__.py:585
 #, python-format
 msgid "1 result for address %s found, verifying"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:513
+#: ../pykolab/auth/ldap/__init__.py:595
 #, python-format
 msgid "Too bad, primary email address %s "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:524
-#: .././pykolab/auth/ldap/__init__.py:613
+#: ../pykolab/auth/ldap/__init__.py:606 ../pykolab/auth/ldap/__init__.py:695
 msgid "Address assigned to us"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:579
+#: ../pykolab/auth/ldap/__init__.py:661
 #, python-format
 msgid "No results for address %s found"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:590
+#: ../pykolab/auth/ldap/__init__.py:672
 #, python-format
 msgid "1 result for address %s found, "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:601
+#: ../pykolab/auth/ldap/__init__.py:683
 msgid "Too bad, secondary email "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:655
+#: ../pykolab/auth/ldap/__init__.py:710
+msgid "Recipient policy composed the following set of secondary "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:716
+#, python-format
+msgid "Secondary mail addresses that we want is not None: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:727
+msgid "Avoiding the duplication of the primary mail "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:738
+#, python-format
+msgid "Entry is getting secondary mail addresses: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:746
+msgid "Entry did not have any secondary mail "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:772
 #, python-format
 msgid "Entry modifications list: %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:698
+#: ../pykolab/auth/ldap/__init__.py:792
+#, python-format
+msgid "Setting entry attribute %r to %r for %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:828
+#, python-format
+msgid "Could not update dn %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:841
 #, python-format
 msgid "Using filter %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:736
+#: ../pykolab/auth/ldap/__init__.py:879
+#, python-format
+msgid "About to consider the user quota for %r (used: %r, "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:945
 msgid "Invalid bind credentials"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:989
+#: ../pykolab/auth/ldap/__init__.py:1229
 #, python-format
 msgid "Current changelog entry %s with %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:996
+#: ../pykolab/auth/ldap/__init__.py:1242
 #, python-format
 msgid "Result from recipient policy: %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1227
+#: ../pykolab/auth/ldap/__init__.py:1385
+#, python-format
+msgid "Kolab user %s does not have a result attribute %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1527
 #, python-format
 msgid "Finding domain root dn for domain %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1315
+#: ../pykolab/auth/ldap/__init__.py:1615
 msgid "Authentication database DOWN"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1394
+#: ../pykolab/auth/ldap/__init__.py:1699 ../pykolab/auth/ldap/__init__.py:1734
 #, python-format
 msgid "Entry type: %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1492
+#: ../pykolab/auth/ldap/__init__.py:1822
 msgid "LDAP Search Result Data Entry:"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1508
+#: ../pykolab/auth/ldap/__init__.py:1838
 msgid "Entry Change Notification attributes:"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1513
+#: ../pykolab/auth/ldap/__init__.py:1843
 #, python-format
 msgid "Change Type: %r (%r)"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1521
+#: ../pykolab/auth/ldap/__init__.py:1851
 #, python-format
 msgid "Previous DN: %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1575
+#: ../pykolab/auth/ldap/__init__.py:1906
 #, python-format
 msgid "Object %s searched no longer exists"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1583
+#: ../pykolab/auth/ldap/__init__.py:1916
 #, python-format
 msgid "%d results..."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1677
+#: ../pykolab/auth/ldap/__init__.py:2014
 #, python-format
 msgid "Searching with filter %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1721
+#: ../pykolab/auth/ldap/__init__.py:2058
 #, python-format
 msgid "Checking for support for %s on %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/cache.py:109
-#, python-format
-msgid "Inserting cache entry %r"
+#: ../pykolab/cli/cmd_add_domain.py:36 ../pykolab/cli/cmd_create_mailbox.py:36
+#: ../pykolab/cli/cmd_export_mailbox.py:33
+#: ../pykolab/cli/cmd_list_mailboxes.py:39
+msgid "CLI Options"
 msgstr ""
 
-#: .././pykolab/auth/ldap/cache.py:122
-#, python-format
-msgid "Updating timestamp for cache entry %r"
+#: ../pykolab/cli/cmd_add_domain.py:42
+msgid "Add domain as alias for DOMAIN"
 msgstr ""
 
-#: .././pykolab/auth/ldap/cache.py:128
-#, python-format
-msgid "Updating result_attribute for cache entry %r"
+#: ../pykolab/cli/cmd_add_domain.py:47
+msgid "Add a new domain or domain alias."
 msgstr ""
 
-#: .././pykolab/auth/sql/__init__.py:44
-msgid "Connecting to SQL..."
+#: ../pykolab/cli/cmd_add_domain.py:55
+msgid "Could not find credentials with sufficient permissions"
 msgstr ""
 
-#: .././pykolab/utils.py:92
-msgid "Please answer 'yes' or 'no'."
+#: ../pykolab/cli/cmd_add_domain.py:80 ../pykolab/wap_client/__init__.py:113
+msgid "Invalid parent domain"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:87
-#, python-format
-msgid "Setting %s to %r (from defaults)"
+#: ../pykolab/cli/cmd_add_domain.py:86
+msgid "Domain name"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:106
-#, python-format
-msgid "Setting %s to %r (from CLI, verified)"
+#: ../pykolab/cli/cmd_create_mailbox.py:41
+msgid "Set metadata for folder to ANNOTATION=VALUE"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:109
-#, python-format
-msgid "Setting %s to %r (from CLI, not checked)"
+#: ../pykolab/cli/cmd_create_mailbox.py:50
+msgid "Invalid argument"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:150 .././pykolab/conf/__init__.py:207
-#, python-format
-msgid "Setting %s_%s to '****' (from configuration file)"
+#: ../pykolab/cli/cmd_create_mailbox.py:58
+msgid "Invalid argument for metadata"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:152 .././pykolab/conf/__init__.py:209
-#, python-format
-msgid "Setting %s_%s to %r (from configuration file)"
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:45
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:49
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:50
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:55
+msgid "ACI Subject"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:162
-msgid "Setting options from configuration file"
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:48
+#: ../pykolab/cli/cmd_list_mailbox_acls.py:41
+#: ../pykolab/cli/cmd_list_mailbox_metadata.py:41
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:54
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:54
+msgid "Folder name"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:223
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:60
+#: ../pykolab/cli/cmd_list_mailbox_acls.py:52
+#: ../pykolab/cli/cmd_list_mailbox_metadata.py:52
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:67
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:67
 #, python-format
-msgid "Configuration file %s not readable"
+msgid "No such folder %r"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:226
-#, python-format
-msgid "Reading configuration file %s"
+#: ../pykolab/cli/cmd_delete_mailbox.py:46
+msgid "No mailbox specified"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:230
+#: ../pykolab/cli/cmd_export_mailbox.py:38
+msgid "All folders this user has access to"
+msgstr ""
+
+#: ../pykolab/cli/cmd_export_mailbox.py:108
+#, python-format
+msgid "%s is not a directory"
+msgstr ""
+
+#: ../pykolab/cli/cmd_export_mailbox.py:118
+#, python-format
+msgid "ZIP file at %s.zip"
+msgstr ""
+
+#: ../pykolab/cli/cmd_export_mailbox.py:120
+#, python-format
+msgid "No directories found for user %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_mailboxes.py:44
+msgid "Display raw IMAP UTF-7 folder names"
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_mailboxes.py:75
+#, python-format
+msgid "Appending folder search for %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:49
+msgid "Invalid or unqualified email address."
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:57
+#, python-format
+msgid "No recipient found for email address %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:60
+#, python-format
+msgid "Found the following recipient(s): %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:66
+#, python-format
+msgid "Using the following mail attributes: %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:90
+msgid "Found the following recipients:"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:48
+msgid "No target mailbox name specified"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:50
+msgid "No source mailbox name specified"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:62
+#, python-format
+msgid "Source folder %r does not exist"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:66
+#, python-format
+msgid "Target folder %r already exists"
+msgstr ""
+
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:47
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:51
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:56
+msgid "ACI Permissions"
+msgstr ""
+
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:47
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:51
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:56
+msgid "Metadata value"
+msgstr ""
+
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:50
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:55
+msgid "Metadata path"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:41
+#, python-format
+msgid "Found %d domains in %d seconds"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:51
+#, python-format
+msgid "Running for domain %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:57
+#, python-format
+msgid "Synchronizing users for %s took %d seconds"
+msgstr ""
+
+#. This is a nested command
+#. This is a nested component
+#: ../pykolab/cli/commands.py:98 ../pykolab/setup/components.py:90
+#, python-format
+msgid "Command Group: %s"
+msgstr ""
+
+#: ../pykolab/cli/commands.py:109 ../pykolab/cli/commands.py:114
+msgid "No such command."
+msgstr ""
+
+#: ../pykolab/cli/commands.py:165 ../pykolab/setup/components.py:231
+#, python-format
+msgid "Command '%s' already registered"
+msgstr ""
+
+#: ../pykolab/cli/commands.py:190 ../pykolab/setup/components.py:257
+#: ../wallace/modules.py:338
+#, python-format
+msgid "Alias for %s"
+msgstr ""
+
+#: ../pykolab/cli/commands.py:198 ../pykolab/setup/components.py:265
+msgid "Not yet implemented"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:40
+msgid "Unspecified command issue identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:50
+msgid "Invalid command issue identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:60
+#: ../pykolab/cli/telemetry/cmd_examine_session.py:65
+msgid "Invalid session identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:75
+#: ../pykolab/cli/telemetry/cmd_examine_session.py:100
+#, python-format
+msgid "Session by %s on server %s"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_session.py:43
+msgid "Unspecified session identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_list_sessions.py:35
+msgid "List Options"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_list_sessions.py:40
+msgid "Display sessions since ..."
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_list_sessions.py:58
+#, python-format
+msgid "Session for user %s started at %s with ID %s"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:57 ../pykolab/conf/entitlement.py:80
+#: ../pykolab/conf/entitlement.py:98 ../pykolab/conf/entitlement.py:116
+#: ../pykolab/conf/entitlement.py:230 ../pykolab/conf/entitlement.py:246
+#: ../pykolab/conf/entitlement.py:262
+msgid "Invalid entitlement verification "
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:120 ../pykolab/conf/entitlement.py:123
+msgid "Invalid entitlement certificate"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:132
+#, python-format
+msgid "Parsing entitlement file %s"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:141
+#, python-format
+msgid "License file %s not readable!"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:147
+msgid "No entitlement directory found"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:87
+#, python-format
+msgid "Setting %s to %r (from defaults)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:106
+#, python-format
+msgid "Setting %s to %r (from CLI, verified)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:109
+#, python-format
+msgid "Setting %s to %r (from CLI, not checked)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:150 ../pykolab/conf/__init__.py:207
+#, python-format
+msgid "Setting %s_%s to '****' (from configuration file)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:152 ../pykolab/conf/__init__.py:209
+#, python-format
+msgid "Setting %s_%s to %r (from configuration file)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:162
+msgid "Setting options from configuration file"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:223
+#, python-format
+msgid "Configuration file %s not readable"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:226
+#, python-format
+msgid "Reading configuration file %s"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:230
 #, python-format
 msgid "Invalid configuration file %s"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:233
+#: ../pykolab/conf/__init__.py:233
 #, python-format
 msgid "No master configuration section [kolab] in configuration file %s"
 msgstr ""
@@ -811,1088 +925,1335 @@ msgstr ""
 #. #
 #. # Runtime Options
 #. #
-#: .././pykolab/conf/__init__.py:267
+#: ../pykolab/conf/__init__.py:267
 msgid "Runtime Options"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:272
+#: ../pykolab/conf/__init__.py:272
 msgid "Configuration file to use"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:278
+#: ../pykolab/conf/__init__.py:278
 msgid "Set the debugging "
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:286
+#: ../pykolab/conf/__init__.py:286
 msgid "Set the logging level. "
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:294
+#: ../pykolab/conf/__init__.py:294
 msgid "Log file to use"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:300
+#: ../pykolab/conf/__init__.py:300
 msgid "Be quiet."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:306
+#: ../pykolab/conf/__init__.py:306
 msgid "Answer yes to all questions."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:328
+#: ../pykolab/conf/__init__.py:328
 msgid "No command supplied"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:411
+#: ../pykolab/conf/__init__.py:411
 msgid "Insufficient options. Need section, key and value -in that order."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:414
+#: ../pykolab/conf/__init__.py:414
 #, python-format
 msgid "No section '%s' exists."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:445
+#: ../pykolab/conf/__init__.py:445
 #, python-format
 msgid "Setting %s to %r (from the default values for CLI options)"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:514
+#: ../pykolab/conf/__init__.py:514
 #, python-format
 msgid "Could not execute configuration function: %s"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:522
+#: ../pykolab/conf/__init__.py:522
 #, python-format
 msgid "Option %s/%s does not exist in config file %s, pulling from defaults"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:530 .././pykolab/conf/__init__.py:533
+#: ../pykolab/conf/__init__.py:530 ../pykolab/conf/__init__.py:533
 msgid "Option does not exist in defaults."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:531 .././pykolab/conf/__init__.py:534
-msgid "Not available"
-msgstr ""
-
-#: .././pykolab/conf/__init__.py:543
+#: ../pykolab/conf/__init__.py:543
 #, python-format
 msgid "Configuration file %s not readable."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:546
+#: ../pykolab/conf/__init__.py:546
 #, python-format
 msgid "Configuration file %s does not exist."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:551
+#: ../pykolab/conf/__init__.py:551
 msgid ""
 "WARNING: A negative debug level value does not make this program be any more "
 "silent."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:557
+#: ../pykolab/conf/__init__.py:557
 msgid "This program has 9 levels of verbosity. Using the maximum of 9."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:565 .././pykolab/conf/__init__.py:571
+#: ../pykolab/conf/__init__.py:565 ../pykolab/conf/__init__.py:571
 msgid "Cannot start SASL authentication daemon"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:582
+#: ../pykolab/conf/__init__.py:582
 msgid "No imaplib library found."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:592
+#: ../pykolab/conf/__init__.py:592
 msgid "No LMTP class found in the smtplib library."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:602
+#: ../pykolab/conf/__init__.py:602
 msgid "No SMTP class found in the smtplib library."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:616
+#: ../pykolab/conf/__init__.py:616
 #, python-format
 msgid "Found you specified a specific set of items to test: %s"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:624
+#: ../pykolab/conf/__init__.py:624
 #, python-format
 msgid "Selectively selecting: %s"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:57 .././pykolab/conf/entitlement.py:80
-#: .././pykolab/conf/entitlement.py:98 .././pykolab/conf/entitlement.py:116
-#: .././pykolab/conf/entitlement.py:229 .././pykolab/conf/entitlement.py:245
-#: .././pykolab/conf/entitlement.py:261
-msgid "Invalid entitlement verification "
+#: ../pykolab/constants.py.in:40
+msgid "PyKolab is a Kolab Systems product. For more information "
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:120 .././pykolab/conf/entitlement.py:123
-msgid "Invalid entitlement certificate"
+#: ../pykolab/constants.py.in:54
+msgid "WARNING"
+msgstr ""
+
+#: ../pykolab/constants.py.in:54
+msgid "The Fully Qualified "
+msgstr ""
+
+#: ../pykolab/constants.py.in:75
+msgid "389 Directory Server or Red Hat Directory Server"
+msgstr ""
+
+#: ../pykolab/constants.py.in:79 ../pykolab/constants.py.in:83
+msgid "OpenLDAP or compatible"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:132
+#: ../pykolab/imap/cyrus.py:79
 #, python-format
-msgid "Parsing entitlement file %s"
+msgid "Could not connect to Cyrus IMAP server %r"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:141
+#: ../pykolab/imap/cyrus.py:134
 #, python-format
-msgid "License file %s not readable!"
+msgid "Continuing with separator: %r"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:146
-msgid "No entitlement directory found"
+#: ../pykolab/imap/cyrus.py:139
+msgid "Detected we are running in a Murder topology"
 msgstr ""
 
-#: .././pykolab/logger.py:89
+#: ../pykolab/imap/cyrus.py:143
+msgid "This system is not part of a murder topology"
+msgstr ""
+
+#: ../pykolab/imap/cyrus.py:164
 #, python-format
-msgid "Cannot log to file %s: %s"
+msgid "Checking actual backend server for folder %s through annotations"
 msgstr ""
 
-#: .././pykolab/constants.py:40
-msgid "PyKolab is a Kolab Systems product. For more information "
+#: ../pykolab/imap/cyrus.py:179
+#, python-format
+msgid "Could not get the annotations after %s tries."
 msgstr ""
 
-#: .././pykolab/constants.py:54
-msgid "WARNING"
+#: ../pykolab/imap/cyrus.py:183
+#, python-format
+msgid "No annotations for %s: %r"
 msgstr ""
 
-#: .././pykolab/constants.py:54
-msgid "The Fully Qualified "
+#: ../pykolab/imap/cyrus.py:190
+#, python-format
+msgid "Server for INBOX folder %s is %s"
 msgstr ""
 
-#: .././pykolab/constants.py:75
-msgid "389 Directory Server or Red Hat Directory Server"
+#: ../pykolab/imap/cyrus.py:202
+#, python-format
+msgid "Setting quota for folder %s to %s"
 msgstr ""
 
-#: .././pykolab/constants.py:79 .././pykolab/constants.py:83
-msgid "OpenLDAP or compatible"
+#: ../pykolab/imap/cyrus.py:206
+#, python-format
+msgid "Could not set quota for mailfolder %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_list_sessions.py:35
-msgid "List Options"
+#: ../pykolab/imap/cyrus.py:215
+#, python-format
+msgid "Moving INBOX folder %s to %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_list_sessions.py:40
-msgid "Display sessions since ..."
+#: ../pykolab/imap/cyrus.py:227
+#, python-format
+msgid "Setting annotation %s on folder %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_list_sessions.py:58
+#: ../pykolab/imap/cyrus.py:234
 #, python-format
-msgid "Session for user %s started at %s with ID %s"
+msgid "Could not set annotation %r on mail folder %r: %r"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_session.py:43
-msgid "Unspecified session identifier"
+#: ../pykolab/imap/cyrus.py:238
+#, python-format
+msgid "Transferring folder %s from %s to %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_session.py:65
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:60
-msgid "Invalid session identifier"
+#: ../pykolab/imap/cyrus.py:298
+#, python-format
+msgid "Undeleting %s to %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_session.py:100
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:75
+#: ../pykolab/imap/__init__.py:45
 #, python-format
-msgid "Session by %s on server %s"
+msgid "Cleaning up ACL entries for %s across all folders"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:40
-msgid "Unspecified command issue identifier"
+#: ../pykolab/imap/__init__.py:60
+#, python-format
+msgid "Cleaning up ACL entries referring to identifier %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:50
-msgid "Invalid command issue identifier"
+#: ../pykolab/imap/__init__.py:69
+#, python-format
+msgid "Iterating over %d folders"
 msgstr ""
 
-#. This is a nested command
-#. This is a nested component
-#: .././pykolab/cli/commands.py:95 .././pykolab/setup/components.py:88
+#. Set the ACL to '' (effectively deleting the ACL entry)
+#: ../pykolab/imap/__init__.py:82
 #, python-format
-msgid "Command Group: %s"
+msgid "Removing acl %r for subject %r from folder %r"
 msgstr ""
 
-#: .././pykolab/cli/commands.py:106 .././pykolab/cli/commands.py:111
-msgid "No such command."
+#: ../pykolab/imap/__init__.py:143
+#, python-format
+msgid "Logging on to Cyrus IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/commands.py:161 .././pykolab/setup/components.py:217
+#: ../pykolab/imap/__init__.py:152
 #, python-format
-msgid "Command '%s' already registered"
+msgid "Logging on to Dovecot IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_delete_mailbox.py:43
-msgid "No mailbox specified"
+#: ../pykolab/imap/__init__.py:161
+#, python-format
+msgid "Logging on to generic IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_list_mailboxes.py:35
-#: .././pykolab/cli/cmd_export_mailbox.py:33
-msgid "CLI Options"
+#: ../pykolab/imap/__init__.py:179
+#, python-format
+msgid "Reusing existing IMAP server connection to %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_list_mailboxes.py:40
-msgid "Display raw UTF-7 folder names"
+#: ../pykolab/imap/__init__.py:181
+#, python-format
+msgid "Reconnecting to IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:38
-msgid "All folders this user has access to"
+#: ../pykolab/imap/__init__.py:197
+msgid "Called imap.disconnect() on a server that "
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:108
+#: ../pykolab/imap/__init__.py:213
 #, python-format
-msgid "%s is not a directory"
+msgid "%r has no attribute %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:118
+#: ../pykolab/imap/__init__.py:286
+msgid "Private annotations need to be set using the appropriate user account."
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:319 ../pykolab/imap/__init__.py:354
 #, python-format
-msgid "ZIP file at %s.zip"
+msgid "Creating new shared folder %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:120
+#: ../pykolab/imap/__init__.py:376
 #, python-format
-msgid "No directories found for user %s"
+msgid "Creating new mailbox for user %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_sync.py:38
+#: ../pykolab/imap/__init__.py:405
 #, python-format
-msgid "Found %d domains in %d seconds"
+msgid "Creating additional folders for user %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_sync.py:48
+#: ../pykolab/imap/__init__.py:429
 #, python-format
-msgid "Running for domain %s"
+msgid "Mailbox already exists: %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_sync.py:54
+#: ../pykolab/imap/__init__.py:472
+msgid "Subscribing user to the additional folders"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:532 ../pykolab/imap/__init__.py:611
 #, python-format
-msgid "Synchronizing users for %s took %d seconds"
+msgid "Renaming INBOX from %s to %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:536
+#, python-format
+msgid "Could not rename INBOX folder %s to %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:538 ../pykolab/imap/__init__.py:615
+#, python-format
+msgid "Moving INBOX folder %s won't succeed as target folder %s already exists"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:70
+#: ../pykolab/imap/__init__.py:551
+#, python-format
+msgid "Looking for folder '%s', we found folders: %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:574
+#, python-format
+msgid "Setting ACL rights %s for subject %s on folder "
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:585
+#, python-format
+msgid "Removing ACL rights %s for subject %s on folder "
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:608
+#, python-format
+msgid "Found old INBOX folder %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:617
+#, python-format
+msgid "Did not find old folder user/%s to rename"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:619
+msgid "Value for user is not a dictionary"
+msgstr ""
+
+#. TODO: Go in fact correct the quota.
+#: ../pykolab/imap/__init__.py:682
+#, python-format
+msgid "Cannot get current IMAP quota for folder %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:695
+#, python-format
+msgid "Quota for %s currently is %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:701
+#, python-format
+msgid "Adjusting authentication database quota for folder %s to %d"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:706
+#, python-format
+msgid "Correcting quota for %s to %s (currently %s)"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:788
+#, python-format
+msgid "Checking folder: %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:793
+#, python-format
+msgid "Folder has no corresponding user (1): %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:796
+#, python-format
+msgid "Folder has no corresponding user (2): %s"
+msgstr ""
+
+#. We got user identifier only
+#: ../pykolab/imap/__init__.py:811
+msgid "Please don't give us just a user identifier"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:814
+#, python-format
+msgid "Deleting folder %s"
+msgstr ""
+
+#: ../pykolab/__init__.py:50
+msgid "Returning thread local configuration"
+msgstr ""
+
+#: ../pykolab/logger.py:105
+#, python-format
+msgid "Could not change the ownership of log file %s"
+msgstr ""
+
+#: ../pykolab/logger.py:121
+#, python-format
+msgid "Cannot log to file %s: %s"
+msgstr ""
+
+#: ../pykolab/plugins/defaultfolders/__init__.py:47
+#, python-format
+msgid "Plugin %s called without required keyword %s."
+msgstr ""
+
+#: ../pykolab/plugins/defaultfolders/__init__.py:53
+msgid "Could not parse additional_folders"
+msgstr ""
+
+#: ../pykolab/plugins/dynamicquota/__init__.py:58
+#, python-format
+msgid "No keyword %s passed to set_user_folder_quota"
+msgstr ""
+
+#: ../pykolab/plugins/dynamicquota/__init__.py:70
+#, python-format
+msgid "Quota '%s' not an integer!"
+msgstr ""
+
+#: ../pykolab/plugins/__init__.py:70
 #, python-format
 msgid "ImportError for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:74
+#: ../pykolab/plugins/__init__.py:74
 #, python-format
 msgid "RuntimeError for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:78
+#: ../pykolab/plugins/__init__.py:78
 #, python-format
 msgid "Plugin %s failed to load (%s: %s)"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:116 .././pykolab/plugins/__init__.py:118
+#: ../pykolab/plugins/__init__.py:116 ../pykolab/plugins/__init__.py:118
 #, python-format
 msgid "Cannot set defaults for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:120
+#: ../pykolab/plugins/__init__.py:120
 #, python-format
 msgid "Cannot set defaults for plugin %s: Unknown Error"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:123
+#: ../pykolab/plugins/__init__.py:123
 #, python-format
 msgid "Not setting defaults for plugin %s: No function 'set_defaults()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:142
+#: ../pykolab/plugins/__init__.py:142
 #, python-format
 msgid "Cannot set runtime for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:144
+#: ../pykolab/plugins/__init__.py:144
 #, python-format
 msgid "Not setting runtime for plugin %s: No function 'set_runtime()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:163 .././pykolab/plugins/__init__.py:165
+#: ../pykolab/plugins/__init__.py:163 ../pykolab/plugins/__init__.py:165
 #, python-format
 msgid "Cannot add options for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:167
+#: ../pykolab/plugins/__init__.py:167
 #, python-format
 msgid "Not adding options for plugin %s: No function 'add_options()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:187
+#: ../pykolab/plugins/__init__.py:187
 #, python-format
 msgid "Cannot check options for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:189
+#: ../pykolab/plugins/__init__.py:189
 #, python-format
 msgid "Not checking options for plugin %s: No function 'check_options()'"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:227
+#: ../pykolab/plugins/__init__.py:227
 #, python-format
 msgid "Executing hook %s for plugin %s"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:231 .././pykolab/plugins/__init__.py:233
+#: ../pykolab/plugins/__init__.py:231 ../pykolab/plugins/__init__.py:233
 #, python-format
 msgid "Cannot execute hook %s for plugin %s: %s"
 msgstr ""
 
-#: .././pykolab/plugins/defaultfolders/__init__.py:47
-#, python-format
-msgid "Plugin %s called without required keyword %s."
+#: ../pykolab/plugins/recipientpolicy/__init__.py:79
+msgid "Attribute substitution for 'mail' failed in Recipient Policy"
 msgstr ""
 
-#: .././pykolab/plugins/defaultfolders/__init__.py:53
-msgid "Could not parse additional_folders"
+#: ../pykolab/plugins/recipientpolicy/__init__.py:115
+msgid "Could not parse the alternative mail routines"
 msgstr ""
 
-#: .././pykolab/plugins/dynamicquota/__init__.py:56
-#, python-format
-msgid "Quota '%s' not an integer!"
+#: ../pykolab/plugins/recipientpolicy/__init__.py:127
+#: ../pykolab/plugins/recipientpolicy/__init__.py:137
+msgid ""
+"Attribute substitution for 'alternative_mail' failed in Recipient Policy"
 msgstr ""
 
-#: .././pykolab/plugins/dynamicquota/__init__.py:63
-msgid ""
-"The new quota was set to 0, but default quota > 0, returning default quota"
+#: ../pykolab/setup/components.py:58
+msgid "Display this help."
 msgstr ""
 
-#: .././pykolab/plugins/dynamicquota/__init__.py:82
-msgid ""
-"The default quota is larger then the calculated new quota, using the default "
-"quota"
+#: ../pykolab/setup/components.py:149
+msgid "No component selected, continuing for all components"
 msgstr ""
 
-#: .././pykolab/plugins/recipientpolicy/__init__.py:70
-msgid "Attribute substitution for 'mail' failed in Recipient Policy"
+#: ../pykolab/setup/components.py:187 ../pykolab/setup/components.py:192
+msgid "No such component."
 msgstr ""
 
-#: .././pykolab/plugins/recipientpolicy/__init__.py:97
-msgid "Could not parse the alternative mail routines"
+#: ../pykolab/setup/setup_freebusy.py:46
+msgid "Setup Free/Busy."
 msgstr ""
 
-#: .././pykolab/plugins/recipientpolicy/__init__.py:109
-#: .././pykolab/plugins/recipientpolicy/__init__.py:119
-msgid ""
-"Attribute substitution for 'alternative_mail' failed in Recipient Policy"
+#: ../pykolab/setup/setup_freebusy.py:50
+msgid "Free/Busy is not installed on this system"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:40
-msgid "Setup zpush."
+#: ../pykolab/setup/setup_freebusy.py:55
+msgid ""
+"\n"
+"                        Please supply the MySQL password for the "
+"'roundcube'\n"
+"                        user. You have supplied this password earlier, and "
+"it is\n"
+"                        available from the database URI setting in\n"
+"                        /etc/roundcubemail/db.inc.php.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:44
-msgid "Z-Push is not installed on this system"
+#: ../pykolab/setup/setup_freebusy.py:64
+#: ../pykolab/setup/setup_roundcube.py:56
+msgid "MySQL roundcube password"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:70
-#: .././pykolab/setup/setup_roundcube.py:93
-#: .././pykolab/setup/setup_freebusy.py:76
+#: ../pykolab/setup/setup_freebusy.py:92
+#: ../pykolab/setup/setup_roundcube.py:116 ../pykolab/setup/setup_zpush.py:71
 #, python-format
 msgid "Using template file %r"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:77
-#: .././pykolab/setup/setup_roundcube.py:100
-#: .././pykolab/setup/setup_freebusy.py:83
+#: ../pykolab/setup/setup_freebusy.py:99
+#: ../pykolab/setup/setup_roundcube.py:123 ../pykolab/setup/setup_zpush.py:78
 #, python-format
 msgid "Successfully compiled template %r, writing out to %r"
 msgstr ""
 
-#: .././pykolab/setup/setup_zpush.py:95 .././pykolab/setup/setup_ldap.py:184
-#: .././pykolab/setup/setup_ldap.py:358
-#: .././pykolab/setup/setup_roundcube.py:159
-#: .././pykolab/setup/setup_imap.py:137 .././pykolab/setup/setup_mysql.py:49
-#: .././pykolab/setup/setup_freebusy.py:101
-msgid "Could not start and configure to start on boot, the "
+#: ../pykolab/setup/setup_freebusy.py:119 ../pykolab/setup/setup_imap.py:143
+#: ../pykolab/setup/setup_ldap.py:288 ../pykolab/setup/setup_ldap.py:521
+#: ../pykolab/setup/setup_mta.py:309 ../pykolab/setup/setup_mysql.py:49
+#: ../pykolab/setup/setup_roundcube.py:191
+#: ../pykolab/setup/setup_syncroton.py:66 ../pykolab/setup/setup_zpush.py:98
+msgid "Could not start and configure to start on boot, the "
+msgstr ""
+
+#: ../pykolab/setup/setup_imap.py:44
+msgid "Setup IMAP."
+msgstr ""
+
+#: ../pykolab/setup/setup_imap.py:88 ../pykolab/setup/setup_imap.py:113
+msgid "Could not write out Cyrus IMAP configuration file /etc/imapd.conf"
+msgstr ""
+
+#: ../pykolab/setup/setup_kolabd.py:43
+msgid "Setup the Kolab daemon."
+msgstr ""
+
+#: ../pykolab/setup/setup_kolabd.py:51
+#, python-format
+msgid ""
+"\n"
+"                            Copying the configuration section for 'example."
+"org' over to\n"
+"                            a section applicable to your domain '%s'.\n"
+"                        "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:43
+msgid "LDAP Options"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:50
+msgid "Specify FQDN (overriding defaults)."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:58
+msgid "Allow anonymous binds (default: no)."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:62
+msgid "Setup LDAP."
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:74
+msgid ""
+"\n"
+"                        Please supply a password for the LDAP administrator "
+"user\n"
+"                        'admin', used to login to the graphical console of "
+"389\n"
+"                        Directory server.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:82
+msgid "Administrator password"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:89
+msgid ""
+"\n"
+"                        Please supply a password for the LDAP Directory "
+"Manager\n"
+"                        user, which is the administrator user you will be "
+"using\n"
+"                        to at least initially log in to the Web Admin, and "
+"that\n"
+"                        Kolab uses to perform administrative tasks.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:98
+msgid "Directory Manager password"
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:105
+msgid ""
+"\n"
+"                        Please choose the system user and group the service\n"
+"                        should use to run under. These should be existing,\n"
+"                        unprivileged, local system POSIX accounts with no "
+"shell.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:112
+msgid "User"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:43
-msgid "LDAP Options"
+#: ../pykolab/setup/setup_ldap.py:113
+msgid "Group"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:50
-msgid "Specify FQDN (overriding defaults)."
+#: ../pykolab/setup/setup_ldap.py:143
+msgid ""
+"\n"
+"                        This setup procedure plans to set up Kolab Groupware "
+"for\n"
+"                        the following domain name space. This domain name "
+"is\n"
+"                        obtained from the reverse DNS entry on your network\n"
+"                        interface. Please confirm this is the appropriate "
+"domain\n"
+"                        name space.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:54
-msgid "Setup LDAP."
+#: ../pykolab/setup/setup_ldap.py:157
+msgid "Domain name to use"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:66
-msgid "Administrator password"
+#: ../pykolab/setup/setup_ldap.py:162 ../pykolab/setup/setup_ldap.py:187
+msgid ""
+"\n"
+"                                    Invalid input. Please try again.\n"
+"                                "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:72
-msgid "Directory Manager password"
+#: ../pykolab/setup/setup_ldap.py:171
+msgid ""
+"\n"
+"                        The standard root dn we composed for you follows. "
+"Please\n"
+"                        confirm this is the root dn you wish to use.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:77
-msgid "User"
+#: ../pykolab/setup/setup_ldap.py:182
+msgid "Root DN to use"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:78
-msgid "Group"
+#: ../pykolab/setup/setup_ldap.py:234
+msgid ""
+"\n"
+"                    Setup is now going to set up the 389 Directory Server. "
+"This\n"
+"                    may take a little while (during which period there is "
+"no\n"
+"                    output and no progress indication).\n"
+"                "
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:143
+#: ../pykolab/setup/setup_ldap.py:241
 msgid "Setting up 389 Directory Server"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:153
+#. TODO: Get the return code and display output if not successful.
+#: ../pykolab/setup/setup_ldap.py:253
 msgid "Setup DS stdout:"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:156
+#: ../pykolab/setup/setup_ldap.py:256
 msgid "Setup DS stderr:"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:175 .././pykolab/setup/setup_mysql.py:97
+#: ../pykolab/setup/setup_ldap.py:279 ../pykolab/setup/setup_mysql.py:129
 msgid "Could not find the Kolab schema file"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:189
+#: ../pykolab/setup/setup_ldap.py:293
+msgid ""
+"\n"
+"                        Please supply a Cyrus Administrator password. This\n"
+"                        password is used by Kolab to execute administrative\n"
+"                        tasks in Cyrus IMAP. You may also need the password\n"
+"                        yourself to troubleshoot Cyrus IMAP and/or perform\n"
+"                        other administrative tasks against Cyrus IMAP "
+"directly.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:303
 msgid "Cyrus Administrator password"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:195
+#: ../pykolab/setup/setup_ldap.py:310
+msgid ""
+"\n"
+"                        Please supply a Kolab Service account password. "
+"This\n"
+"                        account is used by various services such as "
+"Postfix,\n"
+"                        and Roundcube, as anonymous binds to the LDAP "
+"server\n"
+"                        will not be allowed.\n"
+"                    "
+msgstr ""
+
+#: ../pykolab/setup/setup_ldap.py:319
 msgid "Kolab Service password"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:204
+#: ../pykolab/setup/setup_ldap.py:329
 msgid "Writing out configuration to kolab.conf"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:218
+#: ../pykolab/setup/setup_ldap.py:343
 msgid "Inserting service users into LDAP."
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:262
+#: ../pykolab/setup/setup_ldap.py:417
 msgid "Writing out cn=kolab,cn=config"
 msgstr ""
 
 #. TODO: Add kolab-admin role
 #. TODO: Assign kolab-admin admin ACLs
-#: .././pykolab/setup/setup_ldap.py:286
+#: ../pykolab/setup/setup_ldap.py:441
 #, python-format
 msgid "Adding domain %s to list of domains for this deployment"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:294
+#: ../pykolab/setup/setup_ldap.py:457
 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:302
+#: ../pykolab/setup/setup_ldap.py:465
 msgid "Enabling attribute uniqueness plugin"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:308
+#: ../pykolab/setup/setup_ldap.py:471
 msgid "Enabling referential integrity plugin"
 msgstr ""
 
-#: .././pykolab/setup/setup_ldap.py:314
+#: ../pykolab/setup/setup_ldap.py:477
 msgid "Enabling and configuring account policy plugin"
 msgstr ""
 
 #. TODO: Add kolab-admin role
-#: .././pykolab/setup/setup_ldap.py:329
+#: ../pykolab/setup/setup_ldap.py:492
 msgid "Adding the kolab-admin role"
 msgstr ""
 
 #. TODO: User writeable attributes on root_dn
-#: .././pykolab/setup/setup_ldap.py:340
+#: ../pykolab/setup/setup_ldap.py:503
 #, python-format
 msgid "Setting access control to %s"
 msgstr ""
 
-#: .././pykolab/setup/setup_roundcube.py:40
-msgid "Setup Roundcube."
-msgstr ""
-
-#: .././pykolab/setup/setup_roundcube.py:44
-#: .././pykolab/setup/setup_freebusy.py:49
-msgid "MySQL roundcube password"
-msgstr ""
-
-#: .././pykolab/setup/components.py:56
-msgid "Display this help."
-msgstr ""
-
-#: .././pykolab/setup/components.py:122
-msgid "No component selected, continuing for all components"
-msgstr ""
-
-#: .././pykolab/setup/components.py:157 .././pykolab/setup/components.py:162
-msgid "No such component."
-msgstr ""
-
-#: .././pykolab/setup/setup_mta.py:40
+#: ../pykolab/setup/setup_mta.py:40
 msgid "Setup MTA."
 msgstr ""
 
-#: .././pykolab/setup/setup_mta.py:220
+#: ../pykolab/setup/setup_mta.py:224 ../pykolab/setup/setup_php.py:80
 #, python-format
 msgid "Setting key %r to %r"
 msgstr ""
 
-#: .././pykolab/setup/setup_mta.py:248
+#: ../pykolab/setup/setup_mta.py:252
 msgid "Could not write out Postfix configuration file /etc/postfix/master.cf"
 msgstr ""
 
-#: .././pykolab/setup/setup_imap.py:39
-msgid "Setup IMAP."
-msgstr ""
-
-#: .././pykolab/setup/setup_imap.py:82 .././pykolab/setup/setup_imap.py:107
-msgid "Could not write out Cyrus IMAP configuration file /etc/imapd.conf"
-msgstr ""
-
-#: .././pykolab/setup/setup_kolabd.py:38
-msgid "Setup the Kolab daemon."
+#: ../pykolab/setup/setup_mta.py:287
+msgid "Could not write out Amavis configuration file /etc/amavisd/amavisd.conf"
 msgstr ""
 
-#: .././pykolab/setup/setup_mysql.py:39
+#: ../pykolab/setup/setup_mysql.py:39
 msgid "Setup MySQL."
 msgstr ""
 
-#: .././pykolab/setup/setup_mysql.py:53
+#: ../pykolab/setup/setup_mysql.py:53
+msgid ""
+"\n"
+"                    Please supply a root password for MySQL. This password "
+"will\n"
+"                    be the administrative user for this MySQL server, and "
+"it\n"
+"                    should be kept a secret. After this setup process has\n"
+"                    completed, Kolab is going to discard and forget about "
+"this\n"
+"                    password, but you will need it for administrative tasks "
+"in\n"
+"                    MySQL.\n"
+"                "
+msgstr ""
+
+#: ../pykolab/setup/setup_mysql.py:64
 msgid "MySQL root password"
 msgstr ""
 
-#: .././pykolab/setup/setup_freebusy.py:40
-msgid "Setup Free/Busy."
+#: ../pykolab/setup/setup_mysql.py:103
+msgid ""
+"\n"
+"                        Please supply a password for the MySQL user "
+"'kolab'.\n"
+"                        This password will be used by Kolab services, such "
+"as\n"
+"                        the Web Administration Panel.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/setup/setup_freebusy.py:44
-msgid "Free/Busy is not installed on this system"
+#: ../pykolab/setup/setup_mysql.py:111
+msgid "MySQL kolab password"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:45
-#, python-format
-msgid "Cleaning up ACL entries for %s across all folders"
+#: ../pykolab/setup/setup_php.py:42
+msgid "PHP Options"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:60
-#, python-format
-msgid "Cleaning up ACL entries referring to identifier %s"
+#: ../pykolab/setup/setup_php.py:49
+msgid "Specify the timezone for PHP."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:69
-#, python-format
-msgid "Iterating over %d folders"
+#: ../pykolab/setup/setup_php.py:53
+msgid "Setup PHP."
 msgstr ""
 
-#. Set the ACL to '' (effectively deleting the ACL entry)
-#: .././pykolab/imap/__init__.py:82
-#, python-format
-msgid "Removing acl %r for subject %r from folder %r"
+#: ../pykolab/setup/setup_php.py:58
+msgid ""
+"\n"
+"                        Please supply the timezone PHP should be using.\n"
+"                    "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:143
-#, python-format
-msgid "Logging on to Cyrus IMAP server %s"
+#: ../pykolab/setup/setup_php.py:64
+msgid "Timezone ID"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:152
-#, python-format
-msgid "Logging on to Dovecot IMAP server %s"
+#: ../pykolab/setup/setup_roundcube.py:44
+msgid "Setup Roundcube."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:161
-#, python-format
-msgid "Logging on to generic IMAP server %s"
+#: ../pykolab/setup/setup_roundcube.py:48
+msgid ""
+"\n"
+"                    Please supply a password for the MySQL user "
+"'roundcube'.\n"
+"                    This password will be used by the Roundcube webmail\n"
+"                    interface.\n"
+"                "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:179
-#, python-format
-msgid "Reusing existing IMAP server connection to %s"
+#: ../pykolab/setup/setup_syncroton.py:40
+msgid "Setup Syncroton."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:181
-#, python-format
-msgid "Reconnecting to IMAP server %s"
+#: ../pykolab/setup/setup_zpush.py:41
+msgid "Setup zpush."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:197
-msgid "Called imap.disconnect() on a server that "
+#: ../pykolab/setup/setup_zpush.py:45
+msgid "Z-Push is not installed on this system"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:213
+#. start_max = (int)(time.time())
+#: ../pykolab/telemetry.py:588
 #, python-format
-msgid "%r has no attribute %s"
+msgid "Expiring sessions that started before or on %d"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:221 .././pykolab/imap/__init__.py:239
+#: ../pykolab/telemetry.py:601
 #, python-format
-msgid "Creating new shared folder %s"
+msgid "Expiring session ID: %d"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:255
+#: ../pykolab/telemetry.py:620
 #, python-format
-msgid "Creating new mailbox for user %s"
+msgid "Session with ID %d expired from database"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:280
+#: ../pykolab/telemetry.py:646
 #, python-format
-msgid "Creating additional folders for user %s"
+msgid "Operational Error in telemetry database: %s"
+msgstr ""
+
+#: ../pykolab/telemetry.py:652
+msgid "No database available"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:302
+#: ../pykolab/utils.py:57 ../pykolab/utils.py:59
 #, python-format
-msgid "Mailbox already exists: %s"
+msgid "Confirm %s: "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:345
-msgid "Subscribing user to the additional folders"
+#: ../pykolab/utils.py:62
+msgid "Incorrect confirmation. "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:380 .././pykolab/imap/__init__.py:459
+#: ../pykolab/utils.py:67 ../pykolab/utils.py:72
 #, python-format
-msgid "Renaming INBOX from %s to %s"
+msgid "%s: "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:384
+#: ../pykolab/utils.py:69 ../pykolab/utils.py:74
 #, python-format
-msgid "Could not rename INBOX folder %s to %s"
+msgid "%s [%s]: "
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:386 .././pykolab/imap/__init__.py:463
-#, python-format
-msgid "Moving INBOX folder %s won't succeed as target folder %s already exists"
+#: ../pykolab/utils.py:119
+msgid "Please answer 'yes' or 'no'."
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:399
+#: ../pykolab/utils.py:185
 #, python-format
-msgid "Looking for folder '%s', we found folders: %r"
+msgid "Could not change the permissions on %s"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:422
+#: ../pykolab/wap_client/__init__.py:257
 #, python-format
-msgid "Setting ACL rights %s for subject %s on folder "
+msgid "Requesting %r with params %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:433
+#: ../pykolab/wap_client/__init__.py:263
 #, python-format
-msgid "Removing ACL rights %s for subject %s on folder "
+msgid "Got response: %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:456
-#, python-format
-msgid "Found old INBOX folder %s"
+#. Some data is not JSON
+#: ../pykolab/wap_client/__init__.py:268
+msgid "Response data is not JSON"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:465
-#, python-format
-msgid "Did not find old folder user/%s to rename"
+#: ../pykolab/xml/attendee.py:79 ../pykolab/xml/attendee.py:99
+msgid "Not a valid attendee"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:467
-msgid "Value for user is not a dictionary"
+#: ../pykolab/xml/attendee.py:84
+msgid "No valid delegator references found"
 msgstr ""
 
-#. TODO: Go in fact correct the quota.
-#: .././pykolab/imap/__init__.py:527
-#, python-format
-msgid "Cannot get current IMAP quota for folder %s"
+#: ../pykolab/xml/attendee.py:104
+msgid "No valid delegatee references found"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:540
+#: ../pykolab/xml/attendee.py:140
 #, python-format
-msgid "Quota for %s currently is %s"
+msgid "Invalid cutype %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:546
+#: ../pykolab/xml/attendee.py:151
 #, python-format
-msgid "Adjusting authentication database quota for folder %s to %d"
+msgid "Invalid participant status %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:551
+#: ../pykolab/xml/attendee.py:159
 #, python-format
-msgid "Correcting quota for %s to %s (currently %s)"
+msgid "Invalid role %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:633
+#: ../pykolab/xml/event.py:172
 #, python-format
-msgid "Checking folder: %s"
+msgid "No attendee with email or name %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:638
+#: ../pykolab/xml/event.py:180
 #, python-format
-msgid "Folder has no corresponding user (1): %s"
+msgid "Invalid argument value attendee %r, must be basestring or Attendee"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:641
+#: ../pykolab/xml/event.py:186
 #, python-format
-msgid "Folder has no corresponding user (2): %s"
+msgid "No attendee with email %r"
 msgstr ""
 
-#. We got user identifier only
-#: .././pykolab/imap/__init__.py:656
-msgid "Please don't give us just a user identifier"
+#: ../pykolab/xml/event.py:192
+#, python-format
+msgid "No attendee with name %r"
 msgstr ""
 
-#: .././pykolab/imap/__init__.py:659
-#, python-format
-msgid "Deleting folder %s"
+#: ../pykolab/xml/event.py:338
+msgid "Invalid participant status"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:78
-#, python-format
-msgid "Could not connect to Cyrus IMAP server %r"
+#: ../pykolab/xml/event.py:538
+msgid "Event end needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:101
+#: ../pykolab/xml/event.py:657
 #, python-format
-msgid "Continuing with separator: %r"
+msgid "Invalid status %r"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:106
-msgid "Detected we are running in a Murder topology"
+#: ../pykolab/xml/event.py:678 ../pykolab/xml/event.py:728
+msgid "Event start needs datetime.date or datetime.datetime instance"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:110
-msgid "This system is not part of a murder topology"
+#: ../pykolab/xml/event.py:764
+#, python-format
+msgid "Invalid status set: %r"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:131
-#, python-format
-msgid "Checking actual backend server for folder %s through annotations"
+#: ../pykolab/xml/event.py:882
+msgid "No sender specified"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:146
-#, python-format
-msgid "Could not get the annotations after %s tries."
+#: ../saslauthd/__init__.py:126 ../saslauthd/__init__.py:134
+msgid "Traceback occurred, please report a bug at http://bugzilla.kolabsys.com"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:150
+#: ../wallace/__init__.py:61
 #, python-format
-msgid "No annotations for %s: %r"
+msgid "Worker process %s initializing"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:157
-#, python-format
-msgid "Server for INBOX folder %s is %s"
+#: ../wallace/__init__.py:80
+msgid "Bind address for Wallace."
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:169
-#, python-format
-msgid "Setting quota for INBOX folder %s to %s"
+#: ../wallace/__init__.py:106
+msgid "Port that Wallace is supposed to use."
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:173
+#: ../wallace/__init__.py:157
 #, python-format
-msgid "Could not set quota for mailfolder %s"
+msgid "Could not bind to socket on port %d on bind "
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:182
-#, python-format
-msgid "Moving INBOX folder %s to %s"
+#: ../wallace/__init__.py:169
+msgid "Could not shut down socket"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:194
-#, python-format
-msgid "Setting annotation %s on folder %s"
+#: ../wallace/__init__.py:226
+msgid "Accepted connection"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:201
+#: ../wallace/__init__.py:389
 #, python-format
-msgid "Could not set annotation %r on mail folder %r: %r"
+msgid "Could not write pid file %s"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:205
+#: ../wallace/module_optout.py:61 ../wallace/module_resources.py:94
 #, python-format
-msgid "Transferring folder %s from %s to %s"
+msgid "Issuing callback after processing to stage %s"
 msgstr ""
 
-#: .././pykolab/imap/cyrus.py:265
+#: ../wallace/module_optout.py:62 ../wallace/module_resources.py:100
 #, python-format
-msgid "Undeleting %s to %s"
+msgid "Testing cb_action_%s()"
 msgstr ""
 
-#. start_max = (int)(time.time())
-#: .././pykolab/telemetry.py:588
+#: ../wallace/module_optout.py:64 ../wallace/module_resources.py:103
 #, python-format
-msgid "Expiring sessions that started before or on %d"
+msgid "Attempting to execute cb_action_%s()"
 msgstr ""
 
-#: .././pykolab/telemetry.py:601
+#. modules.next_module('optout')
+#: ../wallace/module_optout.py:70
 #, python-format
-msgid "Expiring session ID: %d"
+msgid "Consulting opt-out service for %r, %r"
 msgstr ""
 
-#: .././pykolab/telemetry.py:620
+#: ../wallace/module_optout.py:96
 #, python-format
-msgid "Session with ID %d expired from database"
+msgid "Running opt-out consult from envelope sender '%s "
 msgstr ""
 
-#: .././pykolab/telemetry.py:646
+#: ../wallace/module_optout.py:160
 #, python-format
-msgid "Operational Error in telemetry database: %s"
+msgid "Attempting to execute cb_action_%s(%r, %r)"
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:92
+#: ../wallace/module_optout.py:181
 #, python-format
-msgid "Creating %d Mails"
+msgid "Could not send request to optout_url %s"
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:116
+#: ../wallace/module_resources.py:81
 #, python-format
-msgid "Sending message %s through SMTP targeting user %s@%s"
+msgid "Resource Management called for %r, %r"
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:119
-#, python-format
-msgid "Sending message %s through LMTP targeting user %s@%s"
+#: ../wallace/module_resources.py:139
+msgid "Message is not an iTip message or does not contain any "
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:122
-#, python-format
-msgid "Saving message %s to IMAP (user %s, folder %s)"
+#: ../wallace/module_resources.py:147
+msgid "iTip events attached to this message contain the "
 msgstr ""
 
-#: .././pykolab/tests.old/mail.py:125 .././pykolab/tests.old/calendar.py:198
-#: .././pykolab/tests.old/contacts.py:145
-msgid "Somehow ended up NOT sending these messages"
+#: ../wallace/module_resources.py:174
+msgid "Not an iTip message, but sent to resource nonetheless. Reject message"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:146
-#, python-format
-msgid "Creating %d Events"
+#: ../wallace/module_resources.py:182
+msgid "No itips, no resources, pass along"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:177
-#, python-format
-msgid "Creating Calendar item number %d"
+#: ../wallace/module_resources.py:186
+msgid "iTips, but no resources, pass along"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:189
-#: .././pykolab/tests.old/contacts.py:136
+#: ../wallace/module_resources.py:218
 #, python-format
-msgid "Sending UID message %s through SMTP targeting user %s@%s"
+msgid "Resources: %r"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:192
-#: .././pykolab/tests.old/contacts.py:139
+#: ../wallace/module_resources.py:236
 #, python-format
-msgid "Sending UID message %s through LMTP targeting user %s@%s"
+msgid "Checking events in resource folder %r"
 msgstr ""
 
-#: .././pykolab/tests.old/calendar.py:195
-#: .././pykolab/tests.old/contacts.py:142
+#: ../wallace/module_resources.py:243
 #, python-format
-msgid "Saving UID message %s to IMAP (user %s, folder %s)"
+msgid "Mailbox for resource %r doesn't exist"
 msgstr ""
 
-#: .././pykolab/tests.old/zpush/test_000_001.py:47
+#: ../wallace/module_resources.py:256
 #, python-format
-msgid "Could not load %sItem from %s, skipping the testing."
+msgid "Fetching message UID %r from folder %r"
 msgstr ""
 
-#: .././pykolab/tests.old/zpush/test_000_000.py:77
+#: ../wallace/module_resources.py:295
 #, python-format
-msgid "Authentication failure for %s"
+msgid "Event %r conflicts with event "
 msgstr ""
 
-#: .././pykolab/tests.old/contacts.py:105
+#: ../wallace/module_resources.py:308
 #, python-format
-msgid "Creating %d Contacts"
+msgid "start: %r, end: %r, total: %r, messages: %r"
 msgstr ""
 
-#: .././pykolab/tests.old/contacts.py:124
+#: ../wallace/module_resources.py:315
 #, python-format
-msgid "Creating Contact item number %d"
+msgid "Polling for resource %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:207
+#: ../wallace/module_resources.py:319
 #, python-format
-msgid "Adding policy request to instance %s"
+msgid "Resource %r has been popped from the list"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:442
-msgid "Unauthorized access not allowed"
+#: ../wallace/module_resources.py:326
+msgid "Resource is a collection"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:481
-#: .././bin/kolab_smtp_access_policy.py:541
+#: ../wallace/module_resources.py:374 ../wallace/module_resources.py:424
 #, python-format
-msgid "Could not find envelope sender user %s"
+msgid "Adding event to %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:568
+#: ../wallace/module_resources.py:473
 #, python-format
-msgid "%s is unauthorized to send on behalf of %s"
+msgid "Method %r not really interesting for us."
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:578
+#: ../wallace/module_resources.py:481
 #, python-format
-msgid "User %s attempted to use envelope sender address %s "
+msgid "Raw iTip payload: %s"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:638
-#: .././bin/kolab_smtp_access_policy.py:649
-#, python-format
-msgid "Found user %s to be a delegate user of %s"
+#: ../wallace/module_resources.py:491
+msgid "Could not read iTip from message."
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:673
-#, python-format
-msgid "Verifying authenticated sender '%(sender)s' with "
+#: ../wallace/module_resources.py:513
+msgid "iTip event without a start"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:678
-#, python-format
-msgid "Verifying unauthenticated sender '%(sender)s' "
+#. end if c.name == "VEVENT"
+#. end for c in cal.walk()
+#. end if part.get_content_type() == "text/calendar"
+#. end for part in message.walk()
+#. if message.is_multipart()
+#: ../wallace/module_resources.py:543
+msgid "Message is not an iTip message (non-multipart message)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:695
+#: ../wallace/module_resources.py:564
 #, python-format
-msgid "Reproducing verify_recipient(%s, %s) from "
+msgid "Checking if email address %r belongs to a resource (collection)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:712
+#: ../wallace/module_resources.py:575 ../wallace/module_resources.py:649
+#: ../wallace/module_resources.py:699
 #, python-format
-msgid "Using authentication domain %s instead of %s"
+msgid "No resource (collection) records found for %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:722
+#: ../wallace/module_resources.py:583 ../wallace/module_resources.py:657
+#: ../wallace/module_resources.py:707
 #, python-format
-msgid "Domain %s is a primary domain"
+msgid "Resource record(s): %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:730
+#: ../wallace/module_resources.py:589 ../wallace/module_resources.py:664
+#: ../wallace/module_resources.py:714
 #, python-format
-msgid "Checking the recipient for domain %s that is not "
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:792
-msgid "Could not find this user, accepting"
+msgid "Resource record: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:862
-#: .././bin/kolab_smtp_access_policy.py:915
+#: ../wallace/module_resources.py:608
 #, python-format
-msgid "Sender %s is not allowed to send to "
+msgid "Raw itip_events: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:902
+#: ../wallace/module_resources.py:616
 #, python-format
-msgid "Reproducing verify_sender(%r) from cache, "
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:931
-msgid "Sender uses unauthorized envelope sender address"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:948
-msgid "Could not verify sender"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:955
-msgid "Verifying whether sender is allowed to send to "
+msgid "Raw set of attendees: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:969
+#: ../wallace/module_resources.py:624
 #, python-format
-msgid "Result is %r"
+msgid "Raw set of resources: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:974
-msgid "No recipient policy restrictions exist for this sender"
+#: ../wallace/module_resources.py:638
+#, python-format
+msgid "Checking if attendee %r is a resource (collection)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:983
-msgid "Found a recipient policy to apply for this sender."
+#: ../wallace/module_resources.py:671 ../wallace/module_resources.py:717
+msgid "Resource reservation made but no resource records found"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:998
+#: ../wallace/module_resources.py:689
 #, python-format
-msgid "Sender %s not allowed to send to recipient "
+msgid "Checking if resource %r is a resource (collection)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1029
-msgid "Cleaning up the cache"
+#: ../wallace/module_resources.py:721
+msgid "The following resources are being referred to in the "
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1066
+#. This is a nested module
+#: ../wallace/modules.py:96
 #, python-format
-msgid "Operational Error in caching: %s"
+msgid "Module Group: %s"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1117
-#, python-format
-msgid "Caching the policy result with timestamp %d"
+#: ../wallace/modules.py:107 ../wallace/modules.py:112
+msgid "No such module."
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1194
+#: ../wallace/modules.py:118
 #, python-format
-msgid "Returning action DEFER_IF_PERMIT: %s"
+msgid "Holding message in queue for manual review (%s by %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1199
+#: ../wallace/modules.py:121
 #, python-format
-msgid "Returning action DUNNO: %s"
+msgid "Deferring message in %s (by module %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1204
+#: ../wallace/modules.py:131
 #, python-format
-msgid "Returning action HOLD: %s"
+msgid "The time when the message was sent: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1209
+#: ../wallace/modules.py:132
 #, python-format
-msgid "Returning action PERMIT: %s"
+msgid "The time now: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1214
+#: ../wallace/modules.py:133
 #, python-format
-msgid "Returning action REJECT: %s"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1258
-msgid "Starting to loop for new request"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1267
-msgid "End of current request"
+msgid "The time delta: %r"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1271
+#. TODO: Send NDR back to user
+#: ../wallace/modules.py:137
 #, python-format
-msgid "Getting line: %s"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1275
-msgid "Returning request"
+msgid "Message in file %s older then 5 days, deleting"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1332
+#: ../wallace/modules.py:162
 #, python-format
-msgid "Got request instance %s"
+msgid "Rejecting message in %s (by module %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1341
+#: ../wallace/modules.py:180
 #, python-format
-msgid "Request instance %s is in state %s"
+msgid ""
+"This is the email system Wallace at %s.\n"
+"\n"
+"I'm sorry to inform you we could not deliver the attached message\n"
+"to the following recipients:\n"
+"\n"
+"- %s\n"
+"\n"
+"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 ""
 
-#: .././bin/kolab_smtp_access_policy.py:1349
+#: ../wallace/modules.py:195
 #, python-format
-msgid "Request instance %s is not yet in DATA state"
+msgid ""
+"X-Wallace-Module: %s\n"
+"X-Wallace-Result: REJECT\n"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1361
+#: ../wallace/modules.py:248
 #, python-format
-msgid "Request instance %s reached DATA state"
-msgstr ""
-
-#: .././bin/kolab_smtp_access_policy.py:1379
-msgid "Sender access denied"
+msgid "Accepting message in %s (by module %s)"
 msgstr ""
 
-#: .././bin/kolab_smtp_access_policy.py:1381
-msgid "Recipient access denied"
+#: ../wallace/modules.py:316
+#, python-format
+msgid "Module '%s' already registered"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 28ee025..47b99c0 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pykolab 0.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-09 14:25+0100\n"
+"POT-Creation-Date: 2012-08-11 15:04+0100\n"
 "PO-Revision-Date: 2012-05-09 14:25+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,793 +17,907 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: .././wallace/__init__.py:37 .././bonnie/__init__.py:35
-#: .././kolabd/__init__.py:46 .././saslauthd/__init__.py:47
-msgid "Daemon Options"
-msgstr ""
-
-#: .././wallace/__init__.py:44 .././bonnie/__init__.py:41
-#: .././kolabd/__init__.py:52 .././saslauthd/__init__.py:53
-msgid "Fork to the background."
-msgstr ""
-
-#: .././wallace/__init__.py:52
-msgid "Bind address for Wallace."
+#: ../bin/kolab_smtp_access_policy.py:206
+#, python-format
+msgid "Adding policy request to instance %s"
 msgstr ""
 
-#: .././wallace/__init__.py:60 .././kolabd/__init__.py:58
-#: .././saslauthd/__init__.py:59
-msgid "Path to the PID file to use."
+#: ../bin/kolab_smtp_access_policy.py:446
+msgid "Unauthorized access not allowed"
 msgstr ""
 
-#: .././wallace/__init__.py:68
-msgid "Port that Wallace is supposed to use."
+#: ../bin/kolab_smtp_access_policy.py:467
+#: ../bin/kolab_smtp_access_policy.py:658
+msgid "Could not find recipient"
 msgstr ""
 
-#: .././wallace/__init__.py:102 .././wallace/__init__.py:126
-#: .././wallace/__init__.py:373 .././wallace/__init__.py:401
+#: ../bin/kolab_smtp_access_policy.py:486
+#: ../bin/kolab_smtp_access_policy.py:586
 #, python-format
-msgid "Number of threads currently running: %d"
+msgid "Could not find envelope sender user %s"
 msgstr ""
 
-#: .././wallace/__init__.py:111 .././wallace/__init__.py:135
+#: ../bin/kolab_smtp_access_policy.py:529
 #, python-format
-msgid "Continuing with %d threads currently running"
+msgid "Obtained authenticated user details for %r: %r"
 msgstr ""
 
-#. TODO: Apply throttling
-#: .././wallace/__init__.py:118
+#: ../bin/kolab_smtp_access_policy.py:608
 #, python-format
-msgid "Creating thread for message in %s"
+msgid "%s is unauthorized to send on behalf of %s"
 msgstr ""
 
-#: .././wallace/__init__.py:142
+#: ../bin/kolab_smtp_access_policy.py:618
 #, python-format
-msgid "Running thread %s for message file %s"
+msgid "User %s attempted to use envelope sender address %s "
 msgstr ""
 
-#: .././wallace/__init__.py:151
+#: ../bin/kolab_smtp_access_policy.py:682
+#: ../bin/kolab_smtp_access_policy.py:693
 #, python-format
-msgid "This message was already in module %s, delegating "
+msgid "Found user %s to be a delegate user of %s"
 msgstr ""
 
-#: .././wallace/__init__.py:160
+#: ../bin/kolab_smtp_access_policy.py:717
 #, python-format
-msgid "It was also in a certain stage: %s, letting "
+msgid "Verifying authenticated sender '%(sender)s' with "
 msgstr ""
 
-#: .././wallace/__init__.py:168 .././wallace/__init__.py:174
-#: .././wallace/__init__.py:184
+#: ../bin/kolab_smtp_access_policy.py:722
 #, python-format
-msgid "Executing module %s"
-msgstr ""
-
-#: .././wallace/__init__.py:211 .././bonnie/__init__.py:67
-#: .././kolabd/__init__.py:85 .././saslauthd/__init__.py:90
-msgid "Interrupted by user"
-msgstr ""
-
-#: .././wallace/__init__.py:215 .././wallace/__init__.py:225
-#: .././kolabd/__init__.py:90 .././kolabd/__init__.py:101
-msgid "Traceback occurred, please report a "
+msgid "Verifying unauthenticated sender '%(sender)s' "
 msgstr ""
 
-#: .././wallace/__init__.py:221 .././bonnie/__init__.py:75
-#: .././kolabd/__init__.py:96 .././saslauthd/__init__.py:98
+#: ../bin/kolab_smtp_access_policy.py:739
 #, python-format
-msgid "Type Error: %s"
-msgstr ""
-
-#: .././wallace/__init__.py:241
-msgid "Picking up deferred messages for wallace"
+msgid "Reproducing verify_recipient(%s, %s) from "
 msgstr ""
 
-#: .././wallace/__init__.py:261
+#: ../bin/kolab_smtp_access_policy.py:756
 #, python-format
-msgid "Picking up deferred messages for module %s"
-msgstr ""
-
-#. Sleep for 300 seconds before reprocessing the deferred queues.
-#. TODO: Consider using queue_run_delay from Postfix, which is where
-#. the default value of 300 seconds comes from.
-#: .././wallace/__init__.py:285
-msgid "Sleeping for 300 seconds"
+msgid "Using authentication domain %s instead of %s"
 msgstr ""
 
-#: .././wallace/__init__.py:310
+#: ../bin/kolab_smtp_access_policy.py:766
 #, python-format
-msgid "Could not bind to socket on port %d on bind "
-msgstr ""
-
-#: .././wallace/__init__.py:320
-msgid "Could not shut down socket"
+msgid "Domain %s is a primary domain"
 msgstr ""
 
-#: .././wallace/__init__.py:394
+#: ../bin/kolab_smtp_access_policy.py:774
 #, python-format
-msgid "Picking up spooled email file %s"
+msgid "Checking the recipient for domain %s that is not "
 msgstr ""
 
-#: .././wallace/__init__.py:424
-msgid "Accepted connection"
+#: ../bin/kolab_smtp_access_policy.py:790
+msgid "This recipient address is related to multiple "
 msgstr ""
 
-#. This is a nested module
-#: .././wallace/modules.py:96
+#: ../bin/kolab_smtp_access_policy.py:799
 #, python-format
-msgid "Module Group: %s"
+msgid "Recipient address %r not found. Allowing since "
 msgstr ""
 
-#: .././wallace/modules.py:107 .././wallace/modules.py:112
-msgid "No such module."
+#: ../bin/kolab_smtp_access_policy.py:827
+msgid "Invalid recipient"
 msgstr ""
 
-#: .././wallace/modules.py:118
-#, python-format
-msgid "Holding message in queue for manual review (%s by %s)"
+#: ../bin/kolab_smtp_access_policy.py:838
+msgid "Could not find this user, accepting"
 msgstr ""
 
-#: .././wallace/modules.py:121
+#: ../bin/kolab_smtp_access_policy.py:901
+#: ../bin/kolab_smtp_access_policy.py:954
 #, python-format
-msgid "Deferring message in %s (by module %s)"
+msgid "Sender %s is not allowed to send to "
 msgstr ""
 
-#: .././wallace/modules.py:131
+#: ../bin/kolab_smtp_access_policy.py:941
 #, python-format
-msgid "The time when the message was sent: %r"
+msgid "Reproducing verify_sender(%r) from cache, "
 msgstr ""
 
-#: .././wallace/modules.py:132
-#, python-format
-msgid "The time now: %r"
+#: ../bin/kolab_smtp_access_policy.py:970
+msgid "Sender uses unauthorized envelope sender address"
 msgstr ""
 
-#: .././wallace/modules.py:133
-#, python-format
-msgid "The time delta: %r"
+#: ../bin/kolab_smtp_access_policy.py:987
+msgid "Could not verify sender"
 msgstr ""
 
-#. TODO: Send NDR back to user
-#: .././wallace/modules.py:137
-#, python-format
-msgid "Message in file %s older then 5 days, deleting"
+#: ../bin/kolab_smtp_access_policy.py:994
+msgid "Verifying whether sender is allowed to send to "
 msgstr ""
 
-#: .././wallace/modules.py:162
+#: ../bin/kolab_smtp_access_policy.py:1008
 #, python-format
-msgid "Rejecting message in %s (by module %s)"
+msgid "Result is %r"
 msgstr ""
 
-#: .././wallace/modules.py:180
-#, python-format
-msgid ""
-"This is the email system Wallace at %s.\n"
-"\n"
-"I'm sorry to inform you we could not deliver the attached message\n"
-"to the following recipients:\n"
-"\n"
-"- %s\n"
-"\n"
-"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"
+#: ../bin/kolab_smtp_access_policy.py:1013
+msgid "No recipient policy restrictions exist for this sender"
 msgstr ""
 
-#: .././wallace/modules.py:195
-#, python-format
-msgid ""
-"X-Wallace-Module: %s\n"
-"X-Wallace-Result: REJECT\n"
+#: ../bin/kolab_smtp_access_policy.py:1022
+msgid "Found a recipient policy to apply for this sender."
 msgstr ""
 
-#: .././wallace/modules.py:248
+#: ../bin/kolab_smtp_access_policy.py:1037
 #, python-format
-msgid "Accepting message in %s (by module %s)"
+msgid "Sender %s not allowed to send to recipient "
 msgstr ""
 
-#: .././wallace/modules.py:316
-#, python-format
-msgid "Module '%s' already registered"
+#: ../bin/kolab_smtp_access_policy.py:1068
+msgid "Cleaning up the cache"
 msgstr ""
 
-#: .././wallace/modules.py:338 .././pykolab/tests/tests.py:183
-#: .././pykolab/cli/commands.py:183 .././pykolab/setup/components.py:243
+#: ../bin/kolab_smtp_access_policy.py:1105
 #, python-format
-msgid "Alias for %s"
+msgid "Operational Error in caching: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:57
+#: ../bin/kolab_smtp_access_policy.py:1156
 #, python-format
-msgid "Issuing callback after processing to stage %s"
+msgid "Caching the policy result with timestamp %d"
 msgstr ""
 
-#: .././wallace/module_optout.py:58
+#: ../bin/kolab_smtp_access_policy.py:1233
 #, python-format
-msgid "Testing cb_action_%s()"
+msgid "Returning action DEFER_IF_PERMIT: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:60
+#: ../bin/kolab_smtp_access_policy.py:1238
 #, python-format
-msgid "Attempting to execute cb_action_%s()"
+msgid "Returning action DUNNO: %s"
 msgstr ""
 
-#. modules.next_module('optout')
-#: .././wallace/module_optout.py:66
+#: ../bin/kolab_smtp_access_policy.py:1243
 #, python-format
-msgid "Consulting opt-out service for %r, %r"
+msgid "Returning action HOLD: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:92
+#: ../bin/kolab_smtp_access_policy.py:1248
 #, python-format
-msgid "Running opt-out consult from envelope sender '%s "
+msgid "Returning action PERMIT: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:156
+#: ../bin/kolab_smtp_access_policy.py:1253
 #, python-format
-msgid "Attempting to execute cb_action_%s(%r, %r)"
+msgid "Returning action REJECT: %s"
 msgstr ""
 
-#: .././wallace/module_optout.py:177
-#, python-format
-msgid "Could not send request to optout_url %s"
+#: ../bin/kolab_smtp_access_policy.py:1299
+msgid "Starting to loop for new request"
 msgstr ""
 
-#: .././setup-kolab.py:36 .././kolabtest.py:34 .././kolabd.py:31
-#: .././wallace.py:31 .././bonnie.py:31
-msgid "Cannot load pykolab/constants.py:"
+#: ../bin/kolab_smtp_access_policy.py:1306
+msgid "Timeout for policy request reading exceeded"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:89
-msgid "Could not import caching library, caching disabled"
+#: ../bin/kolab_smtp_access_policy.py:1312
+msgid "End of current request"
 msgstr ""
 
-#. Obtain 'kolabDelegate' from the envelope sender.
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:291
+#: ../bin/kolab_smtp_access_policy.py:1316
 #, python-format
-msgid "Obtaining envelope sender dn for %s"
+msgid "Getting line: %s"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:309
-#, python-format
-msgid ""
-"User %s attempted to use envelope sender address %s without authorization"
+#: ../bin/kolab_smtp_access_policy.py:1320
+msgid "Returning request"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:355
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:358
-#, python-format
-msgid "Found user %s to be a valid delegate user of %s"
+#: ../bin/kolab_smtp_access_policy.py:1346
+msgid "Access Policy Options"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:424
-#: .././bin/kolab_smtp_access_policy.py:1301
-msgid "Access Policy Options"
+#: ../bin/kolab_smtp_access_policy.py:1353
+msgid "SMTP Policy request timeout."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:431
-#: .././bin/kolab_smtp_access_policy.py:1308
+#: ../bin/kolab_smtp_access_policy.py:1359
 msgid "Verify the recipient access policy."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:437
-#: .././bin/kolab_smtp_access_policy.py:1314
+#: ../bin/kolab_smtp_access_policy.py:1365
 msgid "Verify the sender access policy."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:443
-#: .././bin/kolab_smtp_access_policy.py:1320
+#: ../bin/kolab_smtp_access_policy.py:1371
 msgid "Allow unauthenticated senders."
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:464
-msgid "Verifying sender."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:468
-msgid "No sender specified."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:469
-msgid "Invalid sender"
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:473
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:521
-msgid "No SASL username in request."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:475
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:524
-msgid "Not allowing unauthenticated senders."
-msgstr ""
-
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:476
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:525
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:534
-msgid "Access denied"
+#: ../bin/kolab_smtp_access_policy.py:1385
+#, python-format
+msgid "Got request instance %s"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:478
-msgid "Allowing unauthenticated senders."
+#: ../bin/kolab_smtp_access_policy.py:1394
+#, python-format
+msgid "Request instance %s is in state %s"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:484
+#: ../bin/kolab_smtp_access_policy.py:1402
 #, python-format
-msgid "Allowing authenticated sender %s to send as %s."
+msgid "Request instance %s is not yet in DATA state"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:492
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:504
+#: ../bin/kolab_smtp_access_policy.py:1414
 #, python-format
-msgid "Authenticated as sender %s"
+msgid "Request instance %s reached DATA state"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:515
-msgid "Verifying recipient."
+#: ../bin/kolab_smtp_access_policy.py:1432
+msgid "Sender access denied"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:518
-#: .././bin/kolab_smtp_access_policy.py:781
-msgid "Invalid recipient"
+#: ../bin/kolab_smtp_access_policy.py:1434
+msgid "Recipient access denied"
 msgstr ""
 
-#: .././play/kolab-sap/kolab_smtp_access_policy.py:536
-#: .././bin/kolab_smtp_access_policy.py:1383
+#: ../bin/kolab_smtp_access_policy.py:1436
 msgid "No objections"
 msgstr ""
 
-#: .././play/confmgmt/db.py:59 .././play/conf.py:280
-msgid "Dropping all tables..."
-msgstr ""
-
-#: .././play/confmgmt/db.py:62 .././play/conf.py:283
-msgid "Creating the necessary tables..."
-msgstr ""
-
-#: .././play/confmgmt/db.py:69 .././play/conf.py:290
-#: .././play/roundcube_database/__init__.py:57
-#: .././play/roundcube_database/users.py:114 .././pykolab/telemetry.py:652
-msgid "No database available"
-msgstr ""
-
-#: .././play/confmgmt.py:74
-#, python-format
-msgid "Searching for service with name %s"
-msgstr ""
-
-#: .././play/confmgmt.py:77
-#, python-format
-msgid "Found service %s"
+#: ../conf.py:37 ../kolab.py:34 ../saslauthd.py:33
+msgid "Cannot load pykolab/logger.py:"
 msgstr ""
 
-#: .././play/confmgmt.py:82
-#, python-format
-msgid "Searching for role with name %s"
+#: ../kolabd/__init__.py:49 ../saslauthd/__init__.py:48
+#: ../wallace/__init__.py:65
+msgid "Daemon Options"
 msgstr ""
 
-#: .././play/confmgmt.py:85
-#, python-format
-msgid "Found role %s"
+#: ../kolabd/__init__.py:56 ../saslauthd/__init__.py:55
+#: ../wallace/__init__.py:72
+msgid "Fork to the background."
 msgstr ""
 
-#: .././play/confmgmt.py:89
-#, python-format
-msgid "Searching for file with path %s"
+#: ../kolabd/__init__.py:65 ../saslauthd/__init__.py:64
+#: ../wallace/__init__.py:98
+msgid "Path to the PID file to use."
 msgstr ""
 
-#: .././play/confmgmt.py:92
-#, python-format
-msgid "File with path %s not found, adding to database"
+#: ../kolabd/__init__.py:74 ../saslauthd/__init__.py:73
+#: ../wallace/__init__.py:115
+msgid "Run as user USERNAME"
 msgstr ""
 
-#: .././play/confmgmt.py:97
-#, python-format
-msgid "Adding file with path %s to service with name %s"
+#: ../kolabd/__init__.py:84 ../saslauthd/__init__.py:83
+#: ../wallace/__init__.py:89
+msgid "Run as group GROUPNAME"
 msgstr ""
 
-#: .././play/confmgmt.py:101
+#: ../kolabd/__init__.py:122 ../pykolab/utils.py:151
+#: ../wallace/__init__.py:288
 #, python-format
-msgid "Adding setting with key %s (%r, %r)"
+msgid "Group %s does not exist"
 msgstr ""
 
-#: .././play/confmgmt.py:106
+#: ../kolabd/__init__.py:131 ../wallace/__init__.py:297
 #, python-format
-msgid "Adding setting %s to file with path %s"
+msgid "Switching real and effective group id to %d"
 msgstr ""
 
-#: .././play/confmgmt.py:110
+#: ../kolabd/__init__.py:153 ../pykolab/utils.py:175
+#: ../wallace/__init__.py:319
 #, python-format
-msgid "Adding role with name %s to setting with key %s"
+msgid "User %s does not exist"
 msgstr ""
 
-#: .././play/rolequota/__init__.py:53
-#: .././pykolab/plugins/dynamicquota/__init__.py:50
+#: ../kolabd/__init__.py:163 ../wallace/__init__.py:329
 #, python-format
-msgid "No keyword %s passed to set_user_folder_quota"
+msgid "Switching real and effective user id to %d"
 msgstr ""
 
-#: .././play/roundcube_database/__init__.py:51
-#: .././play/roundcube_database/users.py:108
-#, python-format
-msgid "Operational Error in Roundcube database: %s"
+#: ../kolabd/__init__.py:172 ../wallace/__init__.py:338
+msgid "Could not change real and effective uid and/or gid"
 msgstr ""
 
-#: .././kwap/kwap/controllers/secure.py:25
-msgid "Secure Controller here"
+#: ../kolabd/__init__.py:192 ../saslauthd/__init__.py:122
+#: ../wallace/__init__.py:358
+msgid "Interrupted by user"
 msgstr ""
 
-#: .././kwap/kwap/controllers/root.py:103
-msgid "Wrong credentials"
+#: ../kolabd/__init__.py:197 ../kolabd/__init__.py:208
+#: ../wallace/__init__.py:362 ../wallace/__init__.py:372
+msgid "Traceback occurred, please report a "
 msgstr ""
 
-#: .././kwap/kwap/controllers/root.py:118
+#: ../kolabd/__init__.py:203 ../saslauthd/__init__.py:130
+#: ../wallace/__init__.py:368
 #, python-format
-msgid "Welcome back, %s!"
-msgstr ""
-
-#: .././kwap/kwap/controllers/root.py:128
-msgid "We hope to see you soon!"
-msgstr ""
-
-#: .././saslauthd.py:33 .././kolab.py:34 .././conf.py:37
-msgid "Cannot load pykolab/logger.py:"
-msgstr ""
-
-#: .././bonnie/__init__.py:71 .././bonnie/__init__.py:79
-#: .././saslauthd/__init__.py:94 .././saslauthd/__init__.py:102
-msgid "Traceback occurred, please report a bug at http://bugzilla.kolabsys.com"
+msgid "Type Error: %s"
 msgstr ""
 
-#: .././kolabd/__init__.py:116 .././pykolab/auth/ldap/__init__.py:1291
-#: .././pykolab/cli/cmd_sync.py:33
+#: ../kolabd/__init__.py:223 ../pykolab/auth/ldap/__init__.py:1591
+#: ../pykolab/cli/cmd_sync.py:36
 msgid "Listing domains..."
 msgstr ""
 
-#: .././kolabd/__init__.py:148
+#: ../kolabd/__init__.py:256
 #, python-format
 msgid "added domains: %r, removed domains: %r"
 msgstr ""
 
-#: .././pykolab/__init__.py:50
-msgid "Returning thread local configuration"
-msgstr ""
-
-#: .././pykolab/tests/tests.py:53
-msgid "List tests"
-msgstr ""
-
-#. This is a nested test
-#: .././pykolab/tests/tests.py:86
-#, python-format
-msgid "Test Suite: %s"
-msgstr ""
-
-#: .././pykolab/tests/tests.py:100 .././pykolab/tests/tests.py:105
-msgid "No such test."
-msgstr ""
-
-#: .././pykolab/tests/tests.py:157 .././pykolab/tests/tests.py:161
-#, python-format
-msgid "Test '%s' already registered"
-msgstr ""
-
-#: .././pykolab/tests/tests.py:191 .././pykolab/cli/commands.py:191
-#: .././pykolab/setup/components.py:251
-msgid "Not yet implemented"
-msgstr ""
-
-#: .././pykolab/tests/__init__.py:39
-msgid "Test Options"
-msgstr ""
-
-#: .././pykolab/tests/__init__.py:45
-msgid "Run tests in suite SUITE. Implies a certain set of items being tested."
-msgstr ""
-
-#: .././pykolab/tests/imap/test_login.py:44
-#, python-format
-msgid "Connecting at %s"
+#: ../kolabd.py:31 ../setup-kolab.py:36 ../wallace.py:31
+msgid "Cannot load pykolab/constants.py:"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:46
+#: ../pykolab/auth/__init__.py:94
 #, python-format
-msgid "Connected at %s"
+msgid "Called for domain %r"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:51
+#: ../pykolab/auth/__init__.py:107 ../pykolab/auth/__init__.py:116
 #, python-format
-msgid "Logging in at %s"
+msgid "Using section %s and domain %s"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:53
+#: ../pykolab/auth/__init__.py:121
 #, python-format
-msgid "Logged in at %s"
+msgid "Connecting to Authentication backend for domain %s"
 msgstr ""
 
-#: .././pykolab/tests/imap/test_login.py:60
+#: ../pykolab/auth/__init__.py:132
 #, python-format
-msgid "Test failure in %s"
+msgid "Section %s has no option 'auth_mechanism'"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:94
+#: ../pykolab/auth/__init__.py:139
 #, python-format
-msgid "Called for domain %r"
+msgid "Section %s has auth_mechanism: %r"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:107 .././pykolab/auth/__init__.py:116
-#, python-format
-msgid "Using section %s and domain %s"
+#: ../pykolab/auth/__init__.py:148 ../pykolab/auth/__init__.py:157
+msgid "Starting LDAP..."
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:121
+#: ../pykolab/auth/ldap/cache.py:109
 #, python-format
-msgid "Connecting to Authentication backend for domain %s"
+msgid "Inserting cache entry %r"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:132
+#: ../pykolab/auth/ldap/cache.py:122
 #, python-format
-msgid "Section %s has no option 'auth_mechanism'"
+msgid "Updating timestamp for cache entry %r"
 msgstr ""
 
-#: .././pykolab/auth/__init__.py:139
+#: ../pykolab/auth/ldap/cache.py:129
 #, python-format
-msgid "Section %s has auth_mechanism: %r"
-msgstr ""
-
-#: .././pykolab/auth/__init__.py:148 .././pykolab/auth/__init__.py:157
-msgid "Starting LDAP..."
+msgid "Updating result_attribute for cache entry %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:51
+#: ../pykolab/auth/ldap/__init__.py:51
 msgid "Python LDAP library does not support persistent search"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:141
+#: ../pykolab/auth/ldap/__init__.py:142
 #, python-format
 msgid "Attempting to authenticate user %s in realm %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:181
+#: ../pykolab/auth/ldap/__init__.py:184
 #, python-format
 msgid "Binding with user_dn %s and password %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:190
+#: ../pykolab/auth/ldap/__init__.py:194
 #, python-format
 msgid "Failed to authenticate as user %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:205
+#: ../pykolab/auth/ldap/__init__.py:211
 msgid "Connecting to LDAP..."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:209
+#: ../pykolab/auth/ldap/__init__.py:215
 #, python-format
 msgid "Attempting to use LDAP URI %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:345
+#: ../pykolab/auth/ldap/__init__.py:357
 #, python-format
 msgid "Finding recipient with filter %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:398
+#: ../pykolab/auth/ldap/__init__.py:425
+#, python-format
+msgid "Finding resource with filter %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:448
+#, python-format
+msgid "Using timestamp %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:480
 #, python-format
 msgid "Applying recipient policy to %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:415
+#: ../pykolab/auth/ldap/__init__.py:497
 #, python-format
 msgid "Using mail attributes: %r, with primary %r and "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:426
+#: ../pykolab/auth/ldap/__init__.py:508
 #, python-format
 msgid "key %r not in entry"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:428
+#: ../pykolab/auth/ldap/__init__.py:510
 #, python-format
 msgid "key %r is the prim. mail attr."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:430
+#: ../pykolab/auth/ldap/__init__.py:512
 msgid "prim. mail pol. is not empty"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:433
+#: ../pykolab/auth/ldap/__init__.py:515
 #, python-format
 msgid "key %r is the sec. mail attr."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:435
+#: ../pykolab/auth/ldap/__init__.py:517
 msgid "sec. mail pol. is not empty"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:438
-#: .././pykolab/auth/ldap/__init__.py:451
+#: ../pykolab/auth/ldap/__init__.py:520 ../pykolab/auth/ldap/__init__.py:533
 #, python-format
 msgid "Attributes %r are not yet available for entry %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:492
+#: ../pykolab/auth/ldap/__init__.py:574
 #, python-format
 msgid "No results for mail address %s found"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:503
+#: ../pykolab/auth/ldap/__init__.py:585
 #, python-format
 msgid "1 result for address %s found, verifying"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:513
+#: ../pykolab/auth/ldap/__init__.py:595
 #, python-format
 msgid "Too bad, primary email address %s "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:524
-#: .././pykolab/auth/ldap/__init__.py:613
+#: ../pykolab/auth/ldap/__init__.py:606 ../pykolab/auth/ldap/__init__.py:695
 msgid "Address assigned to us"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:579
+#: ../pykolab/auth/ldap/__init__.py:661
 #, python-format
 msgid "No results for address %s found"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:590
+#: ../pykolab/auth/ldap/__init__.py:672
 #, python-format
 msgid "1 result for address %s found, "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:601
+#: ../pykolab/auth/ldap/__init__.py:683
 msgid "Too bad, secondary email "
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:655
+#: ../pykolab/auth/ldap/__init__.py:710
+msgid "Recipient policy composed the following set of secondary "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:716
+#, python-format
+msgid "Secondary mail addresses that we want is not None: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:727
+msgid "Avoiding the duplication of the primary mail "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:738
+#, python-format
+msgid "Entry is getting secondary mail addresses: %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:746
+msgid "Entry did not have any secondary mail "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:772
 #, python-format
 msgid "Entry modifications list: %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:698
+#: ../pykolab/auth/ldap/__init__.py:792
+#, python-format
+msgid "Setting entry attribute %r to %r for %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:828
+#, python-format
+msgid "Could not update dn %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:841
 #, python-format
 msgid "Using filter %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:736
+#: ../pykolab/auth/ldap/__init__.py:879
+#, python-format
+msgid "About to consider the user quota for %r (used: %r, "
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:945
 msgid "Invalid bind credentials"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:989
+#: ../pykolab/auth/ldap/__init__.py:1229
 #, python-format
 msgid "Current changelog entry %s with %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:996
+#: ../pykolab/auth/ldap/__init__.py:1242
 #, python-format
 msgid "Result from recipient policy: %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1227
+#: ../pykolab/auth/ldap/__init__.py:1385
+#, python-format
+msgid "Kolab user %s does not have a result attribute %r"
+msgstr ""
+
+#: ../pykolab/auth/ldap/__init__.py:1527
 #, python-format
 msgid "Finding domain root dn for domain %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1315
+#: ../pykolab/auth/ldap/__init__.py:1615
 msgid "Authentication database DOWN"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1394
+#: ../pykolab/auth/ldap/__init__.py:1699 ../pykolab/auth/ldap/__init__.py:1734
 #, python-format
 msgid "Entry type: %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1492
+#: ../pykolab/auth/ldap/__init__.py:1822
 msgid "LDAP Search Result Data Entry:"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1508
+#: ../pykolab/auth/ldap/__init__.py:1838
 msgid "Entry Change Notification attributes:"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1513
+#: ../pykolab/auth/ldap/__init__.py:1843
 #, python-format
 msgid "Change Type: %r (%r)"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1521
+#: ../pykolab/auth/ldap/__init__.py:1851
 #, python-format
 msgid "Previous DN: %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1575
+#: ../pykolab/auth/ldap/__init__.py:1906
 #, python-format
 msgid "Object %s searched no longer exists"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1583
+#: ../pykolab/auth/ldap/__init__.py:1916
 #, python-format
 msgid "%d results..."
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1677
+#: ../pykolab/auth/ldap/__init__.py:2014
 #, python-format
 msgid "Searching with filter %r"
 msgstr ""
 
-#: .././pykolab/auth/ldap/__init__.py:1721
+#: ../pykolab/auth/ldap/__init__.py:2058
 #, python-format
 msgid "Checking for support for %s on %s"
 msgstr ""
 
-#: .././pykolab/auth/ldap/cache.py:109
-#, python-format
-msgid "Inserting cache entry %r"
+#: ../pykolab/cli/cmd_add_domain.py:36 ../pykolab/cli/cmd_create_mailbox.py:36
+#: ../pykolab/cli/cmd_export_mailbox.py:33
+#: ../pykolab/cli/cmd_list_mailboxes.py:39
+msgid "CLI Options"
 msgstr ""
 
-#: .././pykolab/auth/ldap/cache.py:122
-#, python-format
-msgid "Updating timestamp for cache entry %r"
+#: ../pykolab/cli/cmd_add_domain.py:42
+msgid "Add domain as alias for DOMAIN"
 msgstr ""
 
-#: .././pykolab/auth/ldap/cache.py:128
-#, python-format
-msgid "Updating result_attribute for cache entry %r"
+#: ../pykolab/cli/cmd_add_domain.py:47
+msgid "Add a new domain or domain alias."
 msgstr ""
 
-#: .././pykolab/auth/sql/__init__.py:44
-msgid "Connecting to SQL..."
+#: ../pykolab/cli/cmd_add_domain.py:55
+msgid "Could not find credentials with sufficient permissions"
 msgstr ""
 
-#: .././pykolab/utils.py:92
-msgid "Please answer 'yes' or 'no'."
+#: ../pykolab/cli/cmd_add_domain.py:80 ../pykolab/wap_client/__init__.py:113
+msgid "Invalid parent domain"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:87
-#, python-format
-msgid "Setting %s to %r (from defaults)"
+#: ../pykolab/cli/cmd_add_domain.py:86
+msgid "Domain name"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:106
-#, python-format
-msgid "Setting %s to %r (from CLI, verified)"
+#: ../pykolab/cli/cmd_create_mailbox.py:41
+msgid "Set metadata for folder to ANNOTATION=VALUE"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:109
-#, python-format
-msgid "Setting %s to %r (from CLI, not checked)"
+#: ../pykolab/cli/cmd_create_mailbox.py:50
+msgid "Invalid argument"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:150 .././pykolab/conf/__init__.py:207
-#, python-format
-msgid "Setting %s_%s to '****' (from configuration file)"
+#: ../pykolab/cli/cmd_create_mailbox.py:58
+msgid "Invalid argument for metadata"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:152 .././pykolab/conf/__init__.py:209
-#, python-format
-msgid "Setting %s_%s to %r (from configuration file)"
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:45
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:49
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:50
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:55
+msgid "ACI Subject"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:162
-msgid "Setting options from configuration file"
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:48
+#: ../pykolab/cli/cmd_list_mailbox_acls.py:41
+#: ../pykolab/cli/cmd_list_mailbox_metadata.py:41
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:54
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:54
+msgid "Folder name"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:223
+#: ../pykolab/cli/cmd_delete_mailbox_acl.py:60
+#: ../pykolab/cli/cmd_list_mailbox_acls.py:52
+#: ../pykolab/cli/cmd_list_mailbox_metadata.py:52
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:67
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:67
 #, python-format
-msgid "Configuration file %s not readable"
+msgid "No such folder %r"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:226
-#, python-format
-msgid "Reading configuration file %s"
+#: ../pykolab/cli/cmd_delete_mailbox.py:46
+msgid "No mailbox specified"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:230
+#: ../pykolab/cli/cmd_export_mailbox.py:38
+msgid "All folders this user has access to"
+msgstr ""
+
+#: ../pykolab/cli/cmd_export_mailbox.py:108
+#, python-format
+msgid "%s is not a directory"
+msgstr ""
+
+#: ../pykolab/cli/cmd_export_mailbox.py:118
+#, python-format
+msgid "ZIP file at %s.zip"
+msgstr ""
+
+#: ../pykolab/cli/cmd_export_mailbox.py:120
+#, python-format
+msgid "No directories found for user %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_mailboxes.py:44
+msgid "Display raw IMAP UTF-7 folder names"
+msgstr ""
+
+#: ../pykolab/cli/cmd_list_mailboxes.py:75
+#, python-format
+msgid "Appending folder search for %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:49
+msgid "Invalid or unqualified email address."
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:57
+#, python-format
+msgid "No recipient found for email address %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:60
+#, python-format
+msgid "Found the following recipient(s): %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:66
+#, python-format
+msgid "Using the following mail attributes: %r"
+msgstr ""
+
+#: ../pykolab/cli/cmd_remove_mailaddress.py:90
+msgid "Found the following recipients:"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:48
+msgid "No target mailbox name specified"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:50
+msgid "No source mailbox name specified"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:62
+#, python-format
+msgid "Source folder %r does not exist"
+msgstr ""
+
+#: ../pykolab/cli/cmd_rename_mailbox.py:66
+#, python-format
+msgid "Target folder %r already exists"
+msgstr ""
+
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:47
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:51
+#: ../pykolab/cli/cmd_set_mailbox_acl.py:56
+msgid "ACI Permissions"
+msgstr ""
+
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:47
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:51
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:56
+msgid "Metadata value"
+msgstr ""
+
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:50
+#: ../pykolab/cli/cmd_set_mailbox_metadata.py:55
+msgid "Metadata path"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:41
+#, python-format
+msgid "Found %d domains in %d seconds"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:51
+#, python-format
+msgid "Running for domain %s"
+msgstr ""
+
+#: ../pykolab/cli/cmd_sync.py:57
+#, python-format
+msgid "Synchronizing users for %s took %d seconds"
+msgstr ""
+
+#. This is a nested command
+#. This is a nested component
+#: ../pykolab/cli/commands.py:98 ../pykolab/setup/components.py:90
+#, python-format
+msgid "Command Group: %s"
+msgstr ""
+
+#: ../pykolab/cli/commands.py:109 ../pykolab/cli/commands.py:114
+msgid "No such command."
+msgstr ""
+
+#: ../pykolab/cli/commands.py:165 ../pykolab/setup/components.py:231
+#, python-format
+msgid "Command '%s' already registered"
+msgstr ""
+
+#: ../pykolab/cli/commands.py:190 ../pykolab/setup/components.py:257
+#: ../wallace/modules.py:338
+#, python-format
+msgid "Alias for %s"
+msgstr ""
+
+#: ../pykolab/cli/commands.py:198 ../pykolab/setup/components.py:265
+msgid "Not yet implemented"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:40
+msgid "Unspecified command issue identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:50
+msgid "Invalid command issue identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:60
+#: ../pykolab/cli/telemetry/cmd_examine_session.py:65
+msgid "Invalid session identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_command_issue.py:75
+#: ../pykolab/cli/telemetry/cmd_examine_session.py:100
+#, python-format
+msgid "Session by %s on server %s"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_examine_session.py:43
+msgid "Unspecified session identifier"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_list_sessions.py:35
+msgid "List Options"
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_list_sessions.py:40
+msgid "Display sessions since ..."
+msgstr ""
+
+#: ../pykolab/cli/telemetry/cmd_list_sessions.py:58
+#, python-format
+msgid "Session for user %s started at %s with ID %s"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:57 ../pykolab/conf/entitlement.py:80
+#: ../pykolab/conf/entitlement.py:98 ../pykolab/conf/entitlement.py:116
+#: ../pykolab/conf/entitlement.py:230 ../pykolab/conf/entitlement.py:246
+#: ../pykolab/conf/entitlement.py:262
+msgid "Invalid entitlement verification "
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:120 ../pykolab/conf/entitlement.py:123
+msgid "Invalid entitlement certificate"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:132
+#, python-format
+msgid "Parsing entitlement file %s"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:141
+#, python-format
+msgid "License file %s not readable!"
+msgstr ""
+
+#: ../pykolab/conf/entitlement.py:147
+msgid "No entitlement directory found"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:87
+#, python-format
+msgid "Setting %s to %r (from defaults)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:106
+#, python-format
+msgid "Setting %s to %r (from CLI, verified)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:109
+#, python-format
+msgid "Setting %s to %r (from CLI, not checked)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:150 ../pykolab/conf/__init__.py:207
+#, python-format
+msgid "Setting %s_%s to '****' (from configuration file)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:152 ../pykolab/conf/__init__.py:209
+#, python-format
+msgid "Setting %s_%s to %r (from configuration file)"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:162
+msgid "Setting options from configuration file"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:223
+#, python-format
+msgid "Configuration file %s not readable"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:226
+#, python-format
+msgid "Reading configuration file %s"
+msgstr ""
+
+#: ../pykolab/conf/__init__.py:230
 #, python-format
 msgid "Invalid configuration file %s"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:233
+#: ../pykolab/conf/__init__.py:233
 #, python-format
 msgid "No master configuration section [kolab] in configuration file %s"
 msgstr ""
@@ -811,1088 +925,1335 @@ msgstr ""
 #. #
 #. # Runtime Options
 #. #
-#: .././pykolab/conf/__init__.py:267
+#: ../pykolab/conf/__init__.py:267
 msgid "Runtime Options"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:272
+#: ../pykolab/conf/__init__.py:272
 msgid "Configuration file to use"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:278
+#: ../pykolab/conf/__init__.py:278
 msgid "Set the debugging "
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:286
+#: ../pykolab/conf/__init__.py:286
 msgid "Set the logging level. "
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:294
+#: ../pykolab/conf/__init__.py:294
 msgid "Log file to use"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:300
+#: ../pykolab/conf/__init__.py:300
 msgid "Be quiet."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:306
+#: ../pykolab/conf/__init__.py:306
 msgid "Answer yes to all questions."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:328
+#: ../pykolab/conf/__init__.py:328
 msgid "No command supplied"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:411
+#: ../pykolab/conf/__init__.py:411
 msgid "Insufficient options. Need section, key and value -in that order."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:414
+#: ../pykolab/conf/__init__.py:414
 #, python-format
 msgid "No section '%s' exists."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:445
+#: ../pykolab/conf/__init__.py:445
 #, python-format
 msgid "Setting %s to %r (from the default values for CLI options)"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:514
+#: ../pykolab/conf/__init__.py:514
 #, python-format
 msgid "Could not execute configuration function: %s"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:522
+#: ../pykolab/conf/__init__.py:522
 #, python-format
 msgid "Option %s/%s does not exist in config file %s, pulling from defaults"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:530 .././pykolab/conf/__init__.py:533
+#: ../pykolab/conf/__init__.py:530 ../pykolab/conf/__init__.py:533
 msgid "Option does not exist in defaults."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:531 .././pykolab/conf/__init__.py:534
-msgid "Not available"
-msgstr ""
-
-#: .././pykolab/conf/__init__.py:543
+#: ../pykolab/conf/__init__.py:543
 #, python-format
 msgid "Configuration file %s not readable."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:546
+#: ../pykolab/conf/__init__.py:546
 #, python-format
 msgid "Configuration file %s does not exist."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:551
+#: ../pykolab/conf/__init__.py:551
 msgid ""
 "WARNING: A negative debug level value does not make this program be any more "
 "silent."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:557
+#: ../pykolab/conf/__init__.py:557
 msgid "This program has 9 levels of verbosity. Using the maximum of 9."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:565 .././pykolab/conf/__init__.py:571
+#: ../pykolab/conf/__init__.py:565 ../pykolab/conf/__init__.py:571
 msgid "Cannot start SASL authentication daemon"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:582
+#: ../pykolab/conf/__init__.py:582
 msgid "No imaplib library found."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:592
+#: ../pykolab/conf/__init__.py:592
 msgid "No LMTP class found in the smtplib library."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:602
+#: ../pykolab/conf/__init__.py:602
 msgid "No SMTP class found in the smtplib library."
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:616
+#: ../pykolab/conf/__init__.py:616
 #, python-format
 msgid "Found you specified a specific set of items to test: %s"
 msgstr ""
 
-#: .././pykolab/conf/__init__.py:624
+#: ../pykolab/conf/__init__.py:624
 #, python-format
 msgid "Selectively selecting: %s"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:57 .././pykolab/conf/entitlement.py:80
-#: .././pykolab/conf/entitlement.py:98 .././pykolab/conf/entitlement.py:116
-#: .././pykolab/conf/entitlement.py:229 .././pykolab/conf/entitlement.py:245
-#: .././pykolab/conf/entitlement.py:261
-msgid "Invalid entitlement verification "
+#: ../pykolab/constants.py.in:40
+msgid "PyKolab is a Kolab Systems product. For more information "
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:120 .././pykolab/conf/entitlement.py:123
-msgid "Invalid entitlement certificate"
+#: ../pykolab/constants.py.in:54
+msgid "WARNING"
+msgstr ""
+
+#: ../pykolab/constants.py.in:54
+msgid "The Fully Qualified "
+msgstr ""
+
+#: ../pykolab/constants.py.in:75
+msgid "389 Directory Server or Red Hat Directory Server"
+msgstr ""
+
+#: ../pykolab/constants.py.in:79 ../pykolab/constants.py.in:83
+msgid "OpenLDAP or compatible"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:132
+#: ../pykolab/imap/cyrus.py:79
 #, python-format
-msgid "Parsing entitlement file %s"
+msgid "Could not connect to Cyrus IMAP server %r"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:141
+#: ../pykolab/imap/cyrus.py:134
 #, python-format
-msgid "License file %s not readable!"
+msgid "Continuing with separator: %r"
 msgstr ""
 
-#: .././pykolab/conf/entitlement.py:146
-msgid "No entitlement directory found"
+#: ../pykolab/imap/cyrus.py:139
+msgid "Detected we are running in a Murder topology"
 msgstr ""
 
-#: .././pykolab/logger.py:89
+#: ../pykolab/imap/cyrus.py:143
+msgid "This system is not part of a murder topology"
+msgstr ""
+
+#: ../pykolab/imap/cyrus.py:164
 #, python-format
-msgid "Cannot log to file %s: %s"
+msgid "Checking actual backend server for folder %s through annotations"
 msgstr ""
 
-#: .././pykolab/constants.py:40
-msgid "PyKolab is a Kolab Systems product. For more information "
+#: ../pykolab/imap/cyrus.py:179
+#, python-format
+msgid "Could not get the annotations after %s tries."
 msgstr ""
 
-#: .././pykolab/constants.py:54
-msgid "WARNING"
+#: ../pykolab/imap/cyrus.py:183
+#, python-format
+msgid "No annotations for %s: %r"
 msgstr ""
 
-#: .././pykolab/constants.py:54
-msgid "The Fully Qualified "
+#: ../pykolab/imap/cyrus.py:190
+#, python-format
+msgid "Server for INBOX folder %s is %s"
 msgstr ""
 
-#: .././pykolab/constants.py:75
-msgid "389 Directory Server or Red Hat Directory Server"
+#: ../pykolab/imap/cyrus.py:202
+#, python-format
+msgid "Setting quota for folder %s to %s"
 msgstr ""
 
-#: .././pykolab/constants.py:79 .././pykolab/constants.py:83
-msgid "OpenLDAP or compatible"
+#: ../pykolab/imap/cyrus.py:206
+#, python-format
+msgid "Could not set quota for mailfolder %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_list_sessions.py:35
-msgid "List Options"
+#: ../pykolab/imap/cyrus.py:215
+#, python-format
+msgid "Moving INBOX folder %s to %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_list_sessions.py:40
-msgid "Display sessions since ..."
+#: ../pykolab/imap/cyrus.py:227
+#, python-format
+msgid "Setting annotation %s on folder %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_list_sessions.py:58
+#: ../pykolab/imap/cyrus.py:234
 #, python-format
-msgid "Session for user %s started at %s with ID %s"
+msgid "Could not set annotation %r on mail folder %r: %r"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_session.py:43
-msgid "Unspecified session identifier"
+#: ../pykolab/imap/cyrus.py:238
+#, python-format
+msgid "Transferring folder %s from %s to %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_session.py:65
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:60
-msgid "Invalid session identifier"
+#: ../pykolab/imap/cyrus.py:298
+#, python-format
+msgid "Undeleting %s to %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_session.py:100
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:75
+#: ../pykolab/imap/__init__.py:45
 #, python-format
-msgid "Session by %s on server %s"
+msgid "Cleaning up ACL entries for %s across all folders"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:40
-msgid "Unspecified command issue identifier"
+#: ../pykolab/imap/__init__.py:60
+#, python-format
+msgid "Cleaning up ACL entries referring to identifier %s"
 msgstr ""
 
-#: .././pykolab/cli/telemetry/cmd_examine_command_issue.py:50
-msgid "Invalid command issue identifier"
+#: ../pykolab/imap/__init__.py:69
+#, python-format
+msgid "Iterating over %d folders"
 msgstr ""
 
-#. This is a nested command
-#. This is a nested component
-#: .././pykolab/cli/commands.py:95 .././pykolab/setup/components.py:88
+#. Set the ACL to '' (effectively deleting the ACL entry)
+#: ../pykolab/imap/__init__.py:82
 #, python-format
-msgid "Command Group: %s"
+msgid "Removing acl %r for subject %r from folder %r"
 msgstr ""
 
-#: .././pykolab/cli/commands.py:106 .././pykolab/cli/commands.py:111
-msgid "No such command."
+#: ../pykolab/imap/__init__.py:143
+#, python-format
+msgid "Logging on to Cyrus IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/commands.py:161 .././pykolab/setup/components.py:217
+#: ../pykolab/imap/__init__.py:152
 #, python-format
-msgid "Command '%s' already registered"
+msgid "Logging on to Dovecot IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_delete_mailbox.py:43
-msgid "No mailbox specified"
+#: ../pykolab/imap/__init__.py:161
+#, python-format
+msgid "Logging on to generic IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_list_mailboxes.py:35
-#: .././pykolab/cli/cmd_export_mailbox.py:33
-msgid "CLI Options"
+#: ../pykolab/imap/__init__.py:179
+#, python-format
+msgid "Reusing existing IMAP server connection to %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_list_mailboxes.py:40
-msgid "Display raw UTF-7 folder names"
+#: ../pykolab/imap/__init__.py:181
+#, python-format
+msgid "Reconnecting to IMAP server %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:38
-msgid "All folders this user has access to"
+#: ../pykolab/imap/__init__.py:197
+msgid "Called imap.disconnect() on a server that "
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:108
+#: ../pykolab/imap/__init__.py:213
 #, python-format
-msgid "%s is not a directory"
+msgid "%r has no attribute %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:118
+#: ../pykolab/imap/__init__.py:286
+msgid "Private annotations need to be set using the appropriate user account."
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:319 ../pykolab/imap/__init__.py:354
 #, python-format
-msgid "ZIP file at %s.zip"
+msgid "Creating new shared folder %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_export_mailbox.py:120
+#: ../pykolab/imap/__init__.py:376
 #, python-format
-msgid "No directories found for user %s"
+msgid "Creating new mailbox for user %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_sync.py:38
+#: ../pykolab/imap/__init__.py:405
 #, python-format
-msgid "Found %d domains in %d seconds"
+msgid "Creating additional folders for user %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_sync.py:48
+#: ../pykolab/imap/__init__.py:429
 #, python-format
-msgid "Running for domain %s"
+msgid "Mailbox already exists: %s"
 msgstr ""
 
-#: .././pykolab/cli/cmd_sync.py:54
+#: ../pykolab/imap/__init__.py:472
+msgid "Subscribing user to the additional folders"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:532 ../pykolab/imap/__init__.py:611
 #, python-format
-msgid "Synchronizing users for %s took %d seconds"
+msgid "Renaming INBOX from %s to %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:536
+#, python-format
+msgid "Could not rename INBOX folder %s to %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:538 ../pykolab/imap/__init__.py:615
+#, python-format
+msgid "Moving INBOX folder %s won't succeed as target folder %s already exists"
 msgstr ""
 
-#: .././pykolab/plugins/__init__.py:70
+#: ../pykolab/imap/__init__.py:551
+#, python-format
+msgid "Looking for folder '%s', we found folders: %r"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:574
+#, python-format
+msgid "Setting ACL rights %s for subject %s on folder "
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:585
+#, python-format
+msgid "Removing ACL rights %s for subject %s on folder "
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:608
+#, python-format
+msgid "Found old INBOX folder %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:617
+#, python-format
+msgid "Did not find old folder user/%s to rename"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:619
+msgid "Value for user is not a dictionary"
+msgstr ""
+
+#. TODO: Go in fact correct the quota.
+#: ../pykolab/imap/__init__.py:682
+#, python-format
+msgid "Cannot get current IMAP quota for folder %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:695
+#, python-format
+msgid "Quota for %s currently is %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:701
+#, python-format
+msgid "Adjusting authentication database quota for folder %s to %d"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:706
+#, python-format
+msgid "Correcting quota for %s to %s (currently %s)"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:788
+#, python-format
+msgid "Checking folder: %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:793
+#, python-format
+msgid "Folder has no corresponding user (1): %s"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:796
+#, python-format
+msgid "Folder has no corresponding user (2): %s"
+msgstr ""
+
+#. We got user identifier only
+#: ../pykolab/imap/__init__.py:811
+msgid "Please don't give us just a user identifier"
+msgstr ""
+
+#: ../pykolab/imap/__init__.py:814
+#, python-format
+msgid "Deleting folder %s"
+msgstr ""
+
+#: ../pykolab/__init__.py:50
+msgid "Returning thread local configuration"
+msgstr ""
+
+#: ../pykolab/logger.py:105
+#, python-format
+msgid "Could not change the ownership of log file %s"
+msgstr ""
+
+#: ../pykolab/logger.py:121
+#, python-format
+msgid "Cannot log to file %s: %s"
+msgstr ""
+
+#: ../pykolab/plugins/defaultfolders/__init__.py:47
+#, python-format
+msgid "Plugin %s called without required keyword %s."
+msgstr ""
+
+#: ../pykolab/plugins/defaultfolders/__init__.py:53
+msgid "Could not parse additional_folder