16 commits - data/locale data/templates

Fri Jul 15 15:53:56 CEST 2011

data/locale/de/LC_MESSAGES/messages.po       | 3257 +++++++++++++++------------
 data/locale/es/LC_MESSAGES/messages.po       | 3216 +++++++++++++++-----------
 data/locale/fr/LC_MESSAGES/messages.po       | 3255 +++++++++++++++-----------
 data/locale/it/LC_MESSAGES/messages.po       | 3203 +++++++++++++++-----------
 data/locale/messages.pot                     | 2427 ++++++++++++++++++++
 data/locale/nl/LC_MESSAGES/messages.po       | 3234 +++++++++++++++-----------
 data/templates/welcome-admin.tpl             |    2 
 data/templates/welcome-domain-maintainer.tpl |   12 
 data/templates/welcome-maintainer.tpl        |    2 
 data/templates/welcome-user.tpl              |    2 
 10 files changed, 11608 insertions(+), 7002 deletions(-)

New commits:
commit 5e6be678bce0c3c5eb470e9d1e3b5101ffc51e96
Merge: 05c0866... aebba59...
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Jul 15 15:53:15 2011 +0200

    Merge branch '2.3-stable'



commit aebba598d875394dda55fb83d1ba40c45db1b3ff
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Fri Jul 15 15:27:07 2011 +0200

    Add potfile because kolab-webadmin is now in Transifex

diff --git a/data/locale/de/LC_MESSAGES/messages.po b/data/locale/de/LC_MESSAGES/messages.po
index 64bf511..a6cdb6a 100644
--- a/data/locale/de/LC_MESSAGES/messages.po
+++ b/data/locale/de/LC_MESSAGES/messages.po
@@ -7,408 +7,451 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab-Webadmin German\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-25 18:29+0200\n"
+"POT-Creation-Date: 2011-07-15 12:08+0200\n"
 "PO-Revision-Date: 2008-06-02 17:40+0200\n"
 "Last-Translator: Thomas Arendsen Hein <thomas at intevation.de>\n"
 "Language-Team: Kolab development coordination <kolab-devel at kolab.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tpl_messages.php:2
-msgid "The address with DN"
-msgstr "Die Adresse mit DN"
-
-#: tpl_messages.php:3 tpl_messages.php:21 tpl_messages.php:77
-#: tpl_messages.php:130 tpl_messages.php:192 tpl_messages.php:210
-msgid "has been deleted"
-msgstr "wurde gelÃ¶scht"
+#: tpl_messages.php:2 tpl_messages.php:62
+msgid "Errors:"
+msgstr "Fehler:"
 
-#: tpl_messages.php:4
-msgid "Back to list of addresses"
-msgstr "ZurÃ¼ck zur Adressliste"
+#: tpl_messages.php:3 tpl_messages.php:63
+msgid "Message:"
+msgstr "Nachricht:"
 
-#: tpl_messages.php:5 tpl_messages.php:10
-msgid "(only external addresses without a kolab user account)"
-msgstr "(nur externe Adresse ohne Kolab-Benutzerkonto)"
+#: tpl_messages.php:4 ../../lib/KolabAdmin/include/menu.php:77
+msgid "Administrators"
+msgstr "Administratoren"
 
-#: tpl_messages.php:6 tpl_messages.php:15 tpl_messages.php:24
-#: tpl_messages.php:80 tpl_messages.php:133 tpl_messages.php:195
-#: tpl_messages.php:218 ../../../www/admin/addressbook/index.php.in:121
-#: ../../../www/admin/user/index.php.in:183
+#: tpl_messages.php:5 tpl_messages.php:69 tpl_messages.php:87
+#: tpl_messages.php:111 tpl_messages.php:210 tpl_messages.php:215
+#: tpl_messages.php:278 ../../www/admin/user/index.php:181
+#: ../../www/admin/addressbook/index.php:121
 msgid "Name"
 msgstr "Name"
 
-#: tpl_messages.php:7 tpl_messages.php:16 tpl_messages.php:26
-#: tpl_messages.php:70 tpl_messages.php:82 tpl_messages.php:135
-#: tpl_messages.php:175 tpl_messages.php:188 tpl_messages.php:198
-#: tpl_messages.php:221
+#: tpl_messages.php:6 tpl_messages.php:216 tpl_messages.php:279
+#: ../../www/admin/user/index.php:183
+msgid "UID"
+msgstr "UID"
+
+#: tpl_messages.php:7 tpl_messages.php:70 tpl_messages.php:90
+#: tpl_messages.php:114 tpl_messages.php:190 tpl_messages.php:211
+#: tpl_messages.php:217 tpl_messages.php:251 tpl_messages.php:264
+#: tpl_messages.php:280
 msgid "Action"
 msgstr "Aktion"
 
-#: tpl_messages.php:8 tpl_messages.php:18 tpl_messages.php:28
-#: tpl_messages.php:74 tpl_messages.php:84 tpl_messages.php:137
-#: tpl_messages.php:200 tpl_messages.php:223
+#: tpl_messages.php:8 tpl_messages.php:218 tpl_messages.php:281
+msgid "Object Deleted, awaiting cleanup..."
+msgstr "Objekt gelÃ¶scht, warte auf AufrÃ¤umaktion..."
+
+#: tpl_messages.php:9 tpl_messages.php:72 tpl_messages.php:92
+#: tpl_messages.php:116 tpl_messages.php:194 tpl_messages.php:212
+#: tpl_messages.php:219 tpl_messages.php:282
 msgid "Modify"
 msgstr "Bearbeiten"
 
-#: tpl_messages.php:9 tpl_messages.php:19 tpl_messages.php:29
-#: tpl_messages.php:75 tpl_messages.php:85 tpl_messages.php:138
-#: tpl_messages.php:176 tpl_messages.php:189 tpl_messages.php:201
-#: tpl_messages.php:224 ../../../www/admin/addressbook/addr.php.in:277
-#: ../../../www/admin/administrator/admin.php.in:307
-#: ../../../www/admin/distributionlist/list.php.in:300
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:310
-#: ../../../www/admin/sharedfolder/sf.php.in:310
-#: ../../../www/admin/user/user.php.in:764
-#: ../../../www/admin/user/user.php.in:822
+#: tpl_messages.php:10 tpl_messages.php:73 tpl_messages.php:93
+#: tpl_messages.php:117 tpl_messages.php:195 tpl_messages.php:213
+#: tpl_messages.php:220 tpl_messages.php:252 tpl_messages.php:265
+#: tpl_messages.php:283 ../../www/admin/user/user.php:862
+#: ../../www/admin/user/user.php:920
+#: ../../www/admin/administrator/admin.php:311
+#: ../../www/admin/addressbook/addr.php:277
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:314
+#: ../../www/admin/sharedfolder/sf.php:314
+#: ../../www/admin/distributionlist/list.php:304
 msgid "Delete"
 msgstr "LÃ¶schen"
 
-#: tpl_messages.php:11 tpl_messages.php:213 tpl_messages.php:226
-msgid "[ ALL ]"
-msgstr "[ ALLE ]"
+#: tpl_messages.php:11
+msgid "Email Forwarding"
+msgstr "E-Mail-Weiterleitung"
 
-#: tpl_messages.php:12 tpl_messages.php:214 tpl_messages.php:227
-msgid "[ OTHER ]"
-msgstr "[ ANDERE ]"
+#: tpl_messages.php:12
+#, fuzzy
+msgid "Activate email forwarding"
+msgstr "E-Mail-Weiterleitung"
 
-#: tpl_messages.php:13 tpl_messages.php:215 tpl_messages.php:228
-msgid "Filter:"
-msgstr "Filter:"
+#: tpl_messages.php:13
+msgid "Forward mail to"
+msgstr "E-Mail weiterleiten an"
 
-#: tpl_messages.php:14 tpl_messages.php:216 tpl_messages.php:229
-msgid "Filter"
-msgstr "Filter"
+#: tpl_messages.php:14
+msgid "Keep copy on server"
+msgstr "Kopie auf dem Server belassen"
 
-#: tpl_messages.php:17
-msgid "Entry deleted, awaiting cleanup..."
-msgstr "Eintrag gelÃ¶scht, warte auf AufrÃ¤umaktion..."
+#: tpl_messages.php:15 tpl_messages.php:77 tpl_messages.php:229
+#: tpl_messages.php:233 tpl_messages.php:236 tpl_messages.php:239
+#: tpl_messages.php:242 tpl_messages.php:245 tpl_messages.php:248
+#: tpl_messages.php:261 tpl_messages.php:333
+msgid "Update"
+msgstr "Aktualisieren"
 
-#: tpl_messages.php:20
-msgid "The administrator with DN"
-msgstr "Der Administrator mit DN"
+#: tpl_messages.php:16
+msgid "ActiveSync Configuration"
+msgstr ""
 
-#: tpl_messages.php:22
-msgid "Back to list of administrators"
-msgstr "ZurÃ¼ck zur Liste der Administratoren"
+#: tpl_messages.php:17
+#, fuzzy
+msgid "Device Alias"
+msgstr "E-Mail-Aliasnamen"
 
-#: tpl_messages.php:23 ../include/menu.php:70
-msgid "Administrators"
-msgstr "Administratoren"
+#: tpl_messages.php:18
+msgid "Device Mode"
+msgstr ""
 
-#: tpl_messages.php:25 tpl_messages.php:81 tpl_messages.php:134
-#: ../../../www/admin/user/index.php.in:185
-msgid "UID"
-msgstr "UID"
+#: tpl_messages.php:19
+#, fuzzy
+msgid "Picture Settings"
+msgstr "Systemeinstellungen"
 
-#: tpl_messages.php:27 tpl_messages.php:83 tpl_messages.php:136
-msgid "Object Deleted, awaiting cleanup..."
-msgstr "Objekt gelÃ¶scht, warte auf AufrÃ¤umaktion..."
+#: tpl_messages.php:20
+msgid "Enable PNG and GIF formats while syncing"
+msgstr ""
 
-#: tpl_messages.php:30
-msgid ""
-"<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> is a specialist "
-"email solution provider based in Johannesburg, South Africa specialising in "
-"the deployment and support of Kolab."
+#: tpl_messages.php:21
+msgid "Save"
 msgstr ""
-"<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> ist ein auf E-"
-"Mail-LÃ¶sungen spezialisierter Dienstleister in Johannesburg, SÃ¼dafrika, der "
-"besonders an Inbetriebnahme und Support fÃ¼r Kolab arbeitet."
 
-#: tpl_messages.php:31
-msgid ""
-"Code Fusion has played, and continues to play, an integral part in "
-"developing and extending the Kolab server; specifically with regards to "
-"enhancing the base Kolab engine, adding in support for Microsoft Active "
-"Directory ® as an LDAP backend, as well as extending the <a href="
-"\"http://www.horde.org/\">Horde project</a> to provide a web-based groupware "
-"client for the Kolab server."
+#: tpl_messages.php:22
+msgid "Clear"
 msgstr ""
-"Code Fusion hat eine zentrale Rolle in der Entwicklung und Erweiterung des "
-"Kolab-Servers gespielt und wird das auch in Zukunft tun; insbesondere "
-"hinsichtlich Erweiterungen der zugrundeliegenden Kolab-Engine, der "
-"UnterstÃ¼tzung von Microsoft Active Directory ® als LDAP-Backend und der "
-"Erweiterung des <a href=\"http://www.horde.org/\">Horde-Projekts</a> als Web-"
-"basierter Groupware-Client fÃ¼r den Kolab-Server."
 
-#: tpl_messages.php:32
-msgid ""
-"The following people from Code Fusion are involved in the Kolab project (in "
-"alphabetical order):"
+#: tpl_messages.php:23
+msgid "Forget Device"
 msgstr ""
-"The folgenden Mitarbeiter von Code Fusion haben am Kolab-Projekt mitgewirkt "
-"(in alphabetischer Reihenfolge):"
 
-#: tpl_messages.php:33
+#: tpl_messages.php:24
+msgid "Are you sure?"
+msgstr ""
+
+#: tpl_messages.php:25
+msgid "The maintainer with DN"
+msgstr "Der Verwalter mit DN"
+
+#: tpl_messages.php:26 tpl_messages.php:29 tpl_messages.php:204
+#: tpl_messages.php:207 tpl_messages.php:286 tpl_messages.php:309
+msgid "has been deleted"
+msgstr "wurde gelÃ¶scht"
+
+#: tpl_messages.php:27
+msgid "Back to list of maintainers"
+msgstr "ZurÃ¼ck zur Liste der Verwalter"
+
+#: tpl_messages.php:28
+msgid "The distribution list with DN"
+msgstr "Die Verteilerliste mit DN"
+
+#: tpl_messages.php:30
+msgid "Back to list of distribution lists"
+msgstr "ZurÃ¼ck zur Liste der Verteilerlisten"
+
+#: tpl_messages.php:31
 msgid "Attribute"
 msgstr "Attribut"
 
-#: tpl_messages.php:34
+#: tpl_messages.php:32
 msgid "Value"
 msgstr "Wert"
 
-#: tpl_messages.php:35
+#: tpl_messages.php:33
 msgid "Comment"
 msgstr "Kommentar"
 
-#: tpl_messages.php:36 ../../../www/admin/addressbook/addr.php.in:88
-#: ../../../www/admin/administrator/admin.php.in:139
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:114
-#: ../../../www/admin/maintainer/maintainer.php.in:136
-#: ../../../www/admin/user/user.php.in:384
+#: tpl_messages.php:34 ../../www/admin/user/user.php:449
+#: ../../www/admin/administrator/admin.php:139
+#: ../../www/admin/addressbook/addr.php:88
+#: ../../www/admin/maintainer/maintainer.php:136
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:114
 msgid "First Name"
 msgstr "Vorname"
 
-#: tpl_messages.php:37 tpl_messages.php:39 tpl_messages.php:41
-#: tpl_messages.php:43 ../../../www/admin/addressbook/addr.php.in:90
-#: ../../../www/admin/addressbook/addr.php.in:93
-#: ../../../www/admin/administrator/admin.php.in:133
-#: ../../../www/admin/administrator/admin.php.in:141
-#: ../../../www/admin/administrator/admin.php.in:144
-#: ../../../www/admin/distributionlist/list.php.in:117
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:108
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:116
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:119
-#: ../../../www/admin/maintainer/maintainer.php.in:130
-#: ../../../www/admin/maintainer/maintainer.php.in:138
-#: ../../../www/admin/maintainer/maintainer.php.in:141
-#: ../../../www/admin/sharedfolder/sf.php.in:123
-#: ../../../www/admin/user/user.php.in:376
-#: ../../../www/admin/user/user.php.in:386
-#: ../../../www/admin/user/user.php.in:389
+#: tpl_messages.php:35 tpl_messages.php:38 tpl_messages.php:40
+#: tpl_messages.php:42 ../../www/admin/user/user.php:441
+#: ../../www/admin/user/user.php:451 ../../www/admin/user/user.php:455
+#: ../../www/admin/administrator/admin.php:133
+#: ../../www/admin/administrator/admin.php:141
+#: ../../www/admin/administrator/admin.php:144
+#: ../../www/admin/addressbook/addr.php:90
+#: ../../www/admin/addressbook/addr.php:93
+#: ../../www/admin/maintainer/maintainer.php:130
+#: ../../www/admin/maintainer/maintainer.php:138
+#: ../../www/admin/maintainer/maintainer.php:141
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:108
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:116
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:119
+#: ../../www/admin/sharedfolder/sf.php:125
+#: ../../www/admin/distributionlist/list.php:120
 msgid "Required"
 msgstr "Pflichtfeld"
 
-#: tpl_messages.php:38 ../../../www/admin/addressbook/addr.php.in:91
-#: ../../../www/admin/administrator/admin.php.in:142
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:117
-#: ../../../www/admin/maintainer/maintainer.php.in:139
-#: ../../../www/admin/user/user.php.in:387
+#: tpl_messages.php:36 ../../www/admin/user/user.php:452
+#, fuzzy
+msgid "Middle Name"
+msgstr "Ordnername"
+
+#: tpl_messages.php:37 ../../www/admin/user/user.php:453
+#: ../../www/admin/administrator/admin.php:142
+#: ../../www/admin/addressbook/addr.php:91
+#: ../../www/admin/maintainer/maintainer.php:139
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:117
 msgid "Last Name"
 msgstr "Nachname"
 
-#: tpl_messages.php:40 ../../../www/admin/administrator/admin.php.in:145
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:120
-#: ../../../www/admin/maintainer/maintainer.php.in:142
-#: ../../../www/admin/user/user.php.in:390
+#: tpl_messages.php:39 ../../www/admin/user/user.php:456
+#: ../../www/admin/administrator/admin.php:145
+#: ../../www/admin/maintainer/maintainer.php:142
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:120
 msgid "Password"
 msgstr "Passwort"
 
-#: tpl_messages.php:42 ../../../www/admin/administrator/admin.php.in:149
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:124
-#: ../../../www/admin/maintainer/maintainer.php.in:146
-#: ../../../www/admin/user/user.php.in:394
+#: tpl_messages.php:41 ../../www/admin/user/user.php:460
+#: ../../www/admin/administrator/admin.php:149
+#: ../../www/admin/maintainer/maintainer.php:146
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:124
 msgid "Verify Password"
 msgstr "Passwort bestÃ¤tigen"
 
-#: tpl_messages.php:44 ../../../www/admin/user/user.php.in:398
+#: tpl_messages.php:43 ../../www/admin/user/user.php:464
 msgid "Primary Email Address"
 msgstr "PrimÃ¤re E-Mail-Adresse"
 
-#: tpl_messages.php:45 ../../../www/admin/administrator/admin.php.in:132
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:107
-#: ../../../www/admin/maintainer/maintainer.php.in:129
-#: ../../../www/admin/sharedfolder/sf.php.in:126
-#: ../../../www/admin/user/user.php.in:375
-#: ../../../www/admin/user/user.php.in:377
+#: tpl_messages.php:44 ../../www/admin/user/user.php:440
+#: ../../www/admin/user/user.php:442
+#: ../../www/admin/administrator/admin.php:132
+#: ../../www/admin/maintainer/maintainer.php:129
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:107
+#: ../../www/admin/sharedfolder/sf.php:128
 msgid "Required, non volatile"
 msgstr "Pflichtfeld, unverÃ¤nderlich"
 
-#: tpl_messages.php:46 ../../../www/admin/addressbook/addr.php.in:94
-#: ../../../www/admin/user/user.php.in:433
+#: tpl_messages.php:45 ../../www/admin/user/user.php:505
+#: ../../www/admin/addressbook/addr.php:94
 msgid "Title"
 msgstr "Titel"
 
-#: tpl_messages.php:47
+#: tpl_messages.php:46
 msgid "Email Alias"
 msgstr "E-Mail-Aliasnamen"
 
-#: tpl_messages.php:48 ../../../www/admin/addressbook/addr.php.in:101
-#: ../../../www/admin/user/user.php.in:434
+#: tpl_messages.php:47 ../../www/admin/user/user.php:506
+#: ../../www/admin/addressbook/addr.php:101
 msgid "Organisation"
 msgstr "Organisation"
 
-#: tpl_messages.php:49 ../../../www/admin/addressbook/addr.php.in:102
-#: ../../../www/admin/user/user.php.in:435
+#: tpl_messages.php:48 ../../www/admin/user/user.php:507
+#: ../../www/admin/addressbook/addr.php:102
 msgid "Organisational Unit"
 msgstr "Organisationseinheit"
 
-#: tpl_messages.php:50 ../../../www/admin/addressbook/addr.php.in:103
-#: ../../../www/admin/user/user.php.in:436
+#: tpl_messages.php:49 ../../www/admin/user/user.php:508
+#: ../../www/admin/addressbook/addr.php:103
 msgid "Room Number"
 msgstr "Zimmernummer"
 
-#: tpl_messages.php:51 ../../../www/admin/addressbook/addr.php.in:104
-#: ../../../www/admin/user/user.php.in:437
+#: tpl_messages.php:50 ../../www/admin/user/user.php:509
+#: ../../www/admin/addressbook/addr.php:104
 msgid "Street Address"
 msgstr "StraÃŸenanschrift"
 
-#: tpl_messages.php:52 ../../../www/admin/user/user.php.in:438
+#: tpl_messages.php:51 ../../www/admin/user/user.php:510
 msgid "Postbox"
 msgstr "Postfach"
 
-#: tpl_messages.php:53 ../../../www/admin/addressbook/addr.php.in:106
-#: ../../../www/admin/user/user.php.in:439
+#: tpl_messages.php:52 ../../www/admin/user/user.php:511
+#: ../../www/admin/addressbook/addr.php:106
 msgid "Postal Code"
 msgstr "Postleitzahl"
 
-#: tpl_messages.php:54 ../../../www/admin/addressbook/addr.php.in:107
-#: ../../../www/admin/user/user.php.in:440
+#: tpl_messages.php:53 ../../www/admin/user/user.php:512
+#: ../../www/admin/addressbook/addr.php:107
 msgid "City"
 msgstr "Stadt"
 
-#: tpl_messages.php:55 ../../../www/admin/addressbook/addr.php.in:108
-#: ../../../www/admin/user/user.php.in:441
+#: tpl_messages.php:54 ../../www/admin/user/user.php:513
+#: ../../www/admin/addressbook/addr.php:108
 msgid "Country"
 msgstr "Land"
 
-#: tpl_messages.php:56 ../../../www/admin/addressbook/addr.php.in:109
-#: ../../../www/admin/user/user.php.in:442
+#: tpl_messages.php:55 ../../www/admin/user/user.php:515
+#: ../../www/admin/addressbook/addr.php:109
 msgid "Telephone Number"
 msgstr "Telefonnummer"
 
-#: tpl_messages.php:57 ../../../www/admin/addressbook/addr.php.in:111
-#: ../../../www/admin/user/user.php.in:444
+#: tpl_messages.php:56 ../../www/admin/user/user.php:517
+#: ../../www/admin/addressbook/addr.php:111
 msgid "Fax Number"
 msgstr "Faxnummer"
 
-#: tpl_messages.php:58 ../include/menu.php:45
+#: tpl_messages.php:57 tpl_messages.php:96 tpl_messages.php:313
+#: ../../lib/KolabAdmin/include/menu.php:52
 msgid "Addressbook"
 msgstr "Adressbuch"
 
-#: tpl_messages.php:59
+#: tpl_messages.php:58
 msgid "check here to make this users address <br/> visible in the address book"
 msgstr ""
 "WÃ¤hlen Sie diese Option an, um die Adresse dieses Benutzers <br/> im "
 "Adressbuch anzuzeigen"
 
-#: tpl_messages.php:60
+#: tpl_messages.php:59
 msgid "User Quota in KB"
 msgstr "Kontingent des Benutzers in KBytes"
 
-#: tpl_messages.php:61 ../../../www/admin/user/user.php.in:448
+#: tpl_messages.php:60 ../../www/admin/user/user.php:521
 msgid "Leave blank for unlimited"
 msgstr "Freilassen fÃ¼r unbegrenzten Platz"
 
-#: tpl_messages.php:62 ../include/form.class.php:76
+#: tpl_messages.php:61 ../../lib/KolabAdmin/include/form.class.php:75
 msgid "Submit"
 msgstr "Absenden"
 
-#: tpl_messages.php:63
-msgid "Email Delivery"
-msgstr "E-Mail-Zustellung"
-
-#: tpl_messages.php:64
-msgid ""
-"Activate delivery to folder (only one of vacation, forward and delivery to "
-"folder can be active at any time)"
-msgstr ""
-"Zustellung an den Ordner aktivieren (es kann zu jedem Zeitpunkt nur entweder "
-"ein Abwesenheitsbenachrichtigungs-, Weiterleitungs- oder Zustellungsordner "
-"aktiviert sein)"
-
-#: tpl_messages.php:65
-msgid "Deliver regular mail to folder"
-msgstr "Normale Nachrichten an den Ordner zustellen"
+#: tpl_messages.php:64 tpl_messages.php:209
+msgid "(only external addresses without a kolab user account)"
+msgstr "(nur externe Adresse ohne Kolab-Benutzerkonto)"
 
-#: tpl_messages.php:66 tpl_messages.php:93 tpl_messages.php:153
-#: tpl_messages.php:157 tpl_messages.php:160 tpl_messages.php:163
-#: tpl_messages.php:166 tpl_messages.php:169 tpl_messages.php:172
-#: tpl_messages.php:185 tpl_messages.php:239
-msgid "Update"
-msgstr "Aktualisieren"
+#: tpl_messages.php:65 tpl_messages.php:82 tpl_messages.php:103
+msgid "[ ALL ]"
+msgstr "[ ALLE ]"
 
-#: tpl_messages.php:67 ../include/menu.php:62
-msgid "Distribution Lists"
-msgstr "Verteilerlisten"
+#: tpl_messages.php:66 tpl_messages.php:83 tpl_messages.php:104
+msgid "[ OTHER ]"
+msgstr "[ ANDERE ]"
 
-#: tpl_messages.php:68
-msgid "Listname"
-msgstr "Listenname"
+#: tpl_messages.php:67 tpl_messages.php:84 tpl_messages.php:105
+msgid "Filter:"
+msgstr "Filter:"
 
-#: tpl_messages.php:69
-msgid "Visibility"
-msgstr "Sichtbarkeit"
+#: tpl_messages.php:68 tpl_messages.php:85 tpl_messages.php:106
+msgid "Filter"
+msgstr "Filter"
 
 #: tpl_messages.php:71
-msgid "Internal"
-msgstr "Intern"
+msgid "Entry deleted, awaiting cleanup..."
+msgstr "Eintrag gelÃ¶scht, warte auf AufrÃ¤umaktion..."
 
-#: tpl_messages.php:72
-msgid "Public"
-msgstr "Ã–ffentlich"
+#: tpl_messages.php:74
+msgid "Email Delivery"
+msgstr "E-Mail-Zustellung"
 
-#: tpl_messages.php:73
-msgid "List deleted, awaiting cleanup..."
-msgstr "Liste gelÃ¶scht, warte auf AufrÃ¤umaktion..."
+#: tpl_messages.php:75
+msgid "Activate delivery to folder"
+msgstr ""
 
 #: tpl_messages.php:76
-msgid "The distribution list with DN"
-msgstr "Die Verteilerliste mit DN"
+msgid "Deliver regular mail to folder"
+msgstr "Normale Nachrichten an den Ordner zustellen"
 
 #: tpl_messages.php:78
-msgid "Back to list of distribution lists"
-msgstr "ZurÃ¼ck zur Liste der Verteilerlisten"
-
-#: tpl_messages.php:79 ../include/menu.php:76 ../include/menu.php:93
-#: ../include/menu.php:101
-msgid "Domain Maintainers"
-msgstr "DomÃ¤nenverwalter"
+msgid ""
+"<a href=\"http://www.kde.org\">KDE</a> is a powerful <a href=\"http://www."
+"gnu.org/philosophy/free-sw.html\">Free Software</a> graphical desktop "
+"environment for Linux and Unix workstations. It combines ease of use, "
+"contemporary functionality, and outstanding graphical design with the "
+"technological superiority of the Unix operating system."
+msgstr ""
+"<a href=\"http://www.kde.org\">KDE</a> ist eine mÃ¤chtige <a href=\"http://"
+"www.gnu.org/philosophy/free-sw.html\">Open Source</a> grafische "
+"Schreibtischumgebung fÃ¼r Linux- und UNIX-Workstations. Sie kombiniert "
+"einfachste Bedienung mit zeitgemÃ¤ÃŸer FunktionalitÃ¤t und herausragendes "
+"grafisches Design mit der technologischen Ãœberlegenheit des Betriebssystems "
+"UNIX."
 
-#: tpl_messages.php:86
+#: tpl_messages.php:79
 msgid ""
-"Kolab's architecture was done by <a href=\"http://www.erfrakon.com"
-"\">erfrakon</a>; the company also designed and implemented the Kolab 1 "
-"Server and did the design and architecture for the Kolab 2 Server while "
-"providing consulting for the implementation of the Kolab 2 server and the "
-"Kolab 2 clients."
+"<b>KDE</b> is an Internet project that is truly open in every sense. "
+"Development takes place on the Internet and is discussed on our <a href="
+"\"http://www.kde.org/mailinglists.html\">mailing lists</a>, USENET news "
+"groups, and IRC channels to which we invite and welcome everyone."
 msgstr ""
-"Das Kolab-Konzept wurde von <a href=\"http://www.erfrakon.com\">erfrakon</a> "
-"erstellt, der Firma, die auch den Kolab 1-Server entworfen und implementiert "
-"hat und das Design und die Architektur fÃ¼r den Kolab 2-Server erstellt und "
-"bei der Implementation des Kolab 2-Servers und der Kolab 2-Klienten beraten "
-"hat."
+"<b>KDE</b> ist ein Internet-Projekt, das in jeder Hinsicht wahrhaft offen "
+"ist. Die Entwicklung findet im Internet statt und wird auf unseren <a href="
+"\"http://www.kde.org/mailinglists.html\">Mailing-Listen</a>, USENET-"
+"Newsgruppen und IRC-KanÃ¤len diskutiert, zu denen wir alle einladen und "
+"willkommen heiÃŸen."
 
-#: tpl_messages.php:87
+#: tpl_messages.php:80
 msgid ""
-"<a href=\"http://www.erfrakon.com\">erfrakon</a> is a consulting company "
-"dedicated to opensource software and Linux. The main tasks of erfrakon "
-"within the Kolab project are the principle design and architecure of the "
-"Kolab groupware solution and the creation of the Kolab 1 server."
+"<b>KDE</b> is a mature desktop suite providing a solid basis to an ever "
+"growing number of <a href=\"http://www.kde-apps.org\">applications</a> for "
+"Unix workstations.  KDE has developed a high quality development framework "
+"for Unix, which allows for the rapid and efficient creation of applications."
 msgstr ""
-"<a href=\"http://www.erfrakon.com\">erfrakon</a> ist eine Consulting-Firma, "
-"die sich Open Source Software und Linux verschrieben hat. Die Hauptaufgaben "
-"von erfrakon im Kolab-Projekt sind das grundlegende Design und die "
-"Architektur der Kolab-Groupware-LÃ¶sung und die Erstellung des Kolab 1-"
-"Servers."
+"<b>KDE</b> ist eine reife Schreibtischumgebung, die einer stÃ¤ndig wachsenden "
+"Anzahl von <a href=\"http://apps.kde.com\">Applikationen</a> fÃ¼r Unix-"
+"Umgebungen eine solide Basis bietet. KDE hat ein hochqualitatives "
+"Entwicklungs-Framework fÃ¼r Unix entwickelt, mit dem Applikationen schnell "
+"und effizient entwickelt werden kÃ¶nnen."
 
-#: tpl_messages.php:88
-msgid "The following people worked on Kolab for erfrakon:"
-msgstr "Die folgenden Mitarbeiter von erfrakon haben an Kolab mitgewirkt:"
+#: tpl_messages.php:81 tpl_messages.php:102
+msgid "Email Users"
+msgstr "E-Mail-Benutzer"
 
-#: tpl_messages.php:89
-msgid "Email Forwarding"
-msgstr "E-Mail-Weiterleitung"
+#: tpl_messages.php:86 tpl_messages.php:113
+msgid "Type"
+msgstr "Typ"
 
-#: tpl_messages.php:90
-msgid ""
-"Activate email forwarding (only one of vacation, forward and delivery to "
-"folder can be active at any time)"
-msgstr ""
-"Weiterleitung von E-Mail aktivieren (es kann zu jedem Zeitpunkt nur entweder "
-"ein Abwesenheitsbenachrichtigungs-, Weiterleitungs- oder Zustellungsordner "
-"aktiviert sein)"
+#: tpl_messages.php:88 ../../www/admin/user/activesync.php:496
+msgid "E-mail"
+msgstr "E-Mail"
+
+#: tpl_messages.php:89
+msgid "uid"
+msgstr "uid"
 
 #: tpl_messages.php:91
-msgid "Forward mail to"
-msgstr "E-Mail weiterleiten an"
+msgid "User Deleted, awaiting cleanup..."
+msgstr "Benutzer gelÃ¶scht, warte auf AufrÃ¤umaktion..."
 
-#: tpl_messages.php:92
-msgid "Keep copy on server"
-msgstr "Kopie auf dem Server belassen"
+#: tpl_messages.php:94 tpl_messages.php:151
+#, fuzzy
+msgid "Welcome to the Kolab Groupware Server Maintenance"
+msgstr "Willkommen zur Kolab-Systemadministration"
 
-#: tpl_messages.php:94
+#: tpl_messages.php:95 tpl_messages.php:152 tpl_messages.php:155
+#: tpl_messages.php:312
+#, fuzzy
+msgid "Manage Users"
+msgstr "E-Mail-Benutzer verwalten"
+
+#: tpl_messages.php:97 tpl_messages.php:153 tpl_messages.php:156
+#: tpl_messages.php:314
+#, fuzzy
+msgid "Shared Folders"
+msgstr "Gemeinsam genutzter Ordner"
+
+#: tpl_messages.php:98 tpl_messages.php:157 tpl_messages.php:187
+#: tpl_messages.php:315 ../../lib/KolabAdmin/include/menu.php:69
+msgid "Distribution Lists"
+msgstr "Verteilerlisten"
+
+#: tpl_messages.php:99 tpl_messages.php:214 tpl_messages.php:317
+#: ../../lib/KolabAdmin/include/menu.php:89
+#: ../../lib/KolabAdmin/include/menu.php:97
+msgid "Maintainers"
+msgstr "Verwalter"
+
+#: tpl_messages.php:100 tpl_messages.php:158 tpl_messages.php:277
+#: tpl_messages.php:318 ../../lib/KolabAdmin/include/menu.php:83
+#: ../../lib/KolabAdmin/include/menu.php:100
+#: ../../lib/KolabAdmin/include/menu.php:108
+msgid "Domain Maintainers"
+msgstr "DomÃ¤nenverwalter"
+
+#: tpl_messages.php:101 tpl_messages.php:154 tpl_messages.php:159
+#: tpl_messages.php:276 tpl_messages.php:320
+#, fuzzy
+msgid "About"
+msgstr "Ãœber Kolab"
+
+#: tpl_messages.php:107
 msgid ""
 "Intevation GmbH coordinated the Projects: Kroupware and Proko2, which are "
 "the main driving force behind Kolab1&2. In addition to project management "
@@ -418,7 +461,7 @@ msgstr ""
 "Haupt-Triebkraft hinter Kolab1&2 waren. Neben dem Projektmanagement hat "
 "Intevation auch den grÃ¶ÃŸten Teil der QualitÃ¤tssicherung Ã¼bernommen."
 
-#: tpl_messages.php:95
+#: tpl_messages.php:108
 msgid ""
 "Intevation GmbH is a IT-company exclusively focusing on Free Software. Its "
 "business units are strategic consulting, project management and geographic "
@@ -428,138 +471,129 @@ msgstr ""
 "Software befaÃŸt. Ihre GeschÃ¤ftseinheiten sind die strategische Beratung, "
 "Projektmanagement und geografische Informationssysteme."
 
-#: tpl_messages.php:96
+#: tpl_messages.php:109
 msgid "The following people worked on Kolab for Intevation:"
 msgstr "Die folgenden Mitarbeiter von Intevation haben an Kolab mitgewirkt:"
 
-#: tpl_messages.php:97
-msgid ""
-"The Kolab 1 KDE client and the Kolab 2 KDE Client (Kontact) was developed by"
-msgstr ""
-"Der Kolab 1-KDE-Klient und der Kolab 2-KDE-Klient (Kontact) wurden "
-"entwickelt von"
-
-#: tpl_messages.php:98
-msgid ""
-"Klarälvdalens Datakonsult AB is a consulting company dedicated to "
-"opensource software, Linux, and the <a href=\"http://www.trolltech.com/"
-"products/qt/\">Qt</a> library. The main tasks of KDAB within the Kolab "
-"project are design and implementation of the Kolab KDE clients and the "
-"implementation of the current Kolab 2 server."
-msgstr ""
-"Klarälvdalens Datakonsult AB ist eine Consulting-Firma, die sich Open "
-"Source-Software, Linux, und der <a href=\"http://www.trolltech.com/products/"
-"qt/\">Qt</a>-Bibliothek verschrieben hat. Die Hauptaufgaben von KDAB im "
-"Kolab-Projekt sind das Design und die Implementation der Kolab-KDE-Klienten "
-"und die Implementation des derzeitigen Kolab2-Servers."
+#: tpl_messages.php:110
+msgid "Shared folders"
+msgstr "Gemeinsam genutzte Ordner"
 
-#: tpl_messages.php:99
-msgid ""
-"The following people worked on Kolab for Klarälvdalens Datakonsult AB:"
-msgstr ""
-"Die folgenden Mitarbeiter von Klarälvdalens Datakonsult AB haben an "
-"Kolab mitgearbeitet:"
+#: tpl_messages.php:112
+msgid "Server"
+msgstr "Server"
 
-#: tpl_messages.php:100
-msgid ""
-"<a href=\"http://www.kde.org\">KDE</a> is a powerful <a href=\"http://www."
-"gnu.org/philosophy/free-sw.html\">Free Software</a> graphical desktop "
-"environment for Linux and Unix workstations. It combines ease of use, "
-"contemporary functionality, and outstanding graphical design with the "
-"technological superiority of the Unix operating system."
-msgstr ""
-"<a href=\"http://www.kde.org\">KDE</a> ist eine mÃ¤chtige <a href=\"http://"
-"www.gnu.org/philosophy/free-sw.html\">Open Source</a> grafische "
-"Schreibtischumgebung fÃ¼r Linux- und UNIX-Workstations. Sie kombiniert "
-"einfachste Bedienung mit zeitgemÃ¤ÃŸer FunktionalitÃ¤t und herausragendes "
-"grafisches Design mit der technologischen Ãœberlegenheit des Betriebssystems "
-"UNIX."
+#: tpl_messages.php:115
+msgid "Folder deleted, awaiting cleanup..."
+msgstr "Ordner gelÃ¶scht, warte auf AufrÃ¤umaktion..."
 
-#: tpl_messages.php:101
-msgid ""
-"<b>KDE</b> is an Internet project that is truly open in every sense. "
-"Development takes place on the Internet and is discussed on our <a href="
-"\"http://www.kde.org/mailinglists.html\">mailing lists</a>, USENET news "
-"groups, and IRC channels to which we invite and welcome everyone."
-msgstr ""
-"<b>KDE</b> ist ein Internet-Projekt, das in jeder Hinsicht wahrhaft offen "
-"ist. Die Entwicklung findet im Internet statt und wird auf unseren <a href="
-"\"http://www.kde.org/mailinglists.html\">Mailing-Listen</a>, USENET-"
-"Newsgruppen und IRC-KanÃ¤len diskutiert, zu denen wir alle einladen und "
-"willkommen heiÃŸen."
+#: tpl_messages.php:118
+#, fuzzy
+msgid "Kolab Groupware Solution - Technologies"
+msgstr "Kolab Groupware login"
 
-#: tpl_messages.php:102
+#: tpl_messages.php:119
 msgid ""
-"<b>KDE</b> is a mature desktop suite providing a solid basis to an ever "
-"growing number of <a href=\"http://www.kde-apps.org\">applications</a> for "
-"Unix workstations.  KDE has developed a high quality development framework "
-"for Unix, which allows for the rapid and efficient creation of applications."
+"This is the server of the Kolab Groupware Solution. It is <a href=\"http://"
+"fsfe.org/about/basics/freesoftware\">Free Software</a> developed by the <a "
+"href=\"http://www.kolab.org/\">Kolab Community</a>, which works in "
+"collaboration with and as part of many other communities and projects to "
+"bring you this software."
 msgstr ""
-"<b>KDE</b> ist eine reife Schreibtischumgebung, die einer stÃ¤ndig wachsenden "
-"Anzahl von <a href=\"http://apps.kde.com\">Applikationen</a> fÃ¼r Unix-"
-"Umgebungen eine solide Basis bietet. KDE hat ein hochqualitatives "
-"Entwicklungs-Framework fÃ¼r Unix entwickelt, mit dem Applikationen schnell "
-"und effizient entwickelt werden kÃ¶nnen."
 
-#: tpl_messages.php:103
-msgid "Kolab2 Groupware Server"
-msgstr "Kolab2-Groupware-Server"
-
-#: tpl_messages.php:104
+#: tpl_messages.php:120
 msgid ""
-"This is the Kolab2 Server. It is Free Software developed by the <a href="
-"\"http://www.kolab.org/\">Kolab Project</a>, with the intention of bringing "
-"groupware functionality to Unix/KDE users as well as Windows desktops."
+"For this server, Free Software communities and projects that the Kolab "
+"Community is a part of and builds upon include:"
 msgstr ""
-"Dies ist der Kolab2-Server. Kolab 2 ist Freie Software, entwickelt vom <a "
-"href=\"http://www.kolab.org/\">Kolab-Projekt</a>, um UNIX/KDE-Benutzern wie "
-"auch Windows-ArbeitsplÃ¤tzen Groupware-FunktionalitÃ¤t zu liefern."
 
-#: tpl_messages.php:105
-msgid "Kolab builds upon many other Free Software projects, namely:"
-msgstr "Kolab bedient sich vieler andere Freie Software-Projekte, nÃ¤mlich:"
-
-#: tpl_messages.php:106
+#: tpl_messages.php:121
 msgid "(Mail Scanner)"
 msgstr "(E-Mail-Scanner)"
 
-#: tpl_messages.php:107
+#: tpl_messages.php:122
 msgid "(HTTP Server)"
 msgstr "(HTTP-Server)"
 
-#: tpl_messages.php:108
+#: tpl_messages.php:123
 msgid "(Virus Scanner)"
 msgstr "(Virenscanner)"
 
-#: tpl_messages.php:109
-msgid "(IMAP Server)"
+#: tpl_messages.php:124
+#, fuzzy
+msgid "(IMAP Server & Database)"
 msgstr "IMAP-Server"
 
-#: tpl_messages.php:110
+#: tpl_messages.php:125
 msgid "(LDAP Server)"
 msgstr "LDAP-Server"
 
-#: tpl_messages.php:111
+#: tpl_messages.php:126
 msgid "(MTA)"
 msgstr "(MTA)"
 
-#: tpl_messages.php:112
+#: tpl_messages.php:127
 msgid "(SPAM Filter)"
 msgstr "(Spamfilter)"
 
-#: tpl_messages.php:113
+#: tpl_messages.php:128
+msgid "(ActiveSync Support)"
+msgstr ""
+
+#: tpl_messages.php:129
+msgid "(Web client)"
+msgstr ""
+
+#: tpl_messages.php:130 tpl_messages.php:131
+msgid "(Server side scripting & glue)"
+msgstr ""
+
+#: tpl_messages.php:132
+msgid "(This interface)"
+msgstr ""
+
+#: tpl_messages.php:133
 msgid ""
-"The following projects are used in binding the above together, in order to "
-"create the Kolab Server:"
+"For the clients, Free Software communities and projects that the Kolab "
+"Community is a part of and builds upon include:"
 msgstr ""
-"Die folgenden Projekte dienen dazu, die obigen zusammenzubinden, um so den "
-"Kolab-Server zu bilden:"
 
-#: tpl_messages.php:114
-msgid "The following projects are used as a base for the Kolab Clients:"
-msgstr "Die folgenden Projekte bilden die Basis fÃ¼r die Kolab-Klienten:"
+#: tpl_messages.php:134
+msgid "History & Credits"
+msgstr ""
 
-#: tpl_messages.php:115
+#: tpl_messages.php:135
+msgid ""
+"In 2010, <a href=\"http://www.intevation.de\">Intevation</a>, <a href="
+"\"http://www.kdab.com/\">KDAB</a>, <a href=\"http://uk.linkedin.com/in/"
+"pauljadams\">Dr. Paul Adams</a> and <a href=\"http://ch.linkedin.com/in/"
+"georggreve\">Georg Greve</a> worked together to re-launch the professional "
+"support of the Kolab Groupware Solution into the <a href=\"http://kolabsys."
+"com\">Kolab Systems AG</a>, which took the place of the Kolab-Konsortium."
+msgstr ""
+
+#: tpl_messages.php:136
+msgid ""
+"Kolab Systems together with its partner network, the Kolab Enterprise "
+"Community, has since been the primary facilitator of the Kolab Community, "
+"including for the provision of infrastructure, and the focal point for "
+"further development of the Kolab Groupware Solution, e.g. for inclusion of "
+"ActiveSync support in version 2.3 of the server, or for native packaging on "
+"the various platforms."
+msgstr ""
+
+#: tpl_messages.php:137
+msgid ""
+"If you want to join the community, please visit <a href=\"http://wiki.kolab."
+"org\">http://wiki.kolab.org</a> and <a href=\"http://kolab.org\">http://"
+"kolab.org</a>."
+msgstr ""
+
+#: tpl_messages.php:138
+msgid "History before 2010"
+msgstr ""
+
+#: tpl_messages.php:139
 msgid ""
 "The Kolab project owes a great deal of thanks to the people of the <a href="
 "\"http://www.openpkg.org/\">OpenPKG</a> project. OpenPKG allows Kolab to run "
@@ -572,7 +606,7 @@ msgstr ""
 "indem eine gemeinsame, leicht zu installierende, plattformÃ¼bergreifende "
 "Basis bereitgestellt wird, auf der der Server aufsetzt."
 
-#: tpl_messages.php:116
+#: tpl_messages.php:140
 msgid ""
 "To use all Kolab2 features you need an interoperable client. The KDE Kolab "
 "Client was the first such client to be developed and is still considered the "
@@ -589,7 +623,7 @@ msgstr ""
 "www.kde.org\">KDE-Projekt</a>, das eine derart mÃ¤chtige Grundlage fÃ¼r die "
 "Entwicklung dieser KlientenlÃ¶sung bereitgestellt hat."
 
-#: tpl_messages.php:117
+#: tpl_messages.php:141
 msgid ""
 "Users of Outlook on Microsoft Windows are able to use a proprietary plug-in "
 "to inter-operate with the Kolab server. For Kolab2 the preferred plug-in is "
@@ -603,7 +637,7 @@ msgstr ""
 "a> von Radley Network Technologies CC. Radley hat mit der Kolab-Gemeinde eng "
 "zusammengearbeitet, um das Speicherformat von Kolab2 zu definieren."
 
-#: tpl_messages.php:118
+#: tpl_messages.php:142
 msgid ""
 "A list of additional Outlook plug-ins that provide interoperability with the "
 "Kolab server is <a href=\"http://www.kolab.org/kolab-plugins.html"
@@ -613,7 +647,7 @@ msgstr ""
 "Kolab-Server ermÃ¶glichen, finden Sie unter <a href=\"http://www.kolab.org/"
 "kolab-plugins.html\">auf der Kolab-Website</a>."
 
-#: tpl_messages.php:119
+#: tpl_messages.php:143
 msgid ""
 "There is also a <a href=\"http://www.kolab.org/webclient.html\">web-based "
 "client</a> in development which provides full groupware functionality to "
@@ -632,7 +666,7 @@ msgstr ""
 "\"http://www.horde.org/\">Horde-Projekt</a> als Grundlage nicht mÃ¶glich "
 "gewesen."
 
-#: tpl_messages.php:120
+#: tpl_messages.php:144
 msgid ""
 "As Kolab is a Free Software project, anyone can help to extend the "
 "functionality of the software. An active community has developed around the "
@@ -653,13 +687,13 @@ msgstr ""
 "datakonsult.se/\">Klarälvdalens Datakonsult AB</a> (Klient) ins Leben "
 "gerufen."
 
-#: tpl_messages.php:121
+#: tpl_messages.php:145
+#, fuzzy
 msgid ""
-"<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> joined the "
-"project soon after the original Kolab1 server was released. Its developers "
-"are primarily responsible for an updated engine (which forms the base of the "
-"Kolab2 server), the web client, as well as contributing to development of "
-"the Kolab2 storage format."
+"Code Fusion cc joined the project soon after the original Kolab1 server was "
+"released. Its developers are primarily responsible for an updated engine "
+"(which forms the base of the Kolab2 server), the web client, as well as "
+"contributing to development of the Kolab2 storage format."
 msgstr ""
 "<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> hat sich dem "
 "Projekt kurz nach Freigabe des ursprÃ¼nglichen Kolab1-Servers angeschlossen. "
@@ -668,83 +702,259 @@ msgstr ""
 "zustÃ¤ndig und haben auch zur Definition des Speicherformates von Kolab2 "
 "beigetragen."
 
-#: tpl_messages.php:122
+#: tpl_messages.php:146
 msgid "Other contributors:"
 msgstr "Weitere Mitwirkende:"
 
-#: tpl_messages.php:123
+#: tpl_messages.php:147
 msgid "CSSified the Kolab1 web admin GUI"
 msgstr "Hat das Web-Administrations-GUI von Kolab1 auf CSS umgestellt"
 
-#: tpl_messages.php:124
+#: tpl_messages.php:148
+msgid "Kudos"
+msgstr ""
+
+#: tpl_messages.php:149
+#, fuzzy
 msgid ""
-"The principal authors of the Kolab client and server software are (in "
-"alphabetical order):"
+"Principal contributors of the Kolab Groupware Solution are (in alphabetical "
+"order):"
 msgstr ""
 "Die Hauptentwickler der Kolab-Klienten- und Server-Software sind (in "
 "alphabetischer Reihenfolge):"
 
-#: tpl_messages.php:125
-msgid "Enter UID and password to login"
-msgstr "Geben Sie Ihre UID und Ihr Passwort ein, um sich anzumelden"
+#: tpl_messages.php:150
+msgid ""
+"...and anyone we forgot. Please let us know at <a href=\"mail:kolab-"
+"devel at kolab.org\">kolab-devel at kolab.org</a> so we can add you to this list."
+msgstr ""
 
-#: tpl_messages.php:126
-msgid "Username:"
-msgstr "Benutzername:"
+#: tpl_messages.php:160
+#, fuzzy
+msgid "Kolab Groupware Solution"
+msgstr "Kolab Groupware login"
 
-#: tpl_messages.php:127
-msgid "Password:"
-msgstr "Passwort:"
+#: tpl_messages.php:161
+msgid ""
+"This is the server of the Kolab Groupware Solution, a <a href=\"http://fsfe."
+"org/about/basics/freesoftware\">Free Software</a> Personal Information "
+"Management (PIM) solution developed by the <a href=\"http://www.kolab.org/"
+"\">Kolab Community</a>. Any installation of the Kolab Groupware Solution "
+"would normally include one or more of these servers, in combination with a "
+"variety of clients for its users. If you are interested in the technology, "
+"you can read more about it <a href=\"/admin/kolab/technology.php\">here</a>."
+msgstr ""
 
-#: tpl_messages.php:128 ../include/auth.class.php.in:124
-msgid "Kolab Groupware login"
-msgstr "Kolab Groupware login"
+#: tpl_messages.php:162
+msgid "Why Kolab?"
+msgstr ""
 
-#: tpl_messages.php:129
-msgid "The maintainer with DN"
-msgstr "Der Verwalter mit DN"
+#: tpl_messages.php:163
+msgid ""
+"There is a wide variety of reasons why Kolab should be your choice. Several "
+"of them have been put together for different target groups in the"
+msgstr ""
 
-#: tpl_messages.php:131
-msgid "Back to list of maintainers"
-msgstr "ZurÃ¼ck zur Liste der Verwalter"
+#: tpl_messages.php:164 tpl_messages.php:179
+msgid "Handouts for the Kolab Groupware Solution by Kolab Systems"
+msgstr ""
 
-#: tpl_messages.php:132 ../include/menu.php:82 ../include/menu.php:90
-msgid "Maintainers"
-msgstr "Verwalter"
+#: tpl_messages.php:165
+msgid "To summarize just some points, Kolab is your solution, if"
+msgstr ""
 
-#: tpl_messages.php:139
-msgid "User:"
-msgstr "Benutzer:"
+#: tpl_messages.php:166
+msgid ""
+"you want a solution that seamlessly integrates into your existing "
+"environment;"
+msgstr ""
 
-#: tpl_messages.php:140
-msgid "Role:"
-msgstr "Rolle:"
+#: tpl_messages.php:167
+msgid ""
+"you want full control over your data, with all the convenience of the cloud;"
+msgstr ""
 
-#: tpl_messages.php:141
-msgid "Logout"
-msgstr "Abmelden"
+#: tpl_messages.php:168
+msgid "you have elevated security needs for your data;"
+msgstr ""
 
-#: tpl_messages.php:142
-msgid "Not logged in"
-msgstr "Nicht angemeldet"
+#: tpl_messages.php:169
+msgid ""
+"you have a very large installation, or want to reduce your hardware "
+"footprint;"
+msgstr ""
 
-#: tpl_messages.php:143
-msgid "Errors:"
-msgstr "Fehler:"
+#: tpl_messages.php:170
+msgid "you have to operate in diverse environments and installations;"
+msgstr ""
 
-#: tpl_messages.php:144
-msgid "Message:"
-msgstr "Nachricht:"
+#: tpl_messages.php:171
+msgid ""
+"strategic issues are important to you, e.g. you need sovereignty of the "
+"software you deploy;"
+msgstr ""
 
-#: tpl_messages.php:145
+#: tpl_messages.php:172
+msgid "your users should be fully productive whether they are on- or offline;"
+msgstr ""
+
+#: tpl_messages.php:173
+msgid ""
+"you want the flexibility to create solutions for your specialised needs;"
+msgstr ""
+
+#: tpl_messages.php:174
+msgid ""
+"you want Free Software/Open Source, but also want the professional support "
+"without having to resort to proprietary lock-in."
+msgstr ""
+
+#: tpl_messages.php:175
+msgid "More Information"
+msgstr ""
+
+#: tpl_messages.php:176
+msgid "Kolab Community Web Site"
+msgstr ""
+
+#: tpl_messages.php:177
+msgid "Kolab Community Wiki"
+msgstr ""
+
+#: tpl_messages.php:178
+msgid "Article: "
+msgstr ""
+
+#: tpl_messages.php:180
+msgid "Warranties & Commercial Support"
+msgstr ""
+
+#: tpl_messages.php:181
+msgid ""
+"This is the <b>Community Edition</b> of the Kolab Groupware Server. It is "
+"provided by Kolab Systems as fully <a href=\"http://fsfe.org/about/basics/"
+"freesoftware\">Free Software</a> and you can use it to the fullest extent "
+"and any purpose. There are no license costs or other obligations other than "
+"those set forth in the respective Free Software licenses of the various "
+"components. <b>There are no warranties or guarantees of any kind, nor is "
+"there any guaranteed support. You are running this software entirely at your "
+"own risk.</b>"
+msgstr ""
+
+#: tpl_messages.php:182
+msgid ""
+"There is a wide variety of commercial support options and warranties "
+"available by <a href=\"/admin/kolab/kolabsystems.php\">Kolab Systems AG</a> "
+"and its network of partners, the Kolab Enterprise Community. This support "
+"comes with access to the additionally quality assured and hardened "
+"<b>Certified Kolab</b> edition, which like the community edition is fully "
+"available as Free Software, so has all the advantages of the Community "
+"Edition and is free of hidden lock-in."
+msgstr ""
+
+#: tpl_messages.php:183
+msgid ""
+"Kolab Systems AG will provide limited support for the Community Edition on a "
+"case-by-case basis, but with no guaranteed response times, as availability "
+"permits, and at rates that may be adjusted due to the work load at the time "
+"of the request. <b>It is strongly recommended that for mission-critical "
+"professional deployments of the Kolab Groupware Solution you at least choose "
+"one of the partially self-supported On Demand support models.</b>"
+msgstr ""
+
+#: tpl_messages.php:184
+msgid ""
+"Kolab Systems provides an overview of all available <a href=\"http://"
+"kolabsys.com/index.php/solutions/101\">Service Level Agreements (SLA)</a>. "
+"To upgrade your installation to Certified Kolab, please contact"
+msgstr ""
+
+#: tpl_messages.php:185 tpl_messages.php:301
+msgid "or visit our"
+msgstr ""
+
+#: tpl_messages.php:186 tpl_messages.php:302
+msgid "web page"
+msgstr ""
+
+#: tpl_messages.php:188
+msgid "Listname"
+msgstr "Listenname"
+
+#: tpl_messages.php:189
+msgid "Visibility"
+msgstr "Sichtbarkeit"
+
+#: tpl_messages.php:191
+msgid "Internal"
+msgstr "Intern"
+
+#: tpl_messages.php:192
+msgid "Public"
+msgstr "Ã–ffentlich"
+
+#: tpl_messages.php:193
+msgid "List deleted, awaiting cleanup..."
+msgstr "Liste gelÃ¶scht, warte auf AufrÃ¤umaktion..."
+
+#: tpl_messages.php:196
+msgid "Welcome to the Kolab administration interface"
+msgstr "Willkommen zur Kolab-Systemadministration"
+
+#: tpl_messages.php:197
+msgid "NOTE:"
+msgstr "ANMERKUNG:"
+
+#: tpl_messages.php:198
+msgid ""
+"No account is configured to receive mail for administrative addresses. If "
+"you have not yet created an account for this, "
+msgstr ""
+"Es wurde kein Konto zum Empfang von Nachrichten an administrative Adressen "
+"konfiguriert. Wenn Sie hierfÃ¼r noch kein Konto angelegt haben, "
+
+#: tpl_messages.php:199
+msgid "please do so"
+msgstr "dann tun Sie das bitte jetzt"
+
+#: tpl_messages.php:200
+msgid "and then go"
+msgstr "und richten Sie danach"
+
+#: tpl_messages.php:201
+msgid "here"
+msgstr "hier"
+
+#: tpl_messages.php:202
+msgid "to set up forwarding of mail to administrative email addresses."
+msgstr ""
+"die Weiterleitung von Nachrichten an administrative E-Mail-Adressen ein."
+
+#: tpl_messages.php:203
+msgid "The address with DN"
+msgstr "Die Adresse mit DN"
+
+#: tpl_messages.php:205
+msgid "Back to list of addresses"
+msgstr "ZurÃ¼ck zur Adressliste"
+
+#: tpl_messages.php:206
+msgid "The administrator with DN"
+msgstr "Der Administrator mit DN"
+
+#: tpl_messages.php:208
+msgid "Back to list of administrators"
+msgstr "ZurÃ¼ck zur Liste der Administratoren"
+
+#: tpl_messages.php:221
 msgid "Kolab Server Settings"
 msgstr "Kolab-Server-Einstellungen"
 
-#: tpl_messages.php:146
+#: tpl_messages.php:222
 msgid "Administrative email addresses"
 msgstr "Administrative E-Mail-Adressen"
 
-#: tpl_messages.php:147
+#: tpl_messages.php:223
 msgid ""
 "You have not yet set up a receiving account for the administrative email "
 "addresses hostmaster at yourdomain.tld, postmaster at yourdomain.tld, MAILER-"
@@ -761,64 +971,64 @@ msgstr ""
 "Adressaten diesen Listen hinzufÃ¼gen oder davon entfernen wie mit jeder "
 "anderen Verteilerliste"
 
-#: tpl_messages.php:148
+#: tpl_messages.php:224
 msgid ""
 "Email address of account that should receive administrative mail for domain "
 msgstr ""
 "E-Mail-Adresse des Kontos, das die administrativen Nachrichten empfangen "
 "soll:"
 
-#: tpl_messages.php:149
+#: tpl_messages.php:225
 msgid "Create Distribution Lists"
 msgstr "Verteilerlisten anlegen"
 
-#: tpl_messages.php:150
+#: tpl_messages.php:226
 msgid "Enable or Disable individual Services"
 msgstr "Einzelne Dienste einschalten oder abschalten"
 
-#: tpl_messages.php:151
+#: tpl_messages.php:227
 msgid "Service"
 msgstr "Dienst"
 
-#: tpl_messages.php:152
+#: tpl_messages.php:228
 msgid "Enabled"
 msgstr "Eingeschaltet"
 
-#: tpl_messages.php:154
+#: tpl_messages.php:230
 msgid "Quota settings"
 msgstr "Plattenplatz-Kontingent-Einstellungen"
 
-#: tpl_messages.php:155
+#: tpl_messages.php:231
 msgid "Warn users when they have used"
 msgstr "Benutzer warnen, wenn der Verbrauch"
 
-#: tpl_messages.php:156
+#: tpl_messages.php:232
 #, php-format
 msgid "% of their quota"
 msgstr "% des zugestandenen Kontingents betrÃ¤gt"
 
-#: tpl_messages.php:158
+#: tpl_messages.php:234
 msgid "Free/Busy settings"
 msgstr "Frei/Belegt-Einstellungen"
 
-#: tpl_messages.php:159
+#: tpl_messages.php:235
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 "Unauthentifiziertes Herunterladen von Frei/Belegt-Informationen erlauben"
 
-#: tpl_messages.php:161
+#: tpl_messages.php:237
 msgid "When creating free/busy lists, include data from"
 msgstr "Beim Erzeugen von Frei/Belegt-Listen, Daten aus "
 
-#: tpl_messages.php:162
+#: tpl_messages.php:238
 msgid "days in the past"
 msgstr "vergangenen Tagen verwenden"
 
-#: tpl_messages.php:164
+#: tpl_messages.php:240
 msgid "Privileged Networks"
 msgstr "Privilegierte Netzwerke"
 
-#: tpl_messages.php:165
+#: tpl_messages.php:241
 msgid ""
 "Networks allowed to relay and send mail through unauthenticated SMTP "
 "connections to the Kolab server (comma separated networks in x.x.x.x/y "
@@ -828,11 +1038,11 @@ msgstr ""
 "Kolab-Server weiterleiten und damit verschicken dÃ¼rfen (durch Kommata "
 "getrennte Liste von Netzwerken im Format x.x.x.x/y):"
 
-#: tpl_messages.php:167
+#: tpl_messages.php:243
 msgid "SMTP \"smarthost/relayhost\""
 msgstr "SMTP-\"Smarthost/Relayhost\""
 
-#: tpl_messages.php:168
+#: tpl_messages.php:244
 msgid ""
 "Smarthost (and optional port) to use to send outgoing mail (host.domain."
 "tld). Leave empty for no relayhost."
@@ -841,11 +1051,11 @@ msgstr ""
 "verwendet (host.domain.tld). Wenn Sie keinen solchen verwenden wollen, "
 "lassen Sie dieses Feld leer."
 
-#: tpl_messages.php:170
+#: tpl_messages.php:246
 msgid "Accept Internet Mail"
 msgstr "Nachrichten aus dem Internet akzeptieren"
 
-#: tpl_messages.php:171
+#: tpl_messages.php:247
 msgid ""
 "Accept mail from other domains over unauthenticated SMTP. This must be "
 "enabled if you want to use the Kolab Server to receive mail from other "
@@ -858,30 +1068,30 @@ msgstr ""
 "ausgeschaltet ist, werden E-Mails nur von SMTP-Servern in den privilegierten "
 "Netzwerken angenommen."
 
-#: tpl_messages.php:173
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:134
+#: tpl_messages.php:249
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:134
 msgid "Domains"
 msgstr "DomÃ¤nen"
 
-#: tpl_messages.php:174
+#: tpl_messages.php:250
 msgid "Domain"
 msgstr "DomÃ¤ne"
 
-#: tpl_messages.php:177 tpl_messages.php:190
+#: tpl_messages.php:253 tpl_messages.php:266
 msgid "Add"
 msgstr "HinzufÃ¼gen"
 
-#: tpl_messages.php:178
+#: tpl_messages.php:254
 msgid "Mail Filter Settings"
 msgstr "Einstellungen fÃ¼r Nachrichtenfilter"
 
-#: tpl_messages.php:179
+#: tpl_messages.php:255
 msgid "Check messages for mismatching From header and envelope from."
 msgstr ""
 "Nachrichten darauf Ã¼berprÃ¼fen, ob From-Kopfzeile und Umschlag (\"envelope\") "
 "nicht Ã¼bereinstimmen."
 
-#: tpl_messages.php:180
+#: tpl_messages.php:256
 msgid ""
 "Use the Sender header instead of From for the above checks if Sender is "
 "present."
@@ -889,11 +1099,11 @@ msgstr ""
 "Falls eine Sender-Kopfzeile existiert, diese anstelle der From-Zeile fÃ¼r die "
 "obigen ÃœberprÃ¼fungen verwenden."
 
-#: tpl_messages.php:181
+#: tpl_messages.php:257
 msgid "Action to take for messages that fail the check:"
 msgstr "MaÃŸname fÃ¼r Nachrichten, deren ÃœberprÃ¼fung fehlschlÃ¤gt:"
 
-#: tpl_messages.php:182
+#: tpl_messages.php:258
 msgid ""
 "Reject the message, except if it originates from the outside and the From "
 "header matches one of Kolab server's domains. In that case rewrite the From "
@@ -904,11 +1114,11 @@ msgstr ""
 "diesem Fall die From-Kopfzeile umschreiben, damit der EmpfÃ¤nger die mÃ¶gliche "
 "FÃ¤lschung erkennen kann."
 
-#: tpl_messages.php:183
+#: tpl_messages.php:259
 msgid "Always reject the message."
 msgstr "Die Nachricht immer ablehnen."
 
-#: tpl_messages.php:184
+#: tpl_messages.php:260
 msgid ""
 "Note that enabling this setting will make the server reject any mail with "
 "non-matching sender and From header if the sender is an account on this "
@@ -919,1232 +1129,1324 @@ msgstr ""
 "der Absender Ã¼ber ein Konto auf diesem Server verfÃ¼gt. Dies kann "
 "beispielsweise bei Nachrichtenlisten zu Problemen fÃ¼hren."
 
-#: tpl_messages.php:186
+#: tpl_messages.php:262
 msgid "Kolab Hostnames (for Master and Slaves)"
 msgstr "Kolab-Rechnernamen (fÃ¼r Master- und Slaveserver)"
 
-#: tpl_messages.php:187
+#: tpl_messages.php:263
 msgid "Host"
 msgstr "Host"
 
-#: tpl_messages.php:191
-msgid "The shared folder with DN"
-msgstr "Der gemeinsam genutzte Ordner mit DN"
+#: tpl_messages.php:267
+msgid ""
+"<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> is a specialist "
+"email solution provider based in Johannesburg, South Africa specialising in "
+"the deployment and support of Kolab."
+msgstr ""
+"<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> ist ein auf E-"
+"Mail-LÃ¶sungen spezialisierter Dienstleister in Johannesburg, SÃ¼dafrika, der "
+"besonders an Inbetriebnahme und Support fÃ¼r Kolab arbeitet."
 
-#: tpl_messages.php:193
-msgid "Back to list of shared folders"
-msgstr "ZurÃ¼ck zur Liste der gemeinsam genutzten Ordner"
+#: tpl_messages.php:268
+msgid ""
+"Code Fusion has played, and continues to play, an integral part in "
+"developing and extending the Kolab server; specifically with regards to "
+"enhancing the base Kolab engine, adding in support for Microsoft Active "
+"Directory ® as an LDAP backend, as well as extending the <a href="
+"\"http://www.horde.org/\">Horde project</a> to provide a web-based groupware "
+"client for the Kolab server."
+msgstr ""
+"Code Fusion hat eine zentrale Rolle in der Entwicklung und Erweiterung des "
+"Kolab-Servers gespielt und wird das auch in Zukunft tun; insbesondere "
+"hinsichtlich Erweiterungen der zugrundeliegenden Kolab-Engine, der "
+"UnterstÃ¼tzung von Microsoft Active Directory ® als LDAP-Backend und der "
+"Erweiterung des <a href=\"http://www.horde.org/\">Horde-Projekts</a> als Web-"
+"basierter Groupware-Client fÃ¼r den Kolab-Server."
 
-#: tpl_messages.php:194
-msgid "Shared folders"
-msgstr "Gemeinsam genutzte Ordner"
+#: tpl_messages.php:269
+msgid ""
+"The following people from Code Fusion are involved in the Kolab project (in "
+"alphabetical order):"
+msgstr ""
+"The folgenden Mitarbeiter von Code Fusion haben am Kolab-Projekt mitgewirkt "
+"(in alphabetischer Reihenfolge):"
 
-#: tpl_messages.php:196
-msgid "Server"
-msgstr "Server"
+#: tpl_messages.php:270
+msgid ""
+"Kolab's architecture was done by <a href=\"http://www.erfrakon.com"
+"\">erfrakon</a>; the company also designed and implemented the Kolab 1 "
+"Server and did the design and architecture for the Kolab 2 Server while "
+"providing consulting for the implementation of the Kolab 2 server and the "
+"Kolab 2 clients."
+msgstr ""
+"Das Kolab-Konzept wurde von <a href=\"http://www.erfrakon.com\">erfrakon</a> "
+"erstellt, der Firma, die auch den Kolab 1-Server entworfen und implementiert "
+"hat und das Design und die Architektur fÃ¼r den Kolab 2-Server erstellt und "
+"bei der Implementation des Kolab 2-Servers und der Kolab 2-Klienten beraten "
+"hat."
 
-#: tpl_messages.php:197 tpl_messages.php:217
-msgid "Type"
-msgstr "Typ"
+#: tpl_messages.php:271
+msgid ""
+"<a href=\"http://www.erfrakon.com\">erfrakon</a> is a consulting company "
+"dedicated to opensource software and Linux. The main tasks of erfrakon "
+"within the Kolab project are the principle design and architecure of the "
+"Kolab groupware solution and the creation of the Kolab 1 server."
+msgstr ""
+"<a href=\"http://www.erfrakon.com\">erfrakon</a> ist eine Consulting-Firma, "
+"die sich Open Source Software und Linux verschrieben hat. Die Hauptaufgaben "
+"von erfrakon im Kolab-Projekt sind das grundlegende Design und die "
+"Architektur der Kolab-Groupware-LÃ¶sung und die Erstellung des Kolab 1-"
+"Servers."
 
-#: tpl_messages.php:199
-msgid "Folder deleted, awaiting cleanup..."
-msgstr "Ordner gelÃ¶scht, warte auf AufrÃ¤umaktion..."
+#: tpl_messages.php:272
+msgid "The following people worked on Kolab for erfrakon:"
+msgstr "Die folgenden Mitarbeiter von erfrakon haben an Kolab mitgewirkt:"
 
-#: tpl_messages.php:202 tpl_messages.php:245
-msgid "Welcome to the Kolab administration interface"
+#: tpl_messages.php:273
+#, fuzzy
+msgid "Welcome to the Kolab Groupware Server"
+msgstr "Kolab2-Groupware-Server"
+
+#: tpl_messages.php:274
+#, fuzzy
+msgid "My settings"
+msgstr "Meine Benutzereinstellungen"
+
+#: tpl_messages.php:275 ../../lib/KolabAdmin/include/menu.php:43
+#: ../../lib/KolabAdmin/include/menu.php:47
+#: ../../lib/KolabAdmin/include/menu.php:49
+#, fuzzy
+msgid "ActiveSync"
+msgstr "Aktion"
+
+#: tpl_messages.php:284 tpl_messages.php:311
+#, fuzzy
+msgid "Welcome to the Kolab Groupware Server Administration"
 msgstr "Willkommen zur Kolab-Systemadministration"
 
-#: tpl_messages.php:203
-msgid "NOTE:"
-msgstr "ANMERKUNG:"
+#: tpl_messages.php:285
+msgid "The user with DN"
+msgstr "Der Benutzer mit DN"
+
+#: tpl_messages.php:287
+msgid "Back to list of users"
+msgstr "ZurÃ¼ck zur Liste der Benutzer"
+
+#: tpl_messages.php:288
+msgid "Enter UID and password to login"
+msgstr "Geben Sie Ihre UID und Ihr Passwort ein, um sich anzumelden"
+
+#: tpl_messages.php:289
+msgid "Username:"
+msgstr "Benutzername:"
+
+#: tpl_messages.php:290
+msgid "Password:"
+msgstr "Passwort:"
+
+#: tpl_messages.php:291
+msgid "Login"
+msgstr ""
+
+#: tpl_messages.php:292
+#, fuzzy
+msgid "Kolab Groupware Server Version"
+msgstr "Kolab2-Groupware-Server-Version"
+
+#: tpl_messages.php:293
+#, fuzzy
+msgid "Kolab Groupware Server Component Versions"
+msgstr "Versionen der Komponenten des Kolab2-Groupware-Server"
 
-#: tpl_messages.php:204
+#: tpl_messages.php:294
+msgid "PEAR/Horde Versions"
+msgstr "PEAR/Horde-Versionen"
+
+#: tpl_messages.php:295
+msgid "Kolab2 Patched OpenPKG Package Versions"
+msgstr "Kolab2-Gepatchte-OpenPKG-Paket-Versionen"
+
+#: tpl_messages.php:296
+msgid "OpenPKG Version"
+msgstr "OpenPKG-Version"
+
+#: tpl_messages.php:297
+msgid "Founded in Zürich in 2010, "
+msgstr ""
+
+#: tpl_messages.php:298
 msgid ""
-"No account is configured to receive mail for administrative addresses. If "
-"you have not yet created an account for this, "
+"is the global leader in Kolab Technology. Together with its partners in the "
+"Kolab Enterprise Community, Kolab Systems provides quality assurance, "
+"integration, support, training, certification of individuals and third-party "
+"products, as well as ongoing development for the Kolab Groupware Solution. "
+"The strong partnering model and a highly competent enterprise community "
+"provides users of the Kolab Groupware Solution with the right level of "
+"professional consulting, support and warranties to enable productivity and "
+"collaboration."
 msgstr ""
-"Es wurde kein Konto zum Empfang von Nachrichten an administrative Adressen "
-"konfiguriert. Wenn Sie hierfÃ¼r noch kein Konto angelegt haben, "
 
-#: tpl_messages.php:205
-msgid "please do so"
-msgstr "dann tun Sie das bitte jetzt"
+#: tpl_messages.php:299
+msgid "Looking for professional support for your Kolab Groupware Solution?"
+msgstr ""
 
-#: tpl_messages.php:206
-msgid "and then go"
-msgstr "und richten Sie danach"
+#: tpl_messages.php:300
+msgid "Kolab Systems provides a wide range of "
+msgstr ""
 
-#: tpl_messages.php:207
-msgid "here"
-msgstr "hier"
+#: tpl_messages.php:303
+msgid "Our Development Partners"
+msgstr ""
 
-#: tpl_messages.php:208
-msgid "to set up forwarding of mail to administrative email addresses."
+#: tpl_messages.php:304
+msgid ""
+"In continuously improvingall parts of the Kolab Groupware Solution, Kolab "
+"Systems is working closely with development partners, such as (in "
+"alphabetical order):"
 msgstr ""
-"die Weiterleitung von Nachrichten an administrative E-Mail-Adressen ein."
 
-#: tpl_messages.php:209
-msgid "The user with DN"
-msgstr "Der Benutzer mit DN"
+#: tpl_messages.php:305
+msgid "Thank you for being part of this awesome community!"
+msgstr ""
 
-#: tpl_messages.php:211
-msgid "Back to list of users"
-msgstr "ZurÃ¼ck zur Liste der Benutzer"
+#: tpl_messages.php:306
+msgid "If <b>you</b> want to join the community, please go to "
+msgstr ""
 
-#: tpl_messages.php:212 tpl_messages.php:225
-msgid "Email Users"
-msgstr "E-Mail-Benutzer"
+#: tpl_messages.php:307
+msgid "and"
+msgstr ""
 
-#: tpl_messages.php:219
-msgid "E-mail"
-msgstr "E-Mail"
+#: tpl_messages.php:308
+msgid "The shared folder with DN"
+msgstr "Der gemeinsam genutzte Ordner mit DN"
 
-#: tpl_messages.php:220
-msgid "uid"
-msgstr "uid"
+#: tpl_messages.php:310
+msgid "Back to list of shared folders"
+msgstr "ZurÃ¼ck zur Liste der gemeinsam genutzten Ordner"
 
-#: tpl_messages.php:222
-msgid "User Deleted, awaiting cleanup..."
-msgstr "Benutzer gelÃ¶scht, warte auf AufrÃ¤umaktion..."
+#: tpl_messages.php:316
+#, fuzzy
+msgid "Administrator"
+msgstr "Administratoren"
 
-#: tpl_messages.php:230
-msgid "Vacation Notification"
-msgstr "Benachrichtigungen bei Abwesenheit"
+#: tpl_messages.php:319 ../../lib/KolabAdmin/include/menu.php:113
+msgid "Settings"
+msgstr "Einstellungen"
 
-#: tpl_messages.php:231
+#: tpl_messages.php:321
 msgid ""
-"Activate vacation notification (only one of vacation, forward and delivery "
-"to folder can be active at any time)"
+"The Kolab 1 KDE client and the Kolab 2 KDE Client (Kontact) was developed by"
 msgstr ""
-"Benachrichtigungen bei Abwesenheit aktivieren (es kann zu jedem Zeitpunkt "
-"nur entweder ein Abwesenheitsbenachrichtigungs-, Weiterleitungs- oder "
-"Zustellungsordner aktiviert sein)"
+"Der Kolab 1-KDE-Klient und der Kolab 2-KDE-Klient (Kontact) wurden "
+"entwickelt von"
 
-#: tpl_messages.php:232
+#: tpl_messages.php:322
+msgid ""
+"Klarälvdalens Datakonsult AB is a consulting company dedicated to "
+"opensource software, Linux, and the <a href=\"http://www.trolltech.com/"
+"products/qt/\">Qt</a> library. The main tasks of KDAB within the Kolab "
+"project are design and implementation of the Kolab KDE clients and the "
+"implementation of the current Kolab 2 server."
+msgstr ""
+"Klarälvdalens Datakonsult AB ist eine Consulting-Firma, die sich Open "
+"Source-Software, Linux, und der <a href=\"http://www.trolltech.com/products/"
+"qt/\">Qt</a>-Bibliothek verschrieben hat. Die Hauptaufgaben von KDAB im "
+"Kolab-Projekt sind das Design und die Implementation der Kolab-KDE-Klienten "
+"und die Implementation des derzeitigen Kolab2-Servers."
+
+#: tpl_messages.php:323
+msgid ""
+"The following people worked on Kolab for Klarälvdalens Datakonsult AB:"
+msgstr ""
+"Die folgenden Mitarbeiter von Klarälvdalens Datakonsult AB haben an "
+"Kolab mitgearbeitet:"
+
+#: tpl_messages.php:324
+msgid "Vacation Notification"
+msgstr "Benachrichtigungen bei Abwesenheit"
+
+#: tpl_messages.php:325
+#, fuzzy
+msgid "Activate vacation notification"
+msgstr "Benachrichtigungen bei Abwesenheit"
+
+#: tpl_messages.php:326
 msgid "Resend notification only after"
 msgstr "Benachrichtigung erst nach"
 
-#: tpl_messages.php:233
+#: tpl_messages.php:327
 msgid "days"
 msgstr "Tagen erneut senden"
 
-#: tpl_messages.php:234
+#: tpl_messages.php:328
 msgid "Send responses for these addresses:"
 msgstr "Antworten fÃ¼r diese Adressen schicken:"
 
-#: tpl_messages.php:235
+#: tpl_messages.php:329
 msgid "(one address per line)"
 msgstr "(Eine Adresse pro Zeile)"
 
-#: tpl_messages.php:236
+#: tpl_messages.php:330
 msgid "Do not send vacation replies to spam messages"
 msgstr "Keine Abwesenheitsbenachrichtigungen auf Spamnachrichten senden"
 
-#: tpl_messages.php:237
+#: tpl_messages.php:331
 msgid "Only react to mail coming from domain"
 msgstr "Nur auf Nachrichten reagieren, die aus dieser DomÃ¤ne kommen"
 
-#: tpl_messages.php:238
+#: tpl_messages.php:332
 msgid "(leave empty for all domains)"
 msgstr "(freilassen fÃ¼r alle DomÃ¤nen)"
 
-#: tpl_messages.php:240
-msgid "Kolab2 Groupware Server Version"
-msgstr "Kolab2-Groupware-Server-Version"
+#: ../../www/admin/user/index.php:34
+#: ../../www/admin/administrator/index.php:33
+#: ../../www/admin/addressbook/index.php:23
+#: ../../www/admin/addressbook/addr.php:17
+#: ../../www/admin/maintainer/index.php:33
+#: ../../www/admin/domainmaintainer/index.php:33
+#: ../../www/admin/sharedfolder/index.php:22
+#: ../../www/admin/sharedfolder/sf.php:25
+#: ../../www/admin/distributionlist/index.php:35
+#: ../../www/admin/distributionlist/list.php:37
+#: ../../www/admin/settings/index.php:13
+msgid "Error: You don't have Permissions to access this Menu"
+msgstr "Fehler: Sie haben keine Zugriffsrechte auf dieses MenÃ¼"
 
-#: tpl_messages.php:241
-msgid "Kolab2 Groupware Server Component Versions"
-msgstr "Versionen der Komponenten des Kolab2-Groupware-Server"
+#: ../../www/admin/user/index.php:120
+#, php-format
+msgid "Manage Email User (%d Users)"
+msgstr "E-Mail-Benutzer verwalten (%d Benutzer)"
 
-#: tpl_messages.php:242
-msgid "PEAR/Horde Versions"
-msgstr "PEAR/Horde-Versionen"
+#: ../../www/admin/user/index.php:182
+#: ../../www/admin/addressbook/index.php:122
+msgid "Email"
+msgstr "E-Mail"
 
-#: tpl_messages.php:243
-msgid "Kolab2 Patched OpenPKG Package Versions"
-msgstr "Kolab2-Gepatchte-OpenPKG-Paket-Versionen"
+#: ../../www/admin/user/index.php:184
+#: ../../www/admin/addressbook/index.php:123
+msgid "contains"
+msgstr "enthÃ¤lt"
 
-#: tpl_messages.php:244
-msgid "OpenPKG Version"
-msgstr "OpenPKG-Version"
+#: ../../www/admin/user/index.php:185
+#: ../../www/admin/addressbook/index.php:124
+msgid "is"
+msgstr "ist gleich"
 
-#: ../../../www/admin/addressbook/addr.php.in:17
-#: ../../../www/admin/addressbook/index.php.in:23
-#: ../../../www/admin/administrator/index.php.in:33
-#: ../../../www/admin/distributionlist/index.php.in:35
-#: ../../../www/admin/distributionlist/list.php.in:37
-#: ../../../www/admin/domainmaintainer/index.php.in:33
-#: ../../../www/admin/maintainer/index.php.in:33
-#: ../../../www/admin/settings/index.php.in:13
-#: ../../../www/admin/sharedfolder/index.php.in:22
-#: ../../../www/admin/sharedfolder/sf.php.in:25
-#: ../../../www/admin/user/index.php.in:34
-msgid "Error: You don't have Permissions to access this Menu"
-msgstr "Fehler: Sie haben keine Zugriffsrechte auf dieses MenÃ¼"
+#: ../../www/admin/user/index.php:186
+#: ../../www/admin/addressbook/index.php:125
+msgid "begins with"
+msgstr "beginnt mit"
+
+#: ../../www/admin/user/index.php:187
+#: ../../www/admin/addressbook/index.php:126
+msgid "ends with"
+msgstr "endet mit"
+
+#: ../../www/admin/user/vacation.php:36 ../../www/admin/user/deliver.php:46
+#: ../../www/admin/user/forward.php:47
+msgid "Error while connecting to Sieve service:"
+msgstr ""
+
+#: ../../www/admin/user/vacation.php:55
+msgid "Vacation message successfully activated"
+msgstr "Abwesenheitsnachricht erfolgreich aktiviert"
+
+#: ../../www/admin/user/vacation.php:57
+msgid "Vacation message successfully deactivated"
+msgstr "Abwesenheitsnachricht erfolgreich deaktiviert"
+
+#: ../../www/admin/user/vacation.php:62 ../../www/admin/user/deliver.php:65
+#: ../../www/admin/user/forward.php:67
+#, php-format
+msgid ""
+"Warning: You currently have a sieve script named %s active for your account."
+msgstr ""
+
+#: ../../www/admin/user/vacation.php:63 ../../www/admin/user/deliver.php:66
+#: ../../www/admin/user/forward.php:68
+msgid ""
+"Warning: This script will be overwritten without further warnings if you "
+"press \"Update\"!"
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:43
+msgid "zPush in not enabled in your system."
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:468
+msgid ""
+"There are currently no devices known for your user.<br/><br/>In order to "
+"register a device, please connect it to the server first, using <a "
+"href='http://wiki.kolab.org/Z_push#Clients'>the instructions in the Wiki</"
+"a>. Afterwards the device should become available for configuration in this "
+"dialogue."
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:496
+#, fuzzy
+msgid "Address Books"
+msgstr "Adressbuch"
+
+#: ../../www/admin/user/activesync.php:496
+msgid "Calendars"
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:496
+#: ../../www/admin/sharedfolder/index.php:65
+#: ../../lib/KolabAdmin/include/form.class.php:254
+msgid "Tasks"
+msgstr "Aufgaben"
+
+#: ../../www/admin/user/activesync.php:496
+#: ../../www/admin/sharedfolder/index.php:69
+#: ../../lib/KolabAdmin/include/form.class.php:256
+msgid "Notes"
+msgstr "Notizen"
+
+#: ../../www/admin/user/activesync.php:500
+msgid "Automatic"
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:501
+msgid "Flat Mode"
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:502
+#, fuzzy
+msgid "Folder Mode"
+msgstr "Ordnername"
+
+#: ../../www/admin/user/activesync.php:506
+#: ../../lib/KolabAdmin/include/form.class.php:204
+msgid "No"
+msgstr "Nein"
+
+#: ../../www/admin/user/activesync.php:507
+#: ../../lib/KolabAdmin/include/form.class.php:204
+msgid "Yes"
+msgstr "Ja"
+
+#: ../../www/admin/user/user.php:94
+msgid "Please enter an email address"
+msgstr "Bitte geben Sie eine E-Mail-Adresse ein"
 
-#: ../../../www/admin/addressbook/addr.php.in:65
-#: ../../../www/admin/user/user.php.in:114
+#: ../../www/admin/user/user.php:111
+#, php-format
+msgid "Email address %1$s not in domains %2$s"
+msgstr "E-Mail-Adresse %1$s nicht in DomÃ¤nen %2$s vorhanden"
+
+#: ../../www/admin/user/user.php:114 ../../www/admin/addressbook/addr.php:65
 msgid "User, vCard or distribution list with this email address already exists"
 msgstr ""
 "Es existiert bereits ein Benutzer, eine vCard, oder eine Verteilerliste mit "
 "dieser E-Mail-Adresse"
 
-#: ../../../www/admin/addressbook/addr.php.in:78
-#: ../../../www/admin/administrator/admin.php.in:121
-#: ../../../www/admin/distributionlist/list.php.in:106
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:96
-#: ../../../www/admin/maintainer/maintainer.php.in:118
-#: ../../../www/admin/sharedfolder/sf.php.in:112
-#: ../../../www/admin/user/user.php.in:349
+#: ../../www/admin/user/user.php:130
+msgid "UID "
+msgstr "UID "
+
+#: ../../www/admin/user/user.php:130
+#: ../../lib/KolabAdmin/include/form.class.php:34
+msgid ""
+" collides with an address already used for another user, a vCard or a "
+"distribution list.<br />"
+msgstr ""
+" kollidiert mit einer Adresse, die bereits fÃ¼r einen anderen Benutzer, eine "
+"Visitenkarte oder eine Verteilerliste verwendet wird.<br />"
+
+#: ../../www/admin/user/user.php:145
+#, php-format
+msgid "Email-Delegate %s does not exist"
+msgstr "BevollmÃ¤chtigter %s existiert nicht"
+
+#: ../../www/admin/user/user.php:165
+#, php-format
+msgid "Syntax for Recipient %s is invalid"
+msgstr ""
+
+#: ../../www/admin/user/user.php:211
+#, php-format
+msgid "Illegal user or group %s"
+msgstr "UngÃ¼ltiger Benutzer oder Gruppe %s"
+
+#: ../../www/admin/user/user.php:220
+msgid "Free/Busy interval can not be negative"
+msgstr "Frei/Belegt-Intervall kann nicht negativ sein"
+
+#: ../../www/admin/user/user.php:221
+msgid "Free/Busy interval must be a number"
+msgstr "Frei/Belegt-Intervall muss eine Zahl sein"
+
+#: ../../www/admin/user/user.php:222
+msgid "Free/Busy interval must be an integer"
+msgstr "Frei/Belegt-Intervall muss eine ganze Zahl sein"
+
+#: ../../www/admin/user/user.php:414
+#: ../../www/admin/administrator/admin.php:121
+#: ../../www/admin/addressbook/addr.php:78
+#: ../../www/admin/maintainer/maintainer.php:118
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:96
+#: ../../www/admin/sharedfolder/sf.php:114
+#: ../../www/admin/distributionlist/list.php:109
 msgid "Error: need valid action to proceed"
 msgstr "Fehler: Kann nicht weitermachen ohne zulÃ¤ssige Aktion"
 
-#: ../../../www/admin/addressbook/addr.php.in:81
-#: ../../../www/admin/administrator/admin.php.in:127
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:102
-#: ../../../www/admin/maintainer/maintainer.php.in:124
-#: ../../../www/admin/user/user.php.in:361
-#: ../../../www/admin/user/user.php.in:364
-#: ../../../www/admin/user/user.php.in:370
-#: ../../../www/admin/user/user.php.in:772
+#: ../../www/admin/user/user.php:426 ../../www/admin/user/user.php:429
+#: ../../www/admin/user/user.php:435 ../../www/admin/user/user.php:870
+#: ../../www/admin/administrator/admin.php:127
+#: ../../www/admin/addressbook/addr.php:81
+#: ../../www/admin/maintainer/maintainer.php:124
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:102
 msgid "Error: You don't have the required Permissions"
 msgstr "Fehler: Sie haben nicht die erforderlichen Zugriffsrechte"
 
-#: ../../../www/admin/addressbook/addr.php.in:95
-msgid "Primary E-Mail Address"
-msgstr "PrimÃ¤re E-Mail-Adresse"
+#: ../../www/admin/user/user.php:444 ../../www/admin/user/user.php:446
+#: ../../www/admin/sharedfolder/sf.php:128
+msgid "Non volatile"
+msgstr "unverÃ¤nderlich"
 
-#: ../../../www/admin/addressbook/addr.php.in:97
-msgid "E-Mail Aliases"
+#: ../../www/admin/user/user.php:445
+#: ../../www/admin/administrator/admin.php:136
+#: ../../www/admin/maintainer/maintainer.php:133
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:111
+msgid "Leave blank to keep password unchanged"
+msgstr "Frei lassen, um das alte Passwort beizubehalten"
+
+#: ../../www/admin/user/user.php:469
+msgid "Unique Identity (UID)"
+msgstr "Eindeutige IdentitÃ¤t (UID)"
+
+#: ../../www/admin/user/user.php:471
+msgid "Optional - Defaults to Primary Email Address"
+msgstr "Optional - Default ist die primÃ¤re E-Mail-Adresse"
+
+#: ../../www/admin/user/user.php:472
+msgid "Mailbox Home Server"
+msgstr "Home-Server des E-Mail-Kontos"
+
+#: ../../www/admin/user/user.php:476
+msgid "Account Type"
+msgstr "Kontotyp"
+
+#: ../../www/admin/user/user.php:478
+msgid "User Account"
+msgstr "Benutzerkonto"
+
+#: ../../www/admin/user/user.php:478
+msgid "Internal User Account"
+msgstr "Internes Benutzerkonto"
+
+#: ../../www/admin/user/user.php:478
+msgid "Group Account"
+msgstr "Gruppenkonto"
+
+#: ../../www/admin/user/user.php:478
+msgid "Resource Account"
+msgstr "Ressourcenkonto"
+
+#: ../../www/admin/user/user.php:480
+msgid ""
+"NOTE: An internal user is a user that will not be visible in the address book"
+msgstr ""
+"ANMERKUNG: Ein interner Benutzer ist ein Benutzer, der nicht im Adressbuch "
+"angezeigt wird"
+
+#: ../../www/admin/user/user.php:481
+msgid "Invitation Policy"
+msgstr "Einladungs-Richtlinie"
+
+#: ../../www/admin/user/user.php:485
+msgid "For automatic invitation handling"
+msgstr "FÃ¼r das automatische Bearbeiten von Einladungen"
+
+#: ../../www/admin/user/user.php:486
+msgid ""
+"NOTE: For regular accounts to use this feature, give the 'calendar' user "
+"access to the Calendar folder"
+msgstr ""
+"ANMERKUNG: Damit normale Konten diese Funktion verwenden kÃ¶nnen, muss der "
+"Benutzer 'calendar' Zugriff auf den Kalender-Ordner haben"
+
+#: ../../www/admin/user/user.php:488
+msgid "Email Aliases"
 msgstr "E-Mail-Aliasnamen"
 
-#: ../../../www/admin/addressbook/addr.php.in:100
-#: ../../../www/admin/user/user.php.in:425
+#: ../../www/admin/user/user.php:491 ../../www/admin/addressbook/addr.php:100
 msgid "One address per line"
 msgstr "Eine Adresse pro Zeile"
 
-#: ../../../www/admin/addressbook/addr.php.in:105
-msgid "Post Box"
-msgstr "Postfach"
+#: ../../www/admin/user/user.php:493
+msgid "Email-Delegates"
+msgstr "BevollmÃ¤chtigte"
 
-#: ../../../www/admin/addressbook/addr.php.in:121
-#: ../../../www/admin/distributionlist/list.php.in:135
-#: ../../../www/admin/sharedfolder/sf.php.in:148
-#, php-format
-msgid "Error: DN required for %s operation"
-msgstr "Fehler: dn wird fÃ¼r die Operation %s benÃ¶tigt"
+#: ../../www/admin/user/user.php:496
+msgid "Others allowed to send emails with a \"from\" address of this account."
+msgstr ""
+"Andere, denen erlaubt ist, E-Mails mit einer \"From:\"-Adresse dieses Kontos "
+"zu verschicken."
 
-#: ../../../www/admin/addressbook/addr.php.in:131
-msgid "Add External Address"
-msgstr "Externe Adresse hinzufÃ¼gen"
+#: ../../www/admin/user/user.php:497
+msgid "One email address per line."
+msgstr "Eine E-Mail-Adresse pro Zeile."
 
-#: ../../../www/admin/addressbook/addr.php.in:178
-#, php-format
+#: ../../www/admin/user/user.php:499
+msgid "Allowed Recipients"
+msgstr ""
+
+#: ../../www/admin/user/user.php:502
+msgid "Restrict allowed recipients of SMTP messages"
+msgstr ""
+
+#: ../../www/admin/user/user.php:503
+#, fuzzy
+msgid "One entry per line."
+msgstr "Eine Adresse pro Zeile"
+
+#: ../../www/admin/user/user.php:514
 msgid ""
-"Addressbook entry DN could not be modified, distribution list <a "
-"href='@kolab_wui@/distributionlist/list.php?action=modify&dn=%s'>'%s'</a> "
-"depends on it. To modify this entry, first remove it from the distribution "
-"list."
-msgstr ""
-"Der DN der Adresse konnte nicht geÃ¤ndert werden; Verteilerliste <a "
-"href='@kolab_wui@/distributionlist/list.php?action=modify&dn=%s'>'%s'</a> "
-"hÃ¤ngt davon ab. Um dieses Konto zu verÃ¤ndern, mÃ¼ssen Sie es erst aus der "
-"Verteilerliste entfernen."
-
-#: ../../../www/admin/addressbook/addr.php.in:189
-#: ../../../www/admin/administrator/admin.php.in:216
-#: ../../../www/admin/distributionlist/list.php.in:196
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:200
-#: ../../../www/admin/maintainer/maintainer.php.in:213
-#: ../../../www/admin/sharedfolder/sf.php.in:227
-#: ../../../www/admin/user/user.php.in:617
+"2 letter code from <a href=\"http://www.iso.org/iso/"
+"english_country_names_and_code_elements\" target=\"_blank\">ISO 3166</a>"
+msgstr ""
+
+#: ../../www/admin/user/user.php:520
+msgid "User Quota in MBytes"
+msgstr "Plattenplatz-Kontingent des Benutzers in MBytes"
+
+#: ../../www/admin/user/user.php:536
+msgid "Free/Busy interval in days"
+msgstr "Frei/Belegt-Intervall in Tagen"
+
+#: ../../www/admin/user/user.php:537
+msgid "Leave blank for default (60 days)"
+msgstr "Freilassen fÃ¼r die Voreinstellung (60 Tage)"
+
+#: ../../www/admin/user/user.php:547
+#: ../../www/admin/administrator/admin.php:165
+#: ../../www/admin/maintainer/maintainer.php:162
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:149
+#, php-format
+msgid "LDAP Error: No such dn: %s: %s"
+msgstr "LDAP-Fehler: DN %s existiert nicht: %s"
+
+#: ../../www/admin/user/user.php:711
+#: ../../www/admin/administrator/admin.php:217
+#: ../../www/admin/addressbook/addr.php:189
+#: ../../www/admin/maintainer/maintainer.php:215
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:202
+#: ../../www/admin/sharedfolder/sf.php:231
+#: ../../www/admin/distributionlist/list.php:200
 #, php-format
 msgid "LDAP Error: could not rename %s to %s: %s"
 msgstr "LDAP-Fehler: Konnte %s nicht in %s umbenennen: %s"
 
-#: ../../../www/admin/addressbook/addr.php.in:197
-#: ../../../www/admin/administrator/admin.php.in:224
-#: ../../../www/admin/distributionlist/list.php.in:204
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:208
-#: ../../../www/admin/maintainer/maintainer.php.in:221
-#: ../../../www/admin/sharedfolder/sf.php.in:235
-#: ../../../www/admin/user/user.php.in:625
-#, php-format
-msgid "LDAP Error: could not modify %s to %s: %s"
+#: ../../www/admin/user/user.php:719
+#, fuzzy, php-format
+msgid "LDAP Error: could not modify %s: %s"
 msgstr "LDAP-Fehler: Konnte %s nicht in %s Ã¤ndern: %s"
 
-#: ../../../www/admin/addressbook/addr.php.in:203
-#: ../../../www/admin/addressbook/addr.php.in:218
-#: ../../../www/admin/administrator/admin.php.in:230
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:214
-#: ../../../www/admin/maintainer/maintainer.php.in:227
-#: ../../../www/admin/user/user.php.in:631
+#: ../../www/admin/user/user.php:725
+#: ../../www/admin/administrator/admin.php:231
+#: ../../www/admin/addressbook/addr.php:203
+#: ../../www/admin/addressbook/addr.php:218
+#: ../../www/admin/maintainer/maintainer.php:229
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:216
 #, php-format
 msgid "%s successfully updated"
 msgstr "%s erfolgreich aktualisiert"
 
-#: ../../../www/admin/addressbook/addr.php.in:209
-#: ../../../www/admin/administrator/admin.php.in:234
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:226
-#: ../../../www/admin/maintainer/maintainer.php.in:231
-#: ../../../www/admin/sharedfolder/sf.php.in:247
+#: ../../www/admin/user/user.php:731
+#: ../../www/admin/distributionlist/list.php:220
 #, php-format
-msgid "LDAP Error: could not read %s: %s"
+msgid "LDAP Error: Could not read %s: %s"
 msgstr "LDAP-Fehler: Konnte %s nicht lesen: %s"
 
-#: ../../../www/admin/addressbook/addr.php.in:215
-#: ../../../www/admin/administrator/admin.php.in:238
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:230
-#: ../../../www/admin/maintainer/maintainer.php.in:235
-#: ../../../www/admin/sharedfolder/sf.php.in:251
+#: ../../www/admin/user/user.php:745 ../../www/admin/user/user.php:758
+#: ../../www/admin/user/user.php:797 ../../www/admin/user/user.php:812
+#: ../../www/admin/distributionlist/list.php:224
+#: ../../www/admin/distributionlist/list.php:253
 #, php-format
-msgid "LDAP Error: could not modify object %s: %s"
+msgid "LDAP Error: Could not modify object %s: %s"
 msgstr "LDAP-Fehler: Konnte Objekt %s nicht Ã¤ndern: %s"
 
-#: ../../../www/admin/addressbook/addr.php.in:227
-#: ../../../www/admin/administrator/admin.php.in:256
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:261
-#: ../../../www/admin/maintainer/maintainer.php.in:257
-#: ../../../www/admin/sharedfolder/sf.php.in:261
-#: ../../../www/admin/user/user.php.in:689
+#: ../../www/admin/user/user.php:761 ../../www/admin/user/user.php:815
+#, php-format
+msgid "Mid-air collision detected, alias %1$s renamed to %2$s"
+msgstr ""
+"Miteinander in Konflikt stehende Ã„nderungen aufgetreten; der Aliasname %1$s "
+"wurde in %2$s umbenannt"
+
+#: ../../www/admin/user/user.php:766 ../../www/admin/user/user.php:848
+msgid "Modify User"
+msgstr "Benutzer bearbeiten"
+
+#: ../../www/admin/user/user.php:767
+#, php-format
+msgid "User '%s' successfully modified"
+msgstr "Benutzer '%s' erfolgreich geÃ¤ndert"
+
+#: ../../www/admin/user/user.php:787
+#: ../../www/admin/administrator/admin.php:260
+#: ../../www/admin/addressbook/addr.php:227
+#: ../../www/admin/maintainer/maintainer.php:261
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:265
+#: ../../www/admin/sharedfolder/sf.php:265
 #, php-format
 msgid "LDAP Error: could not add object %s: %s"
 msgstr "LDAP-Fehler: Konnte Objekt %s nicht hinzufÃ¼gen: %s"
 
-#: ../../../www/admin/addressbook/addr.php.in:230
+#: ../../www/admin/user/user.php:800
+#: ../../www/admin/distributionlist/list.php:256
 #, php-format
-msgid "%s successfully added"
-msgstr "%s erfolgreich hinzugefÃ¼gt"
+msgid "Mid-air collision detected, email address %1$s renamed to %2$s"
+msgstr ""
+"Miteinander in Konflikt stehende Ã„nderungen entdeckt: E-Mail-Adresse %1$s "
+"wurde in %2$s umbenannt"
 
-#: ../../../www/admin/addressbook/addr.php.in:240
-#: ../../../www/admin/addressbook/addr.php.in:258
-msgid "Modify External Address"
-msgstr "Externe Adresse bearbeiten"
+#: ../../www/admin/user/user.php:821
+msgid "User "
+msgstr "Benutzer "
 
-#: ../../../www/admin/addressbook/addr.php.in:261
-#: ../../../www/admin/addressbook/addr.php.in:281
-#, php-format
-msgid "Error: No entry with DN %s found"
-msgstr "Fehler: Kein Eintrag mit DN %s gefunden"
+#: ../../www/admin/user/user.php:821
+#: ../../www/admin/administrator/admin.php:270
+#: ../../www/admin/maintainer/maintainer.php:269
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:276
+msgid " successfully created"
+msgstr " erfolgreich erzeugt"
 
-#: ../../../www/admin/addressbook/addr.php.in:278
-msgid "Delete External Address"
-msgstr "Externe Adresse lÃ¶schen"
+#: ../../www/admin/user/user.php:822 ../../www/admin/user/user.php:828
+#: ../../www/admin/user/user.php:839 ../../lib/KolabAdmin/include/menu.php:30
+msgid "Create New User"
+msgstr "Neuen Benutzer anlegen"
+
+#: ../../www/admin/user/user.php:854 ../../www/admin/user/user.php:912
+msgid "Delete User"
+msgstr "Benutzer lÃ¶schen"
 
-#: ../../../www/admin/addressbook/addr.php.in:295
-#: ../../../www/admin/user/user.php.in:788
+#: ../../www/admin/user/user.php:867
+#: ../../www/admin/administrator/admin.php:315
+#: ../../www/admin/maintainer/maintainer.php:314
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:318
+msgid "Error: need DN for delete operation"
+msgstr "Fehler: DN wird fÃ¼r LÃ¶schoperation benÃ¶tigt"
+
+#: ../../www/admin/user/user.php:873
+#: ../../www/admin/maintainer/maintainer.php:316
+msgid "Error: you need administrative permissions to delete users"
+msgstr "Fehler: Sie benÃ¶tigen Administratorrechte, um Benutzer zu lÃ¶schen"
+
+#: ../../www/admin/user/user.php:886 ../../www/admin/addressbook/addr.php:295
 #, php-format
 msgid "Account could not be deleted, distribution list '%s' depends on it."
 msgstr ""
 "Das Konto konnte nicht gelÃ¶scht werden; die Verteilerliste '%s' hÃ¤ngt davon "
 "ab."
 
-#: ../../../www/admin/addressbook/addr.php.in:302
+#: ../../www/admin/user/user.php:893
 #, php-format
-msgid "Addressbook entry removed from distribution list '%s'."
-msgstr "Die Adresse wurde von der Verteilerliste '%s' entfernt."
+msgid "Account removed from distribution list '%s'."
+msgstr "Das Konto wurde von der Verteilerliste '%s' entfernt."
 
-#: ../../../www/admin/addressbook/addr.php.in:304
+#: ../../www/admin/user/user.php:895
 #, php-format
 msgid ""
-"Failure to remove addressbook entry from distribution list '%s', entry will "
-"not be deleted."
+"Failure to remove account from distribution list '%s', account will not be "
+"deleted."
 msgstr ""
-"Konnte die Adresse nicht aus der Verteilerliste '%s' entfernen; der Eintrag "
-"wird nicht gelÃ¶scht."
+"Konnte das Konto nicht aus der Verteilerliste '%s' entfernen; das Konto wird "
+"nicht gelÃ¶scht."
 
-#: ../../../www/admin/addressbook/addr.php.in:312
+#: ../../www/admin/user/user.php:903
 #, php-format
-msgid "LDAP Error: could not delete %s: %s"
-msgstr "LDAP-Fehler: Konnte %s nicht lÃ¶schen: %s"
+msgid "LDAP Error: could not mark '%s' for deletion: %s"
+msgstr "LDAP-Fehler: Konnte '%s' nicht zum LÃ¶schen vormerken: %s"
 
-#: ../../../www/admin/addressbook/addr.php.in:315
-#: ../../../www/admin/distributionlist/list.php.in:312
-#: ../../../www/admin/sharedfolder/sf.php.in:321
-msgid "Entry Deleted"
-msgstr "Eintrag gelÃ¶scht"
+#: ../../www/admin/user/user.php:906
+msgid "User Deleted"
+msgstr "Benutzer gelÃ¶scht"
 
-#: ../../../www/admin/addressbook/addr.php.in:316
+#: ../../www/admin/user/deliver.php:58
 #, php-format
-msgid "Address book entry with DN %s was deleted"
-msgstr "Adressbucheintrag mit DN %s wurde gelÃ¶scht"
+msgid "Delivery to '%s' successfully activated"
+msgstr "Versand an '%s' erfolgreich aktiviert"
 
-#: ../../../www/admin/addressbook/index.php.in:122
-#: ../../../www/admin/user/index.php.in:184
-msgid "Email"
-msgstr "E-Mail"
+#: ../../www/admin/user/deliver.php:60
+#, php-format
+msgid "Delivery to '%s' successfully deactivated"
+msgstr "Versand an '%s' erfolgreich deaktiviert"
 
-#: ../../../www/admin/addressbook/index.php.in:123
-#: ../../../www/admin/user/index.php.in:186
-msgid "contains"
-msgstr "enthÃ¤lt"
+#: ../../www/admin/user/forward.php:60
+#, php-format
+msgid "Forwarding to '%s' successfully activated"
+msgstr "Weiterleitung an '%s' erfolgreich aktiviert"
 
-#: ../../../www/admin/addressbook/index.php.in:124
-#: ../../../www/admin/user/index.php.in:187
-msgid "is"
-msgstr "ist gleich"
+#: ../../www/admin/user/forward.php:62
+#, php-format
+msgid "Forwarding to '%s' successfully deactivated"
+msgstr "Weiterleiten an '%s' erfolgreich deaktiviert"
 
-#: ../../../www/admin/addressbook/index.php.in:125
-#: ../../../www/admin/user/index.php.in:188
-msgid "begins with"
-msgstr "beginnt mit"
+#: ../../www/admin/administrator/index.php:62
+msgid "Manage Administrators ("
+msgstr "Administratoren verwalten ("
 
-#: ../../../www/admin/addressbook/index.php.in:126
-#: ../../../www/admin/user/index.php.in:189
-msgid "ends with"
-msgstr "endet mit"
+#: ../../www/admin/administrator/index.php:62
+msgid " Administrators)"
+msgstr " Administratoren)"
 
-#: ../../../www/admin/administrator/admin.php.in:52
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:53
-#: ../../../www/admin/maintainer/maintainer.php.in:52
+#: ../../www/admin/administrator/admin.php:52
+#: ../../www/admin/maintainer/maintainer.php:52
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:53
 msgid "Account with this UID already exists"
 msgstr "Konto mit dieser UID existiert bereits"
 
-#: ../../../www/admin/administrator/admin.php.in:75
+#: ../../www/admin/administrator/admin.php:75
 msgid "Manager's password can't be changed from the webgui"
 msgstr ""
 "Das Passwort des Managers kann nicht in der Web-Schnittstelle geÃ¤ndert werden"
 
-#: ../../../www/admin/administrator/admin.php.in:135
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:110
-#: ../../../www/admin/maintainer/maintainer.php.in:132
+#: ../../www/admin/administrator/admin.php:135
+#: ../../www/admin/maintainer/maintainer.php:132
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:110
 msgid "non volatile"
 msgstr "unverÃ¤nderlich"
 
-#: ../../../www/admin/administrator/admin.php.in:136
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:111
-#: ../../../www/admin/maintainer/maintainer.php.in:133
-#: ../../../www/admin/user/user.php.in:380
-msgid "Leave blank to keep password unchanged"
-msgstr "Frei lassen, um das alte Passwort beizubehalten"
-
-#: ../../../www/admin/administrator/admin.php.in:153
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:128
-#: ../../../www/admin/maintainer/maintainer.php.in:150
+#: ../../www/admin/administrator/admin.php:153
+#: ../../www/admin/maintainer/maintainer.php:150
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:128
 msgid "Unique User ID"
 msgstr "Eindeutige Benutzer-ID"
 
-#: ../../../www/admin/administrator/admin.php.in:165
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:149
-#: ../../../www/admin/maintainer/maintainer.php.in:162
-#: ../../../www/admin/user/user.php.in:471
+#: ../../www/admin/administrator/admin.php:225
+#: ../../www/admin/addressbook/addr.php:197
+#: ../../www/admin/maintainer/maintainer.php:223
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:210
+#: ../../www/admin/sharedfolder/sf.php:239
+#: ../../www/admin/distributionlist/list.php:208
 #, php-format
-msgid "LDAP Error: No such dn: %s: %s"
-msgstr "LDAP-Fehler: DN %s existiert nicht: %s"
+msgid "LDAP Error: could not modify %s to %s: %s"
+msgstr "LDAP-Fehler: Konnte %s nicht in %s Ã¤ndern: %s"
+
+#: ../../www/admin/administrator/admin.php:235
+#: ../../www/admin/addressbook/addr.php:209
+#: ../../www/admin/maintainer/maintainer.php:233
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:228
+#: ../../www/admin/sharedfolder/sf.php:251
+#, php-format
+msgid "LDAP Error: could not read %s: %s"
+msgstr "LDAP-Fehler: Konnte %s nicht lesen: %s"
 
-#: ../../../www/admin/administrator/admin.php.in:243
-#: ../../../www/admin/administrator/admin.php.in:293
+#: ../../www/admin/administrator/admin.php:239
+#: ../../www/admin/addressbook/addr.php:215
+#: ../../www/admin/maintainer/maintainer.php:237
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:232
+#: ../../www/admin/sharedfolder/sf.php:255
+#, php-format
+msgid "LDAP Error: could not modify object %s: %s"
+msgstr "LDAP-Fehler: Konnte Objekt %s nicht Ã¤ndern: %s"
+
+#: ../../www/admin/administrator/admin.php:244
+#: ../../www/admin/administrator/admin.php:297
 msgid "Modify Administrator"
 msgstr "Administrator bearbeiten"
 
-#: ../../../www/admin/administrator/admin.php.in:244
-#: ../../../www/admin/administrator/admin.php.in:266
+#: ../../www/admin/administrator/admin.php:245
+#: ../../www/admin/administrator/admin.php:270
 msgid "Administrator "
 msgstr "Administrator "
 
-#: ../../../www/admin/administrator/admin.php.in:244
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:244
-#: ../../../www/admin/maintainer/maintainer.php.in:241
+#: ../../www/admin/administrator/admin.php:245
+#: ../../www/admin/maintainer/maintainer.php:243
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:246
 msgid " successfully modified"
 msgstr " erfolgreich geÃ¤ndert"
 
-#: ../../../www/admin/administrator/admin.php.in:262
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:265
-#: ../../../www/admin/maintainer/maintainer.php.in:261
+#: ../../www/admin/administrator/admin.php:266
+#: ../../www/admin/maintainer/maintainer.php:265
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:269
 #, php-format
 msgid "LDAP Error: could not add object %s to maintainer group: %s"
 msgstr "LDAP-Fehler: Konnte Objekt %s nicht zur Verwaltergruppe hinzufÃ¼gen: %s"
 
-#: ../../../www/admin/administrator/admin.php.in:266
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:272
-#: ../../../www/admin/maintainer/maintainer.php.in:265
-#: ../../../www/admin/user/user.php.in:723
-msgid " successfully created"
-msgstr " erfolgreich erzeugt"
-
-#: ../../../www/admin/administrator/admin.php.in:267
-#: ../../../www/admin/administrator/admin.php.in:273
-#: ../../../www/admin/administrator/admin.php.in:284 ../include/menu.php:74
+#: ../../www/admin/administrator/admin.php:271
+#: ../../www/admin/administrator/admin.php:277
+#: ../../www/admin/administrator/admin.php:288
+#: ../../lib/KolabAdmin/include/menu.php:81
 msgid "Create New Administrator"
 msgstr "Neuen Administrator anlegen"
 
-#: ../../../www/admin/administrator/admin.php.in:299
+#: ../../www/admin/administrator/admin.php:303
 msgid "Delete Administrator"
 msgstr "Administrator lÃ¶schen"
 
-#: ../../../www/admin/administrator/admin.php.in:311
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:314
-#: ../../../www/admin/maintainer/maintainer.php.in:310
-#: ../../../www/admin/user/user.php.in:769
-msgid "Error: need DN for delete operation"
-msgstr "Fehler: DN wird fÃ¼r LÃ¶schoperation benÃ¶tigt"
-
-#: ../../../www/admin/administrator/admin.php.in:313
+#: ../../www/admin/administrator/admin.php:317
 msgid "Error: you need administrative permissions to delete administrators"
 msgstr ""
 "Fehler: Sie benÃ¶tigen Administratorrechte, um Administratoren lÃ¶schen zu "
 "dÃ¼rfen"
 
-#: ../../../www/admin/administrator/admin.php.in:317
+#: ../../www/admin/administrator/admin.php:321
 #, php-format
 msgid "LDAP Error: Could not remove %s from admin group: %s"
 msgstr ""
 "LDAP-Fehler: Konnte %s nicht aus der Administratoren-Gruppe entfernen: %s"
 
-#: ../../../www/admin/administrator/admin.php.in:322
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:326
-#: ../../../www/admin/maintainer/maintainer.php.in:322
+#: ../../www/admin/administrator/admin.php:326
+#: ../../www/admin/maintainer/maintainer.php:326
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:330
 #, php-format
 msgid "LDAP Error: could not mark %s for deletion: %s"
 msgstr "LDAP-Fehler: Konnte %s nicht zum LÃ¶schen vormerken: %s"
 
-#: ../../../www/admin/administrator/admin.php.in:328
+#: ../../www/admin/administrator/admin.php:332
 msgid "Administrator Deleted"
 msgstr "Administrator gelÃ¶scht"
 
-#: ../../../www/admin/administrator/index.php.in:62
-msgid "Manage Administrators ("
-msgstr "Administratoren verwalten ("
-
-#: ../../../www/admin/administrator/index.php.in:62
-msgid " Administrators)"
-msgstr " Administratoren)"
-
-#: ../../../www/admin/distributionlist/index.php.in:63
-#, php-format
-msgid "Manage Distribution Lists (%d Lists)"
-msgstr "Verteilerlisten verwalten (%d Listen)"
+#: ../../www/admin/addressbook/addr.php:95
+msgid "Primary E-Mail Address"
+msgstr "PrimÃ¤re E-Mail-Adresse"
 
-#: ../../../www/admin/distributionlist/index.php.in:74
-msgid "not yet implemented"
-msgstr "noch nicht implementiert"
+#: ../../www/admin/addressbook/addr.php:97
+msgid "E-Mail Aliases"
+msgstr "E-Mail-Aliasnamen"
 
-#: ../../../www/admin/distributionlist/list.php.in:46
-msgid "Please add at least one member"
-msgstr "Bitte fÃ¼gen Sie wenigstens einen Eintrag hinzu"
+#: ../../www/admin/addressbook/addr.php:105
+msgid "Post Box"
+msgstr "Postfach"
 
-#: ../../../www/admin/distributionlist/list.php.in:50
+#: ../../www/admin/addressbook/addr.php:121
+#: ../../www/admin/sharedfolder/sf.php:150
+#: ../../www/admin/distributionlist/list.php:138
 #, php-format
-msgid "No user with email address, UID or alias %s"
-msgstr "Kein Benutzer mit dieser E-Mail-Adresse, UID oder Alias: %s"
-
-#: ../../../www/admin/distributionlist/list.php.in:62
-msgid "User or distribution list with this email address already exists"
-msgstr ""
-"Es existiert bereits ein Benutzer oder eine Verteilerliste mit dieser E-Mail-"
-"Adresse"
-
-#: ../../../www/admin/distributionlist/list.php.in:111
-msgid "List Name"
-msgstr "Listenname"
-
-#: ../../../www/admin/distributionlist/list.php.in:118
-msgid "Members"
-msgstr "Teilnehmer"
-
-#: ../../../www/admin/distributionlist/list.php.in:120
-msgid "One email address per line"
-msgstr "Eine E-Mail-Adresse pro Zeile"
-
-#: ../../../www/admin/distributionlist/list.php.in:123
-msgid "Hidden"
-msgstr "Verborgen"
+msgid "Error: DN required for %s operation"
+msgstr "Fehler: dn wird fÃ¼r die Operation %s benÃ¶tigt"
 
-#: ../../../www/admin/distributionlist/list.php.in:126
-msgid ""
-"Check here to make this distribution list available only to authenticated "
-"users"
-msgstr ""
-"Kreuzen Sie diese Option an, wenn diese Verteilerliste nur authentifizierten "
-"Benutzern zur VerfÃ¼gung stehen soll"
+#: ../../www/admin/addressbook/addr.php:131
+msgid "Add External Address"
+msgstr "Externe Adresse hinzufÃ¼gen"
 
-#: ../../../www/admin/distributionlist/list.php.in:145
-msgid "Add Distribution List"
-msgstr "Verteilerliste hinzufÃ¼gen"
+#: ../../www/admin/addressbook/addr.php:178
+#, fuzzy, php-format
+msgid "Addressbook entry DN could not be modified, distribution list <a href='"
+msgstr "Die Adresse wurde von der Verteilerliste '%s' entfernt."
 
-#: ../../../www/admin/distributionlist/list.php.in:179
+#: ../../www/admin/addressbook/addr.php:230
 #, php-format
-msgid "No user with address %s"
-msgstr "Es existiert kein Benutzer mit der Adresse %s"
+msgid "%s successfully added"
+msgstr "%s erfolgreich hinzugefÃ¼gt"
 
-#: ../../../www/admin/distributionlist/list.php.in:210
-#: ../../../www/admin/distributionlist/list.php.in:222
-msgid "Distribution List updated"
-msgstr "Verteilerliste aktualisiert"
+#: ../../www/admin/addressbook/addr.php:240
+#: ../../www/admin/addressbook/addr.php:258
+msgid "Modify External Address"
+msgstr "Externe Adresse bearbeiten"
 
-#: ../../../www/admin/distributionlist/list.php.in:216
-#: ../../../www/admin/user/user.php.in:637
+#: ../../www/admin/addressbook/addr.php:261
+#: ../../www/admin/addressbook/addr.php:281
 #, php-format
-msgid "LDAP Error: Could not read %s: %s"
-msgstr "LDAP-Fehler: Konnte %s nicht lesen: %s"
+msgid "Error: No entry with DN %s found"
+msgstr "Fehler: Kein Eintrag mit DN %s gefunden"
 
-#: ../../../www/admin/distributionlist/list.php.in:220
-#: ../../../www/admin/distributionlist/list.php.in:249
-#: ../../../www/admin/user/user.php.in:649
-#: ../../../www/admin/user/user.php.in:662
-#: ../../../www/admin/user/user.php.in:699
-#: ../../../www/admin/user/user.php.in:714
-#, php-format
-msgid "LDAP Error: Could not modify object %s: %s"
-msgstr "LDAP-Fehler: Konnte Objekt %s nicht Ã¤ndern: %s"
+#: ../../www/admin/addressbook/addr.php:278
+msgid "Delete External Address"
+msgstr "Externe Adresse lÃ¶schen"
 
-#: ../../../www/admin/distributionlist/list.php.in:231
+#: ../../www/admin/addressbook/addr.php:302
 #, php-format
-msgid "LDAP Error: Could not add object %s: %s"
-msgstr "LDAP-Fehler: Konnte Objekt %s nicht hinzufÃ¼gen: %s"
+msgid "Addressbook entry removed from distribution list '%s'."
+msgstr "Die Adresse wurde von der Verteilerliste '%s' entfernt."
 
-#: ../../../www/admin/distributionlist/list.php.in:252
-#: ../../../www/admin/user/user.php.in:702
+#: ../../www/admin/addressbook/addr.php:304
 #, php-format
-msgid "Mid-air collision detected, email address %1$s renamed to %2$s"
+msgid ""
+"Failure to remove addressbook entry from distribution list '%s', entry will "
+"not be deleted."
 msgstr ""
-"Miteinander in Konflikt stehende Ã„nderungen entdeckt: E-Mail-Adresse %1$s "
-"wurde in %2$s umbenannt"
+"Konnte die Adresse nicht aus der Verteilerliste '%s' entfernen; der Eintrag "
+"wird nicht gelÃ¶scht."
 
-#: ../../../www/admin/distributionlist/list.php.in:260
+#: ../../www/admin/addressbook/addr.php:312
 #, php-format
-msgid "Distribution List '%s' added"
-msgstr "Verteilerliste '%s' wurde hinzugefÃ¼gt"
+msgid "LDAP Error: could not delete %s: %s"
+msgstr "LDAP-Fehler: Konnte %s nicht lÃ¶schen: %s"
 
-#: ../../../www/admin/distributionlist/list.php.in:272
-#: ../../../www/admin/distributionlist/list.php.in:286
-msgid "Modify Distribution List"
-msgstr "Verteilerliste bearbeiten"
+#: ../../www/admin/addressbook/addr.php:315
+#: ../../www/admin/sharedfolder/sf.php:325
+#: ../../www/admin/distributionlist/list.php:316
+msgid "Entry Deleted"
+msgstr "Eintrag gelÃ¶scht"
 
-#: ../../../www/admin/distributionlist/list.php.in:289
-#: ../../../www/admin/distributionlist/list.php.in:304
-#: ../../../www/admin/sharedfolder/sf.php.in:298
-#: ../../../www/admin/sharedfolder/sf.php.in:314
+#: ../../www/admin/addressbook/addr.php:316
 #, php-format
-msgid "Error: No results returned for DN '%s'"
-msgstr "Fehler: FÃ¼r DN '%s' wurden keine Ergebnisse zurÃ¼ckgegeben"
+msgid "Address book entry with DN %s was deleted"
+msgstr "Adressbucheintrag mit DN %s wurde gelÃ¶scht"
 
-#: ../../../www/admin/distributionlist/list.php.in:301
-msgid "Delete Distribution List"
-msgstr "Verteilerliste lÃ¶schen"
+#: ../../www/admin/maintainer/index.php:62
+#: ../../www/admin/domainmaintainer/index.php:62
+msgid "Manage Maintainers ("
+msgstr "Verwalter verwalten ("
 
-#: ../../../www/admin/distributionlist/list.php.in:311
-msgid "Distribution List "
-msgstr "Verteilerliste "
+#: ../../www/admin/maintainer/index.php:62
+#: ../../www/admin/domainmaintainer/index.php:62
+msgid " Maintainers)"
+msgstr " Verwalter)"
 
-#: ../../../www/admin/distributionlist/list.php.in:311
-msgid " deleted"
-msgstr " gelÃ¶scht"
+#: ../../www/admin/maintainer/maintainer.php:242
+#: ../../www/admin/maintainer/maintainer.php:296
+msgid "Modify Maintainer"
+msgstr "Verwalter bearbeiten"
 
-#: ../../../www/admin/distributionlist/list.php.in:315
+#: ../../www/admin/maintainer/maintainer.php:243
+#: ../../www/admin/maintainer/maintainer.php:269
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:246
+msgid "Maintainer "
+msgstr "Verwalter "
+
+#: ../../www/admin/maintainer/maintainer.php:270
+#: ../../www/admin/maintainer/maintainer.php:276
+#: ../../www/admin/maintainer/maintainer.php:287
+#: ../../lib/KolabAdmin/include/menu.php:93
+msgid "Create New Maintainer"
+msgstr "Neuen Verwalter anlegen"
+
+#: ../../www/admin/maintainer/maintainer.php:302
+msgid "Delete Maintainer"
+msgstr "Verwalter lÃ¶schen"
+
+#: ../../www/admin/maintainer/maintainer.php:320
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:324
 #, php-format
-msgid "LDAP Error: Could not delete %s: %s"
-msgstr "LDAP-Fehler: Konnte %s nicht lÃ¶schen: %s"
+msgid "LDAP Error: Could not remove %s from maintainer group: %s"
+msgstr "LDAP-Fehler: Konnte %s nicht aus der Verwalter-Gruppe entfernen: %s"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:49
+#: ../../www/admin/maintainer/maintainer.php:332
+msgid "Maintainer Deleted"
+msgstr "Verwalter gelÃ¶scht"
+
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:49
 msgid "Please enter a uid value"
 msgstr "Bitte geben Sie eine UID ein"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:137
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:137
 msgid "Check domains this domain maintainer should be able to maintain"
 msgstr ""
-"Kreuzen Sie die DomÃ¤nen an, die dieser DomÃ¤nenverwalter verwalten kÃ¶nnen sollte"
+"Kreuzen Sie die DomÃ¤nen an, die dieser DomÃ¤nenverwalter verwalten kÃ¶nnen "
+"sollte"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:243
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:296
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:245
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:300
 msgid "Modify Domain Maintainer"
 msgstr "DomÃ¤nenverwalter bearbeiten"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:244
-#: ../../../www/admin/maintainer/maintainer.php.in:241
-#: ../../../www/admin/maintainer/maintainer.php.in:265
-msgid "Maintainer "
-msgstr "Verwalter "
-
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:272
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:276
 msgid "Domain maintainer "
 msgstr "DomÃ¤nenverwalter "
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:273
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:277
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:287
-#: ../include/menu.php:80 ../include/menu.php:97
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:277
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:281
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:291
+#: ../../lib/KolabAdmin/include/menu.php:87
+#: ../../lib/KolabAdmin/include/menu.php:104
 msgid "Create New Domain Maintainer"
 msgstr "Neuen DomÃ¤nenverwalter anlegen"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:302
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:306
 msgid "Delete Domain Maintainer"
 msgstr "DomÃ¤nenverwalter lÃ¶schen"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:316
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:320
 msgid "Error: you need administrative permissions to delete domain maintainers"
 msgstr ""
 "Fehler: Sie benÃ¶tigen Administratorrechte, um DomÃ¤nenverwalter lÃ¶schen zu "
 "dÃ¼rfen"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:320
-#: ../../../www/admin/maintainer/maintainer.php.in:316
-#, php-format
-msgid "LDAP Error: Could not remove %s from maintainer group: %s"
-msgstr "LDAP-Fehler: Konnte %s nicht aus der Verwalter-Gruppe entfernen: %s"
-
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:332
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:336
 msgid "Domain Maintainer Deleted"
 msgstr "DomÃ¤nenverwalter gelÃ¶scht"
 
-#: ../../../www/admin/domainmaintainer/index.php.in:62
-#: ../../../www/admin/maintainer/index.php.in:62
-msgid "Manage Maintainers ("
-msgstr "Verwalter verwalten ("
-
-#: ../../../www/admin/domainmaintainer/index.php.in:62
-#: ../../../www/admin/maintainer/index.php.in:62
-msgid " Maintainers)"
-msgstr " Verwalter)"
-
-#: ../../../www/admin/maintainer/maintainer.php.in:240
-#: ../../../www/admin/maintainer/maintainer.php.in:292
-msgid "Modify Maintainer"
-msgstr "Verwalter bearbeiten"
-
-#: ../../../www/admin/maintainer/maintainer.php.in:266
-#: ../../../www/admin/maintainer/maintainer.php.in:272
-#: ../../../www/admin/maintainer/maintainer.php.in:283 ../include/menu.php:86
-msgid "Create New Maintainer"
-msgstr "Neuen Verwalter anlegen"
-
-#: ../../../www/admin/maintainer/maintainer.php.in:298
-msgid "Delete Maintainer"
-msgstr "Verwalter lÃ¶schen"
-
-#: ../../../www/admin/maintainer/maintainer.php.in:312
-#: ../../../www/admin/user/user.php.in:775
-msgid "Error: you need administrative permissions to delete users"
-msgstr "Fehler: Sie benÃ¶tigen Administratorrechte, um Benutzer zu lÃ¶schen"
-
-#: ../../../www/admin/maintainer/maintainer.php.in:328
-msgid "Maintainer Deleted"
-msgstr "Verwalter gelÃ¶scht"
-
-#: ../../../www/admin/settings/index.php.in:98
-#, php-format
-msgid "No account found for email address %s"
-msgstr "FÃ¼r die E-Mail-Adresse %s wurde kein Konto gefunden"
-
-#: ../../../www/admin/settings/index.php.in:107
-#, php-format
-msgid "LDAP Error: Failed to add distribution list %s: %s"
-msgstr "LDAP-Fehler: Konnte die Verteilerliste %s nicht hinzufÃ¼gen: %s"
-
-#: ../../../www/admin/settings/index.php.in:109
-#, php-format
-msgid "Successfully created distribution list %s"
-msgstr "Verteilerliste %s erfolgreich angelegt"
-
-#: ../../../www/admin/settings/index.php.in:128
-#: ../../../www/admin/settings/index.php.in:137
-#: ../../../www/admin/settings/index.php.in:146
-#: ../../../www/admin/settings/index.php.in:155
-#: ../../../www/admin/settings/index.php.in:165
-#: ../../../www/admin/settings/index.php.in:174
-#: ../../../www/admin/settings/index.php.in:185
-#: ../../../www/admin/settings/index.php.in:199
-#: ../../../www/admin/settings/index.php.in:217
-#: ../../../www/admin/settings/index.php.in:235
-#: ../../../www/admin/settings/index.php.in:252
-#: ../../../www/admin/settings/index.php.in:265
-#, php-format
-msgid "LDAP Error: failed to modify kolab configuration object: %s"
-msgstr "LDAP-Fehler: Konnte das Kolab-Konfigurationsobjekt nicht verÃ¤ndern: %s"
-
-#: ../../../www/admin/settings/index.php.in:223
-#, php-format
-msgid "LDAP Error: Failed to delete domain object %s: %s"
-msgstr "LDAP-Fehler: Konnte das DomÃ¤nen-Objekt %s nicht lÃ¶schen: %s"
-
-#: ../../../www/admin/settings/index.php.in:273
-msgid "POP3 Service"
-msgstr "POP3-Dienst"
-
-#: ../../../www/admin/settings/index.php.in:274
-msgid "POP3/SSL service (TCP port 995)"
-msgstr "POP3/SSL-Dienst (TCP-Port 995)"
-
-#: ../../../www/admin/settings/index.php.in:275
-msgid "IMAP Service"
-msgstr "IMAP-Dienst"
-
-#: ../../../www/admin/settings/index.php.in:276
-msgid "IMAP/SSL Service (TCP port 993)"
-msgstr "IMAP/SSL-Dienst (TCP-Port 993)"
-
-#: ../../../www/admin/settings/index.php.in:277
-msgid "Sieve service (TCP port %s)"
-msgstr "Sieve-Dienst (TCP-Port %s)"
-
-#: ../../../www/admin/settings/index.php.in:278
-msgid "FreeBusy Service via HTTP (in addition to HTTPS)"
-msgstr "Frei/Belegt-Dienst Ã¼ber HTTP (zusÃ¤tzlich zu HTTPS)"
-
-#: ../../../www/admin/settings/index.php.in:279
-msgid "Amavis Email Scanning (Virus/Spam)"
-msgstr "Amavis-Scannen von E-Mail-Nachrichten (Viren/Spam)"
-
-#: ../../../www/admin/sharedfolder/index.php.in:53
+#: ../../www/admin/sharedfolder/index.php:53
 #, php-format
 msgid "Manage Shared Folders (%d Folders)"
 msgstr "Gemeinsam genutzte Ordner verwalten (%d Ordner)"
 
-#: ../../../www/admin/sharedfolder/index.php.in:63
-#: ../include/form.class.php:255
+#: ../../www/admin/sharedfolder/index.php:63
+#: ../../lib/KolabAdmin/include/form.class.php:254
 msgid "Unspecified"
 msgstr "Unspezifiziert"
 
-#: ../../../www/admin/sharedfolder/index.php.in:64
-#: ../include/form.class.php:255
+#: ../../www/admin/sharedfolder/index.php:64
+#: ../../lib/KolabAdmin/include/form.class.php:254
 msgid "Mails"
 msgstr "E-Mail"
 
-#: ../../../www/admin/sharedfolder/index.php.in:65
-#: ../include/form.class.php:255
-msgid "Tasks"
-msgstr "Aufgaben"
-
-#: ../../../www/admin/sharedfolder/index.php.in:66
-#: ../include/form.class.php:256
+#: ../../www/admin/sharedfolder/index.php:66
+#: ../../lib/KolabAdmin/include/form.class.php:255
 msgid "Journals"
 msgstr "Journal"
 
-#: ../../../www/admin/sharedfolder/index.php.in:67
-#: ../include/form.class.php:256
+#: ../../www/admin/sharedfolder/index.php:67
+#: ../../lib/KolabAdmin/include/form.class.php:255
 msgid "Events"
 msgstr "Kalender"
 
-#: ../../../www/admin/sharedfolder/index.php.in:68
-#: ../include/form.class.php:257
+#: ../../www/admin/sharedfolder/index.php:68
+#: ../../lib/KolabAdmin/include/form.class.php:256
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: ../../../www/admin/sharedfolder/index.php.in:69
-#: ../include/form.class.php:257
-msgid "Notes"
-msgstr "Notizen"
-
-#: ../../../www/admin/sharedfolder/sf.php.in:60
-#: ../../../www/admin/sharedfolder/sf.php.in:67
+#: ../../www/admin/sharedfolder/sf.php:62
+#: ../../www/admin/sharedfolder/sf.php:69
 msgid "Permission for UID/email/GID"
 msgstr "Zugriffsrechte fÃ¼r UID/E-Mail/GID"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:101
+#: ../../www/admin/sharedfolder/sf.php:103
 #, php-format
 msgid "No UID or GID %s"
 msgstr "Keine UID oder GID %s"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:117
+#: ../../www/admin/sharedfolder/sf.php:119
 msgid "Folder Name"
 msgstr "Ordnername"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:124
+#: ../../www/admin/sharedfolder/sf.php:126
 msgid "Folder Location"
 msgstr "Ordnerposition"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:126
-#: ../../../www/admin/user/user.php.in:379
-#: ../../../www/admin/user/user.php.in:381
-msgid "Non volatile"
-msgstr "unverÃ¤nderlich"
-
-#: ../../../www/admin/sharedfolder/sf.php.in:128
+#: ../../www/admin/sharedfolder/sf.php:130
 msgid "Folder Type"
 msgstr "Ordnertyp"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:132
+#: ../../www/admin/sharedfolder/sf.php:134
 msgid "Quota Limit"
 msgstr "Plattenplatz-Kontingent"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:133
+#: ../../www/admin/sharedfolder/sf.php:135
 msgid "MBytes (empty for unlimited)"
 msgstr "MBytes (leer lassen fÃ¼r unbegrenzten Plattenplatz)"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:135
+#: ../../www/admin/sharedfolder/sf.php:137
 msgid "Permission for UID/GID"
 msgstr "Zugriffsrechte fÃ¼r UID/GID"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:158 ../include/menu.php:58
+#: ../../www/admin/sharedfolder/sf.php:160
+#: ../../lib/KolabAdmin/include/menu.php:65
 msgid "Add Shared Folder"
 msgstr "Gemeinsam genutzten Ordner hinzufÃ¼gen"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:241
-#: ../../../www/admin/sharedfolder/sf.php.in:253
+#: ../../www/admin/sharedfolder/sf.php:245
+#: ../../www/admin/sharedfolder/sf.php:257
 msgid "Shared folder updated"
 msgstr "Gemeinsam genutzter Ordner aktualisiert"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:263
+#: ../../www/admin/sharedfolder/sf.php:267
 #, php-format
 msgid "Shared folder '%s' added"
 msgstr "Gemeinsam genutzter Ordner '%s' hinzugefÃ¼gt"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:275
-#: ../../../www/admin/sharedfolder/sf.php.in:295
+#: ../../www/admin/sharedfolder/sf.php:279
+#: ../../www/admin/sharedfolder/sf.php:299
 msgid "Modify Shared Folder"
 msgstr "Gemeinsam genutzten Ordner bearbeiten"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:311
+#: ../../www/admin/sharedfolder/sf.php:302
+#: ../../www/admin/sharedfolder/sf.php:318
+#: ../../www/admin/distributionlist/list.php:293
+#: ../../www/admin/distributionlist/list.php:308
+#, php-format
+msgid "Error: No results returned for DN '%s'"
+msgstr "Fehler: FÃ¼r DN '%s' wurden keine Ergebnisse zurÃ¼ckgegeben"
+
+#: ../../www/admin/sharedfolder/sf.php:315
 msgid "Delete Shared Folder"
 msgstr "Gemeinsam genutzten Ordner lÃ¶schen"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:320
+#: ../../www/admin/sharedfolder/sf.php:324
 msgid "Shared folder "
 msgstr "Gemeinsam genutzter Ordner "
 
-#: ../../../www/admin/sharedfolder/sf.php.in:320
+#: ../../www/admin/sharedfolder/sf.php:324
 msgid " marked for deletion"
 msgstr " zum LÃ¶schen vorgemerkt"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:324
+#: ../../www/admin/sharedfolder/sf.php:328
 #, php-format
 msgid "LDAP Error: Could not mark %s for deletion: %s"
 msgstr "LDAP-Fehler: Konnte %s nicht zum LÃ¶schen vormerken: %s"
 
-#: ../../../www/admin/user/deliver.php.in:37
-msgid ""
-"Net/Sieve.php is missing. Without that, filter settings are not available"
-msgstr ""
-"Net/Sieve.php fehlt. Ohne dieses Modul stehen keine Filtereinstellungen zur "
-"VerfÃ¼gung"
-
-#: ../../../www/admin/user/deliver.php.in:38
-#: ../../../www/admin/user/forward.php.in:39
-#: ../../../www/admin/user/vacation.php.in:18
-msgid ""
-"Suggest your system administrator to run \"pear install http://pear.php.net/"
-"get/Net_Sieve\" on the server"
-msgstr ""
-"Empfehlen Sie Ihrem Systemadministrator, \"pear install http://pear.php.net/"
-"get/Net_Sieve\" auf dem Server auszufÃ¼hren."
-
-#: ../../../www/admin/user/deliver.php.in:66
-#: ../../../www/admin/user/forward.php.in:70
-msgid "Script was:"
-msgstr "Skript war:"
-
-#: ../../../www/admin/user/deliver.php.in:74
-#, php-format
-msgid "Delivery to '%s' successfully activated"
-msgstr "Versand an '%s' erfolgreich aktiviert"
-
-#: ../../../www/admin/user/deliver.php.in:75
+#: ../../www/admin/distributionlist/index.php:63
 #, php-format
-msgid "Delivery to '%s' successfully deactivated"
-msgstr "Versand an '%s' erfolgreich deaktiviert"
-
-#: ../../../www/admin/user/forward.php.in:38
-#: ../../../www/admin/user/vacation.php.in:17
-msgid ""
-"Net/Sieve.php is missing. Without that, vacation settings are not available"
-msgstr ""
-"Net/Sieve.php fehlt. Ohne dieses Modul stehen keine "
-"Abwesenheitseinstellungen zur VerfÃ¼gung"
-
-#: ../../../www/admin/user/forward.php.in:64
-#: ../../../www/admin/user/user.php.in:94
-msgid "Please enter an email address"
-msgstr "Bitte geben Sie eine E-Mail-Adresse ein"
-
-#: ../../../www/admin/user/forward.php.in:78
-#, php-format
-msgid "Forwarding to '%s' successfully activated"
-msgstr "Weiterleitung an '%s' erfolgreich aktiviert"
+msgid "Manage Distribution Lists (%d Lists)"
+msgstr "Verteilerlisten verwalten (%d Listen)"
 
-#: ../../../www/admin/user/forward.php.in:79
-#, php-format
-msgid "Forwarding to '%s' successfully deactivated"
-msgstr "Weiterleiten an '%s' erfolgreich deaktiviert"
+#: ../../www/admin/distributionlist/index.php:74
+msgid "not yet implemented"
+msgstr "noch nicht implementiert"
 
-#: ../../../www/admin/user/index.php.in:122
-#, php-format
-msgid "Manage Email User (%d Users)"
-msgstr "E-Mail-Benutzer verwalten (%d Benutzer)"
+#: ../../www/admin/distributionlist/list.php:46
+msgid "Please add at least one member"
+msgstr "Bitte fÃ¼gen Sie wenigstens einen Eintrag hinzu"
 
-#: ../../../www/admin/user/user.php.in:111
+#: ../../www/admin/distributionlist/list.php:50
 #, php-format
-msgid "Email address %1$s not in domains %2$s"
-msgstr "E-Mail-Adresse %1$s nicht in DomÃ¤nen %2$s vorhanden"
-
-#: ../../../www/admin/user/user.php.in:130
-msgid "UID "
-msgstr "UID "
+msgid "No user with email address, UID or alias %s"
+msgstr "Kein Benutzer mit dieser E-Mail-Adresse, UID oder Alias: %s"
 
-#: ../../../www/admin/user/user.php.in:130 ../include/form.class.php:34
-msgid ""
-" collides with an address already used for another user, a vCard or a "
-"distribution list.<br />"
+#: ../../www/admin/distributionlist/list.php:62
+msgid "User or distribution list with this email address already exists"
 msgstr ""
-" kollidiert mit einer Adresse, die bereits fÃ¼r einen anderen Benutzer, eine "
-"Visitenkarte oder eine Verteilerliste verwendet wird.<br />"
-
-#: ../../../www/admin/user/user.php.in:145
-#, php-format
-msgid "Email-Delegate %s does not exist"
-msgstr "BevollmÃ¤chtigter %s existiert nicht"
-
-#: ../../../www/admin/user/user.php.in:158
-#, php-format
-msgid "Illegal user or group %s"
-msgstr "UngÃ¼ltiger Benutzer oder Gruppe %s"
-
-#: ../../../www/admin/user/user.php.in:167
-msgid "Free/Busy interval can not be negative"
-msgstr "Frei/Belegt-Intervall kann nicht negativ sein"
-
-#: ../../../www/admin/user/user.php.in:168
-msgid "Free/Busy interval must be a number"
-msgstr "Frei/Belegt-Intervall muss eine Zahl sein"
-
-#: ../../../www/admin/user/user.php.in:169
-msgid "Free/Busy interval must be an integer"
-msgstr "Frei/Belegt-Intervall muss eine ganze Zahl sein"
-
-#: ../../../www/admin/user/user.php.in:403
-msgid "Unique Identity (UID)"
-msgstr "Eindeutige IdentitÃ¤t (UID)"
-
-#: ../../../www/admin/user/user.php.in:405
-msgid "Optional - Defaults to Primary Email Address"
-msgstr "Optional - Default ist die primÃ¤re E-Mail-Adresse"
-
-#: ../../../www/admin/user/user.php.in:406
-msgid "Mailbox Home Server"
-msgstr "Home-Server des E-Mail-Kontos"
-
-#: ../../../www/admin/user/user.php.in:410
-msgid "Account Type"
-msgstr "Kontotyp"
-
-#: ../../../www/admin/user/user.php.in:412
-msgid "User Account"
-msgstr "Benutzerkonto"
-
-#: ../../../www/admin/user/user.php.in:412
-msgid "Internal User Account"
-msgstr "Internes Benutzerkonto"
-
-#: ../../../www/admin/user/user.php.in:412
-msgid "Group Account"
-msgstr "Gruppenkonto"
+"Es existiert bereits ein Benutzer oder eine Verteilerliste mit dieser E-Mail-"
+"Adresse"
 
-#: ../../../www/admin/user/user.php.in:412
-msgid "Resource Account"
-msgstr "Ressourcenkonto"
+#: ../../www/admin/distributionlist/list.php:114
+msgid "List Name"
+msgstr "Listenname"
 
-#: ../../../www/admin/user/user.php.in:414
-msgid ""
-"NOTE: An internal user is a user that will not be visible in the address book"
-msgstr ""
-"ANMERKUNG: Ein interner Benutzer ist ein Benutzer, der nicht im Adressbuch "
-"angezeigt wird"
+#: ../../www/admin/distributionlist/list.php:121
+msgid "Members"
+msgstr "Teilnehmer"
 
-#: ../../../www/admin/user/user.php.in:415
-msgid "Invitation Policy"
-msgstr "Einladungs-Richtlinie"
+#: ../../www/admin/distributionlist/list.php:123
+msgid "One email address per line"
+msgstr "Eine E-Mail-Adresse pro Zeile"
 
-#: ../../../www/admin/user/user.php.in:419
-msgid "For automatic invitation handling"
-msgstr "FÃ¼r das automatische Bearbeiten von Einladungen"
+#: ../../www/admin/distributionlist/list.php:126
+msgid "Hidden"
+msgstr "Verborgen"
 
-#: ../../../www/admin/user/user.php.in:420
+#: ../../www/admin/distributionlist/list.php:129
 msgid ""
-"NOTE: For regular accounts to use this feature, give the 'calendar' user "
-"access to the Calendar folder"
-msgstr ""
-"ANMERKUNG: Damit normale Konten diese Funktion verwenden kÃ¶nnen, muss der "
-"Benutzer 'calendar' Zugriff auf den Kalender-Ordner haben"
-
-#: ../../../www/admin/user/user.php.in:422
-msgid "Email Aliases"
-msgstr "E-Mail-Aliasnamen"
-
-#: ../../../www/admin/user/user.php.in:427
-msgid "Email-Delegates"
-msgstr "BevollmÃ¤chtigte"
-
-#: ../../../www/admin/user/user.php.in:430
-msgid "Others allowed to send emails with a \"from\" address of this account."
-msgstr ""
-"Andere, denen erlaubt ist, E-Mails mit einer \"From:\"-Adresse dieses Kontos "
-"zu verschicken."
-
-#: ../../../www/admin/user/user.php.in:431
-msgid "One email address per line."
-msgstr "Eine E-Mail-Adresse pro Zeile."
-
-#: ../../../www/admin/user/user.php.in:447
-msgid "User Quota in MBytes"
-msgstr "Plattenplatz-Kontingent des Benutzers in MBytes"
-
-#: ../../../www/admin/user/user.php.in:460
-msgid "Free/Busy interval in days"
-msgstr "Frei/Belegt-Intervall in Tagen"
-
-#: ../../../www/admin/user/user.php.in:461
-msgid "Leave blank for default (60 days)"
-msgstr "Freilassen fÃ¼r die Voreinstellung (60 Tage)"
-
-#: ../../../www/admin/user/user.php.in:665
-#: ../../../www/admin/user/user.php.in:717
-#, php-format
-msgid "Mid-air collision detected, alias %1$s renamed to %2$s"
+"Check here to make this distribution list available only to authenticated "
+"users"
 msgstr ""
-"Miteinander in Konflikt stehende Ã„nderungen aufgetreten; der Aliasname %1$s "
-"wurde in %2$s umbenannt"
+"Kreuzen Sie diese Option an, wenn diese Verteilerliste nur authentifizierten "
+"Benutzern zur VerfÃ¼gung stehen soll"
 
-#: ../../../www/admin/user/user.php.in:670
-#: ../../../www/admin/user/user.php.in:750
-msgid "Modify User"
-msgstr "Benutzer bearbeiten"
+#: ../../www/admin/distributionlist/list.php:148
+msgid "Add Distribution List"
+msgstr "Verteilerliste hinzufÃ¼gen"
 
-#: ../../../www/admin/user/user.php.in:671
+#: ../../www/admin/distributionlist/list.php:183
 #, php-format
-msgid "User '%s' successfully modified"
-msgstr "Benutzer '%s' erfolgreich geÃ¤ndert"
-
-#: ../../../www/admin/user/user.php.in:723
-msgid "User "
-msgstr "Benutzer "
-
-#: ../../../www/admin/user/user.php.in:724
-#: ../../../www/admin/user/user.php.in:730
-#: ../../../www/admin/user/user.php.in:741 ../include/menu.php:30
-msgid "Create New User"
-msgstr "Neuen Benutzer anlegen"
-
-#: ../../../www/admin/user/user.php.in:756
-#: ../../../www/admin/user/user.php.in:814
-msgid "Delete User"
-msgstr "Benutzer lÃ¶schen"
+msgid "No user with address %s"
+msgstr "Es existiert kein Benutzer mit der Adresse %s"
 
-#: ../../../www/admin/user/user.php.in:795
-#, php-format
-msgid "Account removed from distribution list '%s'."
-msgstr "Das Konto wurde von der Verteilerliste '%s' entfernt."
+#: ../../www/admin/distributionlist/list.php:214
+#: ../../www/admin/distributionlist/list.php:226
+msgid "Distribution List updated"
+msgstr "Verteilerliste aktualisiert"
 
-#: ../../../www/admin/user/user.php.in:797
+#: ../../www/admin/distributionlist/list.php:235
 #, php-format
-msgid ""
-"Failure to remove account from distribution list '%s', account will not be "
-"deleted."
-msgstr ""
-"Konnte das Konto nicht aus der Verteilerliste '%s' entfernen; das Konto wird "
-"nicht gelÃ¶scht."
+msgid "LDAP Error: Could not add object %s: %s"
+msgstr "LDAP-Fehler: Konnte Objekt %s nicht hinzufÃ¼gen: %s"
 
-#: ../../../www/admin/user/user.php.in:805
+#: ../../www/admin/distributionlist/list.php:264
 #, php-format
-msgid "LDAP Error: could not mark '%s' for deletion: %s"
-msgstr "LDAP-Fehler: Konnte '%s' nicht zum LÃ¶schen vormerken: %s"
+msgid "Distribution List '%s' added"
+msgstr "Verteilerliste '%s' wurde hinzugefÃ¼gt"
 
-#: ../../../www/admin/user/user.php.in:808
-msgid "User Deleted"
-msgstr "Benutzer gelÃ¶scht"
+#: ../../www/admin/distributionlist/list.php:276
+#: ../../www/admin/distributionlist/list.php:290
+msgid "Modify Distribution List"
+msgstr "Verteilerliste bearbeiten"
 
-#: ../../../www/admin/user/vacation.php.in:43
-msgid "Days must be at least one"
-msgstr "Der Tage-Wert muss mindestens 1 sein"
+#: ../../www/admin/distributionlist/list.php:305
+msgid "Delete Distribution List"
+msgstr "Verteilerliste lÃ¶schen"
 
-#: ../../../www/admin/user/vacation.php.in:65
-msgid "Vacation message successfully activated"
-msgstr "Abwesenheitsnachricht erfolgreich aktiviert"
+#: ../../www/admin/distributionlist/list.php:315
+msgid "Distribution List "
+msgstr "Verteilerliste "
 
-#: ../../../www/admin/user/vacation.php.in:66
-msgid "Vacation message successfully deactivated"
-msgstr "Abwesenheitsnachricht erfolgreich deaktiviert"
+#: ../../www/admin/distributionlist/list.php:315
+msgid " deleted"
+msgstr " gelÃ¶scht"
 
-#: ../../../www/admin/user/vacation.php.in:87
+#: ../../www/admin/distributionlist/list.php:319
 #, php-format
-msgid "%x"
-msgstr "%x"
+msgid "LDAP Error: Could not delete %s: %s"
+msgstr "LDAP-Fehler: Konnte %s nicht lÃ¶schen: %s"
 
-#: ../../../www/admin/user/vacation.php.in:89
+#: ../../www/admin/settings/index.php:99
 #, php-format
-msgid "I am out of office until %s.\r\n"
-msgstr "Ich bin bis %s abwesend.\r\n"
+msgid "No account found for email address %s"
+msgstr "FÃ¼r die E-Mail-Adresse %s wurde kein Konto gefunden"
 
-#: ../../../www/admin/user/vacation.php.in:90
+#: ../../www/admin/settings/index.php:108
 #, php-format
-msgid ""
-"In urgent cases, please contact Mrs. <vacation replacement>\r\n"
-"\r\n"
-msgstr ""
-"In dringenden FÃ¤llen nehmen Sie bitte mit Frau <Urlaubsvertretung> Kontakt "
-"auf\r\n"
-"\r\n"
+msgid "LDAP Error: Failed to add distribution list %s: %s"
+msgstr "LDAP-Fehler: Konnte die Verteilerliste %s nicht hinzufÃ¼gen: %s"
 
-#: ../../../www/admin/user/vacation.php.in:91
+#: ../../www/admin/settings/index.php:110
 #, php-format
-msgid "email: <email address of vacation replacement>\r\n"
-msgstr "E-Mail: <E-Mail-Adresse der Urlaubsvertretung>\r\n"
+msgid "Successfully created distribution list %s"
+msgstr "Verteilerliste %s erfolgreich angelegt"
 
-#: ../../../www/admin/user/vacation.php.in:92
+#: ../../www/admin/settings/index.php:129
+#: ../../www/admin/settings/index.php:138
+#: ../../www/admin/settings/index.php:147
+#: ../../www/admin/settings/index.php:158
+#: ../../www/admin/settings/index.php:168
+#: ../../www/admin/settings/index.php:177
+#: ../../www/admin/settings/index.php:188
+#: ../../www/admin/settings/index.php:202
+#: ../../www/admin/settings/index.php:220
+#: ../../www/admin/settings/index.php:238
+#: ../../www/admin/settings/index.php:255
+#: ../../www/admin/settings/index.php:268
 #, php-format
-msgid "phone: +49 711 1111 11\r\n"
-msgstr "Telefon: +49 711 1111 11\r\n"
+msgid "LDAP Error: failed to modify kolab configuration object: %s"
+msgstr "LDAP-Fehler: Konnte das Kolab-Konfigurationsobjekt nicht verÃ¤ndern: %s"
 
-#: ../../../www/admin/user/vacation.php.in:93
+#: ../../www/admin/settings/index.php:226
 #, php-format
-msgid ""
-"fax.:  +49 711 1111 12\r\n"
-"\r\n"
-msgstr ""
-"Fax: +49 711 1111 12\r\n"
-"\r\n"
+msgid "LDAP Error: Failed to delete domain object %s: %s"
+msgstr "LDAP-Fehler: Konnte das DomÃ¤nen-Objekt %s nicht lÃ¶schen: %s"
 
-#: ../../../www/admin/user/vacation.php.in:94
-#, php-format
-msgid "Yours sincerely,\r\n"
-msgstr "Mit freundlichen GrÃ¼ÃŸen,\r\n"
+#: ../../www/admin/settings/index.php:276
+msgid "POP3 Service"
+msgstr "POP3-Dienst"
 
-#: ../../../www/admin/user/vacation.php.in:95
-#, php-format
-msgid "-- \r\n"
-msgstr "-- \r\n"
+#: ../../www/admin/settings/index.php:277
+msgid "POP3/SSL service (TCP port 995)"
+msgstr "POP3/SSL-Dienst (TCP-Port 995)"
 
-#: ../../../www/admin/user/vacation.php.in:96
-#, php-format
-msgid "<enter your name and email address here>"
-msgstr "<Geben Sie hier Ihren Namen und Ihre E-Mail-Adresse ein>"
+#: ../../www/admin/settings/index.php:278
+msgid "IMAP Service"
+msgstr "IMAP-Dienst"
 
-#: ../include/auth.class.php.in:40
-msgid "Server error, no ldap object!"
-msgstr "Server-Fehler, kein LDAP-Objekt!"
+#: ../../www/admin/settings/index.php:279
+msgid "IMAP/SSL Service (TCP port 993)"
+msgstr "IMAP/SSL-Dienst (TCP-Port 993)"
 
-#: ../include/auth.class.php.in:45
-msgid "Could not bind to LDAP server: "
-msgstr "Anmeldung am LDAP-Server fehlgeschlagen: "
+#: ../../www/admin/settings/index.php:280
+#, php-format
+msgid "Sieve service (TCP port %s)"
+msgstr "Sieve-Dienst (TCP-Port %s)"
 
-#: ../include/auth.class.php.in:56
-msgid "Could not bind to LDAP server"
-msgstr "Anmeldung am LDAP-Server fehlgeschlagen"
+#: ../../www/admin/settings/index.php:281
+msgid "FreeBusy Service via HTTP (in addition to HTTPS)"
+msgstr "Frei/Belegt-Dienst Ã¼ber HTTP (zusÃ¤tzlich zu HTTPS)"
 
-#: ../include/auth.class.php.in:83 ../include/auth.class.php.in:87
-msgid "Wrong username or password"
-msgstr "Falscher Benutzername oder falsches Passwort"
+#: ../../www/admin/settings/index.php:282
+msgid "Amavis Email Scanning (Virus/Spam)"
+msgstr "Amavis-Scannen von E-Mail-Nachrichten (Viren/Spam)"
 
-#: ../include/form.class.php:34
+#: ../../lib/KolabAdmin/include/form.class.php:34
 msgid "Email address "
 msgstr "E-Mail-Adresse"
 
-#: ../include/form.class.php:45
-msgid "Quota must be smaller than 4096"
-msgstr "Plattenplatz-Kontingent muss kleiner sein als 4096"
-
-#: ../include/form.class.php:46
+#: ../../lib/KolabAdmin/include/form.class.php:45
 msgid "Quota can not be negative"
 msgstr "Plattenplatz kann nicht negativ sein"
 
-#: ../include/form.class.php:47
+#: ../../lib/KolabAdmin/include/form.class.php:46
 msgid "Quota must be a number"
 msgstr "Plattenplatz-Kontingent muss eine Zahl sein"
 
-#: ../include/form.class.php:48
+#: ../../lib/KolabAdmin/include/form.class.php:47
 msgid "Quota must be an integer"
 msgstr "Plattenplatz-Kontingent muss eine ganze Zahl sein"
 
-#: ../include/form.class.php:55
+#: ../../lib/KolabAdmin/include/form.class.php:54
 msgid ""
 "Phone entries may only contain a-z, numbers, spaces and the characters ()-+/."
 "=?:"
@@ -2152,210 +2454,349 @@ msgstr ""
 "Telefonnummern dÃ¼rfen nur a-z, Ziffern, Leerzeichen und die Zeichen ()-+/."
 "=?: enthalten."
 
-#: ../include/form.class.php:118
+#: ../../lib/KolabAdmin/include/form.class.php:117
 msgid "<tr><th>Attribute</th><th>Value</th><th>Comment</th></tr>"
 msgstr "<tr><th>Attribut</th><th>Wert</th><th>Kommentar</th></tr>"
 
-#: ../include/form.class.php:205
-msgid "Yes"
-msgstr "Ja"
-
-#: ../include/form.class.php:205
-msgid "No"
-msgstr "Nein"
-
-#: ../include/form.class.php:323
+#: ../../lib/KolabAdmin/include/form.class.php:322
 msgid "Always accept"
 msgstr "Immer annehmen"
 
-#: ../include/form.class.php:324
+#: ../../lib/KolabAdmin/include/form.class.php:323
 msgid "Always reject"
 msgstr "Immer ablehnen"
 
-#: ../include/form.class.php:325
+#: ../../lib/KolabAdmin/include/form.class.php:324
 msgid "Reject if conflicts"
 msgstr "Ablehnen im Konfliktfall"
 
-#: ../include/form.class.php:326
+#: ../../lib/KolabAdmin/include/form.class.php:325
 msgid "Manual if conflicts"
 msgstr "Im Konfliktfall manuell bearbeiten"
 
-#: ../include/form.class.php:327
+#: ../../lib/KolabAdmin/include/form.class.php:326
 msgid "Manual"
 msgstr "Manuell"
 
-#: ../include/form.class.php:333 ../include/form.class.php:339
+#: ../../lib/KolabAdmin/include/form.class.php:332
+#: ../../lib/KolabAdmin/include/form.class.php:338
 msgid "Anyone"
 msgstr "Alle"
 
-#: ../include/form.class.php:375
+#: ../../lib/KolabAdmin/include/form.class.php:374
 msgid "* Required field."
 msgstr "* Pflichtfeld"
 
-#: ../include/form.class.php:396 ../include/form.class.php:399
+#: ../../lib/KolabAdmin/include/form.class.php:395
+#: ../../lib/KolabAdmin/include/form.class.php:398
 msgid "Required field "
 msgstr "Pflichtfeld "
 
-#: ../include/form.class.php:396 ../include/form.class.php:399
+#: ../../lib/KolabAdmin/include/form.class.php:395
+#: ../../lib/KolabAdmin/include/form.class.php:398
 msgid " is empty"
 msgstr " ist leer"
 
-#: ../include/ldap.class.php.in:54
-msgid ""
-"Error setting LDAP protocol to v3. Please contact your system administrator"
-msgstr ""
-"Fehler beim Einstellen des LDAP-Protokolls auf v3. Bitte wenden Sie sich an "
-"Ihren Systemverwalter"
-
-#: ../include/ldap.class.php.in:184 ../include/ldap.class.php.in:214
-#: ../include/ldap.class.php.in:244
-#, php-format
-msgid "No such object %s"
-msgstr "Kein Objekt %s vorhanden"
-
-#: ../include/ldap.class.php.in:187 ../include/ldap.class.php.in:217
-#: ../include/ldap.class.php.in:247
-#, php-format
-msgid "LDAP Error searching for DN %s: %s"
-msgstr "LDAP-Fehler beim Suchen nach DN %s: %s"
-
-#: ../include/ldap.class.php.in:200
-#, php-format
-msgid "Error searching for DN for UID=%s"
-msgstr "Fehler beim Suchen nach dem DN fÃ¼r UID=%s"
-
-#: ../include/ldap.class.php.in:230
-#, php-format
-msgid "Error searching for DN for Mail=%s"
-msgstr "Fehler beim Suchen nach dem DN fÃ¼r Mail=%s"
-
-#: ../include/ldap.class.php.in:260
-#, php-format
-msgid "Error searching for DN for alias=%s: %s"
-msgstr "Fehler beim Suchen nach dem DN fÃ¼r Aliasname=%s: %s"
-
-#: ../include/ldap.class.php.in:273
-#, php-format
-msgid "Error searching for DN for mail or alias %s: %s"
-msgstr "Fehler beim Suchen nach dem DN fÃ¼r Mail oder Alias %s: %s"
-
-#: ../include/ldap.class.php.in:336
-msgid "LDAP Error: Can't read maintainers group: "
-msgstr "LDAP-Fehler: Kann die Verwalter-Gruppe nicht lesen"
-
-#: ../include/menu.php:26
+#: ../../lib/KolabAdmin/include/menu.php:26
 msgid "Users"
 msgstr "Benutzer"
 
-#: ../include/menu.php:28
+#: ../../lib/KolabAdmin/include/menu.php:28
 msgid "Manage Email Users"
 msgstr "E-Mail-Benutzer verwalten"
 
-#: ../include/menu.php:33 ../include/menu.php:35
+#: ../../lib/KolabAdmin/include/menu.php:33
+#: ../../lib/KolabAdmin/include/menu.php:35
 msgid "My User Settings"
 msgstr "Meine Benutzereinstellungen"
 
-#: ../include/menu.php:37
+#: ../../lib/KolabAdmin/include/menu.php:37
 msgid "Mail Delivery"
 msgstr "E-Mail-Zustellung"
 
-#: ../include/menu.php:39
+#: ../../lib/KolabAdmin/include/menu.php:39
 msgid "Forward Email"
 msgstr "E-Mail weiterleiten"
 
-#: ../include/menu.php:41
+#: ../../lib/KolabAdmin/include/menu.php:41
 msgid "Vacation"
 msgstr "Abwesenheit"
 
-#: ../include/menu.php:47
+#: ../../lib/KolabAdmin/include/menu.php:54
 msgid "Manage Address Book"
 msgstr "Adressbuch verwalten"
 
-#: ../include/menu.php:49
+#: ../../lib/KolabAdmin/include/menu.php:56
 msgid "Create New vCard"
 msgstr "Neue Visitenkarte (vCard) erzeugen"
 
-#: ../include/menu.php:54
+#: ../../lib/KolabAdmin/include/menu.php:61
 msgid "Shared Folder"
 msgstr "Gemeinsam genutzter Ordner"
 
-#: ../include/menu.php:56
+#: ../../lib/KolabAdmin/include/menu.php:63
 msgid "Manage Shared Folders"
 msgstr "Gemeinsam genutzte Ordner verwalten"
 
-#: ../include/menu.php:64
+#: ../../lib/KolabAdmin/include/menu.php:71
 msgid "Manage Distribution Lists"
 msgstr "Verteilerlisten verwalten"
 
-#: ../include/menu.php:66
+#: ../../lib/KolabAdmin/include/menu.php:73
 msgid "Create New List"
 msgstr "Neue Liste anlegen"
 
-#: ../include/menu.php:72
+#: ../../lib/KolabAdmin/include/menu.php:79
 msgid "Manage Administrators"
 msgstr "Administratoren verwalten"
 
-#: ../include/menu.php:78 ../include/menu.php:95
+#: ../../lib/KolabAdmin/include/menu.php:85
+#: ../../lib/KolabAdmin/include/menu.php:102
 msgid "Manage Domain Maintainers"
 msgstr "DomÃ¤nenverwalter verwalten"
 
-#: ../include/menu.php:84
+#: ../../lib/KolabAdmin/include/menu.php:91
 msgid "Manage Maintainers"
 msgstr "Verwalter verwalten"
 
-#: ../include/menu.php:92
+#: ../../lib/KolabAdmin/include/menu.php:99
 msgid "Manage Maintainer"
 msgstr "Verwalter verwalten"
 
-#: ../include/menu.php:103
+#: ../../lib/KolabAdmin/include/menu.php:110
 msgid "Manage Domain Maintainer"
 msgstr "DomÃ¤nenverwalter verwalten"
 
-#: ../include/menu.php:106
-msgid "Settings"
-msgstr "Einstellungen"
-
-#: ../include/menu.php:108
+#: ../../lib/KolabAdmin/include/menu.php:115
 msgid "System Settings"
 msgstr "Systemeinstellungen"
 
-#: ../include/menu.php:111 ../include/menu.php:113
+#: ../../lib/KolabAdmin/include/menu.php:118
+#: ../../lib/KolabAdmin/include/menu.php:120
 msgid "About Kolab"
 msgstr "Ãœber Kolab"
 
-#: ../include/menu.php:115
-msgid "Erfrakon"
-msgstr "Erfrakon"
+#: ../../lib/KolabAdmin/include/menu.php:122
+msgid "Kolab Systems"
+msgstr ""
 
-#: ../include/menu.php:117
-msgid "Intevation"
-msgstr "Intevation"
+#: ../../lib/KolabAdmin/include/menu.php:124
+msgid "Technology"
+msgstr ""
 
-#: ../include/menu.php:119
-msgid "Klarälvdalens Datakonsult"
-msgstr "Klarälvdalens Datakonsult AB"
+#: ../../lib/KolabAdmin/include/menu.php:128
+msgid "Versions"
+msgstr "Versionen"
 
-#: ../include/menu.php:121
-msgid "Code Fusion"
-msgstr "Code Fusion"
+#: ../../lib/KolabAdmin/include/auth.class.php:40
+msgid "Server error, no ldap object!"
+msgstr "Server-Fehler, kein LDAP-Objekt!"
 
-#: ../include/menu.php:123
-msgid "KDE"
-msgstr "KDE"
+#: ../../lib/KolabAdmin/include/auth.class.php:45
+msgid "Could not bind to LDAP server: "
+msgstr "Anmeldung am LDAP-Server fehlgeschlagen: "
 
-#: ../include/menu.php:127
-msgid "Versions"
-msgstr "Versionen"
+#: ../../lib/KolabAdmin/include/auth.class.php:56
+msgid "Could not bind to LDAP server"
+msgstr "Anmeldung am LDAP-Server fehlgeschlagen"
+
+#: ../../lib/KolabAdmin/include/auth.class.php:83
+#: ../../lib/KolabAdmin/include/auth.class.php:87
+msgid "Wrong username or password"
+msgstr "Falscher Benutzername oder falsches Passwort"
+
+#: ../../lib/KolabAdmin/include/auth.class.php:124
+msgid "Kolab Groupware login"
+msgstr "Kolab Groupware login"
 
-#: ../include/passwd.php:33
+#: ../../lib/KolabAdmin/include/passwd.php:33
 msgid "Password is empty"
 msgstr "Passwort ist leer"
 
-#: ../include/passwd.php:36 ../include/passwd.php:41
+#: ../../lib/KolabAdmin/include/passwd.php:36
+#: ../../lib/KolabAdmin/include/passwd.php:41
 msgid "Passwords dont match"
 msgstr "PasswÃ¶rter stimmen nicht Ã¼berein"
 
 #~ msgid ""
+#~ "Activate delivery to folder (only one of vacation, forward and delivery "
+#~ "to folder can be active at any time)"
+#~ msgstr ""
+#~ "Zustellung an den Ordner aktivieren (es kann zu jedem Zeitpunkt nur "
+#~ "entweder ein Abwesenheitsbenachrichtigungs-, Weiterleitungs- oder "
+#~ "Zustellungsordner aktiviert sein)"
+
+#~ msgid ""
+#~ "Activate email forwarding (only one of vacation, forward and delivery to "
+#~ "folder can be active at any time)"
+#~ msgstr ""
+#~ "Weiterleitung von E-Mail aktivieren (es kann zu jedem Zeitpunkt nur "
+#~ "entweder ein Abwesenheitsbenachrichtigungs-, Weiterleitungs- oder "
+#~ "Zustellungsordner aktiviert sein)"
+
+#~ msgid ""
+#~ "This is the Kolab2 Server. It is Free Software developed by the <a href="
+#~ "\"http://www.kolab.org/\">Kolab Project</a>, with the intention of "
+#~ "bringing groupware functionality to Unix/KDE users as well as Windows "
+#~ "desktops."
+#~ msgstr ""
+#~ "Dies ist der Kolab2-Server. Kolab 2 ist Freie Software, entwickelt vom <a "
+#~ "href=\"http://www.kolab.org/\">Kolab-Projekt</a>, um UNIX/KDE-Benutzern "
+#~ "wie auch Windows-ArbeitsplÃ¤tzen Groupware-FunktionalitÃ¤t zu liefern."
+
+#~ msgid "Kolab builds upon many other Free Software projects, namely:"
+#~ msgstr "Kolab bedient sich vieler andere Freie Software-Projekte, nÃ¤mlich:"
+
+#~ msgid ""
+#~ "The following projects are used in binding the above together, in order "
+#~ "to create the Kolab Server:"
+#~ msgstr ""
+#~ "Die folgenden Projekte dienen dazu, die obigen zusammenzubinden, um so "
+#~ "den Kolab-Server zu bilden:"
+
+#~ msgid "The following projects are used as a base for the Kolab Clients:"
+#~ msgstr "Die folgenden Projekte bilden die Basis fÃ¼r die Kolab-Klienten:"
+
+#~ msgid "User:"
+#~ msgstr "Benutzer:"
+
+#~ msgid "Role:"
+#~ msgstr "Rolle:"
+
+#~ msgid "Logout"
+#~ msgstr "Abmelden"
+
+#~ msgid "Not logged in"
+#~ msgstr "Nicht angemeldet"
+
+#~ msgid ""
+#~ "Activate vacation notification (only one of vacation, forward and "
+#~ "delivery to folder can be active at any time)"
+#~ msgstr ""
+#~ "Benachrichtigungen bei Abwesenheit aktivieren (es kann zu jedem Zeitpunkt "
+#~ "nur entweder ein Abwesenheitsbenachrichtigungs-, Weiterleitungs- oder "
+#~ "Zustellungsordner aktiviert sein)"
+
+#~ msgid ""
+#~ "Addressbook entry DN could not be modified, distribution list <a "
+#~ "href='@kolab_wui@/distributionlist/list.php?action=modify&dn=%s'>'%s'</a> "
+#~ "depends on it. To modify this entry, first remove it from the "
+#~ "distribution list."
+#~ msgstr ""
+#~ "Der DN der Adresse konnte nicht geÃ¤ndert werden; Verteilerliste <a "
+#~ "href='@kolab_wui@/distributionlist/list.php?action=modify&dn=%s'>'%s'</a> "
+#~ "hÃ¤ngt davon ab. Um dieses Konto zu verÃ¤ndern, mÃ¼ssen Sie es erst aus der "
+#~ "Verteilerliste entfernen."
+
+#~ msgid ""
+#~ "Net/Sieve.php is missing. Without that, filter settings are not available"
+#~ msgstr ""
+#~ "Net/Sieve.php fehlt. Ohne dieses Modul stehen keine Filtereinstellungen "
+#~ "zur VerfÃ¼gung"
+
+#~ msgid ""
+#~ "Suggest your system administrator to run \"pear install http://pear.php."
+#~ "net/get/Net_Sieve\" on the server"
+#~ msgstr ""
+#~ "Empfehlen Sie Ihrem Systemadministrator, \"pear install http://pear.php."
+#~ "net/get/Net_Sieve\" auf dem Server auszufÃ¼hren."
+
+#~ msgid "Script was:"
+#~ msgstr "Skript war:"
+
+#~ msgid ""
+#~ "Net/Sieve.php is missing. Without that, vacation settings are not "
+#~ "available"
+#~ msgstr ""
+#~ "Net/Sieve.php fehlt. Ohne dieses Modul stehen keine "
+#~ "Abwesenheitseinstellungen zur VerfÃ¼gung"
+
+#~ msgid "Days must be at least one"
+#~ msgstr "Der Tage-Wert muss mindestens 1 sein"
+
+#~ msgid "%x"
+#~ msgstr "%x"
+
+#~ msgid "I am out of office until %s.\r\n"
+#~ msgstr "Ich bin bis %s abwesend.\r\n"
+
+#~ msgid ""
+#~ "In urgent cases, please contact Mrs. <vacation replacement>\r\n"
+#~ "\r\n"
+#~ msgstr ""
+#~ "In dringenden FÃ¤llen nehmen Sie bitte mit Frau <Urlaubsvertretung> "
+#~ "Kontakt auf\r\n"
+#~ "\r\n"
+
+#~ msgid "email: <email address of vacation replacement>\r\n"
+#~ msgstr "E-Mail: <E-Mail-Adresse der Urlaubsvertretung>\r\n"
+
+#~ msgid "phone: +49 711 1111 11\r\n"
+#~ msgstr "Telefon: +49 711 1111 11\r\n"
+
+#~ msgid ""
+#~ "fax.:  +49 711 1111 12\r\n"
+#~ "\r\n"
+#~ msgstr ""
+#~ "Fax: +49 711 1111 12\r\n"
+#~ "\r\n"
+
+#~ msgid "Yours sincerely,\r\n"
+#~ msgstr "Mit freundlichen GrÃ¼ÃŸen,\r\n"
+
+#~ msgid "-- \r\n"
+#~ msgstr "-- \r\n"
+
+#~ msgid "<enter your name and email address here>"
+#~ msgstr "<Geben Sie hier Ihren Namen und Ihre E-Mail-Adresse ein>"
+
+#~ msgid "Quota must be smaller than 4096"
+#~ msgstr "Plattenplatz-Kontingent muss kleiner sein als 4096"
+
+#~ msgid ""
+#~ "Error setting LDAP protocol to v3. Please contact your system "
+#~ "administrator"
+#~ msgstr ""
+#~ "Fehler beim Einstellen des LDAP-Protokolls auf v3. Bitte wenden Sie sich "
+#~ "an Ihren Systemverwalter"
+
+#~ msgid "No such object %s"
+#~ msgstr "Kein Objekt %s vorhanden"
+
+#~ msgid "LDAP Error searching for DN %s: %s"
+#~ msgstr "LDAP-Fehler beim Suchen nach DN %s: %s"
+
+#~ msgid "Error searching for DN for UID=%s"
+#~ msgstr "Fehler beim Suchen nach dem DN fÃ¼r UID=%s"
+
+#~ msgid "Error searching for DN for Mail=%s"
+#~ msgstr "Fehler beim Suchen nach dem DN fÃ¼r Mail=%s"
+
+#~ msgid "Error searching for DN for alias=%s: %s"
+#~ msgstr "Fehler beim Suchen nach dem DN fÃ¼r Aliasname=%s: %s"
+
+#~ msgid "Error searching for DN for mail or alias %s: %s"
+#~ msgstr "Fehler beim Suchen nach dem DN fÃ¼r Mail oder Alias %s: %s"
+
+#~ msgid "LDAP Error: Can't read maintainers group: "
+#~ msgstr "LDAP-Fehler: Kann die Verwalter-Gruppe nicht lesen"
+
+#~ msgid "Erfrakon"
+#~ msgstr "Erfrakon"
+
+#~ msgid "Intevation"
+#~ msgstr "Intevation"
+
+#~ msgid "Klarälvdalens Datakonsult"
+#~ msgstr "Klarälvdalens Datakonsult AB"
+
+#~ msgid "Code Fusion"
+#~ msgstr "Code Fusion"
+
+#~ msgid "KDE"
+#~ msgstr "KDE"
+
+#~ msgid ""
 #~ "Using legacy services poses a security thread due to leakage of cleartext "
 #~ "passwords, lack of authenticity and privacy."
 #~ msgstr ""
diff --git a/data/locale/es/LC_MESSAGES/messages.po b/data/locale/es/LC_MESSAGES/messages.po
index 7f5aa3f..844d1b1 100644
--- a/data/locale/es/LC_MESSAGES/messages.po
+++ b/data/locale/es/LC_MESSAGES/messages.po
@@ -6,405 +6,450 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab-Webadmin Spanish\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-25 18:29+0200\n"
+"POT-Creation-Date: 2011-07-15 12:08+0200\n"
 "PO-Revision-Date: 2007-11-21 14:56+0100\n"
 "Last-Translator: Aron Galdon <aron20012004 at ya.com>\n"
 "Language-Team: Kolab development coordination <kolab-devel at kolab.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tpl_messages.php:2
-msgid "The address with DN"
-msgstr "La direcciÃ³n con DN"
-
-#: tpl_messages.php:3 tpl_messages.php:21 tpl_messages.php:77
-#: tpl_messages.php:130 tpl_messages.php:192 tpl_messages.php:210
-msgid "has been deleted"
-msgstr "ha sido borrado"
+#: tpl_messages.php:2 tpl_messages.php:62
+msgid "Errors:"
+msgstr "Errores:"
 
-#: tpl_messages.php:4
-msgid "Back to list of addresses"
-msgstr "Volver a la lista de direcciones"
+#: tpl_messages.php:3 tpl_messages.php:63
+msgid "Message:"
+msgstr "Mensaje:"
 
-#: tpl_messages.php:5 tpl_messages.php:10
-msgid "(only external addresses without a kolab user account)"
-msgstr "(sÃ³lo direcciones externas con una cuenta de usuario kolab)"
+#: tpl_messages.php:4 ../../lib/KolabAdmin/include/menu.php:77
+msgid "Administrators"
+msgstr "Administradores"
 
-#: tpl_messages.php:6 tpl_messages.php:15 tpl_messages.php:24
-#: tpl_messages.php:80 tpl_messages.php:133 tpl_messages.php:195
-#: tpl_messages.php:218 ../../../www/admin/addressbook/index.php.in:121
-#: ../../../www/admin/user/index.php.in:183
+#: tpl_messages.php:5 tpl_messages.php:69 tpl_messages.php:87
+#: tpl_messages.php:111 tpl_messages.php:210 tpl_messages.php:215
+#: tpl_messages.php:278 ../../www/admin/user/index.php:181
+#: ../../www/admin/addressbook/index.php:121
 msgid "Name"
 msgstr "Nombre"
 
-#: tpl_messages.php:7 tpl_messages.php:16 tpl_messages.php:26
-#: tpl_messages.php:70 tpl_messages.php:82 tpl_messages.php:135
-#: tpl_messages.php:175 tpl_messages.php:188 tpl_messages.php:198
-#: tpl_messages.php:221
+#: tpl_messages.php:6 tpl_messages.php:216 tpl_messages.php:279
+#: ../../www/admin/user/index.php:183
+msgid "UID"
+msgstr "ID Usuario"
+
+#: tpl_messages.php:7 tpl_messages.php:70 tpl_messages.php:90
+#: tpl_messages.php:114 tpl_messages.php:190 tpl_messages.php:211
+#: tpl_messages.php:217 tpl_messages.php:251 tpl_messages.php:264
+#: tpl_messages.php:280
 msgid "Action"
 msgstr "AcciÃ³n"
 
-#: tpl_messages.php:8 tpl_messages.php:18 tpl_messages.php:28
-#: tpl_messages.php:74 tpl_messages.php:84 tpl_messages.php:137
-#: tpl_messages.php:200 tpl_messages.php:223
+#: tpl_messages.php:8 tpl_messages.php:218 tpl_messages.php:281
+msgid "Object Deleted, awaiting cleanup..."
+msgstr "Objeto borrado, esperando limpieza..."
+
+#: tpl_messages.php:9 tpl_messages.php:72 tpl_messages.php:92
+#: tpl_messages.php:116 tpl_messages.php:194 tpl_messages.php:212
+#: tpl_messages.php:219 tpl_messages.php:282
 msgid "Modify"
 msgstr "Modificar"
 
-#: tpl_messages.php:9 tpl_messages.php:19 tpl_messages.php:29
-#: tpl_messages.php:75 tpl_messages.php:85 tpl_messages.php:138
-#: tpl_messages.php:176 tpl_messages.php:189 tpl_messages.php:201
-#: tpl_messages.php:224 ../../../www/admin/addressbook/addr.php.in:277
-#: ../../../www/admin/administrator/admin.php.in:307
-#: ../../../www/admin/distributionlist/list.php.in:300
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:310
-#: ../../../www/admin/sharedfolder/sf.php.in:310
-#: ../../../www/admin/user/user.php.in:764
-#: ../../../www/admin/user/user.php.in:822
+#: tpl_messages.php:10 tpl_messages.php:73 tpl_messages.php:93
+#: tpl_messages.php:117 tpl_messages.php:195 tpl_messages.php:213
+#: tpl_messages.php:220 tpl_messages.php:252 tpl_messages.php:265
+#: tpl_messages.php:283 ../../www/admin/user/user.php:862
+#: ../../www/admin/user/user.php:920
+#: ../../www/admin/administrator/admin.php:311
+#: ../../www/admin/addressbook/addr.php:277
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:314
+#: ../../www/admin/sharedfolder/sf.php:314
+#: ../../www/admin/distributionlist/list.php:304
 msgid "Delete"
 msgstr "Borrar"
 
-#: tpl_messages.php:11 tpl_messages.php:213 tpl_messages.php:226
-msgid "[ ALL ]"
-msgstr "[ TODOS ]"
+#: tpl_messages.php:11
+msgid "Email Forwarding"
+msgstr "EnvÃo de correo electrÃ³nico"
 
-#: tpl_messages.php:12 tpl_messages.php:214 tpl_messages.php:227
-msgid "[ OTHER ]"
-msgstr "[ OTROS ]"
+#: tpl_messages.php:12
+#, fuzzy
+msgid "Activate email forwarding"
+msgstr "EnvÃo de correo electrÃ³nico"
 
-#: tpl_messages.php:13 tpl_messages.php:215 tpl_messages.php:228
-msgid "Filter:"
-msgstr "Filtro:"
+#: tpl_messages.php:13
+msgid "Forward mail to"
+msgstr "Enviar correo a"
 
-#: tpl_messages.php:14 tpl_messages.php:216 tpl_messages.php:229
-msgid "Filter"
-msgstr "Filtro"
+#: tpl_messages.php:14
+msgid "Keep copy on server"
+msgstr "Mantener copia en el servidor"
 
-#: tpl_messages.php:17
-msgid "Entry deleted, awaiting cleanup..."
-msgstr "Entrada borrada, esperando limpieza..."
+#: tpl_messages.php:15 tpl_messages.php:77 tpl_messages.php:229
+#: tpl_messages.php:233 tpl_messages.php:236 tpl_messages.php:239
+#: tpl_messages.php:242 tpl_messages.php:245 tpl_messages.php:248
+#: tpl_messages.php:261 tpl_messages.php:333
+msgid "Update"
+msgstr "Actualizar"
 
-#: tpl_messages.php:20
-msgid "The administrator with DN"
-msgstr "El administrador con DN"
+#: tpl_messages.php:16
+msgid "ActiveSync Configuration"
+msgstr ""
 
-#: tpl_messages.php:22
-msgid "Back to list of administrators"
-msgstr "Volver a la lista de administradores"
+#: tpl_messages.php:17
+#, fuzzy
+msgid "Device Alias"
+msgstr "Alias de correo electrÃ³nico"
 
-#: tpl_messages.php:23 ../include/menu.php:70
-msgid "Administrators"
-msgstr "Administradores"
+#: tpl_messages.php:18
+msgid "Device Mode"
+msgstr ""
 
-#: tpl_messages.php:25 tpl_messages.php:81 tpl_messages.php:134
-#: ../../../www/admin/user/index.php.in:185
-msgid "UID"
-msgstr "ID Usuario"
+#: tpl_messages.php:19
+#, fuzzy
+msgid "Picture Settings"
+msgstr "Administrar servicios"
 
-#: tpl_messages.php:27 tpl_messages.php:83 tpl_messages.php:136
-msgid "Object Deleted, awaiting cleanup..."
-msgstr "Objeto borrado, esperando limpieza..."
+#: tpl_messages.php:20
+msgid "Enable PNG and GIF formats while syncing"
+msgstr ""
 
-#: tpl_messages.php:30
-msgid ""
-"<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> is a specialist "
-"email solution provider based in Johannesburg, South Africa specialising in "
-"the deployment and support of Kolab."
+#: tpl_messages.php:21
+msgid "Save"
 msgstr ""
-"<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> es un proveedor "
-"de soluciones de correo electrÃ³nico con base en Johannesburgo, SudÃ¡frica "
-"especializado en el uso y soporte de Kolab."
 
-#: tpl_messages.php:31
-msgid ""
-"Code Fusion has played, and continues to play, an integral part in "
-"developing and extending the Kolab server; specifically with regards to "
-"enhancing the base Kolab engine, adding in support for Microsoft Active "
-"Directory ® as an LDAP backend, as well as extending the <a href="
-"\"http://www.horde.org/\">Horde project</a> to provide a web-based groupware "
-"client for the Kolab server."
+#: tpl_messages.php:22
+msgid "Clear"
 msgstr ""
-"Code Fusion ha sido, y sigue siendo, parte intergral en el desarrollo y "
-"extensiÃ³n del servidor Kolab; concretamente en la mejora de la base del "
-"motor Kolab, aÃ±adiendo soporte para Microsoft Active Directory ® como "
-"una integraciÃ³n LDAP, ademÃ¡s de extender el <a href=\"http://www.horde.org/"
-"\">proyecto Horde</a> para proporcionar un cliente groupware basado en web "
-"para el servidor Kolab."
 
-#: tpl_messages.php:32
-msgid ""
-"The following people from Code Fusion are involved in the Kolab project (in "
-"alphabetical order):"
+#: tpl_messages.php:23
+msgid "Forget Device"
 msgstr ""
-"Las siguientes personas de Code Fusion estÃ¡n involucradas en el proyecto "
-"Kolab (en orden alfabÃ©tico):"
 
-#: tpl_messages.php:33
+#: tpl_messages.php:24
+msgid "Are you sure?"
+msgstr ""
+
+#: tpl_messages.php:25
+msgid "The maintainer with DN"
+msgstr "El mantenedor con DN"
+
+#: tpl_messages.php:26 tpl_messages.php:29 tpl_messages.php:204
+#: tpl_messages.php:207 tpl_messages.php:286 tpl_messages.php:309
+msgid "has been deleted"
+msgstr "ha sido borrado"
+
+#: tpl_messages.php:27
+msgid "Back to list of maintainers"
+msgstr "Volver a la lista de mantenedores"
+
+#: tpl_messages.php:28
+msgid "The distribution list with DN"
+msgstr "La lista de distribuciÃ³n con DN"
+
+#: tpl_messages.php:30
+msgid "Back to list of distribution lists"
+msgstr "Volver a la lista de listas de distribuciÃ³n"
+
+#: tpl_messages.php:31
 msgid "Attribute"
 msgstr "Atributo"
 
-#: tpl_messages.php:34
+#: tpl_messages.php:32
 msgid "Value"
 msgstr "Valor"
 
-#: tpl_messages.php:35
+#: tpl_messages.php:33
 msgid "Comment"
 msgstr "Comentario"
 
-#: tpl_messages.php:36 ../../../www/admin/addressbook/addr.php.in:88
-#: ../../../www/admin/administrator/admin.php.in:139
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:114
-#: ../../../www/admin/maintainer/maintainer.php.in:136
-#: ../../../www/admin/user/user.php.in:384
+#: tpl_messages.php:34 ../../www/admin/user/user.php:449
+#: ../../www/admin/administrator/admin.php:139
+#: ../../www/admin/addressbook/addr.php:88
+#: ../../www/admin/maintainer/maintainer.php:136
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:114
 msgid "First Name"
 msgstr "Nombre"
 
-#: tpl_messages.php:37 tpl_messages.php:39 tpl_messages.php:41
-#: tpl_messages.php:43 ../../../www/admin/addressbook/addr.php.in:90
-#: ../../../www/admin/addressbook/addr.php.in:93
-#: ../../../www/admin/administrator/admin.php.in:133
-#: ../../../www/admin/administrator/admin.php.in:141
-#: ../../../www/admin/administrator/admin.php.in:144
-#: ../../../www/admin/distributionlist/list.php.in:117
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:108
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:116
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:119
-#: ../../../www/admin/maintainer/maintainer.php.in:130
-#: ../../../www/admin/maintainer/maintainer.php.in:138
-#: ../../../www/admin/maintainer/maintainer.php.in:141
-#: ../../../www/admin/sharedfolder/sf.php.in:123
-#: ../../../www/admin/user/user.php.in:376
-#: ../../../www/admin/user/user.php.in:386
-#: ../../../www/admin/user/user.php.in:389
+#: tpl_messages.php:35 tpl_messages.php:38 tpl_messages.php:40
+#: tpl_messages.php:42 ../../www/admin/user/user.php:441
+#: ../../www/admin/user/user.php:451 ../../www/admin/user/user.php:455
+#: ../../www/admin/administrator/admin.php:133
+#: ../../www/admin/administrator/admin.php:141
+#: ../../www/admin/administrator/admin.php:144
+#: ../../www/admin/addressbook/addr.php:90
+#: ../../www/admin/addressbook/addr.php:93
+#: ../../www/admin/maintainer/maintainer.php:130
+#: ../../www/admin/maintainer/maintainer.php:138
+#: ../../www/admin/maintainer/maintainer.php:141
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:108
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:116
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:119
+#: ../../www/admin/sharedfolder/sf.php:125
+#: ../../www/admin/distributionlist/list.php:120
 msgid "Required"
 msgstr "Requerido"
 
-#: tpl_messages.php:38 ../../../www/admin/addressbook/addr.php.in:91
-#: ../../../www/admin/administrator/admin.php.in:142
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:117
-#: ../../../www/admin/maintainer/maintainer.php.in:139
-#: ../../../www/admin/user/user.php.in:387
+#: tpl_messages.php:36 ../../www/admin/user/user.php:452
+#, fuzzy
+msgid "Middle Name"
+msgstr "Nombre de carpeta"
+
+#: tpl_messages.php:37 ../../www/admin/user/user.php:453
+#: ../../www/admin/administrator/admin.php:142
+#: ../../www/admin/addressbook/addr.php:91
+#: ../../www/admin/maintainer/maintainer.php:139
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:117
 msgid "Last Name"
 msgstr "Apellidos"
 
-#: tpl_messages.php:40 ../../../www/admin/administrator/admin.php.in:145
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:120
-#: ../../../www/admin/maintainer/maintainer.php.in:142
-#: ../../../www/admin/user/user.php.in:390
+#: tpl_messages.php:39 ../../www/admin/user/user.php:456
+#: ../../www/admin/administrator/admin.php:145
+#: ../../www/admin/maintainer/maintainer.php:142
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:120
 msgid "Password"
 msgstr "ContraseÃ±a"
 
-#: tpl_messages.php:42 ../../../www/admin/administrator/admin.php.in:149
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:124
-#: ../../../www/admin/maintainer/maintainer.php.in:146
-#: ../../../www/admin/user/user.php.in:394
+#: tpl_messages.php:41 ../../www/admin/user/user.php:460
+#: ../../www/admin/administrator/admin.php:149
+#: ../../www/admin/maintainer/maintainer.php:146
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:124
 msgid "Verify Password"
 msgstr "Verificar ContraseÃ±a"
 
-#: tpl_messages.php:44 ../../../www/admin/user/user.php.in:398
+#: tpl_messages.php:43 ../../www/admin/user/user.php:464
 msgid "Primary Email Address"
 msgstr "DirecciÃ³n primario de correo electrÃ³nico"
 
-#: tpl_messages.php:45 ../../../www/admin/administrator/admin.php.in:132
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:107
-#: ../../../www/admin/maintainer/maintainer.php.in:129
-#: ../../../www/admin/sharedfolder/sf.php.in:126
-#: ../../../www/admin/user/user.php.in:375
-#: ../../../www/admin/user/user.php.in:377
+#: tpl_messages.php:44 ../../www/admin/user/user.php:440
+#: ../../www/admin/user/user.php:442
+#: ../../www/admin/administrator/admin.php:132
+#: ../../www/admin/maintainer/maintainer.php:129
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:107
+#: ../../www/admin/sharedfolder/sf.php:128
 msgid "Required, non volatile"
 msgstr "Requerido, no volÃ¡til"
 
-#: tpl_messages.php:46 ../../../www/admin/addressbook/addr.php.in:94
-#: ../../../www/admin/user/user.php.in:433
+#: tpl_messages.php:45 ../../www/admin/user/user.php:505
+#: ../../www/admin/addressbook/addr.php:94
 msgid "Title"
 msgstr "TÃtulo"
 
-#: tpl_messages.php:47
+#: tpl_messages.php:46
 msgid "Email Alias"
 msgstr "Alias de correo electrÃ³nico"
 
-#: tpl_messages.php:48 ../../../www/admin/addressbook/addr.php.in:101
-#: ../../../www/admin/user/user.php.in:434
+#: tpl_messages.php:47 ../../www/admin/user/user.php:506
+#: ../../www/admin/addressbook/addr.php:101
 msgid "Organisation"
 msgstr "OrganizaciÃ³n"
 
-#: tpl_messages.php:49 ../../../www/admin/addressbook/addr.php.in:102
-#: ../../../www/admin/user/user.php.in:435
+#: tpl_messages.php:48 ../../www/admin/user/user.php:507
+#: ../../www/admin/addressbook/addr.php:102
 msgid "Organisational Unit"
 msgstr "Unidad organizacional"
 
-#: tpl_messages.php:50 ../../../www/admin/addressbook/addr.php.in:103
-#: ../../../www/admin/user/user.php.in:436
+#: tpl_messages.php:49 ../../www/admin/user/user.php:508
+#: ../../www/admin/addressbook/addr.php:103
 msgid "Room Number"
 msgstr "NÃºmero de habitaciÃ³n"
 
-#: tpl_messages.php:51 ../../../www/admin/addressbook/addr.php.in:104
-#: ../../../www/admin/user/user.php.in:437
+#: tpl_messages.php:50 ../../www/admin/user/user.php:509
+#: ../../www/admin/addressbook/addr.php:104
 msgid "Street Address"
 msgstr "Calle"
 
-#: tpl_messages.php:52 ../../../www/admin/user/user.php.in:438
+#: tpl_messages.php:51 ../../www/admin/user/user.php:510
 msgid "Postbox"
 msgstr "BuzÃ³n postal"
 
-#: tpl_messages.php:53 ../../../www/admin/addressbook/addr.php.in:106
-#: ../../../www/admin/user/user.php.in:439
+#: tpl_messages.php:52 ../../www/admin/user/user.php:511
+#: ../../www/admin/addressbook/addr.php:106
 msgid "Postal Code"
 msgstr "CÃ³digo Postal"
 
-#: tpl_messages.php:54 ../../../www/admin/addressbook/addr.php.in:107
-#: ../../../www/admin/user/user.php.in:440
+#: tpl_messages.php:53 ../../www/admin/user/user.php:512
+#: ../../www/admin/addressbook/addr.php:107
 msgid "City"
 msgstr "Ciudad"
 
-#: tpl_messages.php:55 ../../../www/admin/addressbook/addr.php.in:108
-#: ../../../www/admin/user/user.php.in:441
+#: tpl_messages.php:54 ../../www/admin/user/user.php:513
+#: ../../www/admin/addressbook/addr.php:108
 msgid "Country"
 msgstr "PaÃs"
 
-#: tpl_messages.php:56 ../../../www/admin/addressbook/addr.php.in:109
-#: ../../../www/admin/user/user.php.in:442
+#: tpl_messages.php:55 ../../www/admin/user/user.php:515
+#: ../../www/admin/addressbook/addr.php:109
 msgid "Telephone Number"
 msgstr "NÃºmero de telÃ©fono"
 
-#: tpl_messages.php:57 ../../../www/admin/addressbook/addr.php.in:111
-#: ../../../www/admin/user/user.php.in:444
+#: tpl_messages.php:56 ../../www/admin/user/user.php:517
+#: ../../www/admin/addressbook/addr.php:111
 msgid "Fax Number"
 msgstr "NÃºmero de Fax"
 
-#: tpl_messages.php:58 ../include/menu.php:45
+#: tpl_messages.php:57 tpl_messages.php:96 tpl_messages.php:313
+#: ../../lib/KolabAdmin/include/menu.php:52
 msgid "Addressbook"
 msgstr "Libreta de Direcciones"
 
-#: tpl_messages.php:59
+#: tpl_messages.php:58
 msgid "check here to make this users address <br/> visible in the address book"
 msgstr ""
 "Seleccionar aquÃ para hacer que esta direcciÃ³n de usuario <br/> sea visible "
 "en la libreta de direcciones"
 
-#: tpl_messages.php:60
+#: tpl_messages.php:59
 msgid "User Quota in KB"
 msgstr "Cuota de usuario en KB"
 
-#: tpl_messages.php:61 ../../../www/admin/user/user.php.in:448
+#: tpl_messages.php:60 ../../www/admin/user/user.php:521
 msgid "Leave blank for unlimited"
 msgstr "Dejar en blanco para ilimitado"
 
-#: tpl_messages.php:62 ../include/form.class.php:76
+#: tpl_messages.php:61 ../../lib/KolabAdmin/include/form.class.php:75
 msgid "Submit"
 msgstr "Enviar"
 
-#: tpl_messages.php:63
-msgid "Email Delivery"
-msgstr "ObtenciÃ³n de correo"
-
-#: tpl_messages.php:64
-msgid ""
-"Activate delivery to folder (only one of vacation, forward and delivery to "
-"folder can be active at any time)"
-msgstr ""
-"Activar recepciÃ³n a carpeta (sÃ³lo uno de vacaciones, enviar y recibir a "
-"carpeta pueden ser activados en cualquier momento)"
-
-#: tpl_messages.php:65
-msgid "Deliver regular mail to folder"
-msgstr "Recibir correo regular a carpeta"
+#: tpl_messages.php:64 tpl_messages.php:209
+msgid "(only external addresses without a kolab user account)"
+msgstr "(sÃ³lo direcciones externas con una cuenta de usuario kolab)"
 
-#: tpl_messages.php:66 tpl_messages.php:93 tpl_messages.php:153
-#: tpl_messages.php:157 tpl_messages.php:160 tpl_messages.php:163
-#: tpl_messages.php:166 tpl_messages.php:169 tpl_messages.php:172
-#: tpl_messages.php:185 tpl_messages.php:239
-msgid "Update"
-msgstr "Actualizar"
+#: tpl_messages.php:65 tpl_messages.php:82 tpl_messages.php:103
+msgid "[ ALL ]"
+msgstr "[ TODOS ]"
 
-#: tpl_messages.php:67 ../include/menu.php:62
-msgid "Distribution Lists"
-msgstr "Listas de distribuciÃ³n"
+#: tpl_messages.php:66 tpl_messages.php:83 tpl_messages.php:104
+msgid "[ OTHER ]"
+msgstr "[ OTROS ]"
 
-#: tpl_messages.php:68
-msgid "Listname"
-msgstr "Nombre de lista"
+#: tpl_messages.php:67 tpl_messages.php:84 tpl_messages.php:105
+msgid "Filter:"
+msgstr "Filtro:"
 
-#: tpl_messages.php:69
-msgid "Visibility"
-msgstr "Visibilidad"
+#: tpl_messages.php:68 tpl_messages.php:85 tpl_messages.php:106
+msgid "Filter"
+msgstr "Filtro"
 
 #: tpl_messages.php:71
-msgid "Internal"
-msgstr "Interno"
+msgid "Entry deleted, awaiting cleanup..."
+msgstr "Entrada borrada, esperando limpieza..."
 
-#: tpl_messages.php:72
-msgid "Public"
-msgstr "PÃºblico"
+#: tpl_messages.php:74
+msgid "Email Delivery"
+msgstr "ObtenciÃ³n de correo"
 
-#: tpl_messages.php:73
-msgid "List deleted, awaiting cleanup..."
-msgstr "Lista borrada, esperando limpieza..."
+#: tpl_messages.php:75
+msgid "Activate delivery to folder"
+msgstr ""
 
 #: tpl_messages.php:76
-msgid "The distribution list with DN"
-msgstr "La lista de distribuciÃ³n con DN"
+msgid "Deliver regular mail to folder"
+msgstr "Recibir correo regular a carpeta"
 
 #: tpl_messages.php:78
-msgid "Back to list of distribution lists"
-msgstr "Volver a la lista de listas de distribuciÃ³n"
-
-#: tpl_messages.php:79 ../include/menu.php:76 ../include/menu.php:93
-#: ../include/menu.php:101
-msgid "Domain Maintainers"
-msgstr "Mantenedores de dominio"
+msgid ""
+"<a href=\"http://www.kde.org\">KDE</a> is a powerful <a href=\"http://www."
+"gnu.org/philosophy/free-sw.html\">Free Software</a> graphical desktop "
+"environment for Linux and Unix workstations. It combines ease of use, "
+"contemporary functionality, and outstanding graphical design with the "
+"technological superiority of the Unix operating system."
+msgstr ""
+"<a href=\"http://www.kde.org\">KDE</a> es un potente <a href=\"http://www."
+"gnu.org/philosophy/free-sw.html\">software libre</a> de entorno grÃ¡fico de "
+"escritorio para estaciones de trabajo Linux y Unix. Combina la facilidad de "
+"uso, funcionalidad contemporÃ¡nea y un destacado diseÃ±o grÃ¡fico con la "
+"superioridad tecnolÃ³gica del sistema operativo Unix."
 
-#: tpl_messages.php:86
+#: tpl_messages.php:79
 msgid ""
-"Kolab's architecture was done by <a href=\"http://www.erfrakon.com"
-"\">erfrakon</a>; the company also designed and implemented the Kolab 1 "
-"Server and did the design and architecture for the Kolab 2 Server while "
-"providing consulting for the implementation of the Kolab 2 server and the "
-"Kolab 2 clients."
+"<b>KDE</b> is an Internet project that is truly open in every sense. "
+"Development takes place on the Internet and is discussed on our <a href="
+"\"http://www.kde.org/mailinglists.html\">mailing lists</a>, USENET news "
+"groups, and IRC channels to which we invite and welcome everyone."
 msgstr ""
-"La arquitectura de Kolab fue desarrollada por <a href=\"http://www.erfrakon."
-"com\">erfrakon</a>; la compaÃ±Ãa tambiÃ©n diseÃ±Ã³ e implementÃ³ el Servidor "
-"Kolab 1 y realizÃ³ el diseÃ±o y arquitectura para el Servidor Kolab 2 mientras "
-"proporcionaba consultorÃa para la implementaciÃ³n del Servidor Kolab 2 y los "
-"clientes Kolab 2."
+"<b>KDE</b> es un proyecto de Internet que es verdaderamente abierto en todos "
+"los sentidos. El desarrollo tiene lugar en Internet y se debate en nuestras "
+"<a href=\"http://www.kde.org/mailinglists.html\">listas de correo de KDE</"
+"a>, grupos de noticias USENET, y canales IRC a los que invitamos y damos la "
+"bienvenida a todos."
 
-#: tpl_messages.php:87
+#: tpl_messages.php:80
 msgid ""
-"<a href=\"http://www.erfrakon.com\">erfrakon</a> is a consulting company "
-"dedicated to opensource software and Linux. The main tasks of erfrakon "
-"within the Kolab project are the principle design and architecure of the "
-"Kolab groupware solution and the creation of the Kolab 1 server."
+"<b>KDE</b> is a mature desktop suite providing a solid basis to an ever "
+"growing number of <a href=\"http://www.kde-apps.org\">applications</a> for "
+"Unix workstations.  KDE has developed a high quality development framework "
+"for Unix, which allows for the rapid and efficient creation of applications."
 msgstr ""
-"<a href=\"http://www.erfrakon.com\">erfrakon</a> es una compaÃ±Ãa consultora "
-"dedicada al software de cÃ³digo abierto y Linux. Las principales tareas de "
-"erfrakon dentro del proyecto Kolab son el diseÃ±o y arquitectura iniciales de "
-"la soluciÃ³n groupware Kolab y la creaciÃ³n del servidor Kolab 1."
+"<b>KDE</b> es un entorno de escritorio maduro que proporciona una sÃ³lida "
+"base a un cada mayor nÃºmero de <a href=\"http://www.kde-apps.org"
+"\">aplicaciones KDE</a> para estaciones de trabajo Unix. KDE ha desarrollado "
+"un entorno de desarrollo de alta calidad para Unix, el cual permite la "
+"creaciÃ³n rÃ¡pida y eficiente de aplicaciones."
 
-#: tpl_messages.php:88
-msgid "The following people worked on Kolab for erfrakon:"
-msgstr "Las siguientes personas trabajaron en Kolab para erfrakon:"
+#: tpl_messages.php:81 tpl_messages.php:102
+msgid "Email Users"
+msgstr "Usuario de correo electrÃ³nico"
 
-#: tpl_messages.php:89
-msgid "Email Forwarding"
-msgstr "EnvÃo de correo electrÃ³nico"
+#: tpl_messages.php:86 tpl_messages.php:113
+msgid "Type"
+msgstr "Tipo"
 
-#: tpl_messages.php:90
-msgid ""
-"Activate email forwarding (only one of vacation, forward and delivery to "
-"folder can be active at any time)"
+#: tpl_messages.php:88 ../../www/admin/user/activesync.php:496
+msgid "E-mail"
+msgstr "Correo electrÃ³nico"
+
+#: tpl_messages.php:89
+msgid "uid"
 msgstr ""
-"Activar envÃo de correo electrÃ³nico (sÃ³lo uno de vacaciones, enviar y "
-"recibir a carpeta pueden ser activados en cualquier momento)"
 
 #: tpl_messages.php:91
-msgid "Forward mail to"
-msgstr "Enviar correo a"
+msgid "User Deleted, awaiting cleanup..."
+msgstr "Usuario borrado, esperando limpieza..."
 
-#: tpl_messages.php:92
-msgid "Keep copy on server"
-msgstr "Mantener copia en el servidor"
+#: tpl_messages.php:94 tpl_messages.php:151
+#, fuzzy
+msgid "Welcome to the Kolab Groupware Server Maintenance"
+msgstr "Bienvenida al interfaz de administraciÃ³n de Kolab"
 
-#: tpl_messages.php:94
+#: tpl_messages.php:95 tpl_messages.php:152 tpl_messages.php:155
+#: tpl_messages.php:312
+#, fuzzy
+msgid "Manage Users"
+msgstr "Administrar correos de usuarios"
+
+#: tpl_messages.php:97 tpl_messages.php:153 tpl_messages.php:156
+#: tpl_messages.php:314
+#, fuzzy
+msgid "Shared Folders"
+msgstr "Carpetas compartidas"
+
+#: tpl_messages.php:98 tpl_messages.php:157 tpl_messages.php:187
+#: tpl_messages.php:315 ../../lib/KolabAdmin/include/menu.php:69
+msgid "Distribution Lists"
+msgstr "Listas de distribuciÃ³n"
+
+#: tpl_messages.php:99 tpl_messages.php:214 tpl_messages.php:317
+#: ../../lib/KolabAdmin/include/menu.php:89
+#: ../../lib/KolabAdmin/include/menu.php:97
+msgid "Maintainers"
+msgstr "Mantenedores"
+
+#: tpl_messages.php:100 tpl_messages.php:158 tpl_messages.php:277
+#: tpl_messages.php:318 ../../lib/KolabAdmin/include/menu.php:83
+#: ../../lib/KolabAdmin/include/menu.php:100
+#: ../../lib/KolabAdmin/include/menu.php:108
+msgid "Domain Maintainers"
+msgstr "Mantenedores de dominio"
+
+#: tpl_messages.php:101 tpl_messages.php:154 tpl_messages.php:159
+#: tpl_messages.php:276 tpl_messages.php:320
+#, fuzzy
+msgid "About"
+msgstr "Sobre Kolab"
+
+#: tpl_messages.php:107
 msgid ""
 "Intevation GmbH coordinated the Projects: Kroupware and Proko2, which are "
 "the main driving force behind Kolab1&2. In addition to project management "
@@ -415,7 +460,7 @@ msgstr ""
 "administraciÃ³n del proyecto Intervation realizÃ³ la mayor parte de "
 "aseguramiento de calidad."
 
-#: tpl_messages.php:95
+#: tpl_messages.php:108
 msgid ""
 "Intevation GmbH is a IT-company exclusively focusing on Free Software. Its "
 "business units are strategic consulting, project management and geographic "
@@ -425,140 +470,129 @@ msgstr ""
 "Software Libre. Sus unidades de negocio son la consultorÃa estratÃ©gica, la "
 "administraciÃ³n de proyectos y los sistemas de informaciÃ³n geogrÃ¡fica."
 
-#: tpl_messages.php:96
+#: tpl_messages.php:109
 msgid "The following people worked on Kolab for Intevation:"
 msgstr "Las siguientes personas trabajaron en Kolab para Intervation:"
 
-#: tpl_messages.php:97
-msgid ""
-"The Kolab 1 KDE client and the Kolab 2 KDE Client (Kontact) was developed by"
-msgstr ""
-"El cliente KDE Kolab 1 y el cliente KDE Kolab 2 (Kontact) fueron "
-"desarrollados por"
-
-#: tpl_messages.php:98
-msgid ""
-"Klarälvdalens Datakonsult AB is a consulting company dedicated to "
-"opensource software, Linux, and the <a href=\"http://www.trolltech.com/"
-"products/qt/\">Qt</a> library. The main tasks of KDAB within the Kolab "
-"project are design and implementation of the Kolab KDE clients and the "
-"implementation of the current Kolab 2 server."
-msgstr ""
-"Klarälvdalens Datakonsult AB es una compaÃ±Ãa consultora dedicada a "
-"software de cÃ³digo abierto, Linux y la librerÃa <a href=\"http://www."
-"trolltech.com/products/qt/\">Qt</a>. Las principales tareas de KDAB dentro "
-"del proyecto Kolab son el diseÃ±o y la implementaciÃ³n de los clientes KDE "
-"Kolab y la implementaciÃ³n del servidor Kolab 2 actual."
+#: tpl_messages.php:110
+msgid "Shared folders"
+msgstr "Carpetas compartidas"
 
-#: tpl_messages.php:99
-msgid ""
-"The following people worked on Kolab for Klarälvdalens Datakonsult AB:"
-msgstr ""
-"Las siguientes personas trabajaron en Kolab para Klarälvdalens "
-"Datakonsult AB:"
+#: tpl_messages.php:112
+msgid "Server"
+msgstr "Servidor"
 
-#: tpl_messages.php:100
-msgid ""
-"<a href=\"http://www.kde.org\">KDE</a> is a powerful <a href=\"http://www."
-"gnu.org/philosophy/free-sw.html\">Free Software</a> graphical desktop "
-"environment for Linux and Unix workstations. It combines ease of use, "
-"contemporary functionality, and outstanding graphical design with the "
-"technological superiority of the Unix operating system."
-msgstr ""
-"<a href=\"http://www.kde.org\">KDE</a> es un potente <a href=\"http://www."
-"gnu.org/philosophy/free-sw.html\">software libre</a> de entorno grÃ¡fico de "
-"escritorio para estaciones de trabajo Linux y Unix. Combina la facilidad de "
-"uso, funcionalidad contemporÃ¡nea y un destacado diseÃ±o grÃ¡fico con la "
-"superioridad tecnolÃ³gica del sistema operativo Unix."
+#: tpl_messages.php:115
+msgid "Folder deleted, awaiting cleanup..."
+msgstr "Carpeta borrada, esperando limpieza..."
 
-#: tpl_messages.php:101
-msgid ""
-"<b>KDE</b> is an Internet project that is truly open in every sense. "
-"Development takes place on the Internet and is discussed on our <a href="
-"\"http://www.kde.org/mailinglists.html\">mailing lists</a>, USENET news "
-"groups, and IRC channels to which we invite and welcome everyone."
-msgstr ""
-"<b>KDE</b> es un proyecto de Internet que es verdaderamente abierto en todos "
-"los sentidos. El desarrollo tiene lugar en Internet y se debate en nuestras "
-"<a href=\"http://www.kde.org/mailinglists.html\">listas de correo de KDE</"
-"a>, grupos de noticias USENET, y canales IRC a los que invitamos y damos la "
-"bienvenida a todos."
+#: tpl_messages.php:118
+#, fuzzy
+msgid "Kolab Groupware Solution - Technologies"
+msgstr "Kolab Groupware login"
 
-#: tpl_messages.php:102
+#: tpl_messages.php:119
 msgid ""
-"<b>KDE</b> is a mature desktop suite providing a solid basis to an ever "
-"growing number of <a href=\"http://www.kde-apps.org\">applications</a> for "
-"Unix workstations.  KDE has developed a high quality development framework "
-"for Unix, which allows for the rapid and efficient creation of applications."
+"This is the server of the Kolab Groupware Solution. It is <a href=\"http://"
+"fsfe.org/about/basics/freesoftware\">Free Software</a> developed by the <a "
+"href=\"http://www.kolab.org/\">Kolab Community</a>, which works in "
+"collaboration with and as part of many other communities and projects to "
+"bring you this software."
 msgstr ""
-"<b>KDE</b> es un entorno de escritorio maduro que proporciona una sÃ³lida "
-"base a un cada mayor nÃºmero de <a href=\"http://www.kde-apps.org"
-"\">aplicaciones KDE</a> para estaciones de trabajo Unix. KDE ha desarrollado "
-"un entorno de desarrollo de alta calidad para Unix, el cual permite la "
-"creaciÃ³n rÃ¡pida y eficiente de aplicaciones."
 
-#: tpl_messages.php:103
-msgid "Kolab2 Groupware Server"
-msgstr "Servidor Groupware Kolab2"
-
-#: tpl_messages.php:104
+#: tpl_messages.php:120
 msgid ""
-"This is the Kolab2 Server. It is Free Software developed by the <a href="
-"\"http://www.kolab.org/\">Kolab Project</a>, with the intention of bringing "
-"groupware functionality to Unix/KDE users as well as Windows desktops."
-msgstr ""
-"Este es el servidor Kolab2. Es un software libre desarrollado por el <a href="
-"\"http://www.kolab.org/\">proyecto Kolab</a>, con la intenciÃ³n de ofrecer "
-"funcionalidades groupware a los usuarios de Unix/KDE asÃ como a los de "
-"escritorios Windows."
-
-#: tpl_messages.php:105
-msgid "Kolab builds upon many other Free Software projects, namely:"
+"For this server, Free Software communities and projects that the Kolab "
+"Community is a part of and builds upon include:"
 msgstr ""
-"Kolab se sustenta en otros muchos proyectos de software libre, a saber:"
 
-#: tpl_messages.php:106
+#: tpl_messages.php:121
 msgid "(Mail Scanner)"
 msgstr "(EscÃ¡ner de Correo ElectrÃ³nico)"
 
-#: tpl_messages.php:107
+#: tpl_messages.php:122
 msgid "(HTTP Server)"
 msgstr "(Servidor HTTP)"
 
-#: tpl_messages.php:108
+#: tpl_messages.php:123
 msgid "(Virus Scanner)"
 msgstr "(EscÃ¡ner de Virus)"
 
-#: tpl_messages.php:109
-msgid "(IMAP Server)"
+#: tpl_messages.php:124
+#, fuzzy
+msgid "(IMAP Server & Database)"
 msgstr "(Servidor IMAP)"
 
-#: tpl_messages.php:110
+#: tpl_messages.php:125
 msgid "(LDAP Server)"
 msgstr "(Servidor LDAP)"
 
-#: tpl_messages.php:111
+#: tpl_messages.php:126
 msgid "(MTA)"
 msgstr ""
 
-#: tpl_messages.php:112
+#: tpl_messages.php:127
 msgid "(SPAM Filter)"
 msgstr "(Filtro contra el SPAM)"
 
-#: tpl_messages.php:113
+#: tpl_messages.php:128
+msgid "(ActiveSync Support)"
+msgstr ""
+
+#: tpl_messages.php:129
+msgid "(Web client)"
+msgstr ""
+
+#: tpl_messages.php:130 tpl_messages.php:131
+msgid "(Server side scripting & glue)"
+msgstr ""
+
+#: tpl_messages.php:132
+msgid "(This interface)"
+msgstr ""
+
+#: tpl_messages.php:133
 msgid ""
-"The following projects are used in binding the above together, in order to "
-"create the Kolab Server:"
+"For the clients, Free Software communities and projects that the Kolab "
+"Community is a part of and builds upon include:"
 msgstr ""
-"Los siguientes proyectos son usados para unir los anteriores, con el "
-"objetivo de crear el Servidor Kolab:"
 
-#: tpl_messages.php:114
-msgid "The following projects are used as a base for the Kolab Clients:"
+#: tpl_messages.php:134
+msgid "History & Credits"
 msgstr ""
-"Los siguientes proyectos son usados como una base para los clientes de Kolab:"
 
-#: tpl_messages.php:115
+#: tpl_messages.php:135
+msgid ""
+"In 2010, <a href=\"http://www.intevation.de\">Intevation</a>, <a href="
+"\"http://www.kdab.com/\">KDAB</a>, <a href=\"http://uk.linkedin.com/in/"
+"pauljadams\">Dr. Paul Adams</a> and <a href=\"http://ch.linkedin.com/in/"
+"georggreve\">Georg Greve</a> worked together to re-launch the professional "
+"support of the Kolab Groupware Solution into the <a href=\"http://kolabsys."
+"com\">Kolab Systems AG</a>, which took the place of the Kolab-Konsortium."
+msgstr ""
+
+#: tpl_messages.php:136
+msgid ""
+"Kolab Systems together with its partner network, the Kolab Enterprise "
+"Community, has since been the primary facilitator of the Kolab Community, "
+"including for the provision of infrastructure, and the focal point for "
+"further development of the Kolab Groupware Solution, e.g. for inclusion of "
+"ActiveSync support in version 2.3 of the server, or for native packaging on "
+"the various platforms."
+msgstr ""
+
+#: tpl_messages.php:137
+msgid ""
+"If you want to join the community, please visit <a href=\"http://wiki.kolab."
+"org\">http://wiki.kolab.org</a> and <a href=\"http://kolab.org\">http://"
+"kolab.org</a>."
+msgstr ""
+
+#: tpl_messages.php:138
+msgid "History before 2010"
+msgstr ""
+
+#: tpl_messages.php:139
 msgid ""
 "The Kolab project owes a great deal of thanks to the people of the <a href="
 "\"http://www.openpkg.org/\">OpenPKG</a> project. OpenPKG allows Kolab to run "
@@ -571,7 +605,7 @@ msgstr ""
 "una base comÃºn, fÃ¡cil de instalar y multiplataforma sobre la que construir "
 "el servidor."
 
-#: tpl_messages.php:116
+#: tpl_messages.php:140
 msgid ""
 "To use all Kolab2 features you need an interoperable client. The KDE Kolab "
 "Client was the first such client to be developed and is still considered the "
@@ -588,7 +622,7 @@ msgstr ""
 "KDE</a> por proveer tan potente base sobre que la que construir esta "
 "soluciÃ³n cliente."
 
-#: tpl_messages.php:117
+#: tpl_messages.php:141
 msgid ""
 "Users of Outlook on Microsoft Windows are able to use a proprietary plug-in "
 "to inter-operate with the Kolab server. For Kolab2 the preferred plug-in is "
@@ -603,7 +637,7 @@ msgstr ""
 "comunidad Kolab para ayudar a desarrollar el formato de almacenamiento "
 "Kolab2."
 
-#: tpl_messages.php:118
+#: tpl_messages.php:142
 msgid ""
 "A list of additional Outlook plug-ins that provide interoperability with the "
 "Kolab server is <a href=\"http://www.kolab.org/kolab-plugins.html"
@@ -613,7 +647,7 @@ msgstr ""
 "a Outlook con el servidor Kolab <a href=\"http://www.kolab.org/kolab-plugins."
 "html\">mantenida en el sitio web de Kolab</a>."
 
-#: tpl_messages.php:119
+#: tpl_messages.php:143
 msgid ""
 "There is also a <a href=\"http://www.kolab.org/webclient.html\">web-based "
 "client</a> in development which provides full groupware functionality to "
@@ -632,7 +666,7 @@ msgstr ""
 "href=\"http://www.horde.org/\">proyecto Horde</a> sober el que se ha "
 "construido."
 
-#: tpl_messages.php:120
+#: tpl_messages.php:144
 msgid ""
 "As Kolab is a Free Software project, anyone can help to extend the "
 "functionality of the software. An active community has developed around the "
@@ -652,13 +686,13 @@ msgstr ""
 "a> (administraciÃ³n del proyecto) y <a href=\"http://www.klaralvdalens-"
 "datakonsult.se/\">Klarälvdalens Datakonsult</a> (cliente)."
 
-#: tpl_messages.php:121
+#: tpl_messages.php:145
+#, fuzzy
 msgid ""
-"<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> joined the "
-"project soon after the original Kolab1 server was released. Its developers "
-"are primarily responsible for an updated engine (which forms the base of the "
-"Kolab2 server), the web client, as well as contributing to development of "
-"the Kolab2 storage format."
+"Code Fusion cc joined the project soon after the original Kolab1 server was "
+"released. Its developers are primarily responsible for an updated engine "
+"(which forms the base of the Kolab2 server), the web client, as well as "
+"contributing to development of the Kolab2 storage format."
 msgstr ""
 "<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> se uniÃ³ pronto "
 "al proyecto despuÃ©s de que el servidor Kolab1 fuera liberado. Sus "
@@ -666,83 +700,258 @@ msgstr ""
 "cual forma parte del servidor Kolab2), el cliente web, asÃ como en el "
 "desarrollo del formato de almacenamiento Kolab2."
 
-#: tpl_messages.php:122
+#: tpl_messages.php:146
 msgid "Other contributors:"
 msgstr "Otras contribuciones:"
 
-#: tpl_messages.php:123
+#: tpl_messages.php:147
 msgid "CSSified the Kolab1 web admin GUI"
 msgstr "CSSified el GUI de administraciÃ³n web de Kolab1"
 
-#: tpl_messages.php:124
+#: tpl_messages.php:148
+msgid "Kudos"
+msgstr ""
+
+#: tpl_messages.php:149
+#, fuzzy
 msgid ""
-"The principal authors of the Kolab client and server software are (in "
-"alphabetical order):"
+"Principal contributors of the Kolab Groupware Solution are (in alphabetical "
+"order):"
 msgstr ""
 "Los principales autores del cliente y servidor de Kolab son (en orden "
 "alfabÃ©tico):"
 
-#: tpl_messages.php:125
-msgid "Enter UID and password to login"
-msgstr "Entrar UID y contraseÃ±a para entrar"
+#: tpl_messages.php:150
+msgid ""
+"...and anyone we forgot. Please let us know at <a href=\"mail:kolab-"
+"devel at kolab.org\">kolab-devel at kolab.org</a> so we can add you to this list."
+msgstr ""
 
-#: tpl_messages.php:126
-msgid "Username:"
-msgstr "Nombre de usuario:"
+#: tpl_messages.php:160
+#, fuzzy
+msgid "Kolab Groupware Solution"
+msgstr "Kolab Groupware login"
 
-#: tpl_messages.php:127
-msgid "Password:"
-msgstr "ContraseÃ±a:"
+#: tpl_messages.php:161
+msgid ""
+"This is the server of the Kolab Groupware Solution, a <a href=\"http://fsfe."
+"org/about/basics/freesoftware\">Free Software</a> Personal Information "
+"Management (PIM) solution developed by the <a href=\"http://www.kolab.org/"
+"\">Kolab Community</a>. Any installation of the Kolab Groupware Solution "
+"would normally include one or more of these servers, in combination with a "
+"variety of clients for its users. If you are interested in the technology, "
+"you can read more about it <a href=\"/admin/kolab/technology.php\">here</a>."
+msgstr ""
 
-#: tpl_messages.php:128 ../include/auth.class.php.in:124
-msgid "Kolab Groupware login"
-msgstr "Kolab Groupware login"
+#: tpl_messages.php:162
+msgid "Why Kolab?"
+msgstr ""
 
-#: tpl_messages.php:129
-msgid "The maintainer with DN"
-msgstr "El mantenedor con DN"
+#: tpl_messages.php:163
+msgid ""
+"There is a wide variety of reasons why Kolab should be your choice. Several "
+"of them have been put together for different target groups in the"
+msgstr ""
 
-#: tpl_messages.php:131
-msgid "Back to list of maintainers"
-msgstr "Volver a la lista de mantenedores"
+#: tpl_messages.php:164 tpl_messages.php:179
+msgid "Handouts for the Kolab Groupware Solution by Kolab Systems"
+msgstr ""
 
-#: tpl_messages.php:132 ../include/menu.php:82 ../include/menu.php:90
-msgid "Maintainers"
-msgstr "Mantenedores"
+#: tpl_messages.php:165
+msgid "To summarize just some points, Kolab is your solution, if"
+msgstr ""
 
-#: tpl_messages.php:139
-msgid "User:"
-msgstr "Usuario:"
+#: tpl_messages.php:166
+msgid ""
+"you want a solution that seamlessly integrates into your existing "
+"environment;"
+msgstr ""
 
-#: tpl_messages.php:140
-msgid "Role:"
-msgstr "Papel:"
+#: tpl_messages.php:167
+msgid ""
+"you want full control over your data, with all the convenience of the cloud;"
+msgstr ""
 
-#: tpl_messages.php:141
-msgid "Logout"
-msgstr "Desconectar"
+#: tpl_messages.php:168
+msgid "you have elevated security needs for your data;"
+msgstr ""
 
-#: tpl_messages.php:142
-msgid "Not logged in"
-msgstr "No estÃ¡ dentro"
+#: tpl_messages.php:169
+msgid ""
+"you have a very large installation, or want to reduce your hardware "
+"footprint;"
+msgstr ""
 
-#: tpl_messages.php:143
-msgid "Errors:"
-msgstr "Errores:"
+#: tpl_messages.php:170
+msgid "you have to operate in diverse environments and installations;"
+msgstr ""
 
-#: tpl_messages.php:144
-msgid "Message:"
-msgstr "Mensaje:"
+#: tpl_messages.php:171
+msgid ""
+"strategic issues are important to you, e.g. you need sovereignty of the "
+"software you deploy;"
+msgstr ""
 
-#: tpl_messages.php:145
+#: tpl_messages.php:172
+msgid "your users should be fully productive whether they are on- or offline;"
+msgstr ""
+
+#: tpl_messages.php:173
+msgid ""
+"you want the flexibility to create solutions for your specialised needs;"
+msgstr ""
+
+#: tpl_messages.php:174
+msgid ""
+"you want Free Software/Open Source, but also want the professional support "
+"without having to resort to proprietary lock-in."
+msgstr ""
+
+#: tpl_messages.php:175
+msgid "More Information"
+msgstr ""
+
+#: tpl_messages.php:176
+msgid "Kolab Community Web Site"
+msgstr ""
+
+#: tpl_messages.php:177
+msgid "Kolab Community Wiki"
+msgstr ""
+
+#: tpl_messages.php:178
+msgid "Article: "
+msgstr ""
+
+#: tpl_messages.php:180
+msgid "Warranties & Commercial Support"
+msgstr ""
+
+#: tpl_messages.php:181
+msgid ""
+"This is the <b>Community Edition</b> of the Kolab Groupware Server. It is "
+"provided by Kolab Systems as fully <a href=\"http://fsfe.org/about/basics/"
+"freesoftware\">Free Software</a> and you can use it to the fullest extent "
+"and any purpose. There are no license costs or other obligations other than "
+"those set forth in the respective Free Software licenses of the various "
+"components. <b>There are no warranties or guarantees of any kind, nor is "
+"there any guaranteed support. You are running this software entirely at your "
+"own risk.</b>"
+msgstr ""
+
+#: tpl_messages.php:182
+msgid ""
+"There is a wide variety of commercial support options and warranties "
+"available by <a href=\"/admin/kolab/kolabsystems.php\">Kolab Systems AG</a> "
+"and its network of partners, the Kolab Enterprise Community. This support "
+"comes with access to the additionally quality assured and hardened "
+"<b>Certified Kolab</b> edition, which like the community edition is fully "
+"available as Free Software, so has all the advantages of the Community "
+"Edition and is free of hidden lock-in."
+msgstr ""
+
+#: tpl_messages.php:183
+msgid ""
+"Kolab Systems AG will provide limited support for the Community Edition on a "
+"case-by-case basis, but with no guaranteed response times, as availability "
+"permits, and at rates that may be adjusted due to the work load at the time "
+"of the request. <b>It is strongly recommended that for mission-critical "
+"professional deployments of the Kolab Groupware Solution you at least choose "
+"one of the partially self-supported On Demand support models.</b>"
+msgstr ""
+
+#: tpl_messages.php:184
+msgid ""
+"Kolab Systems provides an overview of all available <a href=\"http://"
+"kolabsys.com/index.php/solutions/101\">Service Level Agreements (SLA)</a>. "
+"To upgrade your installation to Certified Kolab, please contact"
+msgstr ""
+
+#: tpl_messages.php:185 tpl_messages.php:301
+msgid "or visit our"
+msgstr ""
+
+#: tpl_messages.php:186 tpl_messages.php:302
+msgid "web page"
+msgstr ""
+
+#: tpl_messages.php:188
+msgid "Listname"
+msgstr "Nombre de lista"
+
+#: tpl_messages.php:189
+msgid "Visibility"
+msgstr "Visibilidad"
+
+#: tpl_messages.php:191
+msgid "Internal"
+msgstr "Interno"
+
+#: tpl_messages.php:192
+msgid "Public"
+msgstr "PÃºblico"
+
+#: tpl_messages.php:193
+msgid "List deleted, awaiting cleanup..."
+msgstr "Lista borrada, esperando limpieza..."
+
+#: tpl_messages.php:196
+msgid "Welcome to the Kolab administration interface"
+msgstr "Bienvenida al interfaz de administraciÃ³n de Kolab"
+
+#: tpl_messages.php:197
+msgid "NOTE:"
+msgstr "NOTA:"
+
+#: tpl_messages.php:198
+msgid ""
+"No account is configured to receive mail for administrative addresses. If "
+"you have not yet created an account for this, "
+msgstr ""
+"No hay un cuenta configurada para recibir mensajes de direcciones "
+"administrativas. Si todavÃa no ha creado una cuenta para ello,"
+
+#: tpl_messages.php:199
+msgid "please do so"
+msgstr "por favor hacer asÃ"
+
+#: tpl_messages.php:200
+msgid "and then go"
+msgstr "y entonces vamos"
+
+#: tpl_messages.php:201
+msgid "here"
+msgstr "aquÃ"
+
+#: tpl_messages.php:202
+msgid "to set up forwarding of mail to administrative email addresses."
+msgstr "para establecer el envÃo de correo a las direcciones administrativas."
+
+#: tpl_messages.php:203
+msgid "The address with DN"
+msgstr "La direcciÃ³n con DN"
+
+#: tpl_messages.php:205
+msgid "Back to list of addresses"
+msgstr "Volver a la lista de direcciones"
+
+#: tpl_messages.php:206
+msgid "The administrator with DN"
+msgstr "El administrador con DN"
+
+#: tpl_messages.php:208
+msgid "Back to list of administrators"
+msgstr "Volver a la lista de administradores"
+
+#: tpl_messages.php:221
 msgid "Kolab Server Settings"
 msgstr "Ajustes del Servidor Kolab"
 
-#: tpl_messages.php:146
+#: tpl_messages.php:222
 msgid "Administrative email addresses"
 msgstr "Direcciones de correo electrÃ³nico administrativas"
 
-#: tpl_messages.php:147
+#: tpl_messages.php:223
 msgid ""
 "You have not yet set up a receiving account for the administrative email "
 "addresses hostmaster at yourdomain.tld, postmaster at yourdomain.tld, MAILER-"
@@ -759,63 +968,63 @@ msgstr ""
 "direcciones. MÃ¡s tarde podrÃ¡ aÃ±adir o eliminar gente de las listas como en "
 "cualquier otra lista de distribuciÃ³n"
 
-#: tpl_messages.php:148
+#: tpl_messages.php:224
 msgid ""
 "Email address of account that should receive administrative mail for domain "
 msgstr ""
 "DirecciÃ³n de correo electrÃ³nico de la cuenta que debe recibir mensajes "
 "administrativos para el dominio"
 
-#: tpl_messages.php:149
+#: tpl_messages.php:225
 msgid "Create Distribution Lists"
 msgstr "Crear listas de distribuciÃ³n"
 
-#: tpl_messages.php:150
+#: tpl_messages.php:226
 msgid "Enable or Disable individual Services"
 msgstr "Habilitar o deshabilitar servicios individuales"
 
-#: tpl_messages.php:151
+#: tpl_messages.php:227
 msgid "Service"
 msgstr "Servicio"
 
-#: tpl_messages.php:152
+#: tpl_messages.php:228
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: tpl_messages.php:154
+#: tpl_messages.php:230
 msgid "Quota settings"
 msgstr "Ajustes de cuota"
 
-#: tpl_messages.php:155
+#: tpl_messages.php:231
 msgid "Warn users when they have used"
 msgstr "Avisar a los usuarios cuando hayan usado"
 
-#: tpl_messages.php:156
+#: tpl_messages.php:232
 #, php-format
 msgid "% of their quota"
 msgstr "% de su cuota"
 
-#: tpl_messages.php:158
+#: tpl_messages.php:234
 msgid "Free/Busy settings"
 msgstr "Ajustes de libre/ocupado"
 
-#: tpl_messages.php:159
+#: tpl_messages.php:235
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr "Permitir descarga sin autentificar de informaciÃ³n libre/ocupada"
 
-#: tpl_messages.php:161
+#: tpl_messages.php:237
 msgid "When creating free/busy lists, include data from"
 msgstr "Cuando se creen listas libres/ocupadas, incluir datos desde"
 
-#: tpl_messages.php:162
+#: tpl_messages.php:238
 msgid "days in the past"
 msgstr "dÃas en el pasado"
 
-#: tpl_messages.php:164
+#: tpl_messages.php:240
 msgid "Privileged Networks"
 msgstr "Redes privilegiadas"
 
-#: tpl_messages.php:165
+#: tpl_messages.php:241
 msgid ""
 "Networks allowed to relay and send mail through unauthenticated SMTP "
 "connections to the Kolab server (comma separated networks in x.x.x.x/y "
@@ -825,11 +1034,11 @@ msgstr ""
 "SMTP sin autentificar al servidor Kolab (redes separadas por comas en "
 "formato x.x.x.x/y):"
 
-#: tpl_messages.php:167
+#: tpl_messages.php:243
 msgid "SMTP \"smarthost/relayhost\""
 msgstr ""
 
-#: tpl_messages.php:168
+#: tpl_messages.php:244
 msgid ""
 "Smarthost (and optional port) to use to send outgoing mail (host.domain."
 "tld). Leave empty for no relayhost."
@@ -837,11 +1046,11 @@ msgstr ""
 "Smarthost (y puerto opcional) a usar para enviar correo saliente (host."
 "domain.tld). Dejar vacÃo para no relayhost."
 
-#: tpl_messages.php:170
+#: tpl_messages.php:246
 msgid "Accept Internet Mail"
 msgstr "Aceptar correo Internet"
 
-#: tpl_messages.php:171
+#: tpl_messages.php:247
 msgid ""
 "Accept mail from other domains over unauthenticated SMTP. This must be "
 "enabled if you want to use the Kolab Server to receive mail from other "
@@ -854,30 +1063,30 @@ msgstr ""
 "desde puertas de enlace SMTP que se encuentren dentro de las red "
 "privilegiada."
 
-#: tpl_messages.php:173
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:134
+#: tpl_messages.php:249
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:134
 msgid "Domains"
 msgstr "Dominios"
 
-#: tpl_messages.php:174
+#: tpl_messages.php:250
 msgid "Domain"
 msgstr "Dominio"
 
-#: tpl_messages.php:177 tpl_messages.php:190
+#: tpl_messages.php:253 tpl_messages.php:266
 msgid "Add"
 msgstr "AÃ±adir"
 
-#: tpl_messages.php:178
+#: tpl_messages.php:254
 msgid "Mail Filter Settings"
 msgstr "Ajustes del filtro de correo electrÃ³nico"
 
-#: tpl_messages.php:179
+#: tpl_messages.php:255
 msgid "Check messages for mismatching From header and envelope from."
 msgstr ""
 "Comprobar desajustes en la cabecera From de los mensajes y en el from del "
 "sobre."
 
-#: tpl_messages.php:180
+#: tpl_messages.php:256
 msgid ""
 "Use the Sender header instead of From for the above checks if Sender is "
 "present."
@@ -885,11 +1094,11 @@ msgstr ""
 "Usar la cabecera Sender en lugar de From para los chequeos anteriores si el "
 "remitente estÃ¡ presente."
 
-#: tpl_messages.php:181
+#: tpl_messages.php:257
 msgid "Action to take for messages that fail the check:"
 msgstr ""
 
-#: tpl_messages.php:182
+#: tpl_messages.php:258
 msgid ""
 "Reject the message, except if it originates from the outside and the From "
 "header matches one of Kolab server's domains. In that case rewrite the From "
@@ -900,11 +1109,11 @@ msgstr ""
 "reescribe la cabecera From de modo que el recipiente pueda ver la potencial "
 "falsificaciÃ³n."
 
-#: tpl_messages.php:183
+#: tpl_messages.php:259
 msgid "Always reject the message."
 msgstr "Rechazar siempre el mensaje."
 
-#: tpl_messages.php:184
+#: tpl_messages.php:260
 msgid ""
 "Note that enabling this setting will make the server reject any mail with "
 "non-matching sender and From header if the sender is an account on this "
@@ -915,1439 +1124,1648 @@ msgstr ""
 "una cuenta de este servidor. Es sabido que puede causar problemas con listas "
 "de correo."
 
-#: tpl_messages.php:186
+#: tpl_messages.php:262
 msgid "Kolab Hostnames (for Master and Slaves)"
 msgstr "Nombres de host Kolab (para Maestro y Esclavos)"
 
-#: tpl_messages.php:187
+#: tpl_messages.php:263
 msgid "Host"
 msgstr ""
 
-#: tpl_messages.php:191
-msgid "The shared folder with DN"
-msgstr "La carpeta compartida con DN"
+#: tpl_messages.php:267
+msgid ""
+"<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> is a specialist "
+"email solution provider based in Johannesburg, South Africa specialising in "
+"the deployment and support of Kolab."
+msgstr ""
+"<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> es un proveedor "
+"de soluciones de correo electrÃ³nico con base en Johannesburgo, SudÃ¡frica "
+"especializado en el uso y soporte de Kolab."
 
-#: tpl_messages.php:193
-msgid "Back to list of shared folders"
-msgstr "Volver a la lista de carpetas compartidas"
+#: tpl_messages.php:268
+msgid ""
+"Code Fusion has played, and continues to play, an integral part in "
+"developing and extending the Kolab server; specifically with regards to "
+"enhancing the base Kolab engine, adding in support for Microsoft Active "
+"Directory ® as an LDAP backend, as well as extending the <a href="
+"\"http://www.horde.org/\">Horde project</a> to provide a web-based groupware "
+"client for the Kolab server."
+msgstr ""
+"Code Fusion ha sido, y sigue siendo, parte intergral en el desarrollo y "
+"extensiÃ³n del servidor Kolab; concretamente en la mejora de la base del "
+"motor Kolab, aÃ±adiendo soporte para Microsoft Active Directory ® como "
+"una integraciÃ³n LDAP, ademÃ¡s de extender el <a href=\"http://www.horde.org/"
+"\">proyecto Horde</a> para proporcionar un cliente groupware basado en web "
+"para el servidor Kolab."
 
-#: tpl_messages.php:194
-msgid "Shared folders"
-msgstr "Carpetas compartidas"
+#: tpl_messages.php:269
+msgid ""
+"The following people from Code Fusion are involved in the Kolab project (in "
+"alphabetical order):"
+msgstr ""
+"Las siguientes personas de Code Fusion estÃ¡n involucradas en el proyecto "
+"Kolab (en orden alfabÃ©tico):"
 
-#: tpl_messages.php:196
-msgid "Server"
-msgstr "Servidor"
+#: tpl_messages.php:270
+msgid ""
+"Kolab's architecture was done by <a href=\"http://www.erfrakon.com"
+"\">erfrakon</a>; the company also designed and implemented the Kolab 1 "
+"Server and did the design and architecture for the Kolab 2 Server while "
+"providing consulting for the implementation of the Kolab 2 server and the "
+"Kolab 2 clients."
+msgstr ""
+"La arquitectura de Kolab fue desarrollada por <a href=\"http://www.erfrakon."
+"com\">erfrakon</a>; la compaÃ±Ãa tambiÃ©n diseÃ±Ã³ e implementÃ³ el Servidor "
+"Kolab 1 y realizÃ³ el diseÃ±o y arquitectura para el Servidor Kolab 2 mientras "
+"proporcionaba consultorÃa para la implementaciÃ³n del Servidor Kolab 2 y los "
+"clientes Kolab 2."
 
-#: tpl_messages.php:197 tpl_messages.php:217
-msgid "Type"
-msgstr "Tipo"
+#: tpl_messages.php:271
+msgid ""
+"<a href=\"http://www.erfrakon.com\">erfrakon</a> is a consulting company "
+"dedicated to opensource software and Linux. The main tasks of erfrakon "
+"within the Kolab project are the principle design and architecure of the "
+"Kolab groupware solution and the creation of the Kolab 1 server."
+msgstr ""
+"<a href=\"http://www.erfrakon.com\">erfrakon</a> es una compaÃ±Ãa consultora "
+"dedicada al software de cÃ³digo abierto y Linux. Las principales tareas de "
+"erfrakon dentro del proyecto Kolab son el diseÃ±o y arquitectura iniciales de "
+"la soluciÃ³n groupware Kolab y la creaciÃ³n del servidor Kolab 1."
 
-#: tpl_messages.php:199
-msgid "Folder deleted, awaiting cleanup..."
-msgstr "Carpeta borrada, esperando limpieza..."
+#: tpl_messages.php:272
+msgid "The following people worked on Kolab for erfrakon:"
+msgstr "Las siguientes personas trabajaron en Kolab para erfrakon:"
 
-#: tpl_messages.php:202 tpl_messages.php:245
-msgid "Welcome to the Kolab administration interface"
+#: tpl_messages.php:273
+#, fuzzy
+msgid "Welcome to the Kolab Groupware Server"
+msgstr "Servidor Groupware Kolab2"
+
+#: tpl_messages.php:274
+#, fuzzy
+msgid "My settings"
+msgstr "Mis ajustes de usuario"
+
+#: tpl_messages.php:275 ../../lib/KolabAdmin/include/menu.php:43
+#: ../../lib/KolabAdmin/include/menu.php:47
+#: ../../lib/KolabAdmin/include/menu.php:49
+#, fuzzy
+msgid "ActiveSync"
+msgstr "AcciÃ³n"
+
+#: tpl_messages.php:284 tpl_messages.php:311
+#, fuzzy
+msgid "Welcome to the Kolab Groupware Server Administration"
 msgstr "Bienvenida al interfaz de administraciÃ³n de Kolab"
 
-#: tpl_messages.php:203
-msgid "NOTE:"
-msgstr "NOTA:"
+#: tpl_messages.php:285
+msgid "The user with DN"
+msgstr "El usuario con DN"
 
-#: tpl_messages.php:204
+#: tpl_messages.php:287
+msgid "Back to list of users"
+msgstr "Volver a la lista de usuarios"
+
+#: tpl_messages.php:288
+msgid "Enter UID and password to login"
+msgstr "Entrar UID y contraseÃ±a para entrar"
+
+#: tpl_messages.php:289
+msgid "Username:"
+msgstr "Nombre de usuario:"
+
+#: tpl_messages.php:290
+msgid "Password:"
+msgstr "ContraseÃ±a:"
+
+#: tpl_messages.php:291
+msgid "Login"
+msgstr ""
+
+#: tpl_messages.php:292
+#, fuzzy
+msgid "Kolab Groupware Server Version"
+msgstr "Servidor Groupware Kolab2 VersiÃ³n"
+
+#: tpl_messages.php:293
+#, fuzzy
+msgid "Kolab Groupware Server Component Versions"
+msgstr "Componentes del Servidor groupware Kolab2 Versiones"
+
+#: tpl_messages.php:294
+msgid "PEAR/Horde Versions"
+msgstr ""
+
+#: tpl_messages.php:295
+msgid "Kolab2 Patched OpenPKG Package Versions"
+msgstr "Paquetes Kolab2 OpenPKG Parcheados Versiones"
+
+#: tpl_messages.php:296
+msgid "OpenPKG Version"
+msgstr "OpenPKG VersiÃ³n"
+
+#: tpl_messages.php:297
+msgid "Founded in Zürich in 2010, "
+msgstr ""
+
+#: tpl_messages.php:298
 msgid ""
-"No account is configured to receive mail for administrative addresses. If "
-"you have not yet created an account for this, "
+"is the global leader in Kolab Technology. Together with its partners in the "
+"Kolab Enterprise Community, Kolab Systems provides quality assurance, "
+"integration, support, training, certification of individuals and third-party "
+"products, as well as ongoing development for the Kolab Groupware Solution. "
+"The strong partnering model and a highly competent enterprise community "
+"provides users of the Kolab Groupware Solution with the right level of "
+"professional consulting, support and warranties to enable productivity and "
+"collaboration."
 msgstr ""
-"No hay un cuenta configurada para recibir mensajes de direcciones "
-"administrativas. Si todavÃa no ha creado una cuenta para ello,"
 
-#: tpl_messages.php:205
-msgid "please do so"
-msgstr "por favor hacer asÃ"
+#: tpl_messages.php:299
+msgid "Looking for professional support for your Kolab Groupware Solution?"
+msgstr ""
 
-#: tpl_messages.php:206
-msgid "and then go"
-msgstr "y entonces vamos"
+#: tpl_messages.php:300
+msgid "Kolab Systems provides a wide range of "
+msgstr ""
 
-#: tpl_messages.php:207
-msgid "here"
-msgstr "aquÃ"
+#: tpl_messages.php:303
+msgid "Our Development Partners"
+msgstr ""
 
-#: tpl_messages.php:208
-msgid "to set up forwarding of mail to administrative email addresses."
-msgstr "para establecer el envÃo de correo a las direcciones administrativas."
+#: tpl_messages.php:304
+msgid ""
+"In continuously improvingall parts of the Kolab Groupware Solution, Kolab "
+"Systems is working closely with development partners, such as (in "
+"alphabetical order):"
+msgstr ""
 
-#: tpl_messages.php:209
-msgid "The user with DN"
-msgstr "El usuario con DN"
+#: tpl_messages.php:305
+msgid "Thank you for being part of this awesome community!"
+msgstr ""
 
-#: tpl_messages.php:211
-msgid "Back to list of users"
-msgstr "Volver a la lista de usuarios"
+#: tpl_messages.php:306
+msgid "If <b>you</b> want to join the community, please go to "
+msgstr ""
 
-#: tpl_messages.php:212 tpl_messages.php:225
-msgid "Email Users"
-msgstr "Usuario de correo electrÃ³nico"
+#: tpl_messages.php:307
+msgid "and"
+msgstr ""
 
-#: tpl_messages.php:219
-msgid "E-mail"
-msgstr "Correo electrÃ³nico"
+#: tpl_messages.php:308
+msgid "The shared folder with DN"
+msgstr "La carpeta compartida con DN"
 
-#: tpl_messages.php:220
-msgid "uid"
+#: tpl_messages.php:310
+msgid "Back to list of shared folders"
+msgstr "Volver a la lista de carpetas compartidas"
+
+#: tpl_messages.php:316
+#, fuzzy
+msgid "Administrator"
+msgstr "Administradores"
+
+#: tpl_messages.php:319 ../../lib/KolabAdmin/include/menu.php:113
+msgid "Settings"
+msgstr "Servicios"
+
+#: tpl_messages.php:321
+msgid ""
+"The Kolab 1 KDE client and the Kolab 2 KDE Client (Kontact) was developed by"
 msgstr ""
+"El cliente KDE Kolab 1 y el cliente KDE Kolab 2 (Kontact) fueron "
+"desarrollados por"
 
-#: tpl_messages.php:222
-msgid "User Deleted, awaiting cleanup..."
-msgstr "Usuario borrado, esperando limpieza..."
+#: tpl_messages.php:322
+msgid ""
+"Klarälvdalens Datakonsult AB is a consulting company dedicated to "
+"opensource software, Linux, and the <a href=\"http://www.trolltech.com/"
+"products/qt/\">Qt</a> library. The main tasks of KDAB within the Kolab "
+"project are design and implementation of the Kolab KDE clients and the "
+"implementation of the current Kolab 2 server."
+msgstr ""
+"Klarälvdalens Datakonsult AB es una compaÃ±Ãa consultora dedicada a "
+"software de cÃ³digo abierto, Linux y la librerÃa <a href=\"http://www."
+"trolltech.com/products/qt/\">Qt</a>. Las principales tareas de KDAB dentro "
+"del proyecto Kolab son el diseÃ±o y la implementaciÃ³n de los clientes KDE "
+"Kolab y la implementaciÃ³n del servidor Kolab 2 actual."
 
-#: tpl_messages.php:230
+#: tpl_messages.php:323
+msgid ""
+"The following people worked on Kolab for Klarälvdalens Datakonsult AB:"
+msgstr ""
+"Las siguientes personas trabajaron en Kolab para Klarälvdalens "
+"Datakonsult AB:"
+
+#: tpl_messages.php:324
 msgid "Vacation Notification"
 msgstr "NotificaciÃ³n de vacaciones"
 
-#: tpl_messages.php:231
-msgid ""
-"Activate vacation notification (only one of vacation, forward and delivery "
-"to folder can be active at any time)"
-msgstr ""
-"Activar la notificaciÃ³n de vacaciones (sÃ³lo una por periodo vacacional, "
-"envÃo y recepciÃ³n a carpeta pueden ser activados en cualquier momento)"
+#: tpl_messages.php:325
+#, fuzzy
+msgid "Activate vacation notification"
+msgstr "NotificaciÃ³n de vacaciones"
 
-#: tpl_messages.php:232
+#: tpl_messages.php:326
 msgid "Resend notification only after"
 msgstr "Reenviar notificaciÃ³n sÃ³lo despuÃ©s"
 
-#: tpl_messages.php:233
+#: tpl_messages.php:327
 msgid "days"
 msgstr "dÃas"
 
-#: tpl_messages.php:234
+#: tpl_messages.php:328
 msgid "Send responses for these addresses:"
 msgstr "Enviar respuestas para estas direcciones:"
 
-#: tpl_messages.php:235
+#: tpl_messages.php:329
 msgid "(one address per line)"
 msgstr "(una direcciÃ³n por lÃnea)"
 
-#: tpl_messages.php:236
+#: tpl_messages.php:330
 msgid "Do not send vacation replies to spam messages"
 msgstr "No enviar respuestas de vacaciones a mensajes de correo basura"
 
-#: tpl_messages.php:237
+#: tpl_messages.php:331
 msgid "Only react to mail coming from domain"
 msgstr "Reaccionar sÃ³lo a los mensajes que vengan del dominio"
 
-#: tpl_messages.php:238
+#: tpl_messages.php:332
 msgid "(leave empty for all domains)"
 msgstr "(dejar vacÃo para todos los dominios)"
 
-#: tpl_messages.php:240
-msgid "Kolab2 Groupware Server Version"
-msgstr "Servidor Groupware Kolab2 VersiÃ³n"
+#: ../../www/admin/user/index.php:34
+#: ../../www/admin/administrator/index.php:33
+#: ../../www/admin/addressbook/index.php:23
+#: ../../www/admin/addressbook/addr.php:17
+#: ../../www/admin/maintainer/index.php:33
+#: ../../www/admin/domainmaintainer/index.php:33
+#: ../../www/admin/sharedfolder/index.php:22
+#: ../../www/admin/sharedfolder/sf.php:25
+#: ../../www/admin/distributionlist/index.php:35
+#: ../../www/admin/distributionlist/list.php:37
+#: ../../www/admin/settings/index.php:13
+msgid "Error: You don't have Permissions to access this Menu"
+msgstr "Error: No tiene permisos para acceder a este MenÃº"
 
-#: tpl_messages.php:241
-msgid "Kolab2 Groupware Server Component Versions"
-msgstr "Componentes del Servidor groupware Kolab2 Versiones"
+#: ../../www/admin/user/index.php:120
+#, php-format
+msgid "Manage Email User (%d Users)"
+msgstr "Administrar usuario de correo (%d usuarios)"
 
-#: tpl_messages.php:242
-msgid "PEAR/Horde Versions"
+#: ../../www/admin/user/index.php:182
+#: ../../www/admin/addressbook/index.php:122
+msgid "Email"
+msgstr "Correo electrÃ³nico"
+
+#: ../../www/admin/user/index.php:184
+#: ../../www/admin/addressbook/index.php:123
+msgid "contains"
+msgstr "contiene"
+
+#: ../../www/admin/user/index.php:185
+#: ../../www/admin/addressbook/index.php:124
+msgid "is"
+msgstr "es"
+
+#: ../../www/admin/user/index.php:186
+#: ../../www/admin/addressbook/index.php:125
+msgid "begins with"
+msgstr "comienza por"
+
+#: ../../www/admin/user/index.php:187
+#: ../../www/admin/addressbook/index.php:126
+msgid "ends with"
+msgstr "acaba por"
+
+#: ../../www/admin/user/vacation.php:36 ../../www/admin/user/deliver.php:46
+#: ../../www/admin/user/forward.php:47
+msgid "Error while connecting to Sieve service:"
 msgstr ""
 
-#: tpl_messages.php:243
-msgid "Kolab2 Patched OpenPKG Package Versions"
-msgstr "Paquetes Kolab2 OpenPKG Parcheados Versiones"
+#: ../../www/admin/user/vacation.php:55
+msgid "Vacation message successfully activated"
+msgstr "Mensaje de vacaciones activado con Ã©xito"
 
-#: tpl_messages.php:244
-msgid "OpenPKG Version"
-msgstr "OpenPKG VersiÃ³n"
+#: ../../www/admin/user/vacation.php:57
+msgid "Vacation message successfully deactivated"
+msgstr "Mensaje de vacaciones desactivado con Ã©xito"
 
-#: ../../../www/admin/addressbook/addr.php.in:17
-#: ../../../www/admin/addressbook/index.php.in:23
-#: ../../../www/admin/administrator/index.php.in:33
-#: ../../../www/admin/distributionlist/index.php.in:35
-#: ../../../www/admin/distributionlist/list.php.in:37
-#: ../../../www/admin/domainmaintainer/index.php.in:33
-#: ../../../www/admin/maintainer/index.php.in:33
-#: ../../../www/admin/settings/index.php.in:13
-#: ../../../www/admin/sharedfolder/index.php.in:22
-#: ../../../www/admin/sharedfolder/sf.php.in:25
-#: ../../../www/admin/user/index.php.in:34
-msgid "Error: You don't have Permissions to access this Menu"
-msgstr "Error: No tiene permisos para acceder a este MenÃº"
+#: ../../www/admin/user/vacation.php:62 ../../www/admin/user/deliver.php:65
+#: ../../www/admin/user/forward.php:67
+#, php-format
+msgid ""
+"Warning: You currently have a sieve script named %s active for your account."
+msgstr ""
 
-#: ../../../www/admin/addressbook/addr.php.in:65
-#: ../../../www/admin/user/user.php.in:114
+#: ../../www/admin/user/vacation.php:63 ../../www/admin/user/deliver.php:66
+#: ../../www/admin/user/forward.php:68
+msgid ""
+"Warning: This script will be overwritten without further warnings if you "
+"press \"Update\"!"
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:43
+msgid "zPush in not enabled in your system."
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:468
+msgid ""
+"There are currently no devices known for your user.<br/><br/>In order to "
+"register a device, please connect it to the server first, using <a "
+"href='http://wiki.kolab.org/Z_push#Clients'>the instructions in the Wiki</"
+"a>. Afterwards the device should become available for configuration in this "
+"dialogue."
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:496
+#, fuzzy
+msgid "Address Books"
+msgstr "Libreta de Direcciones"
+
+#: ../../www/admin/user/activesync.php:496
+msgid "Calendars"
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:496
+#: ../../www/admin/sharedfolder/index.php:65
+#: ../../lib/KolabAdmin/include/form.class.php:254
+msgid "Tasks"
+msgstr "Tareas"
+
+#: ../../www/admin/user/activesync.php:496
+#: ../../www/admin/sharedfolder/index.php:69
+#: ../../lib/KolabAdmin/include/form.class.php:256
+msgid "Notes"
+msgstr "Notas"
+
+#: ../../www/admin/user/activesync.php:500
+msgid "Automatic"
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:501
+msgid "Flat Mode"
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:502
+#, fuzzy
+msgid "Folder Mode"
+msgstr "Nombre de carpeta"
+
+#: ../../www/admin/user/activesync.php:506
+#: ../../lib/KolabAdmin/include/form.class.php:204
+msgid "No"
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:507
+#: ../../lib/KolabAdmin/include/form.class.php:204
+msgid "Yes"
+msgstr "SÃ"
+
+#: ../../www/admin/user/user.php:94
+msgid "Please enter an email address"
+msgstr "Por favor, introduzca una direcciÃ³n de correo electrÃ³nico"
+
+#: ../../www/admin/user/user.php:111
+#, php-format
+msgid "Email address %1$s not in domains %2$s"
+msgstr "La direcciÃ³n de correo %1$s no estÃ¡ en los dominios %2$s"
+
+#: ../../www/admin/user/user.php:114 ../../www/admin/addressbook/addr.php:65
 msgid "User, vCard or distribution list with this email address already exists"
 msgstr ""
 "El usuario, vCard o lista de distribuciÃ³n con esta direcciÃ³n de correo ya "
 "existe"
 
-#: ../../../www/admin/addressbook/addr.php.in:78
-#: ../../../www/admin/administrator/admin.php.in:121
-#: ../../../www/admin/distributionlist/list.php.in:106
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:96
-#: ../../../www/admin/maintainer/maintainer.php.in:118
-#: ../../../www/admin/sharedfolder/sf.php.in:112
-#: ../../../www/admin/user/user.php.in:349
+#: ../../www/admin/user/user.php:130
+msgid "UID "
+msgstr "UID"
+
+#: ../../www/admin/user/user.php:130
+#: ../../lib/KolabAdmin/include/form.class.php:34
+msgid ""
+" collides with an address already used for another user, a vCard or a "
+"distribution list.<br />"
+msgstr ""
+
+#: ../../www/admin/user/user.php:145
+#, php-format
+msgid "Email-Delegate %s does not exist"
+msgstr "Correo-Delegado %s no existe"
+
+#: ../../www/admin/user/user.php:165
+#, php-format
+msgid "Syntax for Recipient %s is invalid"
+msgstr ""
+
+#: ../../www/admin/user/user.php:211
+#, php-format
+msgid "Illegal user or group %s"
+msgstr "Usuario o grupo %s invÃ¡lido"
+
+#: ../../www/admin/user/user.php:220
+#, fuzzy
+msgid "Free/Busy interval can not be negative"
+msgstr "La cuota no puede ser negativa"
+
+#: ../../www/admin/user/user.php:221
+#, fuzzy
+msgid "Free/Busy interval must be a number"
+msgstr "La cuota debe ser menor que 4096"
+
+#: ../../www/admin/user/user.php:222
+#, fuzzy
+msgid "Free/Busy interval must be an integer"
+msgstr "La cuota debe ser menor que 4096"
+
+#: ../../www/admin/user/user.php:414
+#: ../../www/admin/administrator/admin.php:121
+#: ../../www/admin/addressbook/addr.php:78
+#: ../../www/admin/maintainer/maintainer.php:118
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:96
+#: ../../www/admin/sharedfolder/sf.php:114
+#: ../../www/admin/distributionlist/list.php:109
 msgid "Error: need valid action to proceed"
 msgstr "Error: se necesita una acciÃ³n vÃ¡lida para proceder"
 
-#: ../../../www/admin/addressbook/addr.php.in:81
-#: ../../../www/admin/administrator/admin.php.in:127
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:102
-#: ../../../www/admin/maintainer/maintainer.php.in:124
-#: ../../../www/admin/user/user.php.in:361
-#: ../../../www/admin/user/user.php.in:364
-#: ../../../www/admin/user/user.php.in:370
-#: ../../../www/admin/user/user.php.in:772
+#: ../../www/admin/user/user.php:426 ../../www/admin/user/user.php:429
+#: ../../www/admin/user/user.php:435 ../../www/admin/user/user.php:870
+#: ../../www/admin/administrator/admin.php:127
+#: ../../www/admin/addressbook/addr.php:81
+#: ../../www/admin/maintainer/maintainer.php:124
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:102
 msgid "Error: You don't have the required Permissions"
 msgstr "Error: No tiene los permisos requeridos"
 
-#: ../../../www/admin/addressbook/addr.php.in:95
-msgid "Primary E-Mail Address"
-msgstr "DirecciÃ³n primaria de correo electrÃ³nico"
+#: ../../www/admin/user/user.php:444 ../../www/admin/user/user.php:446
+#: ../../www/admin/sharedfolder/sf.php:128
+msgid "Non volatile"
+msgstr "No volÃ¡til"
 
-#: ../../../www/admin/addressbook/addr.php.in:97
-msgid "E-Mail Aliases"
-msgstr "Alias de correo electrÃ³nico"
+#: ../../www/admin/user/user.php:445
+#: ../../www/admin/administrator/admin.php:136
+#: ../../www/admin/maintainer/maintainer.php:133
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:111
+msgid "Leave blank to keep password unchanged"
+msgstr "Dejar en blanco para no cambiar la contraseÃ±a"
 
-#: ../../../www/admin/addressbook/addr.php.in:100
-#: ../../../www/admin/user/user.php.in:425
+#: ../../www/admin/user/user.php:469
+msgid "Unique Identity (UID)"
+msgstr "Identidad Ãºnica (UID)"
+
+#: ../../www/admin/user/user.php:471
+msgid "Optional - Defaults to Primary Email Address"
+msgstr "Opcional - Por defecto es la direcciÃ³n primaria de correo"
+
+#: ../../www/admin/user/user.php:472
+msgid "Mailbox Home Server"
+msgstr "Servidor Mailbox Home"
+
+#: ../../www/admin/user/user.php:476
+msgid "Account Type"
+msgstr "Tipo de cuenta"
+
+#: ../../www/admin/user/user.php:478
+msgid "User Account"
+msgstr "Cuenta de usuario"
+
+#: ../../www/admin/user/user.php:478
+msgid "Internal User Account"
+msgstr "Cuenta interna de usuario"
+
+#: ../../www/admin/user/user.php:478
+msgid "Group Account"
+msgstr "Cuenta de grupo"
+
+#: ../../www/admin/user/user.php:478
+msgid "Resource Account"
+msgstr "Cuenta de recurso"
+
+#: ../../www/admin/user/user.php:480
+msgid ""
+"NOTE: An internal user is a user that will not be visible in the address book"
+msgstr ""
+"NOTA: Un usuario interno es una usuario que no serÃ¡ visible en la libreta de "
+"direcciones"
+
+#: ../../www/admin/user/user.php:481
+msgid "Invitation Policy"
+msgstr "PolÃtica de invitaciÃ³n"
+
+#: ../../www/admin/user/user.php:485
+msgid "For automatic invitation handling"
+msgstr "Para manejo de invitaciÃ³n automÃ¡ticas"
+
+#: ../../www/admin/user/user.php:486
+msgid ""
+"NOTE: For regular accounts to use this feature, give the 'calendar' user "
+"access to the Calendar folder"
+msgstr ""
+"NOTA: Para que las cuentas regulares usen esta caracterÃstica, dar acceso al "
+"ususario 'calendar' a la carpeta 'Calendar'"
+
+#: ../../www/admin/user/user.php:488
+msgid "Email Aliases"
+msgstr "Alias de correo"
+
+#: ../../www/admin/user/user.php:491 ../../www/admin/addressbook/addr.php:100
 msgid "One address per line"
 msgstr "Una direcciÃ³n por lÃnea"
 
-#: ../../../www/admin/addressbook/addr.php.in:105
-msgid "Post Box"
-msgstr "BuzÃ³n de correo"
+#: ../../www/admin/user/user.php:493
+msgid "Email-Delegates"
+msgstr "Correo-Delegados"
 
-#: ../../../www/admin/addressbook/addr.php.in:121
-#: ../../../www/admin/distributionlist/list.php.in:135
-#: ../../../www/admin/sharedfolder/sf.php.in:148
-#, php-format
-msgid "Error: DN required for %s operation"
-msgstr "Error: se requiere un DN para la operaciÃ³n %s"
+#: ../../www/admin/user/user.php:496
+msgid "Others allowed to send emails with a \"from\" address of this account."
+msgstr ""
+"Otros autorizados para mandar correos con una direcciÃ³n \"from\" de esta "
+"cuenta."
 
-#: ../../../www/admin/addressbook/addr.php.in:131
-msgid "Add External Address"
-msgstr "AÃ±adir direcciÃ³n externa"
+#: ../../www/admin/user/user.php:497
+msgid "One email address per line."
+msgstr "Una direcciÃ³n de correo por lÃnea."
 
-#: ../../../www/admin/addressbook/addr.php.in:178
-#, php-format
+#: ../../www/admin/user/user.php:499
+msgid "Allowed Recipients"
+msgstr ""
+
+#: ../../www/admin/user/user.php:502
+msgid "Restrict allowed recipients of SMTP messages"
+msgstr ""
+
+#: ../../www/admin/user/user.php:503
+#, fuzzy
+msgid "One entry per line."
+msgstr "Una direcciÃ³n por lÃnea"
+
+#: ../../www/admin/user/user.php:514
 msgid ""
-"Addressbook entry DN could not be modified, distribution list <a "
-"href='@kolab_wui@/distributionlist/list.php?action=modify&dn=%s'>'%s'</a> "
-"depends on it. To modify this entry, first remove it from the distribution "
-"list."
-msgstr ""
-"La entrada DN de la libreta de direcciones no puede ser modificada, la lista "
-"de distribuciÃ³n <a href='@kolab_wui@/distributionlist/list.php?"
-"action=modify&dn=%s'>'%s'</a> depende de ella. Para modificar esta entrada, "
-"primero bÃ³rrela de la lista de distribuciÃ³n."
-
-#: ../../../www/admin/addressbook/addr.php.in:189
-#: ../../../www/admin/administrator/admin.php.in:216
-#: ../../../www/admin/distributionlist/list.php.in:196
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:200
-#: ../../../www/admin/maintainer/maintainer.php.in:213
-#: ../../../www/admin/sharedfolder/sf.php.in:227
-#: ../../../www/admin/user/user.php.in:617
+"2 letter code from <a href=\"http://www.iso.org/iso/"
+"english_country_names_and_code_elements\" target=\"_blank\">ISO 3166</a>"
+msgstr ""
+
+#: ../../www/admin/user/user.php:520
+msgid "User Quota in MBytes"
+msgstr "Cuota de usuario en MBytes"
+
+#: ../../www/admin/user/user.php:536
+msgid "Free/Busy interval in days"
+msgstr "Intervalo libre/ocupado en dÃas"
+
+#: ../../www/admin/user/user.php:537
+msgid "Leave blank for default (60 days)"
+msgstr "Dejar en blanco para usar el valor por defecto (60 dÃas)"
+
+#: ../../www/admin/user/user.php:547
+#: ../../www/admin/administrator/admin.php:165
+#: ../../www/admin/maintainer/maintainer.php:162
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:149
+#, php-format
+msgid "LDAP Error: No such dn: %s: %s"
+msgstr "Error de LDAP: No existe el DN: %s: %s"
+
+#: ../../www/admin/user/user.php:711
+#: ../../www/admin/administrator/admin.php:217
+#: ../../www/admin/addressbook/addr.php:189
+#: ../../www/admin/maintainer/maintainer.php:215
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:202
+#: ../../www/admin/sharedfolder/sf.php:231
+#: ../../www/admin/distributionlist/list.php:200
 #, php-format
 msgid "LDAP Error: could not rename %s to %s: %s"
 msgstr "Error de LDAP: no se pudo renombrar %s a %s: %s"
 
-#: ../../../www/admin/addressbook/addr.php.in:197
-#: ../../../www/admin/administrator/admin.php.in:224
-#: ../../../www/admin/distributionlist/list.php.in:204
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:208
-#: ../../../www/admin/maintainer/maintainer.php.in:221
-#: ../../../www/admin/sharedfolder/sf.php.in:235
-#: ../../../www/admin/user/user.php.in:625
+#: ../../www/admin/user/user.php:719
 #, fuzzy, php-format
-msgid "LDAP Error: could not modify %s to %s: %s"
+msgid "LDAP Error: could not modify %s: %s"
 msgstr "Error de LDAP: no se pudo modificar el objeto %s: %s"
 
-#: ../../../www/admin/addressbook/addr.php.in:203
-#: ../../../www/admin/addressbook/addr.php.in:218
-#: ../../../www/admin/administrator/admin.php.in:230
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:214
-#: ../../../www/admin/maintainer/maintainer.php.in:227
-#: ../../../www/admin/user/user.php.in:631
+#: ../../www/admin/user/user.php:725
+#: ../../www/admin/administrator/admin.php:231
+#: ../../www/admin/addressbook/addr.php:203
+#: ../../www/admin/addressbook/addr.php:218
+#: ../../www/admin/maintainer/maintainer.php:229
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:216
 #, php-format
 msgid "%s successfully updated"
 msgstr "%s actualizado con Ã©xito"
 
-#: ../../../www/admin/addressbook/addr.php.in:209
-#: ../../../www/admin/administrator/admin.php.in:234
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:226
-#: ../../../www/admin/maintainer/maintainer.php.in:231
-#: ../../../www/admin/sharedfolder/sf.php.in:247
+#: ../../www/admin/user/user.php:731
+#: ../../www/admin/distributionlist/list.php:220
 #, php-format
-msgid "LDAP Error: could not read %s: %s"
-msgstr "Error de LDAP: no se pudo leer %s: %s"
+msgid "LDAP Error: Could not read %s: %s"
+msgstr "Error de LDAP: No se pudo leer %s: %s"
 
-#: ../../../www/admin/addressbook/addr.php.in:215
-#: ../../../www/admin/administrator/admin.php.in:238
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:230
-#: ../../../www/admin/maintainer/maintainer.php.in:235
-#: ../../../www/admin/sharedfolder/sf.php.in:251
+#: ../../www/admin/user/user.php:745 ../../www/admin/user/user.php:758
+#: ../../www/admin/user/user.php:797 ../../www/admin/user/user.php:812
+#: ../../www/admin/distributionlist/list.php:224
+#: ../../www/admin/distributionlist/list.php:253
 #, php-format
-msgid "LDAP Error: could not modify object %s: %s"
-msgstr "Error de LDAP: no se pudo modificar el objeto %s: %s"
+msgid "LDAP Error: Could not modify object %s: %s"
+msgstr "Error de LDAP: No se pudo modificar el objeto %s: %s"
+
+#: ../../www/admin/user/user.php:761 ../../www/admin/user/user.php:815
+#, php-format
+msgid "Mid-air collision detected, alias %1$s renamed to %2$s"
+msgstr "ColisiÃ³n Mid-air detectada, alias %1$s renombrado a %2$s"
+
+#: ../../www/admin/user/user.php:766 ../../www/admin/user/user.php:848
+msgid "Modify User"
+msgstr "Modificar usuario"
+
+#: ../../www/admin/user/user.php:767
+#, php-format
+msgid "User '%s' successfully modified"
+msgstr "Usuario '%s' modificado con Ã©xito"
 
-#: ../../../www/admin/addressbook/addr.php.in:227
-#: ../../../www/admin/administrator/admin.php.in:256
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:261
-#: ../../../www/admin/maintainer/maintainer.php.in:257
-#: ../../../www/admin/sharedfolder/sf.php.in:261
-#: ../../../www/admin/user/user.php.in:689
+#: ../../www/admin/user/user.php:787
+#: ../../www/admin/administrator/admin.php:260
+#: ../../www/admin/addressbook/addr.php:227
+#: ../../www/admin/maintainer/maintainer.php:261
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:265
+#: ../../www/admin/sharedfolder/sf.php:265
 #, php-format
 msgid "LDAP Error: could not add object %s: %s"
 msgstr "Error de LDAP: no se pudo aÃ±adir el objeto %s: %s"
 
-#: ../../../www/admin/addressbook/addr.php.in:230
+#: ../../www/admin/user/user.php:800
+#: ../../www/admin/distributionlist/list.php:256
 #, php-format
-msgid "%s successfully added"
-msgstr "%s aÃ±adido con Ã©xito"
+msgid "Mid-air collision detected, email address %1$s renamed to %2$s"
+msgstr ""
+"ColisiÃ³n Mid-air detectada, direcciÃ³n de correo electrÃ³nico %1$s renombrada "
+"a %2$s"
 
-#: ../../../www/admin/addressbook/addr.php.in:240
-#: ../../../www/admin/addressbook/addr.php.in:258
-msgid "Modify External Address"
-msgstr "Modificar direcciÃ³n externa"
+#: ../../www/admin/user/user.php:821
+msgid "User "
+msgstr "Usuario"
 
-#: ../../../www/admin/addressbook/addr.php.in:261
-#: ../../../www/admin/addressbook/addr.php.in:281
-#, php-format
-msgid "Error: No entry with DN %s found"
-msgstr "Error: no se encontrÃ³ una entrada con DN %s"
+#: ../../www/admin/user/user.php:821
+#: ../../www/admin/administrator/admin.php:270
+#: ../../www/admin/maintainer/maintainer.php:269
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:276
+msgid " successfully created"
+msgstr " creado con Ã©xito"
 
-#: ../../../www/admin/addressbook/addr.php.in:278
-msgid "Delete External Address"
-msgstr "Borrar direcciÃ³n externa"
+#: ../../www/admin/user/user.php:822 ../../www/admin/user/user.php:828
+#: ../../www/admin/user/user.php:839 ../../lib/KolabAdmin/include/menu.php:30
+msgid "Create New User"
+msgstr "Crear nuevo usuario"
+
+#: ../../www/admin/user/user.php:854 ../../www/admin/user/user.php:912
+msgid "Delete User"
+msgstr "Borrar usuario"
+
+#: ../../www/admin/user/user.php:867
+#: ../../www/admin/administrator/admin.php:315
+#: ../../www/admin/maintainer/maintainer.php:314
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:318
+msgid "Error: need DN for delete operation"
+msgstr "Error: se necesita un DN para borrar la operaciÃ³n"
 
-#: ../../../www/admin/addressbook/addr.php.in:295
-#: ../../../www/admin/user/user.php.in:788
+#: ../../www/admin/user/user.php:873
+#: ../../www/admin/maintainer/maintainer.php:316
+msgid "Error: you need administrative permissions to delete users"
+msgstr "Error: necesita permisos administrativos para borrar usuarios"
+
+#: ../../www/admin/user/user.php:886 ../../www/admin/addressbook/addr.php:295
 #, php-format
 msgid "Account could not be deleted, distribution list '%s' depends on it."
 msgstr ""
 "La cuenta no pudo ser borrada, la lista de distribuciÃ³n %s depende de ella."
 
-#: ../../../www/admin/addressbook/addr.php.in:302
+#: ../../www/admin/user/user.php:893
 #, php-format
-msgid "Addressbook entry removed from distribution list '%s'."
-msgstr ""
-"Entrada de la libreta de direcciones eliminada de la lista de distribuciÃ³n '%"
-"s'."
+msgid "Account removed from distribution list '%s'."
+msgstr "Cuenta eliminada de la lista de distribuciÃ³n '%s'."
 
-#: ../../../www/admin/addressbook/addr.php.in:304
+#: ../../www/admin/user/user.php:895
 #, php-format
 msgid ""
-"Failure to remove addressbook entry from distribution list '%s', entry will "
-"not be deleted."
+"Failure to remove account from distribution list '%s', account will not be "
+"deleted."
 msgstr ""
-"Fallo al borrar la entrada de la libreta de direcciones desde la lista de "
-"distribuciÃ³n '%s', la entrada no serÃ¡ borrada."
+"Fallo al borrar la cuenta de la lista de distribuciÃ³n '%s', la cuenta no "
+"serÃ¡ borrada."
 
-#: ../../../www/admin/addressbook/addr.php.in:312
+#: ../../www/admin/user/user.php:903
 #, php-format
-msgid "LDAP Error: could not delete %s: %s"
-msgstr "Error de LDAP: no se puede borrar %s: %s"
+msgid "LDAP Error: could not mark '%s' for deletion: %s"
+msgstr "Error de LDAP: no se pudo marcar '%s' para borrado: %s"
 
-#: ../../../www/admin/addressbook/addr.php.in:315
-#: ../../../www/admin/distributionlist/list.php.in:312
-#: ../../../www/admin/sharedfolder/sf.php.in:321
-msgid "Entry Deleted"
-msgstr "Entrada borrada"
+#: ../../www/admin/user/user.php:906
+msgid "User Deleted"
+msgstr "Usuario borrado"
 
-#: ../../../www/admin/addressbook/addr.php.in:316
+#: ../../www/admin/user/deliver.php:58
 #, php-format
-msgid "Address book entry with DN %s was deleted"
-msgstr "La entrada de la libreta de direcciones con DN %s fue borrada"
+msgid "Delivery to '%s' successfully activated"
+msgstr "Entrega a '%s' activada con Ã©xito"
 
-#: ../../../www/admin/addressbook/index.php.in:122
-#: ../../../www/admin/user/index.php.in:184
-msgid "Email"
-msgstr "Correo electrÃ³nico"
+#: ../../www/admin/user/deliver.php:60
+#, php-format
+msgid "Delivery to '%s' successfully deactivated"
+msgstr "Entrega a '%s' desactivada con Ã©xito"
 
-#: ../../../www/admin/addressbook/index.php.in:123
-#: ../../../www/admin/user/index.php.in:186
-msgid "contains"
-msgstr "contiene"
+#: ../../www/admin/user/forward.php:60
+#, php-format
+msgid "Forwarding to '%s' successfully activated"
+msgstr "ReenvÃo a '%s' activado con Ã©xito"
 
-#: ../../../www/admin/addressbook/index.php.in:124
-#: ../../../www/admin/user/index.php.in:187
-msgid "is"
-msgstr "es"
+#: ../../www/admin/user/forward.php:62
+#, php-format
+msgid "Forwarding to '%s' successfully deactivated"
+msgstr "ReenvÃo a '%s' desactivado con Ã©xito"
 
-#: ../../../www/admin/addressbook/index.php.in:125
-#: ../../../www/admin/user/index.php.in:188
-msgid "begins with"
-msgstr "comienza por"
+#: ../../www/admin/administrator/index.php:62
+msgid "Manage Administrators ("
+msgstr "Gestionar administradores ("
 
-#: ../../../www/admin/addressbook/index.php.in:126
-#: ../../../www/admin/user/index.php.in:189
-msgid "ends with"
-msgstr "acaba por"
+#: ../../www/admin/administrator/index.php:62
+msgid " Administrators)"
+msgstr " administradores)"
 
-#: ../../../www/admin/administrator/admin.php.in:52
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:53
-#: ../../../www/admin/maintainer/maintainer.php.in:52
+#: ../../www/admin/administrator/admin.php:52
+#: ../../www/admin/maintainer/maintainer.php:52
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:53
 msgid "Account with this UID already exists"
 msgstr "Ya existe una cuenta con este UID"
 
-#: ../../../www/admin/administrator/admin.php.in:75
+#: ../../www/admin/administrator/admin.php:75
 msgid "Manager's password can't be changed from the webgui"
 msgstr "La contraseÃ±a del administrador no puede ser cambiada desde el webgui"
 
-#: ../../../www/admin/administrator/admin.php.in:135
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:110
-#: ../../../www/admin/maintainer/maintainer.php.in:132
+#: ../../www/admin/administrator/admin.php:135
+#: ../../www/admin/maintainer/maintainer.php:132
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:110
 msgid "non volatile"
 msgstr "no volÃ¡til"
 
-#: ../../../www/admin/administrator/admin.php.in:136
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:111
-#: ../../../www/admin/maintainer/maintainer.php.in:133
-#: ../../../www/admin/user/user.php.in:380
-msgid "Leave blank to keep password unchanged"
-msgstr "Dejar en blanco para no cambiar la contraseÃ±a"
-
-#: ../../../www/admin/administrator/admin.php.in:153
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:128
-#: ../../../www/admin/maintainer/maintainer.php.in:150
+#: ../../www/admin/administrator/admin.php:153
+#: ../../www/admin/maintainer/maintainer.php:150
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:128
 msgid "Unique User ID"
 msgstr "ID Ãºnico de usuario"
 
-#: ../../../www/admin/administrator/admin.php.in:165
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:149
-#: ../../../www/admin/maintainer/maintainer.php.in:162
-#: ../../../www/admin/user/user.php.in:471
+#: ../../www/admin/administrator/admin.php:225
+#: ../../www/admin/addressbook/addr.php:197
+#: ../../www/admin/maintainer/maintainer.php:223
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:210
+#: ../../www/admin/sharedfolder/sf.php:239
+#: ../../www/admin/distributionlist/list.php:208
+#, fuzzy, php-format
+msgid "LDAP Error: could not modify %s to %s: %s"
+msgstr "Error de LDAP: no se pudo modificar el objeto %s: %s"
+
+#: ../../www/admin/administrator/admin.php:235
+#: ../../www/admin/addressbook/addr.php:209
+#: ../../www/admin/maintainer/maintainer.php:233
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:228
+#: ../../www/admin/sharedfolder/sf.php:251
 #, php-format
-msgid "LDAP Error: No such dn: %s: %s"
-msgstr "Error de LDAP: No existe el DN: %s: %s"
+msgid "LDAP Error: could not read %s: %s"
+msgstr "Error de LDAP: no se pudo leer %s: %s"
+
+#: ../../www/admin/administrator/admin.php:239
+#: ../../www/admin/addressbook/addr.php:215
+#: ../../www/admin/maintainer/maintainer.php:237
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:232
+#: ../../www/admin/sharedfolder/sf.php:255
+#, php-format
+msgid "LDAP Error: could not modify object %s: %s"
+msgstr "Error de LDAP: no se pudo modificar el objeto %s: %s"
 
-#: ../../../www/admin/administrator/admin.php.in:243
-#: ../../../www/admin/administrator/admin.php.in:293
+#: ../../www/admin/administrator/admin.php:244
+#: ../../www/admin/administrator/admin.php:297
 msgid "Modify Administrator"
 msgstr "Modificar administrador"
 
-#: ../../../www/admin/administrator/admin.php.in:244
-#: ../../../www/admin/administrator/admin.php.in:266
+#: ../../www/admin/administrator/admin.php:245
+#: ../../www/admin/administrator/admin.php:270
 msgid "Administrator "
 msgstr "Administrador "
 
-#: ../../../www/admin/administrator/admin.php.in:244
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:244
-#: ../../../www/admin/maintainer/maintainer.php.in:241
+#: ../../www/admin/administrator/admin.php:245
+#: ../../www/admin/maintainer/maintainer.php:243
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:246
 msgid " successfully modified"
 msgstr " modificado con Ã©xito"
 
-#: ../../../www/admin/administrator/admin.php.in:262
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:265
-#: ../../../www/admin/maintainer/maintainer.php.in:261
+#: ../../www/admin/administrator/admin.php:266
+#: ../../www/admin/maintainer/maintainer.php:265
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:269
 #, php-format
 msgid "LDAP Error: could not add object %s to maintainer group: %s"
 msgstr ""
 "Error de LDAP: no se pudo aÃ±adir el objeto %s al grupo de mantenedores: %s"
 
-#: ../../../www/admin/administrator/admin.php.in:266
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:272
-#: ../../../www/admin/maintainer/maintainer.php.in:265
-#: ../../../www/admin/user/user.php.in:723
-msgid " successfully created"
-msgstr " creado con Ã©xito"
-
-#: ../../../www/admin/administrator/admin.php.in:267
-#: ../../../www/admin/administrator/admin.php.in:273
-#: ../../../www/admin/administrator/admin.php.in:284 ../include/menu.php:74
+#: ../../www/admin/administrator/admin.php:271
+#: ../../www/admin/administrator/admin.php:277
+#: ../../www/admin/administrator/admin.php:288
+#: ../../lib/KolabAdmin/include/menu.php:81
 msgid "Create New Administrator"
 msgstr "Crear nuevo administrador"
 
-#: ../../../www/admin/administrator/admin.php.in:299
+#: ../../www/admin/administrator/admin.php:303
 msgid "Delete Administrator"
 msgstr "Borrar administrador"
 
-#: ../../../www/admin/administrator/admin.php.in:311
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:314
-#: ../../../www/admin/maintainer/maintainer.php.in:310
-#: ../../../www/admin/user/user.php.in:769
-msgid "Error: need DN for delete operation"
-msgstr "Error: se necesita un DN para borrar la operaciÃ³n"
-
-#: ../../../www/admin/administrator/admin.php.in:313
+#: ../../www/admin/administrator/admin.php:317
 msgid "Error: you need administrative permissions to delete administrators"
 msgstr ""
 "Error: necesita tener permisos administrativos para borrar administradores"
 
-#: ../../../www/admin/administrator/admin.php.in:317
+#: ../../www/admin/administrator/admin.php:321
 #, php-format
 msgid "LDAP Error: Could not remove %s from admin group: %s"
 msgstr "Error de LDAP: No se pudo borrar %s del grupo admin: %s"
 
-#: ../../../www/admin/administrator/admin.php.in:322
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:326
-#: ../../../www/admin/maintainer/maintainer.php.in:322
+#: ../../www/admin/administrator/admin.php:326
+#: ../../www/admin/maintainer/maintainer.php:326
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:330
 #, php-format
 msgid "LDAP Error: could not mark %s for deletion: %s"
 msgstr "Error de LDAP: no se pudo marcar %s para borrado: %s"
 
-#: ../../../www/admin/administrator/admin.php.in:328
+#: ../../www/admin/administrator/admin.php:332
 msgid "Administrator Deleted"
 msgstr "Administrador borrado"
 
-#: ../../../www/admin/administrator/index.php.in:62
-msgid "Manage Administrators ("
-msgstr "Gestionar administradores ("
-
-#: ../../../www/admin/administrator/index.php.in:62
-msgid " Administrators)"
-msgstr " administradores)"
-
-#: ../../../www/admin/distributionlist/index.php.in:63
-#, php-format
-msgid "Manage Distribution Lists (%d Lists)"
-msgstr "Administrar listas de distribuciÃ³n (%d Listas)"
+#: ../../www/admin/addressbook/addr.php:95
+msgid "Primary E-Mail Address"
+msgstr "DirecciÃ³n primaria de correo electrÃ³nico"
 
-#: ../../../www/admin/distributionlist/index.php.in:74
-msgid "not yet implemented"
-msgstr "por implementar"
+#: ../../www/admin/addressbook/addr.php:97
+msgid "E-Mail Aliases"
+msgstr "Alias de correo electrÃ³nico"
 
-#: ../../../www/admin/distributionlist/list.php.in:46
-msgid "Please add at least one member"
-msgstr "Por favor, aÃ±ada al menos un miembro"
+#: ../../www/admin/addressbook/addr.php:105
+msgid "Post Box"
+msgstr "BuzÃ³n de correo"
 
-#: ../../../www/admin/distributionlist/list.php.in:50
+#: ../../www/admin/addressbook/addr.php:121
+#: ../../www/admin/sharedfolder/sf.php:150
+#: ../../www/admin/distributionlist/list.php:138
 #, php-format
-msgid "No user with email address, UID or alias %s"
-msgstr "No existe el usuario con direcciÃ³n de correo, UID o alias %s"
-
-#: ../../../www/admin/distributionlist/list.php.in:62
-msgid "User or distribution list with this email address already exists"
-msgstr ""
-"El usuario o lista de distribuciÃ³n con esta direcciÃ³n de correo ya existe"
-
-#: ../../../www/admin/distributionlist/list.php.in:111
-msgid "List Name"
-msgstr "Nombre de lista"
-
-#: ../../../www/admin/distributionlist/list.php.in:118
-msgid "Members"
-msgstr "Miembros"
-
-#: ../../../www/admin/distributionlist/list.php.in:120
-msgid "One email address per line"
-msgstr "Una direcciÃ³n de correo por lÃnea"
+msgid "Error: DN required for %s operation"
+msgstr "Error: se requiere un DN para la operaciÃ³n %s"
 
-#: ../../../www/admin/distributionlist/list.php.in:123
-msgid "Hidden"
-msgstr "Escondido"
+#: ../../www/admin/addressbook/addr.php:131
+msgid "Add External Address"
+msgstr "AÃ±adir direcciÃ³n externa"
 
-#: ../../../www/admin/distributionlist/list.php.in:126
-msgid ""
-"Check here to make this distribution list available only to authenticated "
-"users"
+#: ../../www/admin/addressbook/addr.php:178
+#, fuzzy, php-format
+msgid "Addressbook entry DN could not be modified, distribution list <a href='"
 msgstr ""
-"Seleccione aquÃ para hacer que esta lista de distribuciÃ³n sÃ³lo estÃ© "
-"disponible para usuarios autentificados"
+"Entrada de la libreta de direcciones eliminada de la lista de distribuciÃ³n "
+"'%s'."
 
-#: ../../../www/admin/distributionlist/list.php.in:145
-msgid "Add Distribution List"
-msgstr "AÃ±adir lista de distribuciÃ³n"
-
-#: ../../../www/admin/distributionlist/list.php.in:179
+#: ../../www/admin/addressbook/addr.php:230
 #, php-format
-msgid "No user with address %s"
-msgstr "No existe el usuario con direcciÃ³n %s"
+msgid "%s successfully added"
+msgstr "%s aÃ±adido con Ã©xito"
 
-#: ../../../www/admin/distributionlist/list.php.in:210
-#: ../../../www/admin/distributionlist/list.php.in:222
-msgid "Distribution List updated"
-msgstr "Lista de distribuciÃ³n actualizada"
+#: ../../www/admin/addressbook/addr.php:240
+#: ../../www/admin/addressbook/addr.php:258
+msgid "Modify External Address"
+msgstr "Modificar direcciÃ³n externa"
 
-#: ../../../www/admin/distributionlist/list.php.in:216
-#: ../../../www/admin/user/user.php.in:637
+#: ../../www/admin/addressbook/addr.php:261
+#: ../../www/admin/addressbook/addr.php:281
 #, php-format
-msgid "LDAP Error: Could not read %s: %s"
-msgstr "Error de LDAP: No se pudo leer %s: %s"
+msgid "Error: No entry with DN %s found"
+msgstr "Error: no se encontrÃ³ una entrada con DN %s"
 
-#: ../../../www/admin/distributionlist/list.php.in:220
-#: ../../../www/admin/distributionlist/list.php.in:249
-#: ../../../www/admin/user/user.php.in:649
-#: ../../../www/admin/user/user.php.in:662
-#: ../../../www/admin/user/user.php.in:699
-#: ../../../www/admin/user/user.php.in:714
-#, php-format
-msgid "LDAP Error: Could not modify object %s: %s"
-msgstr "Error de LDAP: No se pudo modificar el objeto %s: %s"
+#: ../../www/admin/addressbook/addr.php:278
+msgid "Delete External Address"
+msgstr "Borrar direcciÃ³n externa"
 
-#: ../../../www/admin/distributionlist/list.php.in:231
+#: ../../www/admin/addressbook/addr.php:302
 #, php-format
-msgid "LDAP Error: Could not add object %s: %s"
-msgstr "Error de LDAP: No se pudo aÃ±adir el objeto %s: %s"
+msgid "Addressbook entry removed from distribution list '%s'."
+msgstr ""
+"Entrada de la libreta de direcciones eliminada de la lista de distribuciÃ³n "
+"'%s'."
 
-#: ../../../www/admin/distributionlist/list.php.in:252
-#: ../../../www/admin/user/user.php.in:702
+#: ../../www/admin/addressbook/addr.php:304
 #, php-format
-msgid "Mid-air collision detected, email address %1$s renamed to %2$s"
+msgid ""
+"Failure to remove addressbook entry from distribution list '%s', entry will "
+"not be deleted."
 msgstr ""
-"ColisiÃ³n Mid-air detectada, direcciÃ³n de correo electrÃ³nico %1$s renombrada "
-"a %2$s"
+"Fallo al borrar la entrada de la libreta de direcciones desde la lista de "
+"distribuciÃ³n '%s', la entrada no serÃ¡ borrada."
 
-#: ../../../www/admin/distributionlist/list.php.in:260
+#: ../../www/admin/addressbook/addr.php:312
 #, php-format
-msgid "Distribution List '%s' added"
-msgstr "AÃ±adida lista de distribuciÃ³n '%s'"
+msgid "LDAP Error: could not delete %s: %s"
+msgstr "Error de LDAP: no se puede borrar %s: %s"
 
-#: ../../../www/admin/distributionlist/list.php.in:272
-#: ../../../www/admin/distributionlist/list.php.in:286
-msgid "Modify Distribution List"
-msgstr "Modificar lista de distribuciÃ³n"
+#: ../../www/admin/addressbook/addr.php:315
+#: ../../www/admin/sharedfolder/sf.php:325
+#: ../../www/admin/distributionlist/list.php:316
+msgid "Entry Deleted"
+msgstr "Entrada borrada"
 
-#: ../../../www/admin/distributionlist/list.php.in:289
-#: ../../../www/admin/distributionlist/list.php.in:304
-#: ../../../www/admin/sharedfolder/sf.php.in:298
-#: ../../../www/admin/sharedfolder/sf.php.in:314
+#: ../../www/admin/addressbook/addr.php:316
 #, php-format
-msgid "Error: No results returned for DN '%s'"
-msgstr "Error: No se devolvieron resultados para el DN '%s'"
+msgid "Address book entry with DN %s was deleted"
+msgstr "La entrada de la libreta de direcciones con DN %s fue borrada"
 
-#: ../../../www/admin/distributionlist/list.php.in:301
-msgid "Delete Distribution List"
-msgstr "Borrar lista de distribuciÃ³n"
+#: ../../www/admin/maintainer/index.php:62
+#: ../../www/admin/domainmaintainer/index.php:62
+msgid "Manage Maintainers ("
+msgstr "Administrar mantenedores ("
 
-#: ../../../www/admin/distributionlist/list.php.in:311
-msgid "Distribution List "
-msgstr "Lista de distribuciÃ³n "
+#: ../../www/admin/maintainer/index.php:62
+#: ../../www/admin/domainmaintainer/index.php:62
+msgid " Maintainers)"
+msgstr " Mantenedores)"
 
-#: ../../../www/admin/distributionlist/list.php.in:311
-msgid " deleted"
-msgstr "Borrada"
+#: ../../www/admin/maintainer/maintainer.php:242
+#: ../../www/admin/maintainer/maintainer.php:296
+msgid "Modify Maintainer"
+msgstr "Modificar mantenedores"
+
+#: ../../www/admin/maintainer/maintainer.php:243
+#: ../../www/admin/maintainer/maintainer.php:269
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:246
+msgid "Maintainer "
+msgstr "Mantenedor"
+
+#: ../../www/admin/maintainer/maintainer.php:270
+#: ../../www/admin/maintainer/maintainer.php:276
+#: ../../www/admin/maintainer/maintainer.php:287
+#: ../../lib/KolabAdmin/include/menu.php:93
+msgid "Create New Maintainer"
+msgstr "Crear nuevo mantenedor"
 
-#: ../../../www/admin/distributionlist/list.php.in:315
+#: ../../www/admin/maintainer/maintainer.php:302
+msgid "Delete Maintainer"
+msgstr "Borrar mantenedor"
+
+#: ../../www/admin/maintainer/maintainer.php:320
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:324
 #, php-format
-msgid "LDAP Error: Could not delete %s: %s"
-msgstr "Error de LDAP: no se pudo borrar %s: %s"
+msgid "LDAP Error: Could not remove %s from maintainer group: %s"
+msgstr "Error de LDAP: No se pudo borrar %s del grupo de mantenedores: %s"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:49
+#: ../../www/admin/maintainer/maintainer.php:332
+msgid "Maintainer Deleted"
+msgstr "Mantenedor borrado"
+
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:49
 #, fuzzy
 msgid "Please enter a uid value"
 msgstr "Por favor, introduzca una direcciÃ³n de correo electrÃ³nico"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:137
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:137
 msgid "Check domains this domain maintainer should be able to maintain"
 msgstr ""
 "Comprobar los dominios que este mantenedor de dominio deberÃa de poder "
 "mantener"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:243
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:296
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:245
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:300
 msgid "Modify Domain Maintainer"
 msgstr "Modificar mantenedor de dominio"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:244
-#: ../../../www/admin/maintainer/maintainer.php.in:241
-#: ../../../www/admin/maintainer/maintainer.php.in:265
-msgid "Maintainer "
-msgstr "Mantenedor"
-
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:272
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:276
 msgid "Domain maintainer "
 msgstr "Mantenedor del dominio"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:273
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:277
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:287
-#: ../include/menu.php:80 ../include/menu.php:97
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:277
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:281
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:291
+#: ../../lib/KolabAdmin/include/menu.php:87
+#: ../../lib/KolabAdmin/include/menu.php:104
 msgid "Create New Domain Maintainer"
 msgstr "Crear nuevo mantenedor de dominio"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:302
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:306
 msgid "Delete Domain Maintainer"
 msgstr "Borrar mantenedor de dominio"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:316
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:320
 msgid "Error: you need administrative permissions to delete domain maintainers"
 msgstr ""
 "Error: necesita permisos administrativos para borrar el mantenedor de dominio"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:320
-#: ../../../www/admin/maintainer/maintainer.php.in:316
-#, php-format
-msgid "LDAP Error: Could not remove %s from maintainer group: %s"
-msgstr "Error de LDAP: No se pudo borrar %s del grupo de mantenedores: %s"
-
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:332
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:336
 msgid "Domain Maintainer Deleted"
 msgstr "Mantenedor de dominio borrado"
 
-#: ../../../www/admin/domainmaintainer/index.php.in:62
-#: ../../../www/admin/maintainer/index.php.in:62
-msgid "Manage Maintainers ("
-msgstr "Administrar mantenedores ("
-
-#: ../../../www/admin/domainmaintainer/index.php.in:62
-#: ../../../www/admin/maintainer/index.php.in:62
-msgid " Maintainers)"
-msgstr " Mantenedores)"
-
-#: ../../../www/admin/maintainer/maintainer.php.in:240
-#: ../../../www/admin/maintainer/maintainer.php.in:292
-msgid "Modify Maintainer"
-msgstr "Modificar mantenedores"
-
-#: ../../../www/admin/maintainer/maintainer.php.in:266
-#: ../../../www/admin/maintainer/maintainer.php.in:272
-#: ../../../www/admin/maintainer/maintainer.php.in:283 ../include/menu.php:86
-msgid "Create New Maintainer"
-msgstr "Crear nuevo mantenedor"
-
-#: ../../../www/admin/maintainer/maintainer.php.in:298
-msgid "Delete Maintainer"
-msgstr "Borrar mantenedor"
-
-#: ../../../www/admin/maintainer/maintainer.php.in:312
-#: ../../../www/admin/user/user.php.in:775
-msgid "Error: you need administrative permissions to delete users"
-msgstr "Error: necesita permisos administrativos para borrar usuarios"
-
-#: ../../../www/admin/maintainer/maintainer.php.in:328
-msgid "Maintainer Deleted"
-msgstr "Mantenedor borrado"
-
-#: ../../../www/admin/settings/index.php.in:98
-#, php-format
-msgid "No account found for email address %s"
-msgstr "No se encontrÃ³ una cuenta para la direcciÃ³n de correo %s"
-
-#: ../../../www/admin/settings/index.php.in:107
-#, php-format
-msgid "LDAP Error: Failed to add distribution list %s: %s"
-msgstr "Error de LDAP: No se pudo aÃ±adir la lista de distribuciÃ³n %s: %s"
-
-#: ../../../www/admin/settings/index.php.in:109
-#, php-format
-msgid "Successfully created distribution list %s"
-msgstr "Lista de distribuciÃ³n creada con Ã©xito %s"
-
-#: ../../../www/admin/settings/index.php.in:128
-#: ../../../www/admin/settings/index.php.in:137
-#: ../../../www/admin/settings/index.php.in:146
-#: ../../../www/admin/settings/index.php.in:155
-#: ../../../www/admin/settings/index.php.in:165
-#: ../../../www/admin/settings/index.php.in:174
-#: ../../../www/admin/settings/index.php.in:185
-#: ../../../www/admin/settings/index.php.in:199
-#: ../../../www/admin/settings/index.php.in:217
-#: ../../../www/admin/settings/index.php.in:235
-#: ../../../www/admin/settings/index.php.in:252
-#: ../../../www/admin/settings/index.php.in:265
-#, php-format
-msgid "LDAP Error: failed to modify kolab configuration object: %s"
-msgstr ""
-"Error de LDAP: No se pudo modificar la configuraciÃ³n del objeto Kolab: %s"
-
-#: ../../../www/admin/settings/index.php.in:223
-#, php-format
-msgid "LDAP Error: Failed to delete domain object %s: %s"
-msgstr "Error de LDAP: No se pudo borrar el objeto de dominio %s: %s"
-
-#: ../../../www/admin/settings/index.php.in:273
-msgid "POP3 Service"
-msgstr "Servicio POP3"
-
-#: ../../../www/admin/settings/index.php.in:274
-msgid "POP3/SSL service (TCP port 995)"
-msgstr "Servicio POP3/SSL (puerto TCP 995)"
-
-#: ../../../www/admin/settings/index.php.in:275
-msgid "IMAP Service"
-msgstr "Servicio IMAP"
-
-#: ../../../www/admin/settings/index.php.in:276
-msgid "IMAP/SSL Service (TCP port 993)"
-msgstr "Servicio IMAP/SSL (puerto TCP 993)"
-
-#: ../../../www/admin/settings/index.php.in:277
-msgid "Sieve service (TCP port %s)"
-msgstr "Servicio Sieve (puerto TCP %s)"
-
-#: ../../../www/admin/settings/index.php.in:278
-msgid "FreeBusy Service via HTTP (in addition to HTTPS)"
-msgstr ""
-
-#: ../../../www/admin/settings/index.php.in:279
-msgid "Amavis Email Scanning (Virus/Spam)"
-msgstr "Escaneo de correo Amavis (Virus/Spam)"
-
-#: ../../../www/admin/sharedfolder/index.php.in:53
+#: ../../www/admin/sharedfolder/index.php:53
 #, php-format
 msgid "Manage Shared Folders (%d Folders)"
 msgstr "Administrar carpetas compartidas (%d Carpetas)"
 
-#: ../../../www/admin/sharedfolder/index.php.in:63
-#: ../include/form.class.php:255
+#: ../../www/admin/sharedfolder/index.php:63
+#: ../../lib/KolabAdmin/include/form.class.php:254
 msgid "Unspecified"
 msgstr "Sin especificar"
 
-#: ../../../www/admin/sharedfolder/index.php.in:64
-#: ../include/form.class.php:255
+#: ../../www/admin/sharedfolder/index.php:64
+#: ../../lib/KolabAdmin/include/form.class.php:254
 msgid "Mails"
 msgstr "Correos"
 
-#: ../../../www/admin/sharedfolder/index.php.in:65
-#: ../include/form.class.php:255
-msgid "Tasks"
-msgstr "Tareas"
-
-#: ../../../www/admin/sharedfolder/index.php.in:66
-#: ../include/form.class.php:256
+#: ../../www/admin/sharedfolder/index.php:66
+#: ../../lib/KolabAdmin/include/form.class.php:255
 msgid "Journals"
 msgstr "Revistas"
 
-#: ../../../www/admin/sharedfolder/index.php.in:67
-#: ../include/form.class.php:256
+#: ../../www/admin/sharedfolder/index.php:67
+#: ../../lib/KolabAdmin/include/form.class.php:255
 msgid "Events"
 msgstr "Eventos"
 
-#: ../../../www/admin/sharedfolder/index.php.in:68
-#: ../include/form.class.php:257
+#: ../../www/admin/sharedfolder/index.php:68
+#: ../../lib/KolabAdmin/include/form.class.php:256
 msgid "Contacts"
 msgstr "Contactos"
 
-#: ../../../www/admin/sharedfolder/index.php.in:69
-#: ../include/form.class.php:257
-msgid "Notes"
-msgstr "Notas"
-
-#: ../../../www/admin/sharedfolder/sf.php.in:60
-#: ../../../www/admin/sharedfolder/sf.php.in:67
+#: ../../www/admin/sharedfolder/sf.php:62
+#: ../../www/admin/sharedfolder/sf.php:69
 msgid "Permission for UID/email/GID"
 msgstr "Permiso para UID/email/GID"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:101
+#: ../../www/admin/sharedfolder/sf.php:103
 #, php-format
 msgid "No UID or GID %s"
 msgstr "Sin UID ni GID %s"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:117
+#: ../../www/admin/sharedfolder/sf.php:119
 msgid "Folder Name"
 msgstr "Nombre de carpeta"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:124
+#: ../../www/admin/sharedfolder/sf.php:126
 msgid "Folder Location"
 msgstr "LocalizaciÃ³n de la carpeta"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:126
-#: ../../../www/admin/user/user.php.in:379
-#: ../../../www/admin/user/user.php.in:381
-msgid "Non volatile"
-msgstr "No volÃ¡til"
-
-#: ../../../www/admin/sharedfolder/sf.php.in:128
+#: ../../www/admin/sharedfolder/sf.php:130
 msgid "Folder Type"
 msgstr "Tipo de carpeta"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:132
+#: ../../www/admin/sharedfolder/sf.php:134
 msgid "Quota Limit"
 msgstr "LÃmite de cuota"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:133
+#: ../../www/admin/sharedfolder/sf.php:135
 msgid "MBytes (empty for unlimited)"
 msgstr "MBytes (vacÃo para ilimitado)"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:135
+#: ../../www/admin/sharedfolder/sf.php:137
 msgid "Permission for UID/GID"
 msgstr "Permiso para UID/GID"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:158 ../include/menu.php:58
+#: ../../www/admin/sharedfolder/sf.php:160
+#: ../../lib/KolabAdmin/include/menu.php:65
 msgid "Add Shared Folder"
 msgstr "AÃ±adir carpeta compartida"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:241
-#: ../../../www/admin/sharedfolder/sf.php.in:253
+#: ../../www/admin/sharedfolder/sf.php:245
+#: ../../www/admin/sharedfolder/sf.php:257
 msgid "Shared folder updated"
 msgstr "Carpeta compartida actualizada"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:263
+#: ../../www/admin/sharedfolder/sf.php:267
 #, php-format
 msgid "Shared folder '%s' added"
 msgstr "Carpeta compartida '%s' aÃ±adida"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:275
-#: ../../../www/admin/sharedfolder/sf.php.in:295
+#: ../../www/admin/sharedfolder/sf.php:279
+#: ../../www/admin/sharedfolder/sf.php:299
 msgid "Modify Shared Folder"
 msgstr "Modificar carpeta compartida"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:311
+#: ../../www/admin/sharedfolder/sf.php:302
+#: ../../www/admin/sharedfolder/sf.php:318
+#: ../../www/admin/distributionlist/list.php:293
+#: ../../www/admin/distributionlist/list.php:308
+#, php-format
+msgid "Error: No results returned for DN '%s'"
+msgstr "Error: No se devolvieron resultados para el DN '%s'"
+
+#: ../../www/admin/sharedfolder/sf.php:315
 msgid "Delete Shared Folder"
 msgstr "Borrar carpeta compartida"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:320
+#: ../../www/admin/sharedfolder/sf.php:324
 msgid "Shared folder "
 msgstr "Carpeta compartida"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:320
+#: ../../www/admin/sharedfolder/sf.php:324
 msgid " marked for deletion"
 msgstr "Marcado para borrado"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:324
+#: ../../www/admin/sharedfolder/sf.php:328
 #, php-format
 msgid "LDAP Error: Could not mark %s for deletion: %s"
 msgstr "Error de LDAP: No se pudo marcar %s para borrado: %s"
 
-#: ../../../www/admin/user/deliver.php.in:37
-msgid ""
-"Net/Sieve.php is missing. Without that, filter settings are not available"
-msgstr ""
-"No se encuentra Net/Sieve.php. Si Ã©sto, los ajustes de filtrado no estarÃ¡n "
-"disponibles"
-
-#: ../../../www/admin/user/deliver.php.in:38
-#: ../../../www/admin/user/forward.php.in:39
-#: ../../../www/admin/user/vacation.php.in:18
-#, fuzzy
-msgid ""
-"Suggest your system administrator to run \"pear install http://pear.php.net/"
-"get/Net_Sieve\" on the server"
-msgstr ""
-"Sugiera a su administrador del sistema que ejecute \"@bindir@/pear install "
-"http://pear.php.net/get/Net_Sieve/\" en el servidor"
-
-#: ../../../www/admin/user/deliver.php.in:66
-#: ../../../www/admin/user/forward.php.in:70
-msgid "Script was:"
-msgstr "Script fue:"
-
-#: ../../../www/admin/user/deliver.php.in:74
+#: ../../www/admin/distributionlist/index.php:63
 #, php-format
-msgid "Delivery to '%s' successfully activated"
-msgstr "Entrega a '%s' activada con Ã©xito"
-
-#: ../../../www/admin/user/deliver.php.in:75
-#, php-format
-msgid "Delivery to '%s' successfully deactivated"
-msgstr "Entrega a '%s' desactivada con Ã©xito"
-
-#: ../../../www/admin/user/forward.php.in:38
-#: ../../../www/admin/user/vacation.php.in:17
-msgid ""
-"Net/Sieve.php is missing. Without that, vacation settings are not available"
-msgstr ""
-"No se encuentra Net/Sieve.php. Sin Ã©sto, los ajustes de vacaciones no "
-"estarÃ¡n disponibles"
-
-#: ../../../www/admin/user/forward.php.in:64
-#: ../../../www/admin/user/user.php.in:94
-msgid "Please enter an email address"
-msgstr "Por favor, introduzca una direcciÃ³n de correo electrÃ³nico"
-
-#: ../../../www/admin/user/forward.php.in:78
-#, php-format
-msgid "Forwarding to '%s' successfully activated"
-msgstr "ReenvÃo a '%s' activado con Ã©xito"
+msgid "Manage Distribution Lists (%d Lists)"
+msgstr "Administrar listas de distribuciÃ³n (%d Listas)"
 
-#: ../../../www/admin/user/forward.php.in:79
-#, php-format
-msgid "Forwarding to '%s' successfully deactivated"
-msgstr "ReenvÃo a '%s' desactivado con Ã©xito"
+#: ../../www/admin/distributionlist/index.php:74
+msgid "not yet implemented"
+msgstr "por implementar"
 
-#: ../../../www/admin/user/index.php.in:122
-#, php-format
-msgid "Manage Email User (%d Users)"
-msgstr "Administrar usuario de correo (%d usuarios)"
+#: ../../www/admin/distributionlist/list.php:46
+msgid "Please add at least one member"
+msgstr "Por favor, aÃ±ada al menos un miembro"
 
-#: ../../../www/admin/user/user.php.in:111
+#: ../../www/admin/distributionlist/list.php:50
 #, php-format
-msgid "Email address %1$s not in domains %2$s"
-msgstr "La direcciÃ³n de correo %1$s no estÃ¡ en los dominios %2$s"
-
-#: ../../../www/admin/user/user.php.in:130
-msgid "UID "
-msgstr "UID"
+msgid "No user with email address, UID or alias %s"
+msgstr "No existe el usuario con direcciÃ³n de correo, UID o alias %s"
 
-#: ../../../www/admin/user/user.php.in:130 ../include/form.class.php:34
-msgid ""
-" collides with an address already used for another user, a vCard or a "
-"distribution list.<br />"
+#: ../../www/admin/distributionlist/list.php:62
+msgid "User or distribution list with this email address already exists"
 msgstr ""
+"El usuario o lista de distribuciÃ³n con esta direcciÃ³n de correo ya existe"
 
-#: ../../../www/admin/user/user.php.in:145
-#, php-format
-msgid "Email-Delegate %s does not exist"
-msgstr "Correo-Delegado %s no existe"
-
-#: ../../../www/admin/user/user.php.in:158
-#, php-format
-msgid "Illegal user or group %s"
-msgstr "Usuario o grupo %s invÃ¡lido"
-
-#: ../../../www/admin/user/user.php.in:167
-#, fuzzy
-msgid "Free/Busy interval can not be negative"
-msgstr "La cuota no puede ser negativa"
-
-#: ../../../www/admin/user/user.php.in:168
-#, fuzzy
-msgid "Free/Busy interval must be a number"
-msgstr "La cuota debe ser menor que 4096"
-
-#: ../../../www/admin/user/user.php.in:169
-#, fuzzy
-msgid "Free/Busy interval must be an integer"
-msgstr "La cuota debe ser menor que 4096"
-
-#: ../../../www/admin/user/user.php.in:403
-msgid "Unique Identity (UID)"
-msgstr "Identidad Ãºnica (UID)"
-
-#: ../../../www/admin/user/user.php.in:405
-msgid "Optional - Defaults to Primary Email Address"
-msgstr "Opcional - Por defecto es la direcciÃ³n primaria de correo"
-
-#: ../../../www/admin/user/user.php.in:406
-msgid "Mailbox Home Server"
-msgstr "Servidor Mailbox Home"
-
-#: ../../../www/admin/user/user.php.in:410
-msgid "Account Type"
-msgstr "Tipo de cuenta"
-
-#: ../../../www/admin/user/user.php.in:412
-msgid "User Account"
-msgstr "Cuenta de usuario"
-
-#: ../../../www/admin/user/user.php.in:412
-msgid "Internal User Account"
-msgstr "Cuenta interna de usuario"
-
-#: ../../../www/admin/user/user.php.in:412
-msgid "Group Account"
-msgstr "Cuenta de grupo"
-
-#: ../../../www/admin/user/user.php.in:412
-msgid "Resource Account"
-msgstr "Cuenta de recurso"
+#: ../../www/admin/distributionlist/list.php:114
+msgid "List Name"
+msgstr "Nombre de lista"
 
-#: ../../../www/admin/user/user.php.in:414
-msgid ""
-"NOTE: An internal user is a user that will not be visible in the address book"
-msgstr ""
-"NOTA: Un usuario interno es una usuario que no serÃ¡ visible en la libreta de "
-"direcciones"
+#: ../../www/admin/distributionlist/list.php:121
+msgid "Members"
+msgstr "Miembros"
 
-#: ../../../www/admin/user/user.php.in:415
-msgid "Invitation Policy"
-msgstr "PolÃtica de invitaciÃ³n"
+#: ../../www/admin/distributionlist/list.php:123
+msgid "One email address per line"
+msgstr "Una direcciÃ³n de correo por lÃnea"
 
-#: ../../../www/admin/user/user.php.in:419
-msgid "For automatic invitation handling"
-msgstr "Para manejo de invitaciÃ³n automÃ¡ticas"
+#: ../../www/admin/distributionlist/list.php:126
+msgid "Hidden"
+msgstr "Escondido"
 
-#: ../../../www/admin/user/user.php.in:420
+#: ../../www/admin/distributionlist/list.php:129
 msgid ""
-"NOTE: For regular accounts to use this feature, give the 'calendar' user "
-"access to the Calendar folder"
-msgstr ""
-"NOTA: Para que las cuentas regulares usen esta caracterÃstica, dar acceso al "
-"ususario 'calendar' a la carpeta 'Calendar'"
-
-#: ../../../www/admin/user/user.php.in:422
-msgid "Email Aliases"
-msgstr "Alias de correo"
-
-#: ../../../www/admin/user/user.php.in:427
-msgid "Email-Delegates"
-msgstr "Correo-Delegados"
-
-#: ../../../www/admin/user/user.php.in:430
-msgid "Others allowed to send emails with a \"from\" address of this account."
+"Check here to make this distribution list available only to authenticated "
+"users"
 msgstr ""
-"Otros autorizados para mandar correos con una direcciÃ³n \"from\" de esta "
-"cuenta."
-
-#: ../../../www/admin/user/user.php.in:431
-msgid "One email address per line."
-msgstr "Una direcciÃ³n de correo por lÃnea."
+"Seleccione aquÃ para hacer que esta lista de distribuciÃ³n sÃ³lo estÃ© "
+"disponible para usuarios autentificados"
 
-#: ../../../www/admin/user/user.php.in:447
-msgid "User Quota in MBytes"
-msgstr "Cuota de usuario en MBytes"
+#: ../../www/admin/distributionlist/list.php:148
+msgid "Add Distribution List"
+msgstr "AÃ±adir lista de distribuciÃ³n"
 
-#: ../../../www/admin/user/user.php.in:460
-msgid "Free/Busy interval in days"
-msgstr "Intervalo libre/ocupado en dÃas"
+#: ../../www/admin/distributionlist/list.php:183
+#, php-format
+msgid "No user with address %s"
+msgstr "No existe el usuario con direcciÃ³n %s"
 
-#: ../../../www/admin/user/user.php.in:461
-msgid "Leave blank for default (60 days)"
-msgstr "Dejar en blanco para usar el valor por defecto (60 dÃas)"
+#: ../../www/admin/distributionlist/list.php:214
+#: ../../www/admin/distributionlist/list.php:226
+msgid "Distribution List updated"
+msgstr "Lista de distribuciÃ³n actualizada"
 
-#: ../../../www/admin/user/user.php.in:665
-#: ../../../www/admin/user/user.php.in:717
+#: ../../www/admin/distributionlist/list.php:235
 #, php-format
-msgid "Mid-air collision detected, alias %1$s renamed to %2$s"
-msgstr "ColisiÃ³n Mid-air detectada, alias %1$s renombrado a %2$s"
-
-#: ../../../www/admin/user/user.php.in:670
-#: ../../../www/admin/user/user.php.in:750
-msgid "Modify User"
-msgstr "Modificar usuario"
+msgid "LDAP Error: Could not add object %s: %s"
+msgstr "Error de LDAP: No se pudo aÃ±adir el objeto %s: %s"
 
-#: ../../../www/admin/user/user.php.in:671
+#: ../../www/admin/distributionlist/list.php:264
 #, php-format
-msgid "User '%s' successfully modified"
-msgstr "Usuario '%s' modificado con Ã©xito"
+msgid "Distribution List '%s' added"
+msgstr "AÃ±adida lista de distribuciÃ³n '%s'"
 
-#: ../../../www/admin/user/user.php.in:723
-msgid "User "
-msgstr "Usuario"
+#: ../../www/admin/distributionlist/list.php:276
+#: ../../www/admin/distributionlist/list.php:290
+msgid "Modify Distribution List"
+msgstr "Modificar lista de distribuciÃ³n"
 
-#: ../../../www/admin/user/user.php.in:724
-#: ../../../www/admin/user/user.php.in:730
-#: ../../../www/admin/user/user.php.in:741 ../include/menu.php:30
-msgid "Create New User"
-msgstr "Crear nuevo usuario"
+#: ../../www/admin/distributionlist/list.php:305
+msgid "Delete Distribution List"
+msgstr "Borrar lista de distribuciÃ³n"
 
-#: ../../../www/admin/user/user.php.in:756
-#: ../../../www/admin/user/user.php.in:814
-msgid "Delete User"
-msgstr "Borrar usuario"
+#: ../../www/admin/distributionlist/list.php:315
+msgid "Distribution List "
+msgstr "Lista de distribuciÃ³n "
 
-#: ../../../www/admin/user/user.php.in:795
-#, php-format
-msgid "Account removed from distribution list '%s'."
-msgstr "Cuenta eliminada de la lista de distribuciÃ³n '%s'."
+#: ../../www/admin/distributionlist/list.php:315
+msgid " deleted"
+msgstr "Borrada"
 
-#: ../../../www/admin/user/user.php.in:797
+#: ../../www/admin/distributionlist/list.php:319
 #, php-format
-msgid ""
-"Failure to remove account from distribution list '%s', account will not be "
-"deleted."
-msgstr ""
-"Fallo al borrar la cuenta de la lista de distribuciÃ³n '%s', la cuenta no "
-"serÃ¡ borrada."
+msgid "LDAP Error: Could not delete %s: %s"
+msgstr "Error de LDAP: no se pudo borrar %s: %s"
 
-#: ../../../www/admin/user/user.php.in:805
+#: ../../www/admin/settings/index.php:99
 #, php-format
-msgid "LDAP Error: could not mark '%s' for deletion: %s"
-msgstr "Error de LDAP: no se pudo marcar '%s' para borrado: %s"
-
-#: ../../../www/admin/user/user.php.in:808
-msgid "User Deleted"
-msgstr "Usuario borrado"
-
-#: ../../../www/admin/user/vacation.php.in:43
-msgid "Days must be at least one"
-msgstr "Debe ser al menos un dÃa"
-
-#: ../../../www/admin/user/vacation.php.in:65
-msgid "Vacation message successfully activated"
-msgstr "Mensaje de vacaciones activado con Ã©xito"
-
-#: ../../../www/admin/user/vacation.php.in:66
-msgid "Vacation message successfully deactivated"
-msgstr "Mensaje de vacaciones desactivado con Ã©xito"
+msgid "No account found for email address %s"
+msgstr "No se encontrÃ³ una cuenta para la direcciÃ³n de correo %s"
 
-#: ../../../www/admin/user/vacation.php.in:87
+#: ../../www/admin/settings/index.php:108
 #, php-format
-msgid "%x"
-msgstr ""
+msgid "LDAP Error: Failed to add distribution list %s: %s"
+msgstr "Error de LDAP: No se pudo aÃ±adir la lista de distribuciÃ³n %s: %s"
 
-#: ../../../www/admin/user/vacation.php.in:89
+#: ../../www/admin/settings/index.php:110
 #, php-format
-msgid "I am out of office until %s.\r\n"
-msgstr "EstarÃ© fuera de la oficina hasta %s.\r\n"
+msgid "Successfully created distribution list %s"
+msgstr "Lista de distribuciÃ³n creada con Ã©xito %s"
 
-#: ../../../www/admin/user/vacation.php.in:90
+#: ../../www/admin/settings/index.php:129
+#: ../../www/admin/settings/index.php:138
+#: ../../www/admin/settings/index.php:147
+#: ../../www/admin/settings/index.php:158
+#: ../../www/admin/settings/index.php:168
+#: ../../www/admin/settings/index.php:177
+#: ../../www/admin/settings/index.php:188
+#: ../../www/admin/settings/index.php:202
+#: ../../www/admin/settings/index.php:220
+#: ../../www/admin/settings/index.php:238
+#: ../../www/admin/settings/index.php:255
+#: ../../www/admin/settings/index.php:268
 #, php-format
-msgid ""
-"In urgent cases, please contact Mrs. <vacation replacement>\r\n"
-"\r\n"
+msgid "LDAP Error: failed to modify kolab configuration object: %s"
 msgstr ""
-"En caso de urgencia, contactar con <reemplazo en vacaciones>\r\n"
-"\r\n"
+"Error de LDAP: No se pudo modificar la configuraciÃ³n del objeto Kolab: %s"
 
-#: ../../../www/admin/user/vacation.php.in:91
+#: ../../www/admin/settings/index.php:226
 #, php-format
-msgid "email: <email address of vacation replacement>\r\n"
-msgstr ""
-"DirecciÃ³n de correo electrÃ³nico <email address of vacation replacement>\r\n"
+msgid "LDAP Error: Failed to delete domain object %s: %s"
+msgstr "Error de LDAP: No se pudo borrar el objeto de dominio %s: %s"
 
-#: ../../../www/admin/user/vacation.php.in:92
-#, php-format
-msgid "phone: +49 711 1111 11\r\n"
-msgstr "TelÃ©fono: +49 711 1111 11\r\n"
+#: ../../www/admin/settings/index.php:276
+msgid "POP3 Service"
+msgstr "Servicio POP3"
 
-#: ../../../www/admin/user/vacation.php.in:93
-#, php-format
-msgid ""
-"fax.:  +49 711 1111 12\r\n"
-"\r\n"
-msgstr ""
+#: ../../www/admin/settings/index.php:277
+msgid "POP3/SSL service (TCP port 995)"
+msgstr "Servicio POP3/SSL (puerto TCP 995)"
 
-#: ../../../www/admin/user/vacation.php.in:94
-#, php-format
-msgid "Yours sincerely,\r\n"
-msgstr "Reciba un cordial saludo.\r\n"
+#: ../../www/admin/settings/index.php:278
+msgid "IMAP Service"
+msgstr "Servicio IMAP"
 
-#: ../../../www/admin/user/vacation.php.in:95
-#, php-format
-msgid "-- \r\n"
-msgstr ""
+#: ../../www/admin/settings/index.php:279
+msgid "IMAP/SSL Service (TCP port 993)"
+msgstr "Servicio IMAP/SSL (puerto TCP 993)"
 
-#: ../../../www/admin/user/vacation.php.in:96
+#: ../../www/admin/settings/index.php:280
 #, php-format
-msgid "<enter your name and email address here>"
-msgstr "<introduzca su nombre y direcciÃ³n de correo electrÃ³nico aquÃ>"
-
-#: ../include/auth.class.php.in:40
-msgid "Server error, no ldap object!"
-msgstr "Error en el servidor: Â¡no hay objeto ldap!"
-
-#: ../include/auth.class.php.in:45
-msgid "Could not bind to LDAP server: "
-msgstr "No se pudo enlazar con el servidor LDAP: "
+msgid "Sieve service (TCP port %s)"
+msgstr "Servicio Sieve (puerto TCP %s)"
 
-#: ../include/auth.class.php.in:56
-msgid "Could not bind to LDAP server"
-msgstr "No se pudo enlazar con el servidor LDAP"
+#: ../../www/admin/settings/index.php:281
+msgid "FreeBusy Service via HTTP (in addition to HTTPS)"
+msgstr ""
 
-#: ../include/auth.class.php.in:83 ../include/auth.class.php.in:87
-msgid "Wrong username or password"
-msgstr "Usuario o contraseÃ±a incorrectos"
+#: ../../www/admin/settings/index.php:282
+msgid "Amavis Email Scanning (Virus/Spam)"
+msgstr "Escaneo de correo Amavis (Virus/Spam)"
 
-#: ../include/form.class.php:34
+#: ../../lib/KolabAdmin/include/form.class.php:34
 msgid "Email address "
 msgstr "DirecciÃ³n de correo electrÃ³nico"
 
-#: ../include/form.class.php:45
-msgid "Quota must be smaller than 4096"
-msgstr "La cuota debe ser menor que 4096"
-
-#: ../include/form.class.php:46
+#: ../../lib/KolabAdmin/include/form.class.php:45
 msgid "Quota can not be negative"
 msgstr "La cuota no puede ser negativa"
 
-#: ../include/form.class.php:47
+#: ../../lib/KolabAdmin/include/form.class.php:46
 #, fuzzy
 msgid "Quota must be a number"
 msgstr "La cuota debe ser menor que 4096"
 
-#: ../include/form.class.php:48
+#: ../../lib/KolabAdmin/include/form.class.php:47
 #, fuzzy
 msgid "Quota must be an integer"
 msgstr "La cuota debe ser menor que 4096"
 
-#: ../include/form.class.php:55
+#: ../../lib/KolabAdmin/include/form.class.php:54
 msgid ""
 "Phone entries may only contain a-z, numbers, spaces and the characters ()-+/."
 "=?:"
 msgstr ""
 
-#: ../include/form.class.php:118
+#: ../../lib/KolabAdmin/include/form.class.php:117
 msgid "<tr><th>Attribute</th><th>Value</th><th>Comment</th></tr>"
 msgstr "<tr><th>Atributo</th><th>Valor</th><th>Comentario</th></tr>"
 
-#: ../include/form.class.php:205
-msgid "Yes"
-msgstr "SÃ"
-
-#: ../include/form.class.php:205
-msgid "No"
-msgstr ""
-
-#: ../include/form.class.php:323
+#: ../../lib/KolabAdmin/include/form.class.php:322
 msgid "Always accept"
 msgstr "Siempre aceptar"
 
-#: ../include/form.class.php:324
+#: ../../lib/KolabAdmin/include/form.class.php:323
 msgid "Always reject"
 msgstr "Siempre rechazar"
 
-#: ../include/form.class.php:325
+#: ../../lib/KolabAdmin/include/form.class.php:324
 msgid "Reject if conflicts"
 msgstr "Rechazar si hay conflictos"
 
-#: ../include/form.class.php:326
+#: ../../lib/KolabAdmin/include/form.class.php:325
 msgid "Manual if conflicts"
 msgstr "Manual si hay conflictos"
 
-#: ../include/form.class.php:327
+#: ../../lib/KolabAdmin/include/form.class.php:326
 msgid "Manual"
 msgstr ""
 
-#: ../include/form.class.php:333 ../include/form.class.php:339
+#: ../../lib/KolabAdmin/include/form.class.php:332
+#: ../../lib/KolabAdmin/include/form.class.php:338
 msgid "Anyone"
 msgstr "Alguien"
 
-#: ../include/form.class.php:375
+#: ../../lib/KolabAdmin/include/form.class.php:374
 msgid "* Required field."
 msgstr "* Campo requerido."
 
-#: ../include/form.class.php:396 ../include/form.class.php:399
+#: ../../lib/KolabAdmin/include/form.class.php:395
+#: ../../lib/KolabAdmin/include/form.class.php:398
 msgid "Required field "
 msgstr "Campo requerido"
 
-#: ../include/form.class.php:396 ../include/form.class.php:399
+#: ../../lib/KolabAdmin/include/form.class.php:395
+#: ../../lib/KolabAdmin/include/form.class.php:398
 msgid " is empty"
 msgstr "EstÃ¡ vacÃo "
 
-#: ../include/ldap.class.php.in:54
-msgid ""
-"Error setting LDAP protocol to v3. Please contact your system administrator"
-msgstr ""
-"Error estableciendo el protocolo LDAP a v3. Por favor, contacte con el "
-"administrador del sistema"
-
-#: ../include/ldap.class.php.in:184 ../include/ldap.class.php.in:214
-#: ../include/ldap.class.php.in:244
-#, php-format
-msgid "No such object %s"
-msgstr "No existe el objeto %s"
-
-#: ../include/ldap.class.php.in:187 ../include/ldap.class.php.in:217
-#: ../include/ldap.class.php.in:247
-#, php-format
-msgid "LDAP Error searching for DN %s: %s"
-msgstr "Error de LDAP buscando el DN %s: %s"
-
-#: ../include/ldap.class.php.in:200
-#, php-format
-msgid "Error searching for DN for UID=%s"
-msgstr "Error buscando el DN para UID=%s"
-
-#: ../include/ldap.class.php.in:230
-#, php-format
-msgid "Error searching for DN for Mail=%s"
-msgstr "Error buscando el DN para Correo=%s"
-
-#: ../include/ldap.class.php.in:260
-#, php-format
-msgid "Error searching for DN for alias=%s: %s"
-msgstr "Error buscando DN para el alias=%s: %s"
-
-#: ../include/ldap.class.php.in:273
-#, php-format
-msgid "Error searching for DN for mail or alias %s: %s"
-msgstr "Error buscando DN para el correo o alias %s: %s"
-
-#: ../include/ldap.class.php.in:336
-msgid "LDAP Error: Can't read maintainers group: "
-msgstr "Error LDAP: No se puede leer el grupo de mantenedores: "
-
-#: ../include/menu.php:26
+#: ../../lib/KolabAdmin/include/menu.php:26
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../include/menu.php:28
+#: ../../lib/KolabAdmin/include/menu.php:28
 msgid "Manage Email Users"
 msgstr "Administrar correos de usuarios"
 
-#: ../include/menu.php:33 ../include/menu.php:35
+#: ../../lib/KolabAdmin/include/menu.php:33
+#: ../../lib/KolabAdmin/include/menu.php:35
 msgid "My User Settings"
 msgstr "Mis ajustes de usuario"
 
-#: ../include/menu.php:37
+#: ../../lib/KolabAdmin/include/menu.php:37
 msgid "Mail Delivery"
 msgstr "Recibir correo"
 
-#: ../include/menu.php:39
+#: ../../lib/KolabAdmin/include/menu.php:39
 msgid "Forward Email"
 msgstr "Enviar correo electrÃ³nico"
 
-#: ../include/menu.php:41
+#: ../../lib/KolabAdmin/include/menu.php:41
 msgid "Vacation"
 msgstr "Vacaciones"
 
-#: ../include/menu.php:47
+#: ../../lib/KolabAdmin/include/menu.php:54
 msgid "Manage Address Book"
 msgstr "Administrar libreta de direcciones"
 
-#: ../include/menu.php:49
+#: ../../lib/KolabAdmin/include/menu.php:56
 msgid "Create New vCard"
 msgstr "Crear nueva vCard"
 
-#: ../include/menu.php:54
+#: ../../lib/KolabAdmin/include/menu.php:61
 msgid "Shared Folder"
 msgstr "Carpetas compartidas"
 
-#: ../include/menu.php:56
+#: ../../lib/KolabAdmin/include/menu.php:63
 msgid "Manage Shared Folders"
 msgstr "Administrar carpetas compartidas"
 
-#: ../include/menu.php:64
+#: ../../lib/KolabAdmin/include/menu.php:71
 msgid "Manage Distribution Lists"
 msgstr "Administrar listas de distribuciÃ³n"
 
-#: ../include/menu.php:66
+#: ../../lib/KolabAdmin/include/menu.php:73
 msgid "Create New List"
 msgstr "Crear nueva lista"
 
-#: ../include/menu.php:72
+#: ../../lib/KolabAdmin/include/menu.php:79
 msgid "Manage Administrators"
 msgstr "Administrar administradores"
 
-#: ../include/menu.php:78 ../include/menu.php:95
+#: ../../lib/KolabAdmin/include/menu.php:85
+#: ../../lib/KolabAdmin/include/menu.php:102
 msgid "Manage Domain Maintainers"
 msgstr "Administrar mantenedores de dominio"
 
-#: ../include/menu.php:84
+#: ../../lib/KolabAdmin/include/menu.php:91
 msgid "Manage Maintainers"
 msgstr "Administrar mantenedores"
 
-#: ../include/menu.php:92
+#: ../../lib/KolabAdmin/include/menu.php:99
 msgid "Manage Maintainer"
 msgstr "Administrar mantenedor"
 
-#: ../include/menu.php:103
+#: ../../lib/KolabAdmin/include/menu.php:110
 msgid "Manage Domain Maintainer"
 msgstr "Administrar mantenedor de dominio"
 
-#: ../include/menu.php:106
-msgid "Settings"
-msgstr "Servicios"
-
-#: ../include/menu.php:108
+#: ../../lib/KolabAdmin/include/menu.php:115
 msgid "System Settings"
 msgstr "Administrar servicios"
 
-#: ../include/menu.php:111 ../include/menu.php:113
+#: ../../lib/KolabAdmin/include/menu.php:118
+#: ../../lib/KolabAdmin/include/menu.php:120
 msgid "About Kolab"
 msgstr "Sobre Kolab"
 
-#: ../include/menu.php:115
-msgid "Erfrakon"
+#: ../../lib/KolabAdmin/include/menu.php:122
+msgid "Kolab Systems"
 msgstr ""
 
-#: ../include/menu.php:117
-msgid "Intevation"
+#: ../../lib/KolabAdmin/include/menu.php:124
+msgid "Technology"
 msgstr ""
 
-#: ../include/menu.php:119
-msgid "Klarälvdalens Datakonsult"
-msgstr ""
+#: ../../lib/KolabAdmin/include/menu.php:128
+msgid "Versions"
+msgstr "Versiones"
 
-#: ../include/menu.php:121
-msgid "Code Fusion"
-msgstr ""
+#: ../../lib/KolabAdmin/include/auth.class.php:40
+msgid "Server error, no ldap object!"
+msgstr "Error en el servidor: Â¡no hay objeto ldap!"
 
-#: ../include/menu.php:123
-msgid "KDE"
-msgstr ""
+#: ../../lib/KolabAdmin/include/auth.class.php:45
+msgid "Could not bind to LDAP server: "
+msgstr "No se pudo enlazar con el servidor LDAP: "
 
-#: ../include/menu.php:127
-msgid "Versions"
-msgstr "Versiones"
+#: ../../lib/KolabAdmin/include/auth.class.php:56
+msgid "Could not bind to LDAP server"
+msgstr "No se pudo enlazar con el servidor LDAP"
 
-#: ../include/passwd.php:33
+#: ../../lib/KolabAdmin/include/auth.class.php:83
+#: ../../lib/KolabAdmin/include/auth.class.php:87
+msgid "Wrong username or password"
+msgstr "Usuario o contraseÃ±a incorrectos"
+
+#: ../../lib/KolabAdmin/include/auth.class.php:124
+msgid "Kolab Groupware login"
+msgstr "Kolab Groupware login"
+
+#: ../../lib/KolabAdmin/include/passwd.php:33
 msgid "Password is empty"
 msgstr "La contraseÃ±a estÃ¡ vacÃa"
 
-#: ../include/passwd.php:36 ../include/passwd.php:41
+#: ../../lib/KolabAdmin/include/passwd.php:36
+#: ../../lib/KolabAdmin/include/passwd.php:41
 msgid "Passwords dont match"
 msgstr "Las contraseÃ±as no coinciden"
 
 #~ msgid ""
+#~ "Activate delivery to folder (only one of vacation, forward and delivery "
+#~ "to folder can be active at any time)"
+#~ msgstr ""
+#~ "Activar recepciÃ³n a carpeta (sÃ³lo uno de vacaciones, enviar y recibir a "
+#~ "carpeta pueden ser activados en cualquier momento)"
+
+#~ msgid ""
+#~ "Activate email forwarding (only one of vacation, forward and delivery to "
+#~ "folder can be active at any time)"
+#~ msgstr ""
+#~ "Activar envÃo de correo electrÃ³nico (sÃ³lo uno de vacaciones, enviar y "
+#~ "recibir a carpeta pueden ser activados en cualquier momento)"
+
+#~ msgid ""
+#~ "This is the Kolab2 Server. It is Free Software developed by the <a href="
+#~ "\"http://www.kolab.org/\">Kolab Project</a>, with the intention of "
+#~ "bringing groupware functionality to Unix/KDE users as well as Windows "
+#~ "desktops."
+#~ msgstr ""
+#~ "Este es el servidor Kolab2. Es un software libre desarrollado por el <a "
+#~ "href=\"http://www.kolab.org/\">proyecto Kolab</a>, con la intenciÃ³n de "
+#~ "ofrecer funcionalidades groupware a los usuarios de Unix/KDE asÃ como a "
+#~ "los de escritorios Windows."
+
+#~ msgid "Kolab builds upon many other Free Software projects, namely:"
+#~ msgstr ""
+#~ "Kolab se sustenta en otros muchos proyectos de software libre, a saber:"
+
+#~ msgid ""
+#~ "The following projects are used in binding the above together, in order "
+#~ "to create the Kolab Server:"
+#~ msgstr ""
+#~ "Los siguientes proyectos son usados para unir los anteriores, con el "
+#~ "objetivo de crear el Servidor Kolab:"
+
+#~ msgid "The following projects are used as a base for the Kolab Clients:"
+#~ msgstr ""
+#~ "Los siguientes proyectos son usados como una base para los clientes de "
+#~ "Kolab:"
+
+#~ msgid "User:"
+#~ msgstr "Usuario:"
+
+#~ msgid "Role:"
+#~ msgstr "Papel:"
+
+#~ msgid "Logout"
+#~ msgstr "Desconectar"
+
+#~ msgid "Not logged in"
+#~ msgstr "No estÃ¡ dentro"
+
+#~ msgid ""
+#~ "Activate vacation notification (only one of vacation, forward and "
+#~ "delivery to folder can be active at any time)"
+#~ msgstr ""
+#~ "Activar la notificaciÃ³n de vacaciones (sÃ³lo una por periodo vacacional, "
+#~ "envÃo y recepciÃ³n a carpeta pueden ser activados en cualquier momento)"
+
+#~ msgid ""
+#~ "Addressbook entry DN could not be modified, distribution list <a "
+#~ "href='@kolab_wui@/distributionlist/list.php?action=modify&dn=%s'>'%s'</a> "
+#~ "depends on it. To modify this entry, first remove it from the "
+#~ "distribution list."
+#~ msgstr ""
+#~ "La entrada DN de la libreta de direcciones no puede ser modificada, la "
+#~ "lista de distribuciÃ³n <a href='@kolab_wui@/distributionlist/list.php?"
+#~ "action=modify&dn=%s'>'%s'</a> depende de ella. Para modificar esta "
+#~ "entrada, primero bÃ³rrela de la lista de distribuciÃ³n."
+
+#~ msgid ""
+#~ "Net/Sieve.php is missing. Without that, filter settings are not available"
+#~ msgstr ""
+#~ "No se encuentra Net/Sieve.php. Si Ã©sto, los ajustes de filtrado no "
+#~ "estarÃ¡n disponibles"
+
+#, fuzzy
+#~ msgid ""
+#~ "Suggest your system administrator to run \"pear install http://pear.php."
+#~ "net/get/Net_Sieve\" on the server"
+#~ msgstr ""
+#~ "Sugiera a su administrador del sistema que ejecute \"@bindir@/pear "
+#~ "install http://pear.php.net/get/Net_Sieve/\" en el servidor"
+
+#~ msgid "Script was:"
+#~ msgstr "Script fue:"
+
+#~ msgid ""
+#~ "Net/Sieve.php is missing. Without that, vacation settings are not "
+#~ "available"
+#~ msgstr ""
+#~ "No se encuentra Net/Sieve.php. Sin Ã©sto, los ajustes de vacaciones no "
+#~ "estarÃ¡n disponibles"
+
+#~ msgid "Days must be at least one"
+#~ msgstr "Debe ser al menos un dÃa"
+
+#~ msgid "I am out of office until %s.\r\n"
+#~ msgstr "EstarÃ© fuera de la oficina hasta %s.\r\n"
+
+#~ msgid ""
+#~ "In urgent cases, please contact Mrs. <vacation replacement>\r\n"
+#~ "\r\n"
+#~ msgstr ""
+#~ "En caso de urgencia, contactar con <reemplazo en vacaciones>\r\n"
+#~ "\r\n"
+
+#~ msgid "email: <email address of vacation replacement>\r\n"
+#~ msgstr ""
+#~ "DirecciÃ³n de correo electrÃ³nico <email address of vacation replacement>"
+#~ "\r\n"
+
+#~ msgid "phone: +49 711 1111 11\r\n"
+#~ msgstr "TelÃ©fono: +49 711 1111 11\r\n"
+
+#~ msgid "Yours sincerely,\r\n"
+#~ msgstr "Reciba un cordial saludo.\r\n"
+
+#~ msgid "<enter your name and email address here>"
+#~ msgstr "<introduzca su nombre y direcciÃ³n de correo electrÃ³nico aquÃ>"
+
+#~ msgid "Quota must be smaller than 4096"
+#~ msgstr "La cuota debe ser menor que 4096"
+
+#~ msgid ""
+#~ "Error setting LDAP protocol to v3. Please contact your system "
+#~ "administrator"
+#~ msgstr ""
+#~ "Error estableciendo el protocolo LDAP a v3. Por favor, contacte con el "
+#~ "administrador del sistema"
+
+#~ msgid "No such object %s"
+#~ msgstr "No existe el objeto %s"
+
+#~ msgid "LDAP Error searching for DN %s: %s"
+#~ msgstr "Error de LDAP buscando el DN %s: %s"
+
+#~ msgid "Error searching for DN for UID=%s"
+#~ msgstr "Error buscando el DN para UID=%s"
+
+#~ msgid "Error searching for DN for Mail=%s"
+#~ msgstr "Error buscando el DN para Correo=%s"
+
+#~ msgid "Error searching for DN for alias=%s: %s"
+#~ msgstr "Error buscando DN para el alias=%s: %s"
+
+#~ msgid "Error searching for DN for mail or alias %s: %s"
+#~ msgstr "Error buscando DN para el correo o alias %s: %s"
+
+#~ msgid "LDAP Error: Can't read maintainers group: "
+#~ msgstr "Error LDAP: No se puede leer el grupo de mantenedores: "
+
+#~ msgid ""
 #~ "Using legacy services poses a security thread due to leakage of cleartext "
 #~ "passwords, lack of authenticity and privacy."
 #~ msgstr ""
diff --git a/data/locale/fr/LC_MESSAGES/messages.po b/data/locale/fr/LC_MESSAGES/messages.po
index d3a7d34..47f11b2 100644
--- a/data/locale/fr/LC_MESSAGES/messages.po
+++ b/data/locale/fr/LC_MESSAGES/messages.po
@@ -8,407 +8,451 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab-Webadmin French\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-14 16:03+0200\n"
+"POT-Creation-Date: 2011-07-15 12:08+0200\n"
 "PO-Revision-Date: 2009-04-25 11:45+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier at opensides.be>\n"
 "Language-Team: Kolab development coordination <kolab-devel at kolab.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
-#: tpl_messages.php:2
-msgid "The address with DN"
-msgstr "L'adresse de messagerie avec le DN"
-
-#: tpl_messages.php:3 tpl_messages.php:21 tpl_messages.php:77
-#: tpl_messages.php:130 tpl_messages.php:192 tpl_messages.php:210
-msgid "has been deleted"
-msgstr "Ã  Ã©tÃ© effacÃ©"
+#: tpl_messages.php:2 tpl_messages.php:62
+msgid "Errors:"
+msgstr "Erreurs :"
 
-#: tpl_messages.php:4
-msgid "Back to list of addresses"
-msgstr "Retour Ã  la liste d'adresses"
+#: tpl_messages.php:3 tpl_messages.php:63
+msgid "Message:"
+msgstr "Message :"
 
-#: tpl_messages.php:5 tpl_messages.php:10
-msgid "(only external addresses without a kolab user account)"
-msgstr "(seulement les adresses externes sans un compte de messagerie Kolab)"
+#: tpl_messages.php:4 ../../lib/KolabAdmin/include/menu.php:77
+msgid "Administrators"
+msgstr "Administrateurs"
 
-#: tpl_messages.php:6 tpl_messages.php:15 tpl_messages.php:24
-#: tpl_messages.php:80 tpl_messages.php:133 tpl_messages.php:195
-#: tpl_messages.php:218 ../../../www/admin/addressbook/index.php.in:121
-#: ../../../www/admin/user/index.php.in:183
+#: tpl_messages.php:5 tpl_messages.php:69 tpl_messages.php:87
+#: tpl_messages.php:111 tpl_messages.php:210 tpl_messages.php:215
+#: tpl_messages.php:278 ../../www/admin/user/index.php:181
+#: ../../www/admin/addressbook/index.php:121
 msgid "Name"
 msgstr "Nom"
 
-#: tpl_messages.php:7 tpl_messages.php:16 tpl_messages.php:26
-#: tpl_messages.php:70 tpl_messages.php:82 tpl_messages.php:135
-#: tpl_messages.php:175 tpl_messages.php:188 tpl_messages.php:198
-#: tpl_messages.php:221
+#: tpl_messages.php:6 tpl_messages.php:216 tpl_messages.php:279
+#: ../../www/admin/user/index.php:183
+msgid "UID"
+msgstr "UID"
+
+#: tpl_messages.php:7 tpl_messages.php:70 tpl_messages.php:90
+#: tpl_messages.php:114 tpl_messages.php:190 tpl_messages.php:211
+#: tpl_messages.php:217 tpl_messages.php:251 tpl_messages.php:264
+#: tpl_messages.php:280
 msgid "Action"
 msgstr "Action"
 
-#: tpl_messages.php:8 tpl_messages.php:18 tpl_messages.php:28
-#: tpl_messages.php:74 tpl_messages.php:84 tpl_messages.php:137
-#: tpl_messages.php:200 tpl_messages.php:223
+#: tpl_messages.php:8 tpl_messages.php:218 tpl_messages.php:281
+msgid "Object Deleted, awaiting cleanup..."
+msgstr "L'objet est effacÃ©, en attente du nettoyage..."
+
+#: tpl_messages.php:9 tpl_messages.php:72 tpl_messages.php:92
+#: tpl_messages.php:116 tpl_messages.php:194 tpl_messages.php:212
+#: tpl_messages.php:219 tpl_messages.php:282
 msgid "Modify"
 msgstr "Modifier"
 
-#: tpl_messages.php:9 tpl_messages.php:19 tpl_messages.php:29
-#: tpl_messages.php:75 tpl_messages.php:85 tpl_messages.php:138
-#: tpl_messages.php:176 tpl_messages.php:189 tpl_messages.php:201
-#: tpl_messages.php:224 ../../../www/admin/addressbook/addr.php.in:277
-#: ../../../www/admin/administrator/admin.php.in:307
-#: ../../../www/admin/distributionlist/list.php.in:300
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:310
-#: ../../../www/admin/sharedfolder/sf.php.in:310
-#: ../../../www/admin/user/user.php.in:764
-#: ../../../www/admin/user/user.php.in:822
+#: tpl_messages.php:10 tpl_messages.php:73 tpl_messages.php:93
+#: tpl_messages.php:117 tpl_messages.php:195 tpl_messages.php:213
+#: tpl_messages.php:220 tpl_messages.php:252 tpl_messages.php:265
+#: tpl_messages.php:283 ../../www/admin/user/user.php:862
+#: ../../www/admin/user/user.php:920
+#: ../../www/admin/administrator/admin.php:311
+#: ../../www/admin/addressbook/addr.php:277
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:314
+#: ../../www/admin/sharedfolder/sf.php:314
+#: ../../www/admin/distributionlist/list.php:304
 msgid "Delete"
 msgstr "Effacer"
 
-#: tpl_messages.php:11 tpl_messages.php:213 tpl_messages.php:226
-msgid "[ ALL ]"
-msgstr "[ Tous ]"
+#: tpl_messages.php:11
+msgid "Email Forwarding"
+msgstr "Transfert des messages"
 
-#: tpl_messages.php:12 tpl_messages.php:214 tpl_messages.php:227
-msgid "[ OTHER ]"
-msgstr "[ Autres ]"
+#: tpl_messages.php:12
+#, fuzzy
+msgid "Activate email forwarding"
+msgstr "Transfert des messages"
 
-#: tpl_messages.php:13 tpl_messages.php:215 tpl_messages.php:228
-msgid "Filter:"
-msgstr "Filtre :"
+#: tpl_messages.php:13
+msgid "Forward mail to"
+msgstr "Transmettre le message vers"
 
-#: tpl_messages.php:14 tpl_messages.php:216 tpl_messages.php:229
-msgid "Filter"
-msgstr "Filtre"
+#: tpl_messages.php:14
+msgid "Keep copy on server"
+msgstr "Garder une copie sur le serveur"
 
-#: tpl_messages.php:17
-msgid "Entry deleted, awaiting cleanup..."
-msgstr "Compte effacÃ©, en attente de nettoyage..."
+#: tpl_messages.php:15 tpl_messages.php:77 tpl_messages.php:229
+#: tpl_messages.php:233 tpl_messages.php:236 tpl_messages.php:239
+#: tpl_messages.php:242 tpl_messages.php:245 tpl_messages.php:248
+#: tpl_messages.php:261 tpl_messages.php:333
+msgid "Update"
+msgstr "Mise a jour"
 
-#: tpl_messages.php:20
-msgid "The administrator with DN"
-msgstr "L'administrateur avec le DN"
+#: tpl_messages.php:16
+msgid "ActiveSync Configuration"
+msgstr ""
 
-#: tpl_messages.php:22
-msgid "Back to list of administrators"
-msgstr "Retour Ã  la liste des administrateurs"
+#: tpl_messages.php:17
+#, fuzzy
+msgid "Device Alias"
+msgstr "Alias de l'adresse de messagerie"
 
-#: tpl_messages.php:23 ../include/menu.php:70
-msgid "Administrators"
-msgstr "Administrateurs"
+#: tpl_messages.php:18
+msgid "Device Mode"
+msgstr ""
 
-#: tpl_messages.php:25 tpl_messages.php:81 tpl_messages.php:134
-#: ../../../www/admin/user/index.php.in:185
-msgid "UID"
-msgstr "UID"
+#: tpl_messages.php:19
+#, fuzzy
+msgid "Picture Settings"
+msgstr "GÃ©rer les paramÃ¨tres systÃ¨mes"
 
-#: tpl_messages.php:27 tpl_messages.php:83 tpl_messages.php:136
-msgid "Object Deleted, awaiting cleanup..."
-msgstr "L'objet est effacÃ©, en attente du nettoyage..."
+#: tpl_messages.php:20
+msgid "Enable PNG and GIF formats while syncing"
+msgstr ""
 
-#: tpl_messages.php:30
-msgid ""
-"<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> is a specialist "
-"email solution provider based in Johannesburg, South Africa specialising in "
-"the deployment and support of Kolab."
+#: tpl_messages.php:21
+msgid "Save"
 msgstr ""
-"<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> est une sociÃ©tÃ© "
-"spÃ©cialisÃ©e dans les solutions de messagerie basÃ© Ã  Johannesburg, Afrique du "
-"Sud spÃ©cialisÃ©e dans le dÃ©ploiement et le support de Kolab."
 
-#: tpl_messages.php:31
-msgid ""
-"Code Fusion has played, and continues to play, an integral part in "
-"developing and extending the Kolab server; specifically with regards to "
-"enhancing the base Kolab engine, adding in support for Microsoft Active "
-"Directory ® as an LDAP backend, as well as extending the <a href="
-"\"http://www.horde.org/\">Horde project</a> to provide a web-based groupware "
-"client for the Kolab server."
+#: tpl_messages.php:22
+msgid "Clear"
 msgstr ""
-"Code Fusion Ã  jouÃ© et joue encore un rÃ´le a part entiÃ¨re dans le "
-"dÃ©veloppement et l'amÃ©lioration du serveur de messagerie Kolab; spÃ©cialement "
-"dans l'amÃ©lioration du moteur de base de Kolab en rajoutant le support pour "
-"Microsoft Active Directory ® comme annuaire LDAP et en amÃ©liorant le "
-"projet Horde <a href=\"http://www.horde.org/\"> pour fournir un client web "
-"au serveur de messagerie Kolab."
 
-#: tpl_messages.php:32
-msgid ""
-"The following people from Code Fusion are involved in the Kolab project (in "
-"alphabetical order):"
+#: tpl_messages.php:23
+msgid "Forget Device"
 msgstr ""
-"Les personnes suivantes de l'Ã©quipe de Code Fusion sont impliquÃ©es dans le "
-"projet Kolab (en ordre alphabÃ©tique):"
 
-#: tpl_messages.php:33
+#: tpl_messages.php:24
+msgid "Are you sure?"
+msgstr ""
+
+#: tpl_messages.php:25
+msgid "The maintainer with DN"
+msgstr "Le mainteneur avec le DN"
+
+#: tpl_messages.php:26 tpl_messages.php:29 tpl_messages.php:204
+#: tpl_messages.php:207 tpl_messages.php:286 tpl_messages.php:309
+msgid "has been deleted"
+msgstr "Ã  Ã©tÃ© effacÃ©"
+
+#: tpl_messages.php:27
+msgid "Back to list of maintainers"
+msgstr "Retour Ã  la liste des mainteneurs"
+
+#: tpl_messages.php:28
+msgid "The distribution list with DN"
+msgstr "La liste de distribution avec le DN"
+
+#: tpl_messages.php:30
+msgid "Back to list of distribution lists"
+msgstr "Retour Ã  la liste des listes de distribution"
+
+#: tpl_messages.php:31
 msgid "Attribute"
 msgstr "Attribut"
 
-#: tpl_messages.php:34
+#: tpl_messages.php:32
 msgid "Value"
 msgstr "Valeur"
 
-#: tpl_messages.php:35
+#: tpl_messages.php:33
 msgid "Comment"
 msgstr "Commentaire"
 
-#: tpl_messages.php:36 ../../../www/admin/addressbook/addr.php.in:88
-#: ../../../www/admin/administrator/admin.php.in:139
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:114
-#: ../../../www/admin/maintainer/maintainer.php.in:136
-#: ../../../www/admin/user/user.php.in:384
+#: tpl_messages.php:34 ../../www/admin/user/user.php:449
+#: ../../www/admin/administrator/admin.php:139
+#: ../../www/admin/addressbook/addr.php:88
+#: ../../www/admin/maintainer/maintainer.php:136
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:114
 msgid "First Name"
 msgstr "PrÃ©nom"
 
-#: tpl_messages.php:37 tpl_messages.php:39 tpl_messages.php:41
-#: tpl_messages.php:43 ../../../www/admin/addressbook/addr.php.in:90
-#: ../../../www/admin/addressbook/addr.php.in:93
-#: ../../../www/admin/administrator/admin.php.in:133
-#: ../../../www/admin/administrator/admin.php.in:141
-#: ../../../www/admin/administrator/admin.php.in:144
-#: ../../../www/admin/distributionlist/list.php.in:117
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:108
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:116
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:119
-#: ../../../www/admin/maintainer/maintainer.php.in:130
-#: ../../../www/admin/maintainer/maintainer.php.in:138
-#: ../../../www/admin/maintainer/maintainer.php.in:141
-#: ../../../www/admin/sharedfolder/sf.php.in:123
-#: ../../../www/admin/user/user.php.in:376
-#: ../../../www/admin/user/user.php.in:386
-#: ../../../www/admin/user/user.php.in:389
+#: tpl_messages.php:35 tpl_messages.php:38 tpl_messages.php:40
+#: tpl_messages.php:42 ../../www/admin/user/user.php:441
+#: ../../www/admin/user/user.php:451 ../../www/admin/user/user.php:455
+#: ../../www/admin/administrator/admin.php:133
+#: ../../www/admin/administrator/admin.php:141
+#: ../../www/admin/administrator/admin.php:144
+#: ../../www/admin/addressbook/addr.php:90
+#: ../../www/admin/addressbook/addr.php:93
+#: ../../www/admin/maintainer/maintainer.php:130
+#: ../../www/admin/maintainer/maintainer.php:138
+#: ../../www/admin/maintainer/maintainer.php:141
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:108
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:116
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:119
+#: ../../www/admin/sharedfolder/sf.php:125
+#: ../../www/admin/distributionlist/list.php:120
 msgid "Required"
 msgstr "Requis"
 
-#: tpl_messages.php:38 ../../../www/admin/addressbook/addr.php.in:91
-#: ../../../www/admin/administrator/admin.php.in:142
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:117
-#: ../../../www/admin/maintainer/maintainer.php.in:139
-#: ../../../www/admin/user/user.php.in:387
+#: tpl_messages.php:36 ../../www/admin/user/user.php:452
+#, fuzzy
+msgid "Middle Name"
+msgstr "Nom du dossier"
+
+#: tpl_messages.php:37 ../../www/admin/user/user.php:453
+#: ../../www/admin/administrator/admin.php:142
+#: ../../www/admin/addressbook/addr.php:91
+#: ../../www/admin/maintainer/maintainer.php:139
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:117
 msgid "Last Name"
 msgstr "Nom de Famille"
 
-#: tpl_messages.php:40 ../../../www/admin/administrator/admin.php.in:145
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:120
-#: ../../../www/admin/maintainer/maintainer.php.in:142
-#: ../../../www/admin/user/user.php.in:390
+#: tpl_messages.php:39 ../../www/admin/user/user.php:456
+#: ../../www/admin/administrator/admin.php:145
+#: ../../www/admin/maintainer/maintainer.php:142
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:120
 msgid "Password"
 msgstr "Mot de passe"
 
-#: tpl_messages.php:42 ../../../www/admin/administrator/admin.php.in:149
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:124
-#: ../../../www/admin/maintainer/maintainer.php.in:146
-#: ../../../www/admin/user/user.php.in:394
+#: tpl_messages.php:41 ../../www/admin/user/user.php:460
+#: ../../www/admin/administrator/admin.php:149
+#: ../../www/admin/maintainer/maintainer.php:146
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:124
 msgid "Verify Password"
 msgstr "VÃ©rifier le mot de passe"
 
-#: tpl_messages.php:44 ../../../www/admin/user/user.php.in:398
+#: tpl_messages.php:43 ../../www/admin/user/user.php:464
 msgid "Primary Email Address"
 msgstr "Adresse de messagerie principale"
 
-#: tpl_messages.php:45 ../../../www/admin/administrator/admin.php.in:132
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:107
-#: ../../../www/admin/maintainer/maintainer.php.in:129
-#: ../../../www/admin/sharedfolder/sf.php.in:126
-#: ../../../www/admin/user/user.php.in:375
-#: ../../../www/admin/user/user.php.in:377
+#: tpl_messages.php:44 ../../www/admin/user/user.php:440
+#: ../../www/admin/user/user.php:442
+#: ../../www/admin/administrator/admin.php:132
+#: ../../www/admin/maintainer/maintainer.php:129
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:107
+#: ../../www/admin/sharedfolder/sf.php:128
 msgid "Required, non volatile"
 msgstr "Requis, permanent"
 
-#: tpl_messages.php:46 ../../../www/admin/addressbook/addr.php.in:94
-#: ../../../www/admin/user/user.php.in:433
+#: tpl_messages.php:45 ../../www/admin/user/user.php:505
+#: ../../www/admin/addressbook/addr.php:94
 msgid "Title"
 msgstr "Titre"
 
-#: tpl_messages.php:47
+#: tpl_messages.php:46
 msgid "Email Alias"
 msgstr "Alias de l'adresse de messagerie"
 
-#: tpl_messages.php:48 ../../../www/admin/addressbook/addr.php.in:101
-#: ../../../www/admin/user/user.php.in:434
+#: tpl_messages.php:47 ../../www/admin/user/user.php:506
+#: ../../www/admin/addressbook/addr.php:101
 msgid "Organisation"
 msgstr "Organisation"
 
-#: tpl_messages.php:49 ../../../www/admin/addressbook/addr.php.in:102
-#: ../../../www/admin/user/user.php.in:435
+#: tpl_messages.php:48 ../../www/admin/user/user.php:507
+#: ../../www/admin/addressbook/addr.php:102
 msgid "Organisational Unit"
 msgstr "SociÃ©tÃ©"
 
-#: tpl_messages.php:50 ../../../www/admin/addressbook/addr.php.in:103
-#: ../../../www/admin/user/user.php.in:436
+#: tpl_messages.php:49 ../../www/admin/user/user.php:508
+#: ../../www/admin/addressbook/addr.php:103
 msgid "Room Number"
 msgstr "NumÃ©ro du bureau"
 
-#: tpl_messages.php:51 ../../../www/admin/addressbook/addr.php.in:104
-#: ../../../www/admin/user/user.php.in:437
+#: tpl_messages.php:50 ../../www/admin/user/user.php:509
+#: ../../www/admin/addressbook/addr.php:104
 msgid "Street Address"
 msgstr "Rue"
 
-#: tpl_messages.php:52 ../../../www/admin/user/user.php.in:438
+#: tpl_messages.php:51 ../../www/admin/user/user.php:510
 msgid "Postbox"
 msgstr "Boite postale"
 
-#: tpl_messages.php:53 ../../../www/admin/addressbook/addr.php.in:106
-#: ../../../www/admin/user/user.php.in:439
+#: tpl_messages.php:52 ../../www/admin/user/user.php:511
+#: ../../www/admin/addressbook/addr.php:106
 msgid "Postal Code"
 msgstr "Code postal"
 
-#: tpl_messages.php:54 ../../../www/admin/addressbook/addr.php.in:107
-#: ../../../www/admin/user/user.php.in:440
+#: tpl_messages.php:53 ../../www/admin/user/user.php:512
+#: ../../www/admin/addressbook/addr.php:107
 msgid "City"
 msgstr "Ville"
 
-#: tpl_messages.php:55 ../../../www/admin/addressbook/addr.php.in:108
-#: ../../../www/admin/user/user.php.in:441
+#: tpl_messages.php:54 ../../www/admin/user/user.php:513
+#: ../../www/admin/addressbook/addr.php:108
 msgid "Country"
 msgstr "Pays"
 
-#: tpl_messages.php:56 ../../../www/admin/addressbook/addr.php.in:109
-#: ../../../www/admin/user/user.php.in:442
+#: tpl_messages.php:55 ../../www/admin/user/user.php:515
+#: ../../www/admin/addressbook/addr.php:109
 msgid "Telephone Number"
 msgstr "NumÃ©ro de tÃ©lÃ©phone"
 
-#: tpl_messages.php:57 ../../../www/admin/addressbook/addr.php.in:111
-#: ../../../www/admin/user/user.php.in:444
+#: tpl_messages.php:56 ../../www/admin/user/user.php:517
+#: ../../www/admin/addressbook/addr.php:111
 msgid "Fax Number"
 msgstr "NumÃ©ro de fax"
 
-#: tpl_messages.php:58 ../include/menu.php:45
+#: tpl_messages.php:57 tpl_messages.php:96 tpl_messages.php:313
+#: ../../lib/KolabAdmin/include/menu.php:52
 msgid "Addressbook"
 msgstr "Carnet d'adresses"
 
-#: tpl_messages.php:59
+#: tpl_messages.php:58
 msgid "check here to make this users address <br/> visible in the address book"
 msgstr ""
 "Cochez ceci pour faire apparaÃ®tre l'adresse de cet utilisateur <br/> dans le "
 "carnet d'adresse"
 
-#: tpl_messages.php:60
+#: tpl_messages.php:59
 msgid "User Quota in KB"
 msgstr "Le quota de l'utilisateur en KB"
 
-#: tpl_messages.php:61 ../../../www/admin/user/user.php.in:448
+#: tpl_messages.php:60 ../../www/admin/user/user.php:521
 msgid "Leave blank for unlimited"
 msgstr "Laissez vide pour illimitÃ©"
 
-#: tpl_messages.php:62 ../include/form.class.php:76
+#: tpl_messages.php:61 ../../lib/KolabAdmin/include/form.class.php:75
 msgid "Submit"
 msgstr "Soumettre"
 
-#: tpl_messages.php:63
-msgid "Email Delivery"
-msgstr "Livraison des messages"
-
-#: tpl_messages.php:64
-msgid ""
-"Activate delivery to folder (only one of vacation, forward and delivery to "
-"folder can be active at any time)"
-msgstr ""
-"Activer l'envoi dans un dossier (un seul mode des modes suivants : messages "
-"d'absence, transmission, et envoi dans un dossier peut Ãªtre activÃ©)"
-
-#: tpl_messages.php:65
-msgid "Deliver regular mail to folder"
-msgstr "DÃ©livrer les mail normaux vers un dossier"
+#: tpl_messages.php:64 tpl_messages.php:209
+msgid "(only external addresses without a kolab user account)"
+msgstr "(seulement les adresses externes sans un compte de messagerie Kolab)"
 
-#: tpl_messages.php:66 tpl_messages.php:93 tpl_messages.php:153
-#: tpl_messages.php:157 tpl_messages.php:160 tpl_messages.php:163
-#: tpl_messages.php:166 tpl_messages.php:169 tpl_messages.php:172
-#: tpl_messages.php:185 tpl_messages.php:239
-msgid "Update"
-msgstr "Mise a jour"
+#: tpl_messages.php:65 tpl_messages.php:82 tpl_messages.php:103
+msgid "[ ALL ]"
+msgstr "[ Tous ]"
 
-#: tpl_messages.php:67 ../include/menu.php:62
-msgid "Distribution Lists"
-msgstr "Listes de distributions"
+#: tpl_messages.php:66 tpl_messages.php:83 tpl_messages.php:104
+msgid "[ OTHER ]"
+msgstr "[ Autres ]"
 
-#: tpl_messages.php:68
-msgid "Listname"
-msgstr "Nom de la liste"
+#: tpl_messages.php:67 tpl_messages.php:84 tpl_messages.php:105
+msgid "Filter:"
+msgstr "Filtre :"
 
-#: tpl_messages.php:69
-msgid "Visibility"
-msgstr "VisibilitÃ©"
+#: tpl_messages.php:68 tpl_messages.php:85 tpl_messages.php:106
+msgid "Filter"
+msgstr "Filtre"
 
 #: tpl_messages.php:71
-msgid "Internal"
-msgstr "Interne"
+msgid "Entry deleted, awaiting cleanup..."
+msgstr "Compte effacÃ©, en attente de nettoyage..."
 
-#: tpl_messages.php:72
-msgid "Public"
-msgstr "Publique"
+#: tpl_messages.php:74
+msgid "Email Delivery"
+msgstr "Livraison des messages"
 
-#: tpl_messages.php:73
-msgid "List deleted, awaiting cleanup..."
-msgstr "Liste effacÃ©e, en attente du nettoyage..."
+#: tpl_messages.php:75
+msgid "Activate delivery to folder"
+msgstr ""
 
 #: tpl_messages.php:76
-msgid "The distribution list with DN"
-msgstr "La liste de distribution avec le DN"
+msgid "Deliver regular mail to folder"
+msgstr "DÃ©livrer les mail normaux vers un dossier"
 
 #: tpl_messages.php:78
-msgid "Back to list of distribution lists"
-msgstr "Retour Ã  la liste des listes de distribution"
-
-#: tpl_messages.php:79 ../include/menu.php:76 ../include/menu.php:93
-#: ../include/menu.php:101
-msgid "Domain Maintainers"
-msgstr "Administrateurs de domaines"
+msgid ""
+"<a href=\"http://www.kde.org\">KDE</a> is a powerful <a href=\"http://www."
+"gnu.org/philosophy/free-sw.html\">Free Software</a> graphical desktop "
+"environment for Linux and Unix workstations. It combines ease of use, "
+"contemporary functionality, and outstanding graphical design with the "
+"technological superiority of the Unix operating system."
+msgstr ""
+"<a href=\"http://www.kde.org\">KDE</a> est environnement de travail "
+"performant<a href=\"http://www.gnu.org/philosophy/free-sw.html\">en Logiciel "
+"Libre</a> destinÃ© aux stations de travail Linux et Unix. Il allie simplicitÃ© "
+"d'utilisation, fonctionnalitÃ©s usuelles, une remarquable interface graphique "
+"et la supÃ©rioritÃ© technologique du systÃ¨me d'exploitation Unix."
 
-#: tpl_messages.php:86
+#: tpl_messages.php:79
 msgid ""
-"Kolab's architecture was done by <a href=\"http://www.erfrakon.com"
-"\">erfrakon</a>; the company also designed and implemented the Kolab 1 "
-"Server and did the design and architecture for the Kolab 2 Server while "
-"providing consulting for the implementation of the Kolab 2 server and the "
-"Kolab 2 clients."
+"<b>KDE</b> is an Internet project that is truly open in every sense. "
+"Development takes place on the Internet and is discussed on our <a href="
+"\"http://www.kde.org/mailinglists.html\">mailing lists</a>, USENET news "
+"groups, and IRC channels to which we invite and welcome everyone."
 msgstr ""
-"Le concept de Kolab Ã  Ã©tÃ© rÃ©alisÃ© par <a href=\"http://www.erfrakon.com"
-"\">erfrakon</a>; cette sociÃ©tÃ© Ã  aussi rÃ©alisÃ© le design et l'implÃ©mentation "
-"du serveur Kolab 1 ainsi que le design et l'architecture du serveur Kolab 2, "
-"en mÃªme temps que de la consultance pour l'implÃ©mentation du serveur Kolab 2 "
-"et les clients Kolab 2."
+"<b>KDE</b> est un projet Internet qui est vraiment ouvert dans tout les sens "
+"du terme. Le dÃ©veloppement prend place sur Internet et est discutÃ© sur nos "
+"<a href=\"http://www.kde.org/mailinglists.html\">listes de discutions</a>, "
+"les groupes USENET, et des canaux IRC auquel nous convions tout le monde."
 
-#: tpl_messages.php:87
+#: tpl_messages.php:80
 msgid ""
-"<a href=\"http://www.erfrakon.com\">erfrakon</a> is a consulting company "
-"dedicated to opensource software and Linux. The main tasks of erfrakon "
-"within the Kolab project are the principle design and architecure of the "
-"Kolab groupware solution and the creation of the Kolab 1 server."
+"<b>KDE</b> is a mature desktop suite providing a solid basis to an ever "
+"growing number of <a href=\"http://www.kde-apps.org\">applications</a> for "
+"Unix workstations.  KDE has developed a high quality development framework "
+"for Unix, which allows for the rapid and efficient creation of applications."
 msgstr ""
-"<a href=\"http://www.erfrakon.com\">erfrakon</a> est une sociÃ©tÃ© de "
-"consultance dÃ©dicacÃ©e au logiciel libre et a Linux. Les tÃ¢ches principales "
-"d'erfrakon dans le projet Kolab sont le design et l'architecture du logiciel "
-"de collaboration Kolab et la crÃ©ation du serveur Kolab 1."
+"<b>KDE</b> est un environnement de travail Ã©voluÃ© fournissant une base "
+"solide pour un nombre grandissant <a href=\"http://apps.kde.com"
+"\">d'applications</a> pour postes de travail Unix.  KDE Ã  dÃ©veloppÃ© un "
+"environnement de dÃ©veloppement haut de gamme pour Unix, qui permet le "
+"dÃ©veloppement rapide et efficace des applications."
 
-#: tpl_messages.php:88
-msgid "The following people worked on Kolab for erfrakon:"
-msgstr "Les personnes suivantes on travaillÃ© sur Kolab pour efrakon :"
+#: tpl_messages.php:81 tpl_messages.php:102
+msgid "Email Users"
+msgstr "Adresse de messagerie des utilisateurs"
 
-#: tpl_messages.php:89
-msgid "Email Forwarding"
-msgstr "Transfert des messages"
+#: tpl_messages.php:86 tpl_messages.php:113
+msgid "Type"
+msgstr "Type"
 
-#: tpl_messages.php:90
-msgid ""
-"Activate email forwarding (only one of vacation, forward and delivery to "
-"folder can be active at any time)"
-msgstr ""
-"Activer le transfert des messages (un seul mode des modes suivants : "
-"messages d'absence, transmission, et envoi dans un dossier peut Ãªtre activÃ©)"
+#: tpl_messages.php:88 ../../www/admin/user/activesync.php:496
+msgid "E-mail"
+msgstr "Adresse de messagerie"
+
+#: tpl_messages.php:89
+msgid "uid"
+msgstr "uid"
 
 #: tpl_messages.php:91
-msgid "Forward mail to"
-msgstr "Transmettre le message vers"
+msgid "User Deleted, awaiting cleanup..."
+msgstr "Utilisateur effacÃ©, en attente du nettoyage..."
 
-#: tpl_messages.php:92
-msgid "Keep copy on server"
-msgstr "Garder une copie sur le serveur"
+#: tpl_messages.php:94 tpl_messages.php:151
+#, fuzzy
+msgid "Welcome to the Kolab Groupware Server Maintenance"
+msgstr "Bienvenue dans l'interface d'administration de Kolab"
+
+#: tpl_messages.php:95 tpl_messages.php:152 tpl_messages.php:155
+#: tpl_messages.php:312
+#, fuzzy
+msgid "Manage Users"
+msgstr "GÃ©rer les utilisateurs de messagerie"
+
+#: tpl_messages.php:97 tpl_messages.php:153 tpl_messages.php:156
+#: tpl_messages.php:314
+#, fuzzy
+msgid "Shared Folders"
+msgstr "Dossier partagÃ©"
+
+#: tpl_messages.php:98 tpl_messages.php:157 tpl_messages.php:187
+#: tpl_messages.php:315 ../../lib/KolabAdmin/include/menu.php:69
+msgid "Distribution Lists"
+msgstr "Listes de distributions"
+
+#: tpl_messages.php:99 tpl_messages.php:214 tpl_messages.php:317
+#: ../../lib/KolabAdmin/include/menu.php:89
+#: ../../lib/KolabAdmin/include/menu.php:97
+msgid "Maintainers"
+msgstr "Mainteneurs"
+
+#: tpl_messages.php:100 tpl_messages.php:158 tpl_messages.php:277
+#: tpl_messages.php:318 ../../lib/KolabAdmin/include/menu.php:83
+#: ../../lib/KolabAdmin/include/menu.php:100
+#: ../../lib/KolabAdmin/include/menu.php:108
+msgid "Domain Maintainers"
+msgstr "Administrateurs de domaines"
+
+#: tpl_messages.php:101 tpl_messages.php:154 tpl_messages.php:159
+#: tpl_messages.php:276 tpl_messages.php:320
+#, fuzzy
+msgid "About"
+msgstr "A propos de Kolab"
 
-#: tpl_messages.php:94
+#: tpl_messages.php:107
 msgid ""
 "Intevation GmbH coordinated the Projects: Kroupware and Proko2, which are "
 "the main driving force behind Kolab1&2. In addition to project management "
@@ -418,7 +462,7 @@ msgstr ""
 "qui sont la base des projets pour Kolab1&2. En plus de la gestion de ces "
 "projets Intevation Ã  rÃ©alisÃ© la plupart du contrÃ´le qualitÃ©."
 
-#: tpl_messages.php:95
+#: tpl_messages.php:108
 msgid ""
 "Intevation GmbH is a IT-company exclusively focusing on Free Software. Its "
 "business units are strategic consulting, project management and geographic "
@@ -428,135 +472,129 @@ msgstr ""
 "logiciel libre. Ses spÃ©cialitÃ©s sont consultance stratÃ©gique, gestion de "
 "projets et systÃ¨mes gÃ©ographiques."
 
-#: tpl_messages.php:96
+#: tpl_messages.php:109
 msgid "The following people worked on Kolab for Intevation:"
 msgstr "Les personnes suivantes on travaillÃ© sur Kolab pour Intevation :"
 
-#: tpl_messages.php:97
-msgid ""
-"The Kolab 1 KDE client and the Kolab 2 KDE Client (Kontact) was developed by"
-msgstr "Le client KDE pour Kolab1 et Kolab2 (Kontact) Ã  Ã©tÃ© dÃ©veloppÃ© par "
-
-#: tpl_messages.php:98
-msgid ""
-"Klarälvdalens Datakonsult AB is a consulting company dedicated to "
-"opensource software, Linux, and the <a href=\"http://www.trolltech.com/"
-"products/qt/\">Qt</a> library. The main tasks of KDAB within the Kolab "
-"project are design and implementation of the Kolab KDE clients and the "
-"implementation of the current Kolab 2 server."
-msgstr ""
-"Klarälvdalens Datakonsult AB est une sociÃ©tÃ© de consultance dÃ©diÃ©e au "
-"logiciel libre, Linux et la librairie <a href=\"http://www.trolltech.com/"
-"products/qt/\">Qt</a>. Les tÃ¢ches principales de KDAB dans le projet Kolab "
-"sont le design et l'implÃ©mentation de clients KDE pour Kolab et "
-"l'implÃ©mentation du serveur Kolab 2."
+#: tpl_messages.php:110
+msgid "Shared folders"
+msgstr "Dossier PartagÃ©s"
 
-#: tpl_messages.php:99
-msgid ""
-"The following people worked on Kolab for Klarälvdalens Datakonsult AB:"
-msgstr ""
-"Les personnes suivantes on travaillÃ© sur Kolab pour Klarälvdalens "
-"Datakonsult AB :"
+#: tpl_messages.php:112
+msgid "Server"
+msgstr "Serveur"
 
-#: tpl_messages.php:100
-msgid ""
-"<a href=\"http://www.kde.org\">KDE</a> is a powerful <a href=\"http://www."
-"gnu.org/philosophy/free-sw.html\">Free Software</a> graphical desktop "
-"environment for Linux and Unix workstations. It combines ease of use, "
-"contemporary functionality, and outstanding graphical design with the "
-"technological superiority of the Unix operating system."
-msgstr ""
-"<a href=\"http://www.kde.org\">KDE</a> est environnement de travail "
-"performant<a href=\"http://www.gnu.org/philosophy/free-sw.html\">en Logiciel "
-"Libre</a> destinÃ© aux stations de travail Linux et Unix. Il allie simplicitÃ© "
-"d'utilisation, fonctionnalitÃ©s usuelles, une remarquable interface graphique "
-"et la supÃ©rioritÃ© technologique du systÃ¨me d'exploitation Unix."
+#: tpl_messages.php:115
+msgid "Folder deleted, awaiting cleanup..."
+msgstr "Dossier effacÃ©, en attente de nettoyage..."
 
-#: tpl_messages.php:101
-msgid ""
-"<b>KDE</b> is an Internet project that is truly open in every sense. "
-"Development takes place on the Internet and is discussed on our <a href="
-"\"http://www.kde.org/mailinglists.html\">mailing lists</a>, USENET news "
-"groups, and IRC channels to which we invite and welcome everyone."
-msgstr ""
-"<b>KDE</b> est un projet Internet qui est vraiment ouvert dans tout les sens "
-"du terme. Le dÃ©veloppement prend place sur Internet et est discutÃ© sur nos "
-"<a href=\"http://www.kde.org/mailinglists.html\">listes de discutions</a>, "
-"les groupes USENET, et des canaux IRC auquel nous convions tout le monde."
+#: tpl_messages.php:118
+#, fuzzy
+msgid "Kolab Groupware Solution - Technologies"
+msgstr "Connexion au serveur Kolab"
 
-#: tpl_messages.php:102
+#: tpl_messages.php:119
 msgid ""
-"<b>KDE</b> is a mature desktop suite providing a solid basis to an ever "
-"growing number of <a href=\"http://www.kde-apps.org\">applications</a> for "
-"Unix workstations.  KDE has developed a high quality development framework "
-"for Unix, which allows for the rapid and efficient creation of applications."
+"This is the server of the Kolab Groupware Solution. It is <a href=\"http://"
+"fsfe.org/about/basics/freesoftware\">Free Software</a> developed by the <a "
+"href=\"http://www.kolab.org/\">Kolab Community</a>, which works in "
+"collaboration with and as part of many other communities and projects to "
+"bring you this software."
 msgstr ""
-"<b>KDE</b> est un environnement de travail Ã©voluÃ© fournissant une base "
-"solide pour un nombre grandissant <a href=\"http://apps.kde.com"
-"\">d'applications</a> pour postes de travail Unix.  KDE Ã  dÃ©veloppÃ© un "
-"environnement de dÃ©veloppement haut de gamme pour Unix, qui permet le "
-"dÃ©veloppement rapide et efficace des applications."
 
-#: tpl_messages.php:103
-msgid "Kolab2 Groupware Server"
-msgstr "Serveur de collaboration Kolab2"
-
-#: tpl_messages.php:104
+#: tpl_messages.php:120
 msgid ""
-"This is the Kolab2 Server. It is Free Software developed by the <a href="
-"\"http://www.kolab.org/\">Kolab Project</a>, with the intention of bringing "
-"groupware functionality to Unix/KDE users as well as Windows desktops."
+"For this server, Free Software communities and projects that the Kolab "
+"Community is a part of and builds upon include:"
 msgstr ""
-"Ceci est le serveur Kolab2. C'est du logiciel libre dÃ©veloppÃ© par  <a ref="
-"\"http://www.kolab.org/\">Le projet Kolab</a>, avec l'intention de fournir "
-"un logiciel de messagerie collaborative au utilisateurs de Unix/KDE ainsi "
-"qu'au utilisateurs Microsoft Windows."
 
-#: tpl_messages.php:105
-msgid "Kolab builds upon many other Free Software projects, namely:"
-msgstr ""
-"Kolab est construit sur base d'autres projets logiciels libres "
-"spÃ©cifiquement :"
-
-#: tpl_messages.php:106
+#: tpl_messages.php:121
 msgid "(Mail Scanner)"
 msgstr "(Scanner de messagerie)"
 
-#: tpl_messages.php:107
+#: tpl_messages.php:122
 msgid "(HTTP Server)"
 msgstr "(Serveur Web)"
 
-#: tpl_messages.php:108
+#: tpl_messages.php:123
 msgid "(Virus Scanner)"
 msgstr "(Scanner antivirus)"
 
-#: tpl_messages.php:109
-msgid "(IMAP Server)"
+#: tpl_messages.php:124
+#, fuzzy
+msgid "(IMAP Server & Database)"
 msgstr "(Serveur Imap)"
 
-#: tpl_messages.php:110
+#: tpl_messages.php:125
 msgid "(LDAP Server)"
 msgstr "(Serveur LDAP)"
 
-#: tpl_messages.php:111
+#: tpl_messages.php:126
 msgid "(MTA)"
 msgstr "(Serveur SMTP)"
 
-#: tpl_messages.php:112
+#: tpl_messages.php:127
 msgid "(SPAM Filter)"
 msgstr "(Filtre anti-spam)"
 
-#: tpl_messages.php:113
+#: tpl_messages.php:128
+msgid "(ActiveSync Support)"
+msgstr ""
+
+#: tpl_messages.php:129
+msgid "(Web client)"
+msgstr ""
+
+#: tpl_messages.php:130 tpl_messages.php:131
+msgid "(Server side scripting & glue)"
+msgstr ""
+
+#: tpl_messages.php:132
+msgid "(This interface)"
+msgstr ""
+
+#: tpl_messages.php:133
 msgid ""
-"The following projects are used in binding the above together, in order to "
-"create the Kolab Server:"
-msgstr "Les projets suivants sont utilisÃ©s pour crÃ©er le Serveur Kolab :"
+"For the clients, Free Software communities and projects that the Kolab "
+"Community is a part of and builds upon include:"
+msgstr ""
 
-#: tpl_messages.php:114
-msgid "The following projects are used as a base for the Kolab Clients:"
-msgstr "Les projets suivants sont utilisÃ©s comme base pour les clients Kolab :"
+#: tpl_messages.php:134
+msgid "History & Credits"
+msgstr ""
 
-#: tpl_messages.php:115
+#: tpl_messages.php:135
+msgid ""
+"In 2010, <a href=\"http://www.intevation.de\">Intevation</a>, <a href="
+"\"http://www.kdab.com/\">KDAB</a>, <a href=\"http://uk.linkedin.com/in/"
+"pauljadams\">Dr. Paul Adams</a> and <a href=\"http://ch.linkedin.com/in/"
+"georggreve\">Georg Greve</a> worked together to re-launch the professional "
+"support of the Kolab Groupware Solution into the <a href=\"http://kolabsys."
+"com\">Kolab Systems AG</a>, which took the place of the Kolab-Konsortium."
+msgstr ""
+
+#: tpl_messages.php:136
+msgid ""
+"Kolab Systems together with its partner network, the Kolab Enterprise "
+"Community, has since been the primary facilitator of the Kolab Community, "
+"including for the provision of infrastructure, and the focal point for "
+"further development of the Kolab Groupware Solution, e.g. for inclusion of "
+"ActiveSync support in version 2.3 of the server, or for native packaging on "
+"the various platforms."
+msgstr ""
+
+#: tpl_messages.php:137
+msgid ""
+"If you want to join the community, please visit <a href=\"http://wiki.kolab."
+"org\">http://wiki.kolab.org</a> and <a href=\"http://kolab.org\">http://"
+"kolab.org</a>."
+msgstr ""
+
+#: tpl_messages.php:138
+msgid "History before 2010"
+msgstr ""
+
+#: tpl_messages.php:139
 msgid ""
 "The Kolab project owes a great deal of thanks to the people of the <a href="
 "\"http://www.openpkg.org/\">OpenPKG</a> project. OpenPKG allows Kolab to run "
@@ -568,7 +606,7 @@ msgstr ""
 "diffÃ©rentes plateformes d'un maniÃ¨re fiable et prÃ©visible, en procurant une "
 "base commune, une installation facile."
 
-#: tpl_messages.php:116
+#: tpl_messages.php:140
 msgid ""
 "To use all Kolab2 features you need an interoperable client. The KDE Kolab "
 "Client was the first such client to be developed and is still considered the "
@@ -585,7 +623,7 @@ msgstr ""
 "\"http://www.kde.org\">Projet KDE </a> pour la mise Ã  disposition d'un "
 "plateforme performante sur laquelle ce client Ã  pu Ãªtre construit."
 
-#: tpl_messages.php:117
+#: tpl_messages.php:141
 msgid ""
 "Users of Outlook on Microsoft Windows are able to use a proprietary plug-in "
 "to inter-operate with the Kolab server. For Kolab2 the preferred plug-in is "
@@ -600,7 +638,7 @@ msgstr ""
 "avec la communautÃ© Kolab pour aider au dÃ©veloppement du format de stockage "
 "de Kolab2."
 
-#: tpl_messages.php:118
+#: tpl_messages.php:142
 msgid ""
 "A list of additional Outlook plug-ins that provide interoperability with the "
 "Kolab server is <a href=\"http://www.kolab.org/kolab-plugins.html"
@@ -610,7 +648,7 @@ msgstr ""
 "serveur Kolab est disponible Ã  <a href=\"http://www.kolab.org/kolab-plugins."
 "html\">cette liste est maintenue sur le site web de Kolab</a>."
 
-#: tpl_messages.php:119
+#: tpl_messages.php:143
 msgid ""
 "There is also a <a href=\"http://www.kolab.org/webclient.html\">web-based "
 "client</a> in development which provides full groupware functionality to "
@@ -628,7 +666,7 @@ msgstr ""
 "n'aurait pas Ã©tÃ© possible sans l'excellent <a href=\"http://www.horde.org/"
 "\">projet Horde</a> grÃ¢ce auquel il Ã  Ã©tÃ© construit."
 
-#: tpl_messages.php:120
+#: tpl_messages.php:144
 msgid ""
 "As Kolab is a Free Software project, anyone can help to extend the "
 "functionality of the software. An active community has developed around the "
@@ -648,13 +686,13 @@ msgstr ""
 "management) et <a href=\"http://www.klaralvdalens-datakonsult.se/"
 "\">Klarälvdalens Datakonsult</a> (client)."
 
-#: tpl_messages.php:121
+#: tpl_messages.php:145
+#, fuzzy
 msgid ""
-"<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> joined the "
-"project soon after the original Kolab1 server was released. Its developers "
-"are primarily responsible for an updated engine (which forms the base of the "
-"Kolab2 server), the web client, as well as contributing to development of "
-"the Kolab2 storage format."
+"Code Fusion cc joined the project soon after the original Kolab1 server was "
+"released. Its developers are primarily responsible for an updated engine "
+"(which forms the base of the Kolab2 server), the web client, as well as "
+"contributing to development of the Kolab2 storage format."
 msgstr ""
 "<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> a rejoint le "
 "projet juste aprÃ¨s que le serveur Kolab1 soit annoncÃ©. Ses dÃ©veloppeurs sont "
@@ -662,84 +700,259 @@ msgstr ""
 "serveur Kolab2), le client web, ainsi que des contributions au dÃ©veloppement "
 "du format de stockage de Kolab2."
 
-#: tpl_messages.php:122
+#: tpl_messages.php:146
 msgid "Other contributors:"
 msgstr "Autres Contributeurs :"
 
-#: tpl_messages.php:123
+#: tpl_messages.php:147
 msgid "CSSified the Kolab1 web admin GUI"
 msgstr ""
 "Transformation de l'interface d'administration web de Kolab1 avec des CSS"
 
-#: tpl_messages.php:124
+#: tpl_messages.php:148
+msgid "Kudos"
+msgstr ""
+
+#: tpl_messages.php:149
+#, fuzzy
 msgid ""
-"The principal authors of the Kolab client and server software are (in "
-"alphabetical order):"
+"Principal contributors of the Kolab Groupware Solution are (in alphabetical "
+"order):"
 msgstr ""
 "Les auteurs principaux des clients Kolab et du serveur sont (en ordre "
 "alphabÃ©tique) :"
 
-#: tpl_messages.php:125
-msgid "Enter UID and password to login"
-msgstr "Entrer le nom de l'utilisateur et le mot de passe pour vous connecter"
+#: tpl_messages.php:150
+msgid ""
+"...and anyone we forgot. Please let us know at <a href=\"mail:kolab-"
+"devel at kolab.org\">kolab-devel at kolab.org</a> so we can add you to this list."
+msgstr ""
 
-#: tpl_messages.php:126
-msgid "Username:"
-msgstr "Nom de l'utilisateur :"
+#: tpl_messages.php:160
+#, fuzzy
+msgid "Kolab Groupware Solution"
+msgstr "Connexion au serveur Kolab"
 
-#: tpl_messages.php:127
-msgid "Password:"
-msgstr "Mot de passe :"
+#: tpl_messages.php:161
+msgid ""
+"This is the server of the Kolab Groupware Solution, a <a href=\"http://fsfe."
+"org/about/basics/freesoftware\">Free Software</a> Personal Information "
+"Management (PIM) solution developed by the <a href=\"http://www.kolab.org/"
+"\">Kolab Community</a>. Any installation of the Kolab Groupware Solution "
+"would normally include one or more of these servers, in combination with a "
+"variety of clients for its users. If you are interested in the technology, "
+"you can read more about it <a href=\"/admin/kolab/technology.php\">here</a>."
+msgstr ""
 
-#: tpl_messages.php:128
-msgid "Login"
-msgstr "connexion"
+#: tpl_messages.php:162
+msgid "Why Kolab?"
+msgstr ""
 
-#: tpl_messages.php:129
-msgid "The maintainer with DN"
-msgstr "Le mainteneur avec le DN"
+#: tpl_messages.php:163
+msgid ""
+"There is a wide variety of reasons why Kolab should be your choice. Several "
+"of them have been put together for different target groups in the"
+msgstr ""
 
-#: tpl_messages.php:131
-msgid "Back to list of maintainers"
-msgstr "Retour Ã  la liste des mainteneurs"
+#: tpl_messages.php:164 tpl_messages.php:179
+msgid "Handouts for the Kolab Groupware Solution by Kolab Systems"
+msgstr ""
 
-#: tpl_messages.php:132 ../include/menu.php:82 ../include/menu.php:90
-msgid "Maintainers"
-msgstr "Mainteneurs"
+#: tpl_messages.php:165
+msgid "To summarize just some points, Kolab is your solution, if"
+msgstr ""
 
-#: tpl_messages.php:139
-msgid "User:"
-msgstr "Utilisateur :"
+#: tpl_messages.php:166
+msgid ""
+"you want a solution that seamlessly integrates into your existing "
+"environment;"
+msgstr ""
 
-#: tpl_messages.php:140
-msgid "Role:"
-msgstr "RÃ´le :"
+#: tpl_messages.php:167
+msgid ""
+"you want full control over your data, with all the convenience of the cloud;"
+msgstr ""
 
-#: tpl_messages.php:141
-msgid "Logout"
-msgstr "Se dÃ©connecter"
+#: tpl_messages.php:168
+msgid "you have elevated security needs for your data;"
+msgstr ""
 
-#: tpl_messages.php:142
-msgid "Not logged in"
-msgstr "Non connectÃ©"
+#: tpl_messages.php:169
+msgid ""
+"you have a very large installation, or want to reduce your hardware "
+"footprint;"
+msgstr ""
 
-#: tpl_messages.php:143
-msgid "Errors:"
-msgstr "Erreurs :"
+#: tpl_messages.php:170
+msgid "you have to operate in diverse environments and installations;"
+msgstr ""
 
-#: tpl_messages.php:144
-msgid "Message:"
-msgstr "Message :"
+#: tpl_messages.php:171
+msgid ""
+"strategic issues are important to you, e.g. you need sovereignty of the "
+"software you deploy;"
+msgstr ""
 
-#: tpl_messages.php:145
+#: tpl_messages.php:172
+msgid "your users should be fully productive whether they are on- or offline;"
+msgstr ""
+
+#: tpl_messages.php:173
+msgid ""
+"you want the flexibility to create solutions for your specialised needs;"
+msgstr ""
+
+#: tpl_messages.php:174
+msgid ""
+"you want Free Software/Open Source, but also want the professional support "
+"without having to resort to proprietary lock-in."
+msgstr ""
+
+#: tpl_messages.php:175
+msgid "More Information"
+msgstr ""
+
+#: tpl_messages.php:176
+msgid "Kolab Community Web Site"
+msgstr ""
+
+#: tpl_messages.php:177
+msgid "Kolab Community Wiki"
+msgstr ""
+
+#: tpl_messages.php:178
+msgid "Article: "
+msgstr ""
+
+#: tpl_messages.php:180
+msgid "Warranties & Commercial Support"
+msgstr ""
+
+#: tpl_messages.php:181
+msgid ""
+"This is the <b>Community Edition</b> of the Kolab Groupware Server. It is "
+"provided by Kolab Systems as fully <a href=\"http://fsfe.org/about/basics/"
+"freesoftware\">Free Software</a> and you can use it to the fullest extent "
+"and any purpose. There are no license costs or other obligations other than "
+"those set forth in the respective Free Software licenses of the various "
+"components. <b>There are no warranties or guarantees of any kind, nor is "
+"there any guaranteed support. You are running this software entirely at your "
+"own risk.</b>"
+msgstr ""
+
+#: tpl_messages.php:182
+msgid ""
+"There is a wide variety of commercial support options and warranties "
+"available by <a href=\"/admin/kolab/kolabsystems.php\">Kolab Systems AG</a> "
+"and its network of partners, the Kolab Enterprise Community. This support "
+"comes with access to the additionally quality assured and hardened "
+"<b>Certified Kolab</b> edition, which like the community edition is fully "
+"available as Free Software, so has all the advantages of the Community "
+"Edition and is free of hidden lock-in."
+msgstr ""
+
+#: tpl_messages.php:183
+msgid ""
+"Kolab Systems AG will provide limited support for the Community Edition on a "
+"case-by-case basis, but with no guaranteed response times, as availability "
+"permits, and at rates that may be adjusted due to the work load at the time "
+"of the request. <b>It is strongly recommended that for mission-critical "
+"professional deployments of the Kolab Groupware Solution you at least choose "
+"one of the partially self-supported On Demand support models.</b>"
+msgstr ""
+
+#: tpl_messages.php:184
+msgid ""
+"Kolab Systems provides an overview of all available <a href=\"http://"
+"kolabsys.com/index.php/solutions/101\">Service Level Agreements (SLA)</a>. "
+"To upgrade your installation to Certified Kolab, please contact"
+msgstr ""
+
+#: tpl_messages.php:185 tpl_messages.php:301
+msgid "or visit our"
+msgstr ""
+
+#: tpl_messages.php:186 tpl_messages.php:302
+msgid "web page"
+msgstr ""
+
+#: tpl_messages.php:188
+msgid "Listname"
+msgstr "Nom de la liste"
+
+#: tpl_messages.php:189
+msgid "Visibility"
+msgstr "VisibilitÃ©"
+
+#: tpl_messages.php:191
+msgid "Internal"
+msgstr "Interne"
+
+#: tpl_messages.php:192
+msgid "Public"
+msgstr "Publique"
+
+#: tpl_messages.php:193
+msgid "List deleted, awaiting cleanup..."
+msgstr "Liste effacÃ©e, en attente du nettoyage..."
+
+#: tpl_messages.php:196
+msgid "Welcome to the Kolab administration interface"
+msgstr "Bienvenue dans l'interface d'administration de Kolab"
+
+#: tpl_messages.php:197
+msgid "NOTE:"
+msgstr "Note :"
+
+#: tpl_messages.php:198
+msgid ""
+"No account is configured to receive mail for administrative addresses. If "
+"you have not yet created an account for this, "
+msgstr ""
+"Aucun compte n'est configurÃ© pour recevoir les messages destinÃ©s aux "
+"adresses administratives. Si vous n'avez pas encore crÃ©e un compte pour cela,"
+
+#: tpl_messages.php:199
+msgid "please do so"
+msgstr "veuillez le faire"
+
+#: tpl_messages.php:200
+msgid "and then go"
+msgstr "et ensuite allez"
+
+#: tpl_messages.php:201
+msgid "here"
+msgstr "ici"
+
+#: tpl_messages.php:202
+msgid "to set up forwarding of mail to administrative email addresses."
+msgstr "pour configurer le renvoi des messages Ã  une adresse administrative. "
+
+#: tpl_messages.php:203
+msgid "The address with DN"
+msgstr "L'adresse de messagerie avec le DN"
+
+#: tpl_messages.php:205
+msgid "Back to list of addresses"
+msgstr "Retour Ã  la liste d'adresses"
+
+#: tpl_messages.php:206
+msgid "The administrator with DN"
+msgstr "L'administrateur avec le DN"
+
+#: tpl_messages.php:208
+msgid "Back to list of administrators"
+msgstr "Retour Ã  la liste des administrateurs"
+
+#: tpl_messages.php:221
 msgid "Kolab Server Settings"
 msgstr "Les prÃ©fÃ©rences du serveur Kolab"
 
-#: tpl_messages.php:146
+#: tpl_messages.php:222
 msgid "Administrative email addresses"
 msgstr "Les adresses de messagerie administratives"
 
-#: tpl_messages.php:147
+#: tpl_messages.php:223
 msgid ""
 "You have not yet set up a receiving account for the administrative email "
 "addresses hostmaster at yourdomain.tld, postmaster at yourdomain.tld, MAILER-"
@@ -756,66 +969,66 @@ msgstr ""
 "Plus tard vous pouvez rajouter ou effacer des personnes faisant partie de "
 "cette liste comme sur n'importe qu'elle autre liste de distribution"
 
-#: tpl_messages.php:148
+#: tpl_messages.php:224
 msgid ""
 "Email address of account that should receive administrative mail for domain "
 msgstr ""
 "Les adresses de messagerie qui doivent recevoir les messages "
 "d'administration :"
 
-#: tpl_messages.php:149
+#: tpl_messages.php:225
 msgid "Create Distribution Lists"
 msgstr "CrÃ©er des listes de distribution"
 
-#: tpl_messages.php:150
+#: tpl_messages.php:226
 msgid "Enable or Disable individual Services"
 msgstr "Activez ou dÃ©sactivez individuellement des services"
 
-#: tpl_messages.php:151
+#: tpl_messages.php:227
 msgid "Service"
 msgstr "Service"
 
-#: tpl_messages.php:152
+#: tpl_messages.php:228
 msgid "Enabled"
 msgstr "ActivÃ©"
 
-#: tpl_messages.php:154
+#: tpl_messages.php:230
 msgid "Quota settings"
 msgstr "PrÃ©fÃ©rences des quotas"
 
-#: tpl_messages.php:155
+#: tpl_messages.php:231
 msgid "Warn users when they have used"
 msgstr "Avertissez les utilisateurs quand ils ont utilisÃ©"
 
-#: tpl_messages.php:156
+#: tpl_messages.php:232
 #, php-format
 msgid "% of their quota"
 msgstr "% de leur quota"
 
-#: tpl_messages.php:158
+#: tpl_messages.php:234
 msgid "Free/Busy settings"
 msgstr "PrÃ©fÃ©rences pour les options de disponibilitÃ©s"
 
-#: tpl_messages.php:159
+#: tpl_messages.php:235
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 "Permettre le tÃ©lÃ©chargement non authentifiÃ© des informations de "
 "disponibilitÃ©s"
 
-#: tpl_messages.php:161
+#: tpl_messages.php:237
 msgid "When creating free/busy lists, include data from"
 msgstr ""
 "Lors de la crÃ©ation des options de disponibilitÃ©s, inclure les donnÃ©es depuis"
 
-#: tpl_messages.php:162
+#: tpl_messages.php:238
 msgid "days in the past"
 msgstr "jours dans le passÃ©"
 
-#: tpl_messages.php:164
+#: tpl_messages.php:240
 msgid "Privileged Networks"
 msgstr "RÃ©seaux privilÃ©giÃ©s"
 
-#: tpl_messages.php:165
+#: tpl_messages.php:241
 msgid ""
 "Networks allowed to relay and send mail through unauthenticated SMTP "
 "connections to the Kolab server (comma separated networks in x.x.x.x/y "
@@ -825,11 +1038,11 @@ msgstr ""
 "SMTP non authentifiÃ© vers le serveur Kolab (liste de rÃ©seaux sÃ©parÃ© par des "
 "virgules dans le format x.x.x.x/y ) :"
 
-#: tpl_messages.php:167
+#: tpl_messages.php:243
 msgid "SMTP \"smarthost/relayhost\""
 msgstr "SMTP \"serveur relais\""
 
-#: tpl_messages.php:168
+#: tpl_messages.php:244
 msgid ""
 "Smarthost (and optional port) to use to send outgoing mail (host.domain."
 "tld). Leave empty for no relayhost."
@@ -838,11 +1051,11 @@ msgstr ""
 "sortants (host.domain.tld). Laissez le vide pour si il n'y a pas de serveur "
 "relais."
 
-#: tpl_messages.php:170
+#: tpl_messages.php:246
 msgid "Accept Internet Mail"
 msgstr "Accepter les messages venant d'internet"
 
-#: tpl_messages.php:171
+#: tpl_messages.php:247
 msgid ""
 "Accept mail from other domains over unauthenticated SMTP. This must be "
 "enabled if you want to use the Kolab Server to receive mail from other "
@@ -855,28 +1068,28 @@ msgstr ""
 "dÃ©sactivÃ© pour accepter les messages venant de serveurs SMTP dans le rÃ©seau "
 "privilÃ©giÃ©."
 
-#: tpl_messages.php:173
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:134
+#: tpl_messages.php:249
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:134
 msgid "Domains"
 msgstr "Domaines"
 
-#: tpl_messages.php:174
+#: tpl_messages.php:250
 msgid "Domain"
 msgstr "Domaine"
 
-#: tpl_messages.php:177 tpl_messages.php:190
+#: tpl_messages.php:253 tpl_messages.php:266
 msgid "Add"
 msgstr "Ajouter"
 
-#: tpl_messages.php:178
+#: tpl_messages.php:254
 msgid "Mail Filter Settings"
 msgstr "PrÃ©fÃ©rences des filtres de messagerie"
 
-#: tpl_messages.php:179
+#: tpl_messages.php:255
 msgid "Check messages for mismatching From header and envelope from."
 msgstr "VÃ©rifie que le champ expÃ©diteur corresponde bien Ã  l'expÃ©diteur rÃ©el."
 
-#: tpl_messages.php:180
+#: tpl_messages.php:256
 msgid ""
 "Use the Sender header instead of From for the above checks if Sender is "
 "present."
@@ -884,12 +1097,12 @@ msgstr ""
 "Utilisez l'entÃªte de l'expÃ©diteur plutÃ´t que le destinataire si les "
 "vÃ©rification ci dessus sont activÃ©es."
 
-#: tpl_messages.php:181
+#: tpl_messages.php:257
 msgid "Action to take for messages that fail the check:"
 msgstr ""
 "Action Ã  rÃ©aliser pour les messages qui ne passent pas la vÃ©rification :"
 
-#: tpl_messages.php:182
+#: tpl_messages.php:258
 msgid ""
 "Reject the message, except if it originates from the outside and the From "
 "header matches one of Kolab server's domains. In that case rewrite the From "
@@ -899,11 +1112,11 @@ msgstr ""
 "d'expÃ©diteur qui correspond au domaine de Kolab. Si c'est le cas, l'en-tÃªte "
 "est rÃ©crite pour en informer le destinataire."
 
-#: tpl_messages.php:183
+#: tpl_messages.php:259
 msgid "Always reject the message."
 msgstr "Toujours rejeter le message"
 
-#: tpl_messages.php:184
+#: tpl_messages.php:260
 msgid ""
 "Note that enabling this setting will make the server reject any mail with "
 "non-matching sender and From header if the sender is an account on this "
@@ -914,1237 +1127,1325 @@ msgstr ""
 "l'expÃ©diteur Ã  un compte de messagerie sur ce serveur. Ceci arrive par "
 "exemple avec les listes de discutions."
 
-#: tpl_messages.php:186
+#: tpl_messages.php:262
 msgid "Kolab Hostnames (for Master and Slaves)"
 msgstr "Nom d'hÃ´tes Kolab (pour serveur maÃ®tre et esclaves)"
 
-#: tpl_messages.php:187
+#: tpl_messages.php:263
 msgid "Host"
 msgstr "HÃ´te"
 
-#: tpl_messages.php:191
-msgid "The shared folder with DN"
-msgstr "Le dossier partagÃ© avec le DN"
+#: tpl_messages.php:267
+msgid ""
+"<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> is a specialist "
+"email solution provider based in Johannesburg, South Africa specialising in "
+"the deployment and support of Kolab."
+msgstr ""
+"<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> est une sociÃ©tÃ© "
+"spÃ©cialisÃ©e dans les solutions de messagerie basÃ© Ã  Johannesburg, Afrique du "
+"Sud spÃ©cialisÃ©e dans le dÃ©ploiement et le support de Kolab."
 
-#: tpl_messages.php:193
-msgid "Back to list of shared folders"
-msgstr "Retour Ã  la liste des dossiers partagÃ©s"
+#: tpl_messages.php:268
+msgid ""
+"Code Fusion has played, and continues to play, an integral part in "
+"developing and extending the Kolab server; specifically with regards to "
+"enhancing the base Kolab engine, adding in support for Microsoft Active "
+"Directory ® as an LDAP backend, as well as extending the <a href="
+"\"http://www.horde.org/\">Horde project</a> to provide a web-based groupware "
+"client for the Kolab server."
+msgstr ""
+"Code Fusion Ã  jouÃ© et joue encore un rÃ´le a part entiÃ¨re dans le "
+"dÃ©veloppement et l'amÃ©lioration du serveur de messagerie Kolab; spÃ©cialement "
+"dans l'amÃ©lioration du moteur de base de Kolab en rajoutant le support pour "
+"Microsoft Active Directory ® comme annuaire LDAP et en amÃ©liorant le "
+"projet Horde <a href=\"http://www.horde.org/\"> pour fournir un client web "
+"au serveur de messagerie Kolab."
 
-#: tpl_messages.php:194
-msgid "Shared folders"
-msgstr "Dossier PartagÃ©s"
+#: tpl_messages.php:269
+msgid ""
+"The following people from Code Fusion are involved in the Kolab project (in "
+"alphabetical order):"
+msgstr ""
+"Les personnes suivantes de l'Ã©quipe de Code Fusion sont impliquÃ©es dans le "
+"projet Kolab (en ordre alphabÃ©tique):"
 
-#: tpl_messages.php:196
-msgid "Server"
-msgstr "Serveur"
+#: tpl_messages.php:270
+msgid ""
+"Kolab's architecture was done by <a href=\"http://www.erfrakon.com"
+"\">erfrakon</a>; the company also designed and implemented the Kolab 1 "
+"Server and did the design and architecture for the Kolab 2 Server while "
+"providing consulting for the implementation of the Kolab 2 server and the "
+"Kolab 2 clients."
+msgstr ""
+"Le concept de Kolab Ã  Ã©tÃ© rÃ©alisÃ© par <a href=\"http://www.erfrakon.com"
+"\">erfrakon</a>; cette sociÃ©tÃ© Ã  aussi rÃ©alisÃ© le design et l'implÃ©mentation "
+"du serveur Kolab 1 ainsi que le design et l'architecture du serveur Kolab 2, "
+"en mÃªme temps que de la consultance pour l'implÃ©mentation du serveur Kolab 2 "
+"et les clients Kolab 2."
 
-#: tpl_messages.php:197 tpl_messages.php:217
-msgid "Type"
-msgstr "Type"
+#: tpl_messages.php:271
+msgid ""
+"<a href=\"http://www.erfrakon.com\">erfrakon</a> is a consulting company "
+"dedicated to opensource software and Linux. The main tasks of erfrakon "
+"within the Kolab project are the principle design and architecure of the "
+"Kolab groupware solution and the creation of the Kolab 1 server."
+msgstr ""
+"<a href=\"http://www.erfrakon.com\">erfrakon</a> est une sociÃ©tÃ© de "
+"consultance dÃ©dicacÃ©e au logiciel libre et a Linux. Les tÃ¢ches principales "
+"d'erfrakon dans le projet Kolab sont le design et l'architecture du logiciel "
+"de collaboration Kolab et la crÃ©ation du serveur Kolab 1."
 
-#: tpl_messages.php:199
-msgid "Folder deleted, awaiting cleanup..."
-msgstr "Dossier effacÃ©, en attente de nettoyage..."
+#: tpl_messages.php:272
+msgid "The following people worked on Kolab for erfrakon:"
+msgstr "Les personnes suivantes on travaillÃ© sur Kolab pour efrakon :"
 
-#: tpl_messages.php:202 tpl_messages.php:245
-msgid "Welcome to the Kolab administration interface"
+#: tpl_messages.php:273
+#, fuzzy
+msgid "Welcome to the Kolab Groupware Server"
+msgstr "Serveur de collaboration Kolab2"
+
+#: tpl_messages.php:274
+#, fuzzy
+msgid "My settings"
+msgstr "Mes prÃ©fÃ©rences"
+
+#: tpl_messages.php:275 ../../lib/KolabAdmin/include/menu.php:43
+#: ../../lib/KolabAdmin/include/menu.php:47
+#: ../../lib/KolabAdmin/include/menu.php:49
+#, fuzzy
+msgid "ActiveSync"
+msgstr "Action"
+
+#: tpl_messages.php:284 tpl_messages.php:311
+#, fuzzy
+msgid "Welcome to the Kolab Groupware Server Administration"
 msgstr "Bienvenue dans l'interface d'administration de Kolab"
 
-#: tpl_messages.php:203
-msgid "NOTE:"
-msgstr "Note :"
+#: tpl_messages.php:285
+msgid "The user with DN"
+msgstr "L'utilisateur avec le DN"
+
+#: tpl_messages.php:287
+msgid "Back to list of users"
+msgstr "Retour Ã  la liste des utilisateurs"
+
+#: tpl_messages.php:288
+msgid "Enter UID and password to login"
+msgstr "Entrer le nom de l'utilisateur et le mot de passe pour vous connecter"
+
+#: tpl_messages.php:289
+msgid "Username:"
+msgstr "Nom de l'utilisateur :"
+
+#: tpl_messages.php:290
+msgid "Password:"
+msgstr "Mot de passe :"
+
+#: tpl_messages.php:291
+msgid "Login"
+msgstr "connexion"
+
+#: tpl_messages.php:292
+#, fuzzy
+msgid "Kolab Groupware Server Version"
+msgstr "Version du serveur de collaboration Kolab2"
+
+#: tpl_messages.php:293
+#, fuzzy
+msgid "Kolab Groupware Server Component Versions"
+msgstr "Version des composants du serveur de collaboration Kolab2"
+
+#: tpl_messages.php:294
+msgid "PEAR/Horde Versions"
+msgstr "Version de PEAR/Horde"
+
+#: tpl_messages.php:295
+msgid "Kolab2 Patched OpenPKG Package Versions"
+msgstr "Version modifiÃ©e des paquets OpenPKG de Kolab2"
+
+#: tpl_messages.php:296
+msgid "OpenPKG Version"
+msgstr "Version de OpenPKG"
+
+#: tpl_messages.php:297
+msgid "Founded in Zürich in 2010, "
+msgstr ""
 
-#: tpl_messages.php:204
+#: tpl_messages.php:298
 msgid ""
-"No account is configured to receive mail for administrative addresses. If "
-"you have not yet created an account for this, "
+"is the global leader in Kolab Technology. Together with its partners in the "
+"Kolab Enterprise Community, Kolab Systems provides quality assurance, "
+"integration, support, training, certification of individuals and third-party "
+"products, as well as ongoing development for the Kolab Groupware Solution. "
+"The strong partnering model and a highly competent enterprise community "
+"provides users of the Kolab Groupware Solution with the right level of "
+"professional consulting, support and warranties to enable productivity and "
+"collaboration."
 msgstr ""
-"Aucun compte n'est configurÃ© pour recevoir les messages destinÃ©s aux "
-"adresses administratives. Si vous n'avez pas encore crÃ©e un compte pour cela,"
 
-#: tpl_messages.php:205
-msgid "please do so"
-msgstr "veuillez le faire"
+#: tpl_messages.php:299
+msgid "Looking for professional support for your Kolab Groupware Solution?"
+msgstr ""
 
-#: tpl_messages.php:206
-msgid "and then go"
-msgstr "et ensuite allez"
+#: tpl_messages.php:300
+msgid "Kolab Systems provides a wide range of "
+msgstr ""
 
-#: tpl_messages.php:207
-msgid "here"
-msgstr "ici"
+#: tpl_messages.php:303
+msgid "Our Development Partners"
+msgstr ""
 
-#: tpl_messages.php:208
-msgid "to set up forwarding of mail to administrative email addresses."
-msgstr "pour configurer le renvoi des messages Ã  une adresse administrative. "
+#: tpl_messages.php:304
+msgid ""
+"In continuously improvingall parts of the Kolab Groupware Solution, Kolab "
+"Systems is working closely with development partners, such as (in "
+"alphabetical order):"
+msgstr ""
 
-#: tpl_messages.php:209
-msgid "The user with DN"
-msgstr "L'utilisateur avec le DN"
+#: tpl_messages.php:305
+msgid "Thank you for being part of this awesome community!"
+msgstr ""
 
-#: tpl_messages.php:211
-msgid "Back to list of users"
-msgstr "Retour Ã  la liste des utilisateurs"
+#: tpl_messages.php:306
+msgid "If <b>you</b> want to join the community, please go to "
+msgstr ""
 
-#: tpl_messages.php:212 tpl_messages.php:225
-msgid "Email Users"
-msgstr "Adresse de messagerie des utilisateurs"
+#: tpl_messages.php:307
+msgid "and"
+msgstr ""
 
-#: tpl_messages.php:219
-msgid "E-mail"
-msgstr "Adresse de messagerie"
+#: tpl_messages.php:308
+msgid "The shared folder with DN"
+msgstr "Le dossier partagÃ© avec le DN"
 
-#: tpl_messages.php:220
-msgid "uid"
-msgstr "uid"
+#: tpl_messages.php:310
+msgid "Back to list of shared folders"
+msgstr "Retour Ã  la liste des dossiers partagÃ©s"
 
-#: tpl_messages.php:222
-msgid "User Deleted, awaiting cleanup..."
-msgstr "Utilisateur effacÃ©, en attente du nettoyage..."
+#: tpl_messages.php:316
+#, fuzzy
+msgid "Administrator"
+msgstr "Administrateurs"
 
-#: tpl_messages.php:230
-msgid "Vacation Notification"
-msgstr "Message d'absence"
+#: tpl_messages.php:319 ../../lib/KolabAdmin/include/menu.php:113
+msgid "Settings"
+msgstr "ParamÃ¨tres"
 
-#: tpl_messages.php:231
+#: tpl_messages.php:321
 msgid ""
-"Activate vacation notification (only one of vacation, forward and delivery "
-"to folder can be active at any time)"
+"The Kolab 1 KDE client and the Kolab 2 KDE Client (Kontact) was developed by"
+msgstr "Le client KDE pour Kolab1 et Kolab2 (Kontact) Ã  Ã©tÃ© dÃ©veloppÃ© par "
+
+#: tpl_messages.php:322
+msgid ""
+"Klarälvdalens Datakonsult AB is a consulting company dedicated to "
+"opensource software, Linux, and the <a href=\"http://www.trolltech.com/"
+"products/qt/\">Qt</a> library. The main tasks of KDAB within the Kolab "
+"project are design and implementation of the Kolab KDE clients and the "
+"implementation of the current Kolab 2 server."
 msgstr ""
-"Activer la notification d'absence (un seul mode des modes suivants : "
-"messages d'absence, transmission, et envoi dans un dossier peut Ãªtre activÃ©)"
+"Klarälvdalens Datakonsult AB est une sociÃ©tÃ© de consultance dÃ©diÃ©e au "
+"logiciel libre, Linux et la librairie <a href=\"http://www.trolltech.com/"
+"products/qt/\">Qt</a>. Les tÃ¢ches principales de KDAB dans le projet Kolab "
+"sont le design et l'implÃ©mentation de clients KDE pour Kolab et "
+"l'implÃ©mentation du serveur Kolab 2."
 
-#: tpl_messages.php:232
+#: tpl_messages.php:323
+msgid ""
+"The following people worked on Kolab for Klarälvdalens Datakonsult AB:"
+msgstr ""
+"Les personnes suivantes on travaillÃ© sur Kolab pour Klarälvdalens "
+"Datakonsult AB :"
+
+#: tpl_messages.php:324
+msgid "Vacation Notification"
+msgstr "Message d'absence"
+
+#: tpl_messages.php:325
+#, fuzzy
+msgid "Activate vacation notification"
+msgstr "Message d'absence"
+
+#: tpl_messages.php:326
 msgid "Resend notification only after"
 msgstr "Seulement renvoyer les notifications aprÃ¨s"
 
-#: tpl_messages.php:233
+#: tpl_messages.php:327
 msgid "days"
 msgstr "jours"
 
-#: tpl_messages.php:234
+#: tpl_messages.php:328
 msgid "Send responses for these addresses:"
 msgstr "Envoyer des rÃ©ponses pour ces adresses :"
 
-#: tpl_messages.php:235
+#: tpl_messages.php:329
 msgid "(one address per line)"
 msgstr "(une adresse par ligne)"
 
-#: tpl_messages.php:236
+#: tpl_messages.php:330
 msgid "Do not send vacation replies to spam messages"
 msgstr ""
 "Ne pas envoyer de messages d'absence au messages Ã©tant reconnu comme du spam"
 
-#: tpl_messages.php:237
+#: tpl_messages.php:331
 msgid "Only react to mail coming from domain"
 msgstr "RÃ©agir seulement au messages venant du domaine"
 
-#: tpl_messages.php:238
+#: tpl_messages.php:332
 msgid "(leave empty for all domains)"
 msgstr "(laisser vide pour tout les domaines)"
 
-#: tpl_messages.php:240
-msgid "Kolab2 Groupware Server Version"
-msgstr "Version du serveur de collaboration Kolab2"
+#: ../../www/admin/user/index.php:34
+#: ../../www/admin/administrator/index.php:33
+#: ../../www/admin/addressbook/index.php:23
+#: ../../www/admin/addressbook/addr.php:17
+#: ../../www/admin/maintainer/index.php:33
+#: ../../www/admin/domainmaintainer/index.php:33
+#: ../../www/admin/sharedfolder/index.php:22
+#: ../../www/admin/sharedfolder/sf.php:25
+#: ../../www/admin/distributionlist/index.php:35
+#: ../../www/admin/distributionlist/list.php:37
+#: ../../www/admin/settings/index.php:13
+msgid "Error: You don't have Permissions to access this Menu"
+msgstr "Erreur: Vous n'avez pas la permission d'accÃ©der ce menu"
 
-#: tpl_messages.php:241
-msgid "Kolab2 Groupware Server Component Versions"
-msgstr "Version des composants du serveur de collaboration Kolab2"
+#: ../../www/admin/user/index.php:120
+#, php-format
+msgid "Manage Email User (%d Users)"
+msgstr "GÃ©rer des utilisateurs de messagerie (%d Utilisateurs)"
 
-#: tpl_messages.php:242
-msgid "PEAR/Horde Versions"
-msgstr "Version de PEAR/Horde"
+#: ../../www/admin/user/index.php:182
+#: ../../www/admin/addressbook/index.php:122
+msgid "Email"
+msgstr "Adresse de messagerie"
 
-#: tpl_messages.php:243
-msgid "Kolab2 Patched OpenPKG Package Versions"
-msgstr "Version modifiÃ©e des paquets OpenPKG de Kolab2"
+#: ../../www/admin/user/index.php:184
+#: ../../www/admin/addressbook/index.php:123
+msgid "contains"
+msgstr "contient"
 
-#: tpl_messages.php:244
-msgid "OpenPKG Version"
-msgstr "Version de OpenPKG"
+#: ../../www/admin/user/index.php:185
+#: ../../www/admin/addressbook/index.php:124
+msgid "is"
+msgstr "est"
 
-#: ../../../www/admin/addressbook/addr.php.in:17
-#: ../../../www/admin/addressbook/index.php.in:23
-#: ../../../www/admin/administrator/index.php.in:33
-#: ../../../www/admin/distributionlist/index.php.in:35
-#: ../../../www/admin/distributionlist/list.php.in:37
-#: ../../../www/admin/domainmaintainer/index.php.in:33
-#: ../../../www/admin/maintainer/index.php.in:33
-#: ../../../www/admin/settings/index.php.in:13
-#: ../../../www/admin/sharedfolder/index.php.in:22
-#: ../../../www/admin/sharedfolder/sf.php.in:25
-#: ../../../www/admin/user/index.php.in:34
-msgid "Error: You don't have Permissions to access this Menu"
-msgstr "Erreur: Vous n'avez pas la permission d'accÃ©der ce menu"
+#: ../../www/admin/user/index.php:186
+#: ../../www/admin/addressbook/index.php:125
+msgid "begins with"
+msgstr "commence avec"
+
+#: ../../www/admin/user/index.php:187
+#: ../../www/admin/addressbook/index.php:126
+msgid "ends with"
+msgstr "fini avec"
+
+#: ../../www/admin/user/vacation.php:36 ../../www/admin/user/deliver.php:46
+#: ../../www/admin/user/forward.php:47
+msgid "Error while connecting to Sieve service:"
+msgstr ""
+
+#: ../../www/admin/user/vacation.php:55
+msgid "Vacation message successfully activated"
+msgstr "Le message d'absence a Ã©tÃ© correctement activÃ©"
+
+#: ../../www/admin/user/vacation.php:57
+msgid "Vacation message successfully deactivated"
+msgstr "Le message d'absence a Ã©tÃ© correctement dÃ©sactivÃ©"
+
+#: ../../www/admin/user/vacation.php:62 ../../www/admin/user/deliver.php:65
+#: ../../www/admin/user/forward.php:67
+#, php-format
+msgid ""
+"Warning: You currently have a sieve script named %s active for your account."
+msgstr ""
+
+#: ../../www/admin/user/vacation.php:63 ../../www/admin/user/deliver.php:66
+#: ../../www/admin/user/forward.php:68
+msgid ""
+"Warning: This script will be overwritten without further warnings if you "
+"press \"Update\"!"
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:43
+msgid "zPush in not enabled in your system."
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:468
+msgid ""
+"There are currently no devices known for your user.<br/><br/>In order to "
+"register a device, please connect it to the server first, using <a "
+"href='http://wiki.kolab.org/Z_push#Clients'>the instructions in the Wiki</"
+"a>. Afterwards the device should become available for configuration in this "
+"dialogue."
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:496
+#, fuzzy
+msgid "Address Books"
+msgstr "Carnet d'adresses"
+
+#: ../../www/admin/user/activesync.php:496
+msgid "Calendars"
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:496
+#: ../../www/admin/sharedfolder/index.php:65
+#: ../../lib/KolabAdmin/include/form.class.php:254
+msgid "Tasks"
+msgstr "TÃ¢ches"
+
+#: ../../www/admin/user/activesync.php:496
+#: ../../www/admin/sharedfolder/index.php:69
+#: ../../lib/KolabAdmin/include/form.class.php:256
+msgid "Notes"
+msgstr "Notes"
+
+#: ../../www/admin/user/activesync.php:500
+msgid "Automatic"
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:501
+msgid "Flat Mode"
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:502
+#, fuzzy
+msgid "Folder Mode"
+msgstr "Nom du dossier"
+
+#: ../../www/admin/user/activesync.php:506
+#: ../../lib/KolabAdmin/include/form.class.php:204
+msgid "No"
+msgstr "Non"
+
+#: ../../www/admin/user/activesync.php:507
+#: ../../lib/KolabAdmin/include/form.class.php:204
+msgid "Yes"
+msgstr "Oui"
 
-#: ../../../www/admin/addressbook/addr.php.in:65
-#: ../../../www/admin/user/user.php.in:114
+#: ../../www/admin/user/user.php:94
+msgid "Please enter an email address"
+msgstr "Veuillez entrer une adresse de messagerie"
+
+#: ../../www/admin/user/user.php:111
+#, php-format
+msgid "Email address %1$s not in domains %2$s"
+msgstr "L'adresse de messagerie %1$s n'est pas dans les domaines %2$s"
+
+#: ../../www/admin/user/user.php:114 ../../www/admin/addressbook/addr.php:65
 msgid "User, vCard or distribution list with this email address already exists"
 msgstr ""
 "Un utilisateur, une vCard ou une liste de distribution avec cette adresse de "
 "messagerie existe dÃ©jÃ "
 
-#: ../../../www/admin/addressbook/addr.php.in:78
-#: ../../../www/admin/administrator/admin.php.in:121
-#: ../../../www/admin/distributionlist/list.php.in:106
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:96
-#: ../../../www/admin/maintainer/maintainer.php.in:118
-#: ../../../www/admin/sharedfolder/sf.php.in:112
-#: ../../../www/admin/user/user.php.in:349
+#: ../../www/admin/user/user.php:130
+msgid "UID "
+msgstr "UID "
+
+#: ../../www/admin/user/user.php:130
+#: ../../lib/KolabAdmin/include/form.class.php:34
+msgid ""
+" collides with an address already used for another user, a vCard or a "
+"distribution list.<br />"
+msgstr ""
+" collision avec un adresse de messagerie dÃ©jÃ  utilisÃ©e pour un autre "
+"utilisateur, une vCard ou une liste de distribution.<br/>"
+
+#: ../../www/admin/user/user.php:145
+#, php-format
+msgid "Email-Delegate %s does not exist"
+msgstr "L'adresse de messagerie dÃ©lÃ©guÃ© %s n'existe pas"
+
+#: ../../www/admin/user/user.php:165
+#, php-format
+msgid "Syntax for Recipient %s is invalid"
+msgstr ""
+
+#: ../../www/admin/user/user.php:211
+#, php-format
+msgid "Illegal user or group %s"
+msgstr "Nom d'utilisateur ou de groupe interdit %s"
+
+#: ../../www/admin/user/user.php:220
+msgid "Free/Busy interval can not be negative"
+msgstr "L'intervalle des options de disponibilitÃ©s ne peut pas Ãªtre nÃ©gatif"
+
+#: ../../www/admin/user/user.php:221
+msgid "Free/Busy interval must be a number"
+msgstr "L'intervalle des options de disponibilitÃ©s doit Ãªtre un nombre"
+
+#: ../../www/admin/user/user.php:222
+msgid "Free/Busy interval must be an integer"
+msgstr "L'intervalle des options de disponibilitÃ©s doit Ãªtre un nombre entier"
+
+#: ../../www/admin/user/user.php:414
+#: ../../www/admin/administrator/admin.php:121
+#: ../../www/admin/addressbook/addr.php:78
+#: ../../www/admin/maintainer/maintainer.php:118
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:96
+#: ../../www/admin/sharedfolder/sf.php:114
+#: ../../www/admin/distributionlist/list.php:109
 msgid "Error: need valid action to proceed"
 msgstr "Erreur: une action valide est nÃ©cessaire pour continuer"
 
-#: ../../../www/admin/addressbook/addr.php.in:81
-#: ../../../www/admin/administrator/admin.php.in:127
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:102
-#: ../../../www/admin/maintainer/maintainer.php.in:124
-#: ../../../www/admin/user/user.php.in:361
-#: ../../../www/admin/user/user.php.in:364
-#: ../../../www/admin/user/user.php.in:370
-#: ../../../www/admin/user/user.php.in:772
+#: ../../www/admin/user/user.php:426 ../../www/admin/user/user.php:429
+#: ../../www/admin/user/user.php:435 ../../www/admin/user/user.php:870
+#: ../../www/admin/administrator/admin.php:127
+#: ../../www/admin/addressbook/addr.php:81
+#: ../../www/admin/maintainer/maintainer.php:124
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:102
 msgid "Error: You don't have the required Permissions"
 msgstr "Erreur: Vous n'avez pas les permissions requises"
 
-#: ../../../www/admin/addressbook/addr.php.in:95
-msgid "Primary E-Mail Address"
-msgstr "Adresse de messagerie principale"
+#: ../../www/admin/user/user.php:444 ../../www/admin/user/user.php:446
+#: ../../www/admin/sharedfolder/sf.php:128
+msgid "Non volatile"
+msgstr "Permanent"
 
-#: ../../../www/admin/addressbook/addr.php.in:97
-msgid "E-Mail Aliases"
-msgstr "Alias de l'adresse de messagerie"
+#: ../../www/admin/user/user.php:445
+#: ../../www/admin/administrator/admin.php:136
+#: ../../www/admin/maintainer/maintainer.php:133
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:111
+msgid "Leave blank to keep password unchanged"
+msgstr "Laissez vide pour garder les mots de passe inchangÃ©s"
 
-#: ../../../www/admin/addressbook/addr.php.in:100
-#: ../../../www/admin/user/user.php.in:425
+#: ../../www/admin/user/user.php:469
+msgid "Unique Identity (UID)"
+msgstr "IdentitÃ© unique (UID)"
+
+#: ../../www/admin/user/user.php:471
+msgid "Optional - Defaults to Primary Email Address"
+msgstr "Optionnel - Par dÃ©faut sÃ©lectionne l'adresse de messagerie principale"
+
+#: ../../www/admin/user/user.php:472
+msgid "Mailbox Home Server"
+msgstr "Serveur contenant le compte de messagerie"
+
+#: ../../www/admin/user/user.php:476
+msgid "Account Type"
+msgstr "Type de compte "
+
+#: ../../www/admin/user/user.php:478
+msgid "User Account"
+msgstr "Compte utilisateur"
+
+#: ../../www/admin/user/user.php:478
+msgid "Internal User Account"
+msgstr "Compte d'utilisateur interne"
+
+#: ../../www/admin/user/user.php:478
+msgid "Group Account"
+msgstr "Compte de groupe"
+
+#: ../../www/admin/user/user.php:478
+msgid "Resource Account"
+msgstr "Compte de ressources"
+
+#: ../../www/admin/user/user.php:480
+msgid ""
+"NOTE: An internal user is a user that will not be visible in the address book"
+msgstr ""
+"NOTE: Un utilisateur interne sera un utilisateur qui ne sera pas visible "
+"dans le carnet d'adresse"
+
+#: ../../www/admin/user/user.php:481
+msgid "Invitation Policy"
+msgstr "Politique d'invitation"
+
+#: ../../www/admin/user/user.php:485
+msgid "For automatic invitation handling"
+msgstr "Pour la gestion des invitation automatiques"
+
+#: ../../www/admin/user/user.php:486
+msgid ""
+"NOTE: For regular accounts to use this feature, give the 'calendar' user "
+"access to the Calendar folder"
+msgstr ""
+"NOTE: Pour que les comptes classiques puissent utiliser cette "
+"fonctionnalitÃ©, donnez Ã  l'utilisateur 'calendar' accÃ¨s au dossier Calendrier"
+
+#: ../../www/admin/user/user.php:488
+msgid "Email Aliases"
+msgstr "Alias de messagerie"
+
+#: ../../www/admin/user/user.php:491 ../../www/admin/addressbook/addr.php:100
 msgid "One address per line"
 msgstr "Une adresse par ligne"
 
-#: ../../../www/admin/addressbook/addr.php.in:105
-msgid "Post Box"
-msgstr "Boite postale"
+#: ../../www/admin/user/user.php:493
+msgid "Email-Delegates"
+msgstr "DÃ©lÃ©guÃ©s"
 
-#: ../../../www/admin/addressbook/addr.php.in:121
-#: ../../../www/admin/distributionlist/list.php.in:135
-#: ../../../www/admin/sharedfolder/sf.php.in:148
-#, php-format
-msgid "Error: DN required for %s operation"
-msgstr "Erreur: DN nÃ©cessaire pour l'opÃ©ration %s"
+#: ../../www/admin/user/user.php:496
+msgid "Others allowed to send emails with a \"from\" address of this account."
+msgstr ""
+"Ceux qui sont autorisÃ© Ã  envoyer un message avec une adresse \"expÃ©diteur\" "
+"correspondant Ã  ce compte."
 
-#: ../../../www/admin/addressbook/addr.php.in:131
-msgid "Add External Address"
-msgstr "Ajouter une adresse externe"
+#: ../../www/admin/user/user.php:497
+msgid "One email address per line."
+msgstr "Une adresse de messagerie par ligne"
 
-#: ../../../www/admin/addressbook/addr.php.in:178
-#, php-format
+#: ../../www/admin/user/user.php:499
+msgid "Allowed Recipients"
+msgstr ""
+
+#: ../../www/admin/user/user.php:502
+msgid "Restrict allowed recipients of SMTP messages"
+msgstr ""
+
+#: ../../www/admin/user/user.php:503
+#, fuzzy
+msgid "One entry per line."
+msgstr "Une adresse par ligne"
+
+#: ../../www/admin/user/user.php:514
 msgid ""
-"Addressbook entry DN could not be modified, distribution list <a "
-"href='@kolab_wui@/distributionlist/list.php?action=modify&dn=%s'>'%s'</a> "
-"depends on it. To modify this entry, first remove it from the distribution "
-"list."
-msgstr ""
-"L'entrÃ©e du carnet d'adresse ne peut pas Ãªtre modifiÃ©e, la liste de "
-"distribution <a href='@kolab_wui@/distributionlist/list.php?action=modify&dn="
-"%s'>'%s'</a> est dÃ©pendante de celle ci. Pour modifier cette entrÃ©e, "
-"veuillez d'abord l'enlever de la liste de distribution."
-
-#: ../../../www/admin/addressbook/addr.php.in:189
-#: ../../../www/admin/administrator/admin.php.in:216
-#: ../../../www/admin/distributionlist/list.php.in:196
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:200
-#: ../../../www/admin/maintainer/maintainer.php.in:213
-#: ../../../www/admin/sharedfolder/sf.php.in:227
-#: ../../../www/admin/user/user.php.in:617
+"2 letter code from <a href=\"http://www.iso.org/iso/"
+"english_country_names_and_code_elements\" target=\"_blank\">ISO 3166</a>"
+msgstr ""
+
+#: ../../www/admin/user/user.php:520
+msgid "User Quota in MBytes"
+msgstr "Quota utilisateur en MBytes"
+
+#: ../../www/admin/user/user.php:536
+msgid "Free/Busy interval in days"
+msgstr "Options de disponibilitÃ©s en jours"
+
+#: ../../www/admin/user/user.php:537
+msgid "Leave blank for default (60 days)"
+msgstr "Laisser vide pour la valeur par dÃ©faut (60 jours)"
+
+#: ../../www/admin/user/user.php:547
+#: ../../www/admin/administrator/admin.php:165
+#: ../../www/admin/maintainer/maintainer.php:162
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:149
+#, php-format
+msgid "LDAP Error: No such dn: %s: %s"
+msgstr "Erreur LDAP: pas de dn : %s: %s"
+
+#: ../../www/admin/user/user.php:711
+#: ../../www/admin/administrator/admin.php:217
+#: ../../www/admin/addressbook/addr.php:189
+#: ../../www/admin/maintainer/maintainer.php:215
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:202
+#: ../../www/admin/sharedfolder/sf.php:231
+#: ../../www/admin/distributionlist/list.php:200
 #, php-format
 msgid "LDAP Error: could not rename %s to %s: %s"
 msgstr "Erreur LDAP: impossible de renommer %s en %s: %s"
 
-#: ../../../www/admin/addressbook/addr.php.in:197
-#: ../../../www/admin/administrator/admin.php.in:224
-#: ../../../www/admin/distributionlist/list.php.in:204
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:208
-#: ../../../www/admin/maintainer/maintainer.php.in:221
-#: ../../../www/admin/sharedfolder/sf.php.in:235
-#: ../../../www/admin/user/user.php.in:625
-#, php-format
-msgid "LDAP Error: could not modify %s to %s: %s"
+#: ../../www/admin/user/user.php:719
+#, fuzzy, php-format
+msgid "LDAP Error: could not modify %s: %s"
 msgstr "Erreur LDAP: impossible de modifier %s en %s: %s"
 
-#: ../../../www/admin/addressbook/addr.php.in:203
-#: ../../../www/admin/addressbook/addr.php.in:218
-#: ../../../www/admin/administrator/admin.php.in:230
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:214
-#: ../../../www/admin/maintainer/maintainer.php.in:227
-#: ../../../www/admin/user/user.php.in:631
+#: ../../www/admin/user/user.php:725
+#: ../../www/admin/administrator/admin.php:231
+#: ../../www/admin/addressbook/addr.php:203
+#: ../../www/admin/addressbook/addr.php:218
+#: ../../www/admin/maintainer/maintainer.php:229
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:216
 #, php-format
 msgid "%s successfully updated"
 msgstr "%s mis Ã  jour avec succÃ¨s"
 
-#: ../../../www/admin/addressbook/addr.php.in:209
-#: ../../../www/admin/administrator/admin.php.in:234
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:226
-#: ../../../www/admin/maintainer/maintainer.php.in:231
-#: ../../../www/admin/sharedfolder/sf.php.in:247
+#: ../../www/admin/user/user.php:731
+#: ../../www/admin/distributionlist/list.php:220
 #, php-format
-msgid "LDAP Error: could not read %s: %s"
+msgid "LDAP Error: Could not read %s: %s"
 msgstr "Erreur LDAP: Impossible de lire %s: %s"
 
-#: ../../../www/admin/addressbook/addr.php.in:215
-#: ../../../www/admin/administrator/admin.php.in:238
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:230
-#: ../../../www/admin/maintainer/maintainer.php.in:235
-#: ../../../www/admin/sharedfolder/sf.php.in:251
+#: ../../www/admin/user/user.php:745 ../../www/admin/user/user.php:758
+#: ../../www/admin/user/user.php:797 ../../www/admin/user/user.php:812
+#: ../../www/admin/distributionlist/list.php:224
+#: ../../www/admin/distributionlist/list.php:253
 #, php-format
-msgid "LDAP Error: could not modify object %s: %s"
+msgid "LDAP Error: Could not modify object %s: %s"
 msgstr "Erreur LDAP: impossible de modifier l'objet %s: %s"
 
-#: ../../../www/admin/addressbook/addr.php.in:227
-#: ../../../www/admin/administrator/admin.php.in:256
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:261
-#: ../../../www/admin/maintainer/maintainer.php.in:257
-#: ../../../www/admin/sharedfolder/sf.php.in:261
-#: ../../../www/admin/user/user.php.in:689
+#: ../../www/admin/user/user.php:761 ../../www/admin/user/user.php:815
+#, php-format
+msgid "Mid-air collision detected, alias %1$s renamed to %2$s"
+msgstr "Un collision a Ã©tÃ© dÃ©tectÃ©, l'alias %1$s a Ã©tÃ© renommÃ© en %2$s"
+
+#: ../../www/admin/user/user.php:766 ../../www/admin/user/user.php:848
+msgid "Modify User"
+msgstr "Modifier un utilisateur"
+
+#: ../../www/admin/user/user.php:767
+#, php-format
+msgid "User '%s' successfully modified"
+msgstr "L'utilisateur '%s' Ã  Ã©tÃ© modifiÃ© avec succÃ¨s"
+
+#: ../../www/admin/user/user.php:787
+#: ../../www/admin/administrator/admin.php:260
+#: ../../www/admin/addressbook/addr.php:227
+#: ../../www/admin/maintainer/maintainer.php:261
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:265
+#: ../../www/admin/sharedfolder/sf.php:265
 #, php-format
 msgid "LDAP Error: could not add object %s: %s"
 msgstr "Erreur LDAP: Impossible d'ajouter l'objet %s: %s"
 
-#: ../../../www/admin/addressbook/addr.php.in:230
+#: ../../www/admin/user/user.php:800
+#: ../../www/admin/distributionlist/list.php:256
 #, php-format
-msgid "%s successfully added"
-msgstr "%s crÃ©e avec succÃ¨s"
+msgid "Mid-air collision detected, email address %1$s renamed to %2$s"
+msgstr ""
+"Une collision a Ã©tÃ© dÃ©tectÃ©e, l'adresse de messagerie %1$s a Ã©tÃ© renommÃ©e en "
+"%2$s"
 
-#: ../../../www/admin/addressbook/addr.php.in:240
-#: ../../../www/admin/addressbook/addr.php.in:258
-msgid "Modify External Address"
-msgstr "Modifier l'adresse externe"
+#: ../../www/admin/user/user.php:821
+msgid "User "
+msgstr "Utilisateur"
 
-#: ../../../www/admin/addressbook/addr.php.in:261
-#: ../../../www/admin/addressbook/addr.php.in:281
-#, php-format
-msgid "Error: No entry with DN %s found"
-msgstr "Erreur: Aucune entrÃ©e avec le DN %s n'a Ã©tÃ© trouvÃ©e"
+#: ../../www/admin/user/user.php:821
+#: ../../www/admin/administrator/admin.php:270
+#: ../../www/admin/maintainer/maintainer.php:269
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:276
+msgid " successfully created"
+msgstr " crÃ©e avec succÃ¨s"
 
-#: ../../../www/admin/addressbook/addr.php.in:278
-msgid "Delete External Address"
-msgstr "Effacer l'adresse externe"
+#: ../../www/admin/user/user.php:822 ../../www/admin/user/user.php:828
+#: ../../www/admin/user/user.php:839 ../../lib/KolabAdmin/include/menu.php:30
+msgid "Create New User"
+msgstr "CrÃ©er un nouvel utilisateur"
+
+#: ../../www/admin/user/user.php:854 ../../www/admin/user/user.php:912
+msgid "Delete User"
+msgstr "Effacer un utilisateur"
 
-#: ../../../www/admin/addressbook/addr.php.in:295
-#: ../../../www/admin/user/user.php.in:788
+#: ../../www/admin/user/user.php:867
+#: ../../www/admin/administrator/admin.php:315
+#: ../../www/admin/maintainer/maintainer.php:314
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:318
+msgid "Error: need DN for delete operation"
+msgstr "Erreur: DN nÃ©cessaire pour une opÃ©ration d'effacement"
+
+#: ../../www/admin/user/user.php:873
+#: ../../www/admin/maintainer/maintainer.php:316
+msgid "Error: you need administrative permissions to delete users"
+msgstr ""
+"Erreur: vous avez besoin des permissions administrateur pour effacer des "
+"utilisateurs"
+
+#: ../../www/admin/user/user.php:886 ../../www/admin/addressbook/addr.php:295
 #, php-format
 msgid "Account could not be deleted, distribution list '%s' depends on it."
 msgstr ""
-"Le compte de messagerie n'a pas pu Ãªtre effacÃ©, la liste de distribution '%"
-"s' en dÃ©pend. "
+"Le compte de messagerie n'a pas pu Ãªtre effacÃ©, la liste de distribution "
+"'%s' en dÃ©pend. "
 
-#: ../../../www/admin/addressbook/addr.php.in:302
+#: ../../www/admin/user/user.php:893
 #, php-format
-msgid "Addressbook entry removed from distribution list '%s'."
-msgstr ""
-"L'entrÃ©e du carnet d'adresse Ã  Ã©tÃ© enlevÃ©e de la liste de distribution '%s'."
+msgid "Account removed from distribution list '%s'."
+msgstr "Compte de messagerie effacÃ© de la liste de distribution '%s'."
 
-#: ../../../www/admin/addressbook/addr.php.in:304
+#: ../../www/admin/user/user.php:895
 #, php-format
 msgid ""
-"Failure to remove addressbook entry from distribution list '%s', entry will "
-"not be deleted."
+"Failure to remove account from distribution list '%s', account will not be "
+"deleted."
 msgstr ""
-"Echec lors de la suppression de l'entrÃ© du carnet d'adresse de la liste de "
-"distribution '%s'. Elle ne sera pas supprimÃ©e."
+"Echec lors de la tentative de suppression du compte de la liste '%s', le "
+"compte ne sera pas supprimÃ©."
 
-#: ../../../www/admin/addressbook/addr.php.in:312
+#: ../../www/admin/user/user.php:903
 #, php-format
-msgid "LDAP Error: could not delete %s: %s"
-msgstr "Erreur LDAP: impossible d'effacer %s: %s"
+msgid "LDAP Error: could not mark '%s' for deletion: %s"
+msgstr "Erreur LDAP: impossible de marquer '%s' pour l'effacement: %s"
 
-#: ../../../www/admin/addressbook/addr.php.in:315
-#: ../../../www/admin/distributionlist/list.php.in:312
-#: ../../../www/admin/sharedfolder/sf.php.in:321
-msgid "Entry Deleted"
-msgstr "EntrÃ©e effacÃ©e"
+#: ../../www/admin/user/user.php:906
+msgid "User Deleted"
+msgstr "Utilisateur effacÃ©"
 
-#: ../../../www/admin/addressbook/addr.php.in:316
+#: ../../www/admin/user/deliver.php:58
 #, php-format
-msgid "Address book entry with DN %s was deleted"
-msgstr "L'entrÃ©e du carnet d'adresse avec le DN %s Ã  Ã©tÃ© supprimÃ©e."
+msgid "Delivery to '%s' successfully activated"
+msgstr "Le message d'absence vers '%s' a Ã©tÃ© correctement activÃ©"
 
-#: ../../../www/admin/addressbook/index.php.in:122
-#: ../../../www/admin/user/index.php.in:184
-msgid "Email"
-msgstr "Adresse de messagerie"
+#: ../../www/admin/user/deliver.php:60
+#, php-format
+msgid "Delivery to '%s' successfully deactivated"
+msgstr "Le message d'absence vers '%s' a Ã©tÃ© correctement dÃ©sactivÃ©"
 
-#: ../../../www/admin/addressbook/index.php.in:123
-#: ../../../www/admin/user/index.php.in:186
-msgid "contains"
-msgstr "contient"
+#: ../../www/admin/user/forward.php:60
+#, php-format
+msgid "Forwarding to '%s' successfully activated"
+msgstr "Le transfert vers '%s' a Ã©tÃ© correctement activÃ©"
 
-#: ../../../www/admin/addressbook/index.php.in:124
-#: ../../../www/admin/user/index.php.in:187
-msgid "is"
-msgstr "est"
+#: ../../www/admin/user/forward.php:62
+#, php-format
+msgid "Forwarding to '%s' successfully deactivated"
+msgstr "Le transfert vers '%s' a Ã©tÃ© correctement dÃ©sactivÃ©"
 
-#: ../../../www/admin/addressbook/index.php.in:125
-#: ../../../www/admin/user/index.php.in:188
-msgid "begins with"
-msgstr "commence avec"
+#: ../../www/admin/administrator/index.php:62
+msgid "Manage Administrators ("
+msgstr "GÃ©rer les administrateurs ("
 
-#: ../../../www/admin/addressbook/index.php.in:126
-#: ../../../www/admin/user/index.php.in:189
-msgid "ends with"
-msgstr "fini avec"
+#: ../../www/admin/administrator/index.php:62
+msgid " Administrators)"
+msgstr " Administrateurs)"
 
-#: ../../../www/admin/administrator/admin.php.in:52
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:53
-#: ../../../www/admin/maintainer/maintainer.php.in:52
+#: ../../www/admin/administrator/admin.php:52
+#: ../../www/admin/maintainer/maintainer.php:52
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:53
 msgid "Account with this UID already exists"
 msgstr "Un compte avec cet UID existe dÃ©jÃ "
 
-#: ../../../www/admin/administrator/admin.php.in:75
+#: ../../www/admin/administrator/admin.php:75
 msgid "Manager's password can't be changed from the webgui"
 msgstr ""
 "Les mots de passe des managers ne peuvent pas Ãªtre changÃ©s depuis "
 "l'interface web"
 
-#: ../../../www/admin/administrator/admin.php.in:135
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:110
-#: ../../../www/admin/maintainer/maintainer.php.in:132
+#: ../../www/admin/administrator/admin.php:135
+#: ../../www/admin/maintainer/maintainer.php:132
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:110
 msgid "non volatile"
 msgstr "permanent"
 
-#: ../../../www/admin/administrator/admin.php.in:136
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:111
-#: ../../../www/admin/maintainer/maintainer.php.in:133
-#: ../../../www/admin/user/user.php.in:380
-msgid "Leave blank to keep password unchanged"
-msgstr "Laissez vide pour garder les mots de passe inchangÃ©s"
-
-#: ../../../www/admin/administrator/admin.php.in:153
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:128
-#: ../../../www/admin/maintainer/maintainer.php.in:150
+#: ../../www/admin/administrator/admin.php:153
+#: ../../www/admin/maintainer/maintainer.php:150
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:128
 msgid "Unique User ID"
 msgstr "ID d'utilisateur unique"
 
-#: ../../../www/admin/administrator/admin.php.in:165
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:149
-#: ../../../www/admin/maintainer/maintainer.php.in:162
-#: ../../../www/admin/user/user.php.in:471
+#: ../../www/admin/administrator/admin.php:225
+#: ../../www/admin/addressbook/addr.php:197
+#: ../../www/admin/maintainer/maintainer.php:223
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:210
+#: ../../www/admin/sharedfolder/sf.php:239
+#: ../../www/admin/distributionlist/list.php:208
 #, php-format
-msgid "LDAP Error: No such dn: %s: %s"
-msgstr "Erreur LDAP: pas de dn : %s: %s"
+msgid "LDAP Error: could not modify %s to %s: %s"
+msgstr "Erreur LDAP: impossible de modifier %s en %s: %s"
 
-#: ../../../www/admin/administrator/admin.php.in:243
-#: ../../../www/admin/administrator/admin.php.in:293
+#: ../../www/admin/administrator/admin.php:235
+#: ../../www/admin/addressbook/addr.php:209
+#: ../../www/admin/maintainer/maintainer.php:233
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:228
+#: ../../www/admin/sharedfolder/sf.php:251
+#, php-format
+msgid "LDAP Error: could not read %s: %s"
+msgstr "Erreur LDAP: Impossible de lire %s: %s"
+
+#: ../../www/admin/administrator/admin.php:239
+#: ../../www/admin/addressbook/addr.php:215
+#: ../../www/admin/maintainer/maintainer.php:237
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:232
+#: ../../www/admin/sharedfolder/sf.php:255
+#, php-format
+msgid "LDAP Error: could not modify object %s: %s"
+msgstr "Erreur LDAP: impossible de modifier l'objet %s: %s"
+
+#: ../../www/admin/administrator/admin.php:244
+#: ../../www/admin/administrator/admin.php:297
 msgid "Modify Administrator"
 msgstr "Modifier l'administrateur"
 
-#: ../../../www/admin/administrator/admin.php.in:244
-#: ../../../www/admin/administrator/admin.php.in:266
+#: ../../www/admin/administrator/admin.php:245
+#: ../../www/admin/administrator/admin.php:270
 msgid "Administrator "
 msgstr "Administrateur"
 
-#: ../../../www/admin/administrator/admin.php.in:244
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:244
-#: ../../../www/admin/maintainer/maintainer.php.in:241
+#: ../../www/admin/administrator/admin.php:245
+#: ../../www/admin/maintainer/maintainer.php:243
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:246
 msgid " successfully modified"
 msgstr " modifiÃ© avec succÃ¨s"
 
-#: ../../../www/admin/administrator/admin.php.in:262
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:265
-#: ../../../www/admin/maintainer/maintainer.php.in:261
+#: ../../www/admin/administrator/admin.php:266
+#: ../../www/admin/maintainer/maintainer.php:265
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:269
 #, php-format
 msgid "LDAP Error: could not add object %s to maintainer group: %s"
 msgstr ""
 "Erreur LDAP: Impossible d'ajouter l'objet %s au groupe des mainteneurs: %s"
 
-#: ../../../www/admin/administrator/admin.php.in:266
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:272
-#: ../../../www/admin/maintainer/maintainer.php.in:265
-#: ../../../www/admin/user/user.php.in:723
-msgid " successfully created"
-msgstr " crÃ©e avec succÃ¨s"
-
-#: ../../../www/admin/administrator/admin.php.in:267
-#: ../../../www/admin/administrator/admin.php.in:273
-#: ../../../www/admin/administrator/admin.php.in:284 ../include/menu.php:74
+#: ../../www/admin/administrator/admin.php:271
+#: ../../www/admin/administrator/admin.php:277
+#: ../../www/admin/administrator/admin.php:288
+#: ../../lib/KolabAdmin/include/menu.php:81
 msgid "Create New Administrator"
 msgstr "CrÃ©er un nouvel administrateur"
 
-#: ../../../www/admin/administrator/admin.php.in:299
+#: ../../www/admin/administrator/admin.php:303
 msgid "Delete Administrator"
 msgstr "Effacer l'administrateur"
 
-#: ../../../www/admin/administrator/admin.php.in:311
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:314
-#: ../../../www/admin/maintainer/maintainer.php.in:310
-#: ../../../www/admin/user/user.php.in:769
-msgid "Error: need DN for delete operation"
-msgstr "Erreur: DN nÃ©cessaire pour une opÃ©ration d'effacement"
-
-#: ../../../www/admin/administrator/admin.php.in:313
+#: ../../www/admin/administrator/admin.php:317
 msgid "Error: you need administrative permissions to delete administrators"
 msgstr ""
 "Erreur: vous avez besoin des permissions administratives pour effacer des "
 "administrateurs"
 
-#: ../../../www/admin/administrator/admin.php.in:317
+#: ../../www/admin/administrator/admin.php:321
 #, php-format
 msgid "LDAP Error: Could not remove %s from admin group: %s"
 msgstr "Erreur LDAP: Impossible d'effacer %s du groupe des administrateurs: %s"
 
-#: ../../../www/admin/administrator/admin.php.in:322
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:326
-#: ../../../www/admin/maintainer/maintainer.php.in:322
+#: ../../www/admin/administrator/admin.php:326
+#: ../../www/admin/maintainer/maintainer.php:326
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:330
 #, php-format
 msgid "LDAP Error: could not mark %s for deletion: %s"
 msgstr "Erreur LDAP: impossible de marquer %s pour l'effacement: %s"
 
-#: ../../../www/admin/administrator/admin.php.in:328
+#: ../../www/admin/administrator/admin.php:332
 msgid "Administrator Deleted"
 msgstr "Administrateur effacÃ©"
 
-#: ../../../www/admin/administrator/index.php.in:62
-msgid "Manage Administrators ("
-msgstr "GÃ©rer les administrateurs ("
-
-#: ../../../www/admin/administrator/index.php.in:62
-msgid " Administrators)"
-msgstr " Administrateurs)"
-
-#: ../../../www/admin/distributionlist/index.php.in:63
-#, php-format
-msgid "Manage Distribution Lists (%d Lists)"
-msgstr "GÃ©rer les listes de distributions (%d Listes)"
+#: ../../www/admin/addressbook/addr.php:95
+msgid "Primary E-Mail Address"
+msgstr "Adresse de messagerie principale"
 
-#: ../../../www/admin/distributionlist/index.php.in:74
-msgid "not yet implemented"
-msgstr "pas encore implÃ©mentÃ©"
+#: ../../www/admin/addressbook/addr.php:97
+msgid "E-Mail Aliases"
+msgstr "Alias de l'adresse de messagerie"
 
-#: ../../../www/admin/distributionlist/list.php.in:46
-msgid "Please add at least one member"
-msgstr "Veuillez ajouter au moins un membre"
+#: ../../www/admin/addressbook/addr.php:105
+msgid "Post Box"
+msgstr "Boite postale"
 
-#: ../../../www/admin/distributionlist/list.php.in:50
+#: ../../www/admin/addressbook/addr.php:121
+#: ../../www/admin/sharedfolder/sf.php:150
+#: ../../www/admin/distributionlist/list.php:138
 #, php-format
-msgid "No user with email address, UID or alias %s"
-msgstr "Pas d'utilisateur avec l'adresse de messagerie, l'UID ou l'alias %s"
-
-#: ../../../www/admin/distributionlist/list.php.in:62
-msgid "User or distribution list with this email address already exists"
-msgstr ""
-"Un utilisateur ou une liste de distribution avec cette adresse de messagerie "
-"existe dÃ©jÃ "
-
-#: ../../../www/admin/distributionlist/list.php.in:111
-msgid "List Name"
-msgstr "Nom de la liste"
-
-#: ../../../www/admin/distributionlist/list.php.in:118
-msgid "Members"
-msgstr "Membres"
-
-#: ../../../www/admin/distributionlist/list.php.in:120
-msgid "One email address per line"
-msgstr "Une adresse de messagerie par ligne"
+msgid "Error: DN required for %s operation"
+msgstr "Erreur: DN nÃ©cessaire pour l'opÃ©ration %s"
 
-#: ../../../www/admin/distributionlist/list.php.in:123
-msgid "Hidden"
-msgstr "CachÃ©"
+#: ../../www/admin/addressbook/addr.php:131
+msgid "Add External Address"
+msgstr "Ajouter une adresse externe"
 
-#: ../../../www/admin/distributionlist/list.php.in:126
-msgid ""
-"Check here to make this distribution list available only to authenticated "
-"users"
+#: ../../www/admin/addressbook/addr.php:178
+#, fuzzy, php-format
+msgid "Addressbook entry DN could not be modified, distribution list <a href='"
 msgstr ""
-"Cochez ici pour que cette liste de distribution soit seulement accessible au "
-"utilisateurs authentifiÃ©s"
-
-#: ../../../www/admin/distributionlist/list.php.in:145
-msgid "Add Distribution List"
-msgstr "Ajouter une liste de distribution"
+"L'entrÃ©e du carnet d'adresse Ã  Ã©tÃ© enlevÃ©e de la liste de distribution '%s'."
 
-#: ../../../www/admin/distributionlist/list.php.in:179
+#: ../../www/admin/addressbook/addr.php:230
 #, php-format
-msgid "No user with address %s"
-msgstr "Pas d'utilisateur avec l'adresse %s"
+msgid "%s successfully added"
+msgstr "%s crÃ©e avec succÃ¨s"
 
-#: ../../../www/admin/distributionlist/list.php.in:210
-#: ../../../www/admin/distributionlist/list.php.in:222
-msgid "Distribution List updated"
-msgstr "Mise Ã  jour de la liste de distribution effectuÃ©e"
+#: ../../www/admin/addressbook/addr.php:240
+#: ../../www/admin/addressbook/addr.php:258
+msgid "Modify External Address"
+msgstr "Modifier l'adresse externe"
 
-#: ../../../www/admin/distributionlist/list.php.in:216
-#: ../../../www/admin/user/user.php.in:637
+#: ../../www/admin/addressbook/addr.php:261
+#: ../../www/admin/addressbook/addr.php:281
 #, php-format
-msgid "LDAP Error: Could not read %s: %s"
-msgstr "Erreur LDAP: Impossible de lire %s: %s"
+msgid "Error: No entry with DN %s found"
+msgstr "Erreur: Aucune entrÃ©e avec le DN %s n'a Ã©tÃ© trouvÃ©e"
 
-#: ../../../www/admin/distributionlist/list.php.in:220
-#: ../../../www/admin/distributionlist/list.php.in:249
-#: ../../../www/admin/user/user.php.in:649
-#: ../../../www/admin/user/user.php.in:662
-#: ../../../www/admin/user/user.php.in:699
-#: ../../../www/admin/user/user.php.in:714
-#, php-format
-msgid "LDAP Error: Could not modify object %s: %s"
-msgstr "Erreur LDAP: impossible de modifier l'objet %s: %s"
+#: ../../www/admin/addressbook/addr.php:278
+msgid "Delete External Address"
+msgstr "Effacer l'adresse externe"
 
-#: ../../../www/admin/distributionlist/list.php.in:231
+#: ../../www/admin/addressbook/addr.php:302
 #, php-format
-msgid "LDAP Error: Could not add object %s: %s"
-msgstr "Erreur LDAP: Impossible d'ajouter un objet %s: %s"
+msgid "Addressbook entry removed from distribution list '%s'."
+msgstr ""
+"L'entrÃ©e du carnet d'adresse Ã  Ã©tÃ© enlevÃ©e de la liste de distribution '%s'."
 
-#: ../../../www/admin/distributionlist/list.php.in:252
-#: ../../../www/admin/user/user.php.in:702
+#: ../../www/admin/addressbook/addr.php:304
 #, php-format
-msgid "Mid-air collision detected, email address %1$s renamed to %2$s"
+msgid ""
+"Failure to remove addressbook entry from distribution list '%s', entry will "
+"not be deleted."
 msgstr ""
-"Une collision a Ã©tÃ© dÃ©tectÃ©e, l'adresse de messagerie %1$s a Ã©tÃ© renommÃ©e en "
-"%2$s"
+"Echec lors de la suppression de l'entrÃ© du carnet d'adresse de la liste de "
+"distribution '%s'. Elle ne sera pas supprimÃ©e."
 
-#: ../../../www/admin/distributionlist/list.php.in:260
+#: ../../www/admin/addressbook/addr.php:312
 #, php-format
-msgid "Distribution List '%s' added"
-msgstr "Ajout de la liste de distribution '%s' effectuÃ©e"
+msgid "LDAP Error: could not delete %s: %s"
+msgstr "Erreur LDAP: impossible d'effacer %s: %s"
 
-#: ../../../www/admin/distributionlist/list.php.in:272
-#: ../../../www/admin/distributionlist/list.php.in:286
-msgid "Modify Distribution List"
-msgstr "Modifier la liste de distribution"
+#: ../../www/admin/addressbook/addr.php:315
+#: ../../www/admin/sharedfolder/sf.php:325
+#: ../../www/admin/distributionlist/list.php:316
+msgid "Entry Deleted"
+msgstr "EntrÃ©e effacÃ©e"
 
-#: ../../../www/admin/distributionlist/list.php.in:289
-#: ../../../www/admin/distributionlist/list.php.in:304
-#: ../../../www/admin/sharedfolder/sf.php.in:298
-#: ../../../www/admin/sharedfolder/sf.php.in:314
+#: ../../www/admin/addressbook/addr.php:316
 #, php-format
-msgid "Error: No results returned for DN '%s'"
-msgstr "Erreur: pas de rÃ©sultat pour le DN '%s'"
+msgid "Address book entry with DN %s was deleted"
+msgstr "L'entrÃ©e du carnet d'adresse avec le DN %s Ã  Ã©tÃ© supprimÃ©e."
 
-#: ../../../www/admin/distributionlist/list.php.in:301
-msgid "Delete Distribution List"
-msgstr "Effacer la liste de distribution"
+#: ../../www/admin/maintainer/index.php:62
+#: ../../www/admin/domainmaintainer/index.php:62
+msgid "Manage Maintainers ("
+msgstr "GÃ©rer les mainteneurs ("
 
-#: ../../../www/admin/distributionlist/list.php.in:311
-msgid "Distribution List "
-msgstr "Liste de distribution"
+#: ../../www/admin/maintainer/index.php:62
+#: ../../www/admin/domainmaintainer/index.php:62
+msgid " Maintainers)"
+msgstr " Mainteneurs)"
 
-#: ../../../www/admin/distributionlist/list.php.in:311
-msgid " deleted"
-msgstr " effacÃ©"
+#: ../../www/admin/maintainer/maintainer.php:242
+#: ../../www/admin/maintainer/maintainer.php:296
+msgid "Modify Maintainer"
+msgstr "Modifier les mainteneurs"
+
+#: ../../www/admin/maintainer/maintainer.php:243
+#: ../../www/admin/maintainer/maintainer.php:269
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:246
+msgid "Maintainer "
+msgstr "Mainteneur"
 
-#: ../../../www/admin/distributionlist/list.php.in:315
+#: ../../www/admin/maintainer/maintainer.php:270
+#: ../../www/admin/maintainer/maintainer.php:276
+#: ../../www/admin/maintainer/maintainer.php:287
+#: ../../lib/KolabAdmin/include/menu.php:93
+msgid "Create New Maintainer"
+msgstr "CrÃ©er un nouveau mainteneur"
+
+#: ../../www/admin/maintainer/maintainer.php:302
+msgid "Delete Maintainer"
+msgstr "Effacer un mainteneur"
+
+#: ../../www/admin/maintainer/maintainer.php:320
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:324
 #, php-format
-msgid "LDAP Error: Could not delete %s: %s"
-msgstr "Erreur LDAP: impossible d'effacer %s: %s"
+msgid "LDAP Error: Could not remove %s from maintainer group: %s"
+msgstr "Erreur LDAP: Impossible d'effacer %s du groupe des mainteneurs: %s"
+
+#: ../../www/admin/maintainer/maintainer.php:332
+msgid "Maintainer Deleted"
+msgstr "Mainteneur effacÃ©"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:49
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:49
 msgid "Please enter a uid value"
 msgstr "Veuillez entrer une valeur de uid"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:137
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:137
 msgid "Check domains this domain maintainer should be able to maintain"
 msgstr ""
 "SÃ©lectionner les domaines que ce mainteneur doit Ãªtre capable de maintenir"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:243
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:296
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:245
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:300
 msgid "Modify Domain Maintainer"
 msgstr "Modifier les mainteneurs de domaine"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:244
-#: ../../../www/admin/maintainer/maintainer.php.in:241
-#: ../../../www/admin/maintainer/maintainer.php.in:265
-msgid "Maintainer "
-msgstr "Mainteneur"
-
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:272
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:276
 msgid "Domain maintainer "
 msgstr "Mainteneur de domaine"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:273
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:277
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:287
-#: ../include/menu.php:80 ../include/menu.php:97
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:277
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:281
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:291
+#: ../../lib/KolabAdmin/include/menu.php:87
+#: ../../lib/KolabAdmin/include/menu.php:104
 msgid "Create New Domain Maintainer"
 msgstr "CrÃ©er un nouveau mainteneur de domaine"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:302
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:306
 msgid "Delete Domain Maintainer"
 msgstr "Effacer un mainteneur de domaine"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:316
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:320
 msgid "Error: you need administrative permissions to delete domain maintainers"
 msgstr ""
 "Erreur: vous avez besoin des permissions administratives pour effacer des "
 "mainteneurs de domaines"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:320
-#: ../../../www/admin/maintainer/maintainer.php.in:316
-#, php-format
-msgid "LDAP Error: Could not remove %s from maintainer group: %s"
-msgstr "Erreur LDAP: Impossible d'effacer %s du groupe des mainteneurs: %s"
-
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:332
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:336
 msgid "Domain Maintainer Deleted"
 msgstr "Mainteneur de domaine effacÃ©"
 
-#: ../../../www/admin/domainmaintainer/index.php.in:62
-#: ../../../www/admin/maintainer/index.php.in:62
-msgid "Manage Maintainers ("
-msgstr "GÃ©rer les mainteneurs ("
-
-#: ../../../www/admin/domainmaintainer/index.php.in:62
-#: ../../../www/admin/maintainer/index.php.in:62
-msgid " Maintainers)"
-msgstr " Mainteneurs)"
-
-#: ../../../www/admin/maintainer/maintainer.php.in:240
-#: ../../../www/admin/maintainer/maintainer.php.in:292
-msgid "Modify Maintainer"
-msgstr "Modifier les mainteneurs"
-
-#: ../../../www/admin/maintainer/maintainer.php.in:266
-#: ../../../www/admin/maintainer/maintainer.php.in:272
-#: ../../../www/admin/maintainer/maintainer.php.in:283 ../include/menu.php:86
-msgid "Create New Maintainer"
-msgstr "CrÃ©er un nouveau mainteneur"
-
-#: ../../../www/admin/maintainer/maintainer.php.in:298
-msgid "Delete Maintainer"
-msgstr "Effacer un mainteneur"
-
-#: ../../../www/admin/maintainer/maintainer.php.in:312
-#: ../../../www/admin/user/user.php.in:775
-msgid "Error: you need administrative permissions to delete users"
-msgstr ""
-"Erreur: vous avez besoin des permissions administrateur pour effacer des "
-"utilisateurs"
-
-#: ../../../www/admin/maintainer/maintainer.php.in:328
-msgid "Maintainer Deleted"
-msgstr "Mainteneur effacÃ©"
-
-#: ../../../www/admin/settings/index.php.in:98
-#, php-format
-msgid "No account found for email address %s"
-msgstr "Pas de compte trouvÃ© pour l'adresse de messagerie %s"
-
-#: ../../../www/admin/settings/index.php.in:107
-#, php-format
-msgid "LDAP Error: Failed to add distribution list %s: %s"
-msgstr "Erreur LDAP: Ã©chec lors de l'ajout d'une liste de distribution %s: %s"
-
-#: ../../../www/admin/settings/index.php.in:109
-#, php-format
-msgid "Successfully created distribution list %s"
-msgstr "CrÃ©ation d'une liste de distribution: %s"
-
-#: ../../../www/admin/settings/index.php.in:128
-#: ../../../www/admin/settings/index.php.in:137
-#: ../../../www/admin/settings/index.php.in:146
-#: ../../../www/admin/settings/index.php.in:157
-#: ../../../www/admin/settings/index.php.in:167
-#: ../../../www/admin/settings/index.php.in:176
-#: ../../../www/admin/settings/index.php.in:187
-#: ../../../www/admin/settings/index.php.in:201
-#: ../../../www/admin/settings/index.php.in:219
-#: ../../../www/admin/settings/index.php.in:237
-#: ../../../www/admin/settings/index.php.in:254
-#: ../../../www/admin/settings/index.php.in:267
-#, php-format
-msgid "LDAP Error: failed to modify kolab configuration object: %s"
-msgstr ""
-"Erreur LDAP: Ã©chec dans la modification de l'objet de configuration kolab: %s"
-
-#: ../../../www/admin/settings/index.php.in:225
-#, php-format
-msgid "LDAP Error: Failed to delete domain object %s: %s"
-msgstr "Erreur LDAP: Ã©chec lors de l'Ã©ffacement de l'objet domaine %s: %s"
-
-#: ../../../www/admin/settings/index.php.in:275
-msgid "POP3 Service"
-msgstr "Service POP3"
-
-#: ../../../www/admin/settings/index.php.in:276
-msgid "POP3/SSL service (TCP port 995)"
-msgstr "Service POP3/SSL (TCP port 995)"
-
-#: ../../../www/admin/settings/index.php.in:277
-msgid "IMAP Service"
-msgstr "Service IMAP"
-
-#: ../../../www/admin/settings/index.php.in:278
-msgid "IMAP/SSL Service (TCP port 993)"
-msgstr "Service IMAP/SSL (TCP port 993)"
-
-#: ../../../www/admin/settings/index.php.in:279
-msgid "Sieve service (TCP port %s)"
-msgstr "Service Sieve (TCP port %s)"
-
-#: ../../../www/admin/settings/index.php.in:280
-msgid "FreeBusy Service via HTTP (in addition to HTTPS)"
-msgstr "Service de disponibilitÃ© par HTTP (en plus du HTTPS)"
-
-#: ../../../www/admin/settings/index.php.in:281
-msgid "Amavis Email Scanning (Virus/Spam)"
-msgstr "Service de vÃ©rification de la messagerie Amavis (Virus/Spam)"
-
-#: ../../../www/admin/sharedfolder/index.php.in:53
+#: ../../www/admin/sharedfolder/index.php:53
 #, php-format
 msgid "Manage Shared Folders (%d Folders)"
 msgstr "GÃ©rer les dossiers partagÃ©s (%d Dossiers)"
 
-#: ../../../www/admin/sharedfolder/index.php.in:63
-#: ../include/form.class.php:255
+#: ../../www/admin/sharedfolder/index.php:63
+#: ../../lib/KolabAdmin/include/form.class.php:254
 msgid "Unspecified"
 msgstr "Non spÃ©cifiÃ©"
 
-#: ../../../www/admin/sharedfolder/index.php.in:64
-#: ../include/form.class.php:255
+#: ../../www/admin/sharedfolder/index.php:64
+#: ../../lib/KolabAdmin/include/form.class.php:254
 msgid "Mails"
 msgstr "Messagerie"
 
-#: ../../../www/admin/sharedfolder/index.php.in:65
-#: ../include/form.class.php:255
-msgid "Tasks"
-msgstr "TÃ¢ches"
-
-#: ../../../www/admin/sharedfolder/index.php.in:66
-#: ../include/form.class.php:256
+#: ../../www/admin/sharedfolder/index.php:66
+#: ../../lib/KolabAdmin/include/form.class.php:255
 msgid "Journals"
 msgstr "Journaux"
 
-#: ../../../www/admin/sharedfolder/index.php.in:67
-#: ../include/form.class.php:256
+#: ../../www/admin/sharedfolder/index.php:67
+#: ../../lib/KolabAdmin/include/form.class.php:255
 msgid "Events"
 msgstr "EvÃ©nements"
 
-#: ../../../www/admin/sharedfolder/index.php.in:68
-#: ../include/form.class.php:257
+#: ../../www/admin/sharedfolder/index.php:68
+#: ../../lib/KolabAdmin/include/form.class.php:256
 msgid "Contacts"
 msgstr "Contacts"
 
-#: ../../../www/admin/sharedfolder/index.php.in:69
-#: ../include/form.class.php:257
-msgid "Notes"
-msgstr "Notes"
-
-#: ../../../www/admin/sharedfolder/sf.php.in:60
-#: ../../../www/admin/sharedfolder/sf.php.in:67
+#: ../../www/admin/sharedfolder/sf.php:62
+#: ../../www/admin/sharedfolder/sf.php:69
 msgid "Permission for UID/email/GID"
 msgstr "Permissions pour UID/message/GID"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:101
+#: ../../www/admin/sharedfolder/sf.php:103
 #, php-format
 msgid "No UID or GID %s"
 msgstr "Pas de UID ou GID %s"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:117
+#: ../../www/admin/sharedfolder/sf.php:119
 msgid "Folder Name"
 msgstr "Nom du dossier"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:124
+#: ../../www/admin/sharedfolder/sf.php:126
 msgid "Folder Location"
 msgstr "Emplacement du dossier"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:126
-#: ../../../www/admin/user/user.php.in:379
-#: ../../../www/admin/user/user.php.in:381
-msgid "Non volatile"
-msgstr "Permanent"
-
-#: ../../../www/admin/sharedfolder/sf.php.in:128
+#: ../../www/admin/sharedfolder/sf.php:130
 msgid "Folder Type"
 msgstr "Type du dossier"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:132
+#: ../../www/admin/sharedfolder/sf.php:134
 msgid "Quota Limit"
 msgstr "Limite du quota"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:133
+#: ../../www/admin/sharedfolder/sf.php:135
 msgid "MBytes (empty for unlimited)"
 msgstr "MBytes (vide pour illimitÃ©)"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:135
+#: ../../www/admin/sharedfolder/sf.php:137
 msgid "Permission for UID/GID"
 msgstr "Permission pour UID/GID"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:158 ../include/menu.php:58
+#: ../../www/admin/sharedfolder/sf.php:160
+#: ../../lib/KolabAdmin/include/menu.php:65
 msgid "Add Shared Folder"
 msgstr "Ajouter un dossier partagÃ©"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:241
-#: ../../../www/admin/sharedfolder/sf.php.in:253
+#: ../../www/admin/sharedfolder/sf.php:245
+#: ../../www/admin/sharedfolder/sf.php:257
 msgid "Shared folder updated"
 msgstr "Dossier partagÃ© mis Ã  jour"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:263
+#: ../../www/admin/sharedfolder/sf.php:267
 #, php-format
 msgid "Shared folder '%s' added"
 msgstr "Dossier partagÃ© '%s' ajoutÃ©"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:275
-#: ../../../www/admin/sharedfolder/sf.php.in:295
+#: ../../www/admin/sharedfolder/sf.php:279
+#: ../../www/admin/sharedfolder/sf.php:299
 msgid "Modify Shared Folder"
 msgstr "Modifier un dossier partagÃ©"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:311
+#: ../../www/admin/sharedfolder/sf.php:302
+#: ../../www/admin/sharedfolder/sf.php:318
+#: ../../www/admin/distributionlist/list.php:293
+#: ../../www/admin/distributionlist/list.php:308
+#, php-format
+msgid "Error: No results returned for DN '%s'"
+msgstr "Erreur: pas de rÃ©sultat pour le DN '%s'"
+
+#: ../../www/admin/sharedfolder/sf.php:315
 msgid "Delete Shared Folder"
 msgstr "Effacer un dossier partagÃ©"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:320
+#: ../../www/admin/sharedfolder/sf.php:324
 msgid "Shared folder "
 msgstr "Dossier partagÃ©"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:320
+#: ../../www/admin/sharedfolder/sf.php:324
 msgid " marked for deletion"
 msgstr " marquÃ© pour effacement"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:324
+#: ../../www/admin/sharedfolder/sf.php:328
 #, php-format
 msgid "LDAP Error: Could not mark %s for deletion: %s"
 msgstr "Erreur LDAP: impossible de marquer %s pour l'effacement: %s"
 
-#: ../../../www/admin/user/deliver.php.in:37
-msgid ""
-"Net/Sieve.php is missing. Without that, filter settings are not available"
-msgstr ""
-"Net/sieve.php est manquant. Sans cela, les prÃ©fÃ©rences des filtres de "
-"messagerie seront indisponibles"
-
-#: ../../../www/admin/user/deliver.php.in:38
-#: ../../../www/admin/user/forward.php.in:39
-#: ../../../www/admin/user/vacation.php.in:18
-msgid ""
-"Suggest your system administrator to run \"pear install http://pear.php.net/"
-"get/Net_Sieve\" on the server"
-msgstr ""
-"SuggÃ©rez Ã  votre administrateur systÃ¨me de lancer  \"pear install http://"
-"pear.php.net/get/Net_Sieve\" sur le serveur"
-
-#: ../../../www/admin/user/deliver.php.in:66
-#: ../../../www/admin/user/forward.php.in:70
-msgid "Script was:"
-msgstr "Le script Ã©tait :"
-
-#: ../../../www/admin/user/deliver.php.in:74
+#: ../../www/admin/distributionlist/index.php:63
 #, php-format
-msgid "Delivery to '%s' successfully activated"
-msgstr "Le message d'absence vers '%s' a Ã©tÃ© correctement activÃ©"
-
-#: ../../../www/admin/user/deliver.php.in:75
-#, php-format
-msgid "Delivery to '%s' successfully deactivated"
-msgstr "Le message d'absence vers '%s' a Ã©tÃ© correctement dÃ©sactivÃ©"
-
-#: ../../../www/admin/user/forward.php.in:38
-#: ../../../www/admin/user/vacation.php.in:17
-msgid ""
-"Net/Sieve.php is missing. Without that, vacation settings are not available"
-msgstr ""
-"Net/sieve.php est manquant. Sans cela, les prÃ©fÃ©rences des messages "
-"d'absence seront indisponible"
-
-#: ../../../www/admin/user/forward.php.in:64
-#: ../../../www/admin/user/user.php.in:94
-msgid "Please enter an email address"
-msgstr "Veuillez entrer une adresse de messagerie"
-
-#: ../../../www/admin/user/forward.php.in:78
-#, php-format
-msgid "Forwarding to '%s' successfully activated"
-msgstr "Le transfert vers '%s' a Ã©tÃ© correctement activÃ©"
+msgid "Manage Distribution Lists (%d Lists)"
+msgstr "GÃ©rer les listes de distributions (%d Listes)"
 
-#: ../../../www/admin/user/forward.php.in:79
-#, php-format
-msgid "Forwarding to '%s' successfully deactivated"
-msgstr "Le transfert vers '%s' a Ã©tÃ© correctement dÃ©sactivÃ©"
+#: ../../www/admin/distributionlist/index.php:74
+msgid "not yet implemented"
+msgstr "pas encore implÃ©mentÃ©"
 
-#: ../../../www/admin/user/index.php.in:122
-#, php-format
-msgid "Manage Email User (%d Users)"
-msgstr "GÃ©rer des utilisateurs de messagerie (%d Utilisateurs)"
+#: ../../www/admin/distributionlist/list.php:46
+msgid "Please add at least one member"
+msgstr "Veuillez ajouter au moins un membre"
 
-#: ../../../www/admin/user/user.php.in:111
+#: ../../www/admin/distributionlist/list.php:50
 #, php-format
-msgid "Email address %1$s not in domains %2$s"
-msgstr "L'adresse de messagerie %1$s n'est pas dans les domaines %2$s"
-
-#: ../../../www/admin/user/user.php.in:130
-msgid "UID "
-msgstr "UID "
+msgid "No user with email address, UID or alias %s"
+msgstr "Pas d'utilisateur avec l'adresse de messagerie, l'UID ou l'alias %s"
 
-#: ../../../www/admin/user/user.php.in:130 ../include/form.class.php:34
-msgid ""
-" collides with an address already used for another user, a vCard or a "
-"distribution list.<br />"
+#: ../../www/admin/distributionlist/list.php:62
+msgid "User or distribution list with this email address already exists"
 msgstr ""
-" collision avec un adresse de messagerie dÃ©jÃ  utilisÃ©e pour un autre "
-"utilisateur, une vCard ou une liste de distribution.<br/>"
-
-#: ../../../www/admin/user/user.php.in:145
-#, php-format
-msgid "Email-Delegate %s does not exist"
-msgstr "L'adresse de messagerie dÃ©lÃ©guÃ© %s n'existe pas"
-
-#: ../../../www/admin/user/user.php.in:158
-#, php-format
-msgid "Illegal user or group %s"
-msgstr "Nom d'utilisateur ou de groupe interdit %s"
-
-#: ../../../www/admin/user/user.php.in:167
-msgid "Free/Busy interval can not be negative"
-msgstr "L'intervalle des options de disponibilitÃ©s ne peut pas Ãªtre nÃ©gatif"
-
-#: ../../../www/admin/user/user.php.in:168
-msgid "Free/Busy interval must be a number"
-msgstr "L'intervalle des options de disponibilitÃ©s doit Ãªtre un nombre"
-
-#: ../../../www/admin/user/user.php.in:169
-msgid "Free/Busy interval must be an integer"
-msgstr "L'intervalle des options de disponibilitÃ©s doit Ãªtre un nombre entier"
-
-#: ../../../www/admin/user/user.php.in:403
-msgid "Unique Identity (UID)"
-msgstr "IdentitÃ© unique (UID)"
-
-#: ../../../www/admin/user/user.php.in:405
-msgid "Optional - Defaults to Primary Email Address"
-msgstr "Optionnel - Par dÃ©faut sÃ©lectionne l'adresse de messagerie principale"
-
-#: ../../../www/admin/user/user.php.in:406
-msgid "Mailbox Home Server"
-msgstr "Serveur contenant le compte de messagerie"
-
-#: ../../../www/admin/user/user.php.in:410
-msgid "Account Type"
-msgstr "Type de compte "
-
-#: ../../../www/admin/user/user.php.in:412
-msgid "User Account"
-msgstr "Compte utilisateur"
-
-#: ../../../www/admin/user/user.php.in:412
-msgid "Internal User Account"
-msgstr "Compte d'utilisateur interne"
-
-#: ../../../www/admin/user/user.php.in:412
-msgid "Group Account"
-msgstr "Compte de groupe"
+"Un utilisateur ou une liste de distribution avec cette adresse de messagerie "
+"existe dÃ©jÃ "
 
-#: ../../../www/admin/user/user.php.in:412
-msgid "Resource Account"
-msgstr "Compte de ressources"
+#: ../../www/admin/distributionlist/list.php:114
+msgid "List Name"
+msgstr "Nom de la liste"
 
-#: ../../../www/admin/user/user.php.in:414
-msgid ""
-"NOTE: An internal user is a user that will not be visible in the address book"
-msgstr ""
-"NOTE: Un utilisateur interne sera un utilisateur qui ne sera pas visible "
-"dans le carnet d'adresse"
+#: ../../www/admin/distributionlist/list.php:121
+msgid "Members"
+msgstr "Membres"
 
-#: ../../../www/admin/user/user.php.in:415
-msgid "Invitation Policy"
-msgstr "Politique d'invitation"
+#: ../../www/admin/distributionlist/list.php:123
+msgid "One email address per line"
+msgstr "Une adresse de messagerie par ligne"
 
-#: ../../../www/admin/user/user.php.in:419
-msgid "For automatic invitation handling"
-msgstr "Pour la gestion des invitation automatiques"
+#: ../../www/admin/distributionlist/list.php:126
+msgid "Hidden"
+msgstr "CachÃ©"
 
-#: ../../../www/admin/user/user.php.in:420
+#: ../../www/admin/distributionlist/list.php:129
 msgid ""
-"NOTE: For regular accounts to use this feature, give the 'calendar' user "
-"access to the Calendar folder"
-msgstr ""
-"NOTE: Pour que les comptes classiques puissent utiliser cette "
-"fonctionnalitÃ©, donnez Ã  l'utilisateur 'calendar' accÃ¨s au dossier Calendrier"
-
-#: ../../../www/admin/user/user.php.in:422
-msgid "Email Aliases"
-msgstr "Alias de messagerie"
-
-#: ../../../www/admin/user/user.php.in:427
-msgid "Email-Delegates"
-msgstr "DÃ©lÃ©guÃ©s"
-
-#: ../../../www/admin/user/user.php.in:430
-msgid "Others allowed to send emails with a \"from\" address of this account."
+"Check here to make this distribution list available only to authenticated "
+"users"
 msgstr ""
-"Ceux qui sont autorisÃ© Ã  envoyer un message avec une adresse \"expÃ©diteur\" "
-"correspondant Ã  ce compte."
-
-#: ../../../www/admin/user/user.php.in:431
-msgid "One email address per line."
-msgstr "Une adresse de messagerie par ligne"
-
-#: ../../../www/admin/user/user.php.in:447
-msgid "User Quota in MBytes"
-msgstr "Quota utilisateur en MBytes"
-
-#: ../../../www/admin/user/user.php.in:460
-msgid "Free/Busy interval in days"
-msgstr "Options de disponibilitÃ©s en jours"
-
-#: ../../../www/admin/user/user.php.in:461
-msgid "Leave blank for default (60 days)"
-msgstr "Laisser vide pour la valeur par dÃ©faut (60 jours)"
-
-#: ../../../www/admin/user/user.php.in:665
-#: ../../../www/admin/user/user.php.in:717
-#, php-format
-msgid "Mid-air collision detected, alias %1$s renamed to %2$s"
-msgstr "Un collision a Ã©tÃ© dÃ©tectÃ©, l'alias %1$s a Ã©tÃ© renommÃ© en %2$s"
+"Cochez ici pour que cette liste de distribution soit seulement accessible au "
+"utilisateurs authentifiÃ©s"
 
-#: ../../../www/admin/user/user.php.in:670
-#: ../../../www/admin/user/user.php.in:750
-msgid "Modify User"
-msgstr "Modifier un utilisateur"
+#: ../../www/admin/distributionlist/list.php:148
+msgid "Add Distribution List"
+msgstr "Ajouter une liste de distribution"
 
-#: ../../../www/admin/user/user.php.in:671
+#: ../../www/admin/distributionlist/list.php:183
 #, php-format
-msgid "User '%s' successfully modified"
-msgstr "L'utilisateur '%s' Ã  Ã©tÃ© modifiÃ© avec succÃ¨s"
-
-#: ../../../www/admin/user/user.php.in:723
-msgid "User "
-msgstr "Utilisateur"
-
-#: ../../../www/admin/user/user.php.in:724
-#: ../../../www/admin/user/user.php.in:730
-#: ../../../www/admin/user/user.php.in:741 ../include/menu.php:30
-msgid "Create New User"
-msgstr "CrÃ©er un nouvel utilisateur"
-
-#: ../../../www/admin/user/user.php.in:756
-#: ../../../www/admin/user/user.php.in:814
-msgid "Delete User"
-msgstr "Effacer un utilisateur"
+msgid "No user with address %s"
+msgstr "Pas d'utilisateur avec l'adresse %s"
 
-#: ../../../www/admin/user/user.php.in:795
-#, php-format
-msgid "Account removed from distribution list '%s'."
-msgstr "Compte de messagerie effacÃ© de la liste de distribution '%s'."
+#: ../../www/admin/distributionlist/list.php:214
+#: ../../www/admin/distributionlist/list.php:226
+msgid "Distribution List updated"
+msgstr "Mise Ã  jour de la liste de distribution effectuÃ©e"
 
-#: ../../../www/admin/user/user.php.in:797
+#: ../../www/admin/distributionlist/list.php:235
 #, php-format
-msgid ""
-"Failure to remove account from distribution list '%s', account will not be "
-"deleted."
-msgstr ""
-"Echec lors de la tentative de suppression du compte de la liste '%s', le "
-"compte ne sera pas supprimÃ©."
+msgid "LDAP Error: Could not add object %s: %s"
+msgstr "Erreur LDAP: Impossible d'ajouter un objet %s: %s"
 
-#: ../../../www/admin/user/user.php.in:805
+#: ../../www/admin/distributionlist/list.php:264
 #, php-format
-msgid "LDAP Error: could not mark '%s' for deletion: %s"
-msgstr "Erreur LDAP: impossible de marquer '%s' pour l'effacement: %s"
-
-#: ../../../www/admin/user/user.php.in:808
-msgid "User Deleted"
-msgstr "Utilisateur effacÃ©"
+msgid "Distribution List '%s' added"
+msgstr "Ajout de la liste de distribution '%s' effectuÃ©e"
 
-#: ../../../www/admin/user/vacation.php.in:43
-msgid "Days must be at least one"
-msgstr "Le nombre de jours doit Ãªtre 1 au minimum"
+#: ../../www/admin/distributionlist/list.php:276
+#: ../../www/admin/distributionlist/list.php:290
+msgid "Modify Distribution List"
+msgstr "Modifier la liste de distribution"
 
-#: ../../../www/admin/user/vacation.php.in:65
-msgid "Vacation message successfully activated"
-msgstr "Le message d'absence a Ã©tÃ© correctement activÃ©"
+#: ../../www/admin/distributionlist/list.php:305
+msgid "Delete Distribution List"
+msgstr "Effacer la liste de distribution"
 
-#: ../../../www/admin/user/vacation.php.in:66
-msgid "Vacation message successfully deactivated"
-msgstr "Le message d'absence a Ã©tÃ© correctement dÃ©sactivÃ©"
+#: ../../www/admin/distributionlist/list.php:315
+msgid "Distribution List "
+msgstr "Liste de distribution"
 
-#: ../../../www/admin/user/vacation.php.in:87
-#, php-format
-msgid "%x"
-msgstr "%x"
+#: ../../www/admin/distributionlist/list.php:315
+msgid " deleted"
+msgstr " effacÃ©"
 
-#: ../../../www/admin/user/vacation.php.in:89
+#: ../../www/admin/distributionlist/list.php:319
 #, php-format
-msgid "I am out of office until %s.\r\n"
-msgstr "Je suis absent jusqu'au %s.\r\n"
+msgid "LDAP Error: Could not delete %s: %s"
+msgstr "Erreur LDAP: impossible d'effacer %s: %s"
 
-#: ../../../www/admin/user/vacation.php.in:90
+#: ../../www/admin/settings/index.php:99
 #, php-format
-msgid ""
-"In urgent cases, please contact Mrs. <vacation replacement>\r\n"
-"\r\n"
-msgstr ""
-"En cas d'urgence veuillez prÃ©venir Monsieur <vacation replacement>\r\n"
-"\r\n"
+msgid "No account found for email address %s"
+msgstr "Pas de compte trouvÃ© pour l'adresse de messagerie %s"
 
-#: ../../../www/admin/user/vacation.php.in:91
+#: ../../www/admin/settings/index.php:108
 #, php-format
-msgid "email: <email address of vacation replacement>\r\n"
-msgstr "email: <adresse de messagerie pour les notification d'absence>\r\n"
+msgid "LDAP Error: Failed to add distribution list %s: %s"
+msgstr "Erreur LDAP: Ã©chec lors de l'ajout d'une liste de distribution %s: %s"
 
-#: ../../../www/admin/user/vacation.php.in:92
+#: ../../www/admin/settings/index.php:110
 #, php-format
-msgid "phone: +49 711 1111 11\r\n"
-msgstr "TÃ©lÃ©phone: +49 711 1111 11\r\n"
+msgid "Successfully created distribution list %s"
+msgstr "CrÃ©ation d'une liste de distribution: %s"
 
-#: ../../../www/admin/user/vacation.php.in:93
+#: ../../www/admin/settings/index.php:129
+#: ../../www/admin/settings/index.php:138
+#: ../../www/admin/settings/index.php:147
+#: ../../www/admin/settings/index.php:158
+#: ../../www/admin/settings/index.php:168
+#: ../../www/admin/settings/index.php:177
+#: ../../www/admin/settings/index.php:188
+#: ../../www/admin/settings/index.php:202
+#: ../../www/admin/settings/index.php:220
+#: ../../www/admin/settings/index.php:238
+#: ../../www/admin/settings/index.php:255
+#: ../../www/admin/settings/index.php:268
 #, php-format
-msgid ""
-"fax.:  +49 711 1111 12\r\n"
-"\r\n"
+msgid "LDAP Error: failed to modify kolab configuration object: %s"
 msgstr ""
-"TÃ©lÃ©copie:  +49 711 1111 12\r\n"
-"\r\n"
+"Erreur LDAP: Ã©chec dans la modification de l'objet de configuration kolab: %s"
 
-#: ../../../www/admin/user/vacation.php.in:94
+#: ../../www/admin/settings/index.php:226
 #, php-format
-msgid "Yours sincerely,\r\n"
-msgstr "Cordialement,\r\n"
+msgid "LDAP Error: Failed to delete domain object %s: %s"
+msgstr "Erreur LDAP: Ã©chec lors de l'Ã©ffacement de l'objet domaine %s: %s"
 
-#: ../../../www/admin/user/vacation.php.in:95
-#, php-format
-msgid "-- \r\n"
-msgstr "-- \r\n"
+#: ../../www/admin/settings/index.php:276
+msgid "POP3 Service"
+msgstr "Service POP3"
 
-#: ../../../www/admin/user/vacation.php.in:96
-#, php-format
-msgid "<enter your name and email address here>"
-msgstr "<entrer votre nom et adresse de messagerie ici>"
+#: ../../www/admin/settings/index.php:277
+msgid "POP3/SSL service (TCP port 995)"
+msgstr "Service POP3/SSL (TCP port 995)"
 
-#: ../include/auth.class.php.in:40
-msgid "Server error, no ldap object!"
-msgstr "Erreur serveur, pas d'objet ldap !"
+#: ../../www/admin/settings/index.php:278
+msgid "IMAP Service"
+msgstr "Service IMAP"
 
-#: ../include/auth.class.php.in:45
-msgid "Could not bind to LDAP server: "
-msgstr "Impossible de se connecter au serveur LDAP : "
+#: ../../www/admin/settings/index.php:279
+msgid "IMAP/SSL Service (TCP port 993)"
+msgstr "Service IMAP/SSL (TCP port 993)"
 
-#: ../include/auth.class.php.in:56
-msgid "Could not bind to LDAP server"
-msgstr "Impossible de se connecter au serveur LDAP"
+#: ../../www/admin/settings/index.php:280
+#, php-format
+msgid "Sieve service (TCP port %s)"
+msgstr "Service Sieve (TCP port %s)"
 
-#: ../include/auth.class.php.in:83 ../include/auth.class.php.in:87
-msgid "Wrong username or password"
-msgstr "Mauvais utilisateur ou mot de passe"
+#: ../../www/admin/settings/index.php:281
+msgid "FreeBusy Service via HTTP (in addition to HTTPS)"
+msgstr "Service de disponibilitÃ© par HTTP (en plus du HTTPS)"
 
-#: ../include/auth.class.php.in:124
-msgid "Kolab Groupware login"
-msgstr "Connexion au serveur Kolab"
+#: ../../www/admin/settings/index.php:282
+msgid "Amavis Email Scanning (Virus/Spam)"
+msgstr "Service de vÃ©rification de la messagerie Amavis (Virus/Spam)"
 
-#: ../include/form.class.php:34
+#: ../../lib/KolabAdmin/include/form.class.php:34
 msgid "Email address "
 msgstr "Adresse de messagerie"
 
-#: ../include/form.class.php:45
-msgid "Quota must be smaller than 4096"
-msgstr "Le quota doit Ãªtre infÃ©rieur Ã  4096"
-
-#: ../include/form.class.php:46
+#: ../../lib/KolabAdmin/include/form.class.php:45
 msgid "Quota can not be negative"
 msgstr "Le quota ne peut pas Ãªtre nÃ©gatif"
 
-#: ../include/form.class.php:47
+#: ../../lib/KolabAdmin/include/form.class.php:46
 msgid "Quota must be a number"
 msgstr "Le quota doit Ãªtre un nombre"
 
-#: ../include/form.class.php:48
+#: ../../lib/KolabAdmin/include/form.class.php:47
 msgid "Quota must be an integer"
 msgstr "Le quota doit Ãªtre un nombre entier"
 
-#: ../include/form.class.php:55
+#: ../../lib/KolabAdmin/include/form.class.php:54
 msgid ""
 "Phone entries may only contain a-z, numbers, spaces and the characters ()-+/."
 "=?:"
@@ -2152,205 +2453,345 @@ msgstr ""
 "Les numÃ©ros de tÃ©lÃ©phones ne peuvent contenir que les lettres a-z, les "
 "nombres, les espaces et les caractÃ¨res ()-+/.=?:"
 
-#: ../include/form.class.php:118
+#: ../../lib/KolabAdmin/include/form.class.php:117
 msgid "<tr><th>Attribute</th><th>Value</th><th>Comment</th></tr>"
 msgstr "<tr><th>Attribut</th><th>Valeur</th><th>Commentaire</th></tr>"
 
-#: ../include/form.class.php:205
-msgid "Yes"
-msgstr "Oui"
-
-#: ../include/form.class.php:205
-msgid "No"
-msgstr "Non"
-
-#: ../include/form.class.php:323
+#: ../../lib/KolabAdmin/include/form.class.php:322
 msgid "Always accept"
 msgstr "Toujours accepter"
 
-#: ../include/form.class.php:324
+#: ../../lib/KolabAdmin/include/form.class.php:323
 msgid "Always reject"
 msgstr "Toujours rejeter"
 
-#: ../include/form.class.php:325
+#: ../../lib/KolabAdmin/include/form.class.php:324
 msgid "Reject if conflicts"
 msgstr "Rejeter si il y a conflit"
 
-#: ../include/form.class.php:326
+#: ../../lib/KolabAdmin/include/form.class.php:325
 msgid "Manual if conflicts"
 msgstr "Passer en mode manuel si il y a conflit"
 
-#: ../include/form.class.php:327
+#: ../../lib/KolabAdmin/include/form.class.php:326
 msgid "Manual"
 msgstr "Manuel"
 
-#: ../include/form.class.php:333 ../include/form.class.php:339
+#: ../../lib/KolabAdmin/include/form.class.php:332
+#: ../../lib/KolabAdmin/include/form.class.php:338
 msgid "Anyone"
 msgstr "N'importe qui"
 
-#: ../include/form.class.php:375
+#: ../../lib/KolabAdmin/include/form.class.php:374
 msgid "* Required field."
 msgstr "* Champ obligatoire"
 
-#: ../include/form.class.php:396 ../include/form.class.php:399
+#: ../../lib/KolabAdmin/include/form.class.php:395
+#: ../../lib/KolabAdmin/include/form.class.php:398
 msgid "Required field "
 msgstr "Champ obligatoire"
 
-#: ../include/form.class.php:396 ../include/form.class.php:399
+#: ../../lib/KolabAdmin/include/form.class.php:395
+#: ../../lib/KolabAdmin/include/form.class.php:398
 msgid " is empty"
 msgstr " est vide"
 
-#: ../include/ldap.class.php.in:54
-msgid ""
-"Error setting LDAP protocol to v3. Please contact your system administrator"
-msgstr ""
-"Erreur lors de la nÃ©gociation du protocole LDAP v3. Veuillez contacter votre "
-"administrateur systÃ¨me"
-
-#: ../include/ldap.class.php.in:184 ../include/ldap.class.php.in:214
-#: ../include/ldap.class.php.in:244
-#, php-format
-msgid "No such object %s"
-msgstr "Il n'existe pas d'objet %s"
-
-#: ../include/ldap.class.php.in:187 ../include/ldap.class.php.in:217
-#: ../include/ldap.class.php.in:247
-#, php-format
-msgid "LDAP Error searching for DN %s: %s"
-msgstr "Erreur LDAP en recherchant le DN %s: %s"
-
-#: ../include/ldap.class.php.in:200
-#, php-format
-msgid "Error searching for DN for UID=%s"
-msgstr "Erreur de recherche du DN pour l'attribut uid=%s"
-
-#: ../include/ldap.class.php.in:230
-#, php-format
-msgid "Error searching for DN for Mail=%s"
-msgstr "Erreur de recherche du DN pour l'attribut mail=%s"
-
-#: ../include/ldap.class.php.in:260
-#, php-format
-msgid "Error searching for DN for alias=%s: %s"
-msgstr "Erreur de recherche du DN pour l'attribut alias=%s: %s"
-
-#: ../include/ldap.class.php.in:273
-#, php-format
-msgid "Error searching for DN for mail or alias %s: %s"
-msgstr "Erreur de recherche du DN pour l'attribut mail ou alias %s: %s"
-
-#: ../include/ldap.class.php.in:336
-msgid "LDAP Error: Can't read maintainers group: "
-msgstr "Erreur LDAP: Impossible de lire le groupe des mainteneurs : "
-
-#: ../include/menu.php:26
+#: ../../lib/KolabAdmin/include/menu.php:26
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: ../include/menu.php:28
+#: ../../lib/KolabAdmin/include/menu.php:28
 msgid "Manage Email Users"
 msgstr "GÃ©rer les utilisateurs de messagerie"
 
-#: ../include/menu.php:33 ../include/menu.php:35
+#: ../../lib/KolabAdmin/include/menu.php:33
+#: ../../lib/KolabAdmin/include/menu.php:35
 msgid "My User Settings"
 msgstr "Mes prÃ©fÃ©rences"
 
-#: ../include/menu.php:37
+#: ../../lib/KolabAdmin/include/menu.php:37
 msgid "Mail Delivery"
 msgstr "Livraison des messages"
 
-#: ../include/menu.php:39
+#: ../../lib/KolabAdmin/include/menu.php:39
 msgid "Forward Email"
 msgstr "Transfert des messages"
 
-#: ../include/menu.php:41
+#: ../../lib/KolabAdmin/include/menu.php:41
 msgid "Vacation"
 msgstr "Message d'absence"
 
-#: ../include/menu.php:47
+#: ../../lib/KolabAdmin/include/menu.php:54
 msgid "Manage Address Book"
 msgstr "GÃ©rer le carnet d'adresse"
 
-#: ../include/menu.php:49
+#: ../../lib/KolabAdmin/include/menu.php:56
 msgid "Create New vCard"
 msgstr "CrÃ©er une nouvelle vCard"
 
-#: ../include/menu.php:54
+#: ../../lib/KolabAdmin/include/menu.php:61
 msgid "Shared Folder"
 msgstr "Dossier partagÃ©"
 
-#: ../include/menu.php:56
+#: ../../lib/KolabAdmin/include/menu.php:63
 msgid "Manage Shared Folders"
 msgstr "GÃ©rer les dossiers partagÃ©s"
 
-#: ../include/menu.php:64
+#: ../../lib/KolabAdmin/include/menu.php:71
 msgid "Manage Distribution Lists"
 msgstr "GÃ©rer les listes de distributions"
 
-#: ../include/menu.php:66
+#: ../../lib/KolabAdmin/include/menu.php:73
 msgid "Create New List"
 msgstr "CrÃ©er une nouvelle liste"
 
-#: ../include/menu.php:72
+#: ../../lib/KolabAdmin/include/menu.php:79
 msgid "Manage Administrators"
 msgstr "GÃ©rer les administrateurs"
 
-#: ../include/menu.php:78 ../include/menu.php:95
+#: ../../lib/KolabAdmin/include/menu.php:85
+#: ../../lib/KolabAdmin/include/menu.php:102
 msgid "Manage Domain Maintainers"
 msgstr "GÃ©rer les mainteneurs de domaines"
 
-#: ../include/menu.php:84
+#: ../../lib/KolabAdmin/include/menu.php:91
 msgid "Manage Maintainers"
 msgstr "GÃ©rer les mainteneurs"
 
-#: ../include/menu.php:92
+#: ../../lib/KolabAdmin/include/menu.php:99
 msgid "Manage Maintainer"
 msgstr "GÃ©rer le mainteneur"
 
-#: ../include/menu.php:103
+#: ../../lib/KolabAdmin/include/menu.php:110
 msgid "Manage Domain Maintainer"
 msgstr "GÃ©rer le mainteneur de domaine"
 
-#: ../include/menu.php:106
-msgid "Settings"
-msgstr "ParamÃ¨tres"
-
-#: ../include/menu.php:108
+#: ../../lib/KolabAdmin/include/menu.php:115
 msgid "System Settings"
 msgstr "GÃ©rer les paramÃ¨tres systÃ¨mes"
 
-#: ../include/menu.php:111 ../include/menu.php:113
+#: ../../lib/KolabAdmin/include/menu.php:118
+#: ../../lib/KolabAdmin/include/menu.php:120
 msgid "About Kolab"
 msgstr "A propos de Kolab"
 
-#: ../include/menu.php:115
-msgid "Erfrakon"
-msgstr "Erfrakon"
+#: ../../lib/KolabAdmin/include/menu.php:122
+msgid "Kolab Systems"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/menu.php:124
+msgid "Technology"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/menu.php:128
+msgid "Versions"
+msgstr "Version"
 
-#: ../include/menu.php:117
-msgid "Intevation"
-msgstr "Intevation"
+#: ../../lib/KolabAdmin/include/auth.class.php:40
+msgid "Server error, no ldap object!"
+msgstr "Erreur serveur, pas d'objet ldap !"
 
-#: ../include/menu.php:119
-msgid "Klarälvdalens Datakonsult"
-msgstr "Klarälvdalens Datakonsult"
+#: ../../lib/KolabAdmin/include/auth.class.php:45
+msgid "Could not bind to LDAP server: "
+msgstr "Impossible de se connecter au serveur LDAP : "
 
-#: ../include/menu.php:121
-msgid "Code Fusion"
-msgstr "Code Fusion"
+#: ../../lib/KolabAdmin/include/auth.class.php:56
+msgid "Could not bind to LDAP server"
+msgstr "Impossible de se connecter au serveur LDAP"
 
-#: ../include/menu.php:123
-msgid "KDE"
-msgstr "KDE"
+#: ../../lib/KolabAdmin/include/auth.class.php:83
+#: ../../lib/KolabAdmin/include/auth.class.php:87
+msgid "Wrong username or password"
+msgstr "Mauvais utilisateur ou mot de passe"
 
-#: ../include/menu.php:127
-msgid "Versions"
-msgstr "Version"
+#: ../../lib/KolabAdmin/include/auth.class.php:124
+msgid "Kolab Groupware login"
+msgstr "Connexion au serveur Kolab"
 
-#: ../include/passwd.php:33
+#: ../../lib/KolabAdmin/include/passwd.php:33
 msgid "Password is empty"
 msgstr "Le mot de passe est vide"
 
-#: ../include/passwd.php:36 ../include/passwd.php:41
+#: ../../lib/KolabAdmin/include/passwd.php:36
+#: ../../lib/KolabAdmin/include/passwd.php:41
 msgid "Passwords dont match"
 msgstr "Les mots de passe ne correspondent pas"
+
+#~ msgid ""
+#~ "Activate delivery to folder (only one of vacation, forward and delivery "
+#~ "to folder can be active at any time)"
+#~ msgstr ""
+#~ "Activer l'envoi dans un dossier (un seul mode des modes suivants : "
+#~ "messages d'absence, transmission, et envoi dans un dossier peut Ãªtre "
+#~ "activÃ©)"
+
+#~ msgid ""
+#~ "Activate email forwarding (only one of vacation, forward and delivery to "
+#~ "folder can be active at any time)"
+#~ msgstr ""
+#~ "Activer le transfert des messages (un seul mode des modes suivants : "
+#~ "messages d'absence, transmission, et envoi dans un dossier peut Ãªtre "
+#~ "activÃ©)"
+
+#~ msgid ""
+#~ "This is the Kolab2 Server. It is Free Software developed by the <a href="
+#~ "\"http://www.kolab.org/\">Kolab Project</a>, with the intention of "
+#~ "bringing groupware functionality to Unix/KDE users as well as Windows "
+#~ "desktops."
+#~ msgstr ""
+#~ "Ceci est le serveur Kolab2. C'est du logiciel libre dÃ©veloppÃ© par  <a ref="
+#~ "\"http://www.kolab.org/\">Le projet Kolab</a>, avec l'intention de "
+#~ "fournir un logiciel de messagerie collaborative au utilisateurs de Unix/"
+#~ "KDE ainsi qu'au utilisateurs Microsoft Windows."
+
+#~ msgid "Kolab builds upon many other Free Software projects, namely:"
+#~ msgstr ""
+#~ "Kolab est construit sur base d'autres projets logiciels libres "
+#~ "spÃ©cifiquement :"
+
+#~ msgid ""
+#~ "The following projects are used in binding the above together, in order "
+#~ "to create the Kolab Server:"
+#~ msgstr "Les projets suivants sont utilisÃ©s pour crÃ©er le Serveur Kolab :"
+
+#~ msgid "The following projects are used as a base for the Kolab Clients:"
+#~ msgstr ""
+#~ "Les projets suivants sont utilisÃ©s comme base pour les clients Kolab :"
+
+#~ msgid "User:"
+#~ msgstr "Utilisateur :"
+
+#~ msgid "Role:"
+#~ msgstr "RÃ´le :"
+
+#~ msgid "Logout"
+#~ msgstr "Se dÃ©connecter"
+
+#~ msgid "Not logged in"
+#~ msgstr "Non connectÃ©"
+
+#~ msgid ""
+#~ "Activate vacation notification (only one of vacation, forward and "
+#~ "delivery to folder can be active at any time)"
+#~ msgstr ""
+#~ "Activer la notification d'absence (un seul mode des modes suivants : "
+#~ "messages d'absence, transmission, et envoi dans un dossier peut Ãªtre "
+#~ "activÃ©)"
+
+#~ msgid ""
+#~ "Addressbook entry DN could not be modified, distribution list <a "
+#~ "href='@kolab_wui@/distributionlist/list.php?action=modify&dn=%s'>'%s'</a> "
+#~ "depends on it. To modify this entry, first remove it from the "
+#~ "distribution list."
+#~ msgstr ""
+#~ "L'entrÃ©e du carnet d'adresse ne peut pas Ãªtre modifiÃ©e, la liste de "
+#~ "distribution <a href='@kolab_wui@/distributionlist/list.php?"
+#~ "action=modify&dn=%s'>'%s'</a> est dÃ©pendante de celle ci. Pour modifier "
+#~ "cette entrÃ©e, veuillez d'abord l'enlever de la liste de distribution."
+
+#~ msgid ""
+#~ "Net/Sieve.php is missing. Without that, filter settings are not available"
+#~ msgstr ""
+#~ "Net/sieve.php est manquant. Sans cela, les prÃ©fÃ©rences des filtres de "
+#~ "messagerie seront indisponibles"
+
+#~ msgid ""
+#~ "Suggest your system administrator to run \"pear install http://pear.php."
+#~ "net/get/Net_Sieve\" on the server"
+#~ msgstr ""
+#~ "SuggÃ©rez Ã  votre administrateur systÃ¨me de lancer  \"pear install http://"
+#~ "pear.php.net/get/Net_Sieve\" sur le serveur"
+
+#~ msgid "Script was:"
+#~ msgstr "Le script Ã©tait :"
+
+#~ msgid ""
+#~ "Net/Sieve.php is missing. Without that, vacation settings are not "
+#~ "available"
+#~ msgstr ""
+#~ "Net/sieve.php est manquant. Sans cela, les prÃ©fÃ©rences des messages "
+#~ "d'absence seront indisponible"
+
+#~ msgid "Days must be at least one"
+#~ msgstr "Le nombre de jours doit Ãªtre 1 au minimum"
+
+#~ msgid "%x"
+#~ msgstr "%x"
+
+#~ msgid "I am out of office until %s.\r\n"
+#~ msgstr "Je suis absent jusqu'au %s.\r\n"
+
+#~ msgid ""
+#~ "In urgent cases, please contact Mrs. <vacation replacement>\r\n"
+#~ "\r\n"
+#~ msgstr ""
+#~ "En cas d'urgence veuillez prÃ©venir Monsieur <vacation replacement>\r\n"
+#~ "\r\n"
+
+#~ msgid "email: <email address of vacation replacement>\r\n"
+#~ msgstr "email: <adresse de messagerie pour les notification d'absence>\r\n"
+
+#~ msgid "phone: +49 711 1111 11\r\n"
+#~ msgstr "TÃ©lÃ©phone: +49 711 1111 11\r\n"
+
+#~ msgid ""
+#~ "fax.:  +49 711 1111 12\r\n"
+#~ "\r\n"
+#~ msgstr ""
+#~ "TÃ©lÃ©copie:  +49 711 1111 12\r\n"
+#~ "\r\n"
+
+#~ msgid "Yours sincerely,\r\n"
+#~ msgstr "Cordialement,\r\n"
+
+#~ msgid "-- \r\n"
+#~ msgstr "-- \r\n"
+
+#~ msgid "<enter your name and email address here>"
+#~ msgstr "<entrer votre nom et adresse de messagerie ici>"
+
+#~ msgid "Quota must be smaller than 4096"
+#~ msgstr "Le quota doit Ãªtre infÃ©rieur Ã  4096"
+
+#~ msgid ""
+#~ "Error setting LDAP protocol to v3. Please contact your system "
+#~ "administrator"
+#~ msgstr ""
+#~ "Erreur lors de la nÃ©gociation du protocole LDAP v3. Veuillez contacter "
+#~ "votre administrateur systÃ¨me"
+
+#~ msgid "No such object %s"
+#~ msgstr "Il n'existe pas d'objet %s"
+
+#~ msgid "LDAP Error searching for DN %s: %s"
+#~ msgstr "Erreur LDAP en recherchant le DN %s: %s"
+
+#~ msgid "Error searching for DN for UID=%s"
+#~ msgstr "Erreur de recherche du DN pour l'attribut uid=%s"
+
+#~ msgid "Error searching for DN for Mail=%s"
+#~ msgstr "Erreur de recherche du DN pour l'attribut mail=%s"
+
+#~ msgid "Error searching for DN for alias=%s: %s"
+#~ msgstr "Erreur de recherche du DN pour l'attribut alias=%s: %s"
+
+#~ msgid "Error searching for DN for mail or alias %s: %s"
+#~ msgstr "Erreur de recherche du DN pour l'attribut mail ou alias %s: %s"
+
+#~ msgid "LDAP Error: Can't read maintainers group: "
+#~ msgstr "Erreur LDAP: Impossible de lire le groupe des mainteneurs : "
+
+#~ msgid "Erfrakon"
+#~ msgstr "Erfrakon"
+
+#~ msgid "Intevation"
+#~ msgstr "Intevation"
+
+#~ msgid "Klarälvdalens Datakonsult"
+#~ msgstr "Klarälvdalens Datakonsult"
+
+#~ msgid "Code Fusion"
+#~ msgstr "Code Fusion"
+
+#~ msgid "KDE"
+#~ msgstr "KDE"
diff --git a/data/locale/it/LC_MESSAGES/messages.po b/data/locale/it/LC_MESSAGES/messages.po
index 13c2c81..0814519 100644
--- a/data/locale/it/LC_MESSAGES/messages.po
+++ b/data/locale/it/LC_MESSAGES/messages.po
@@ -6,407 +6,451 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab-Webadmin Italian\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-25 18:29+0200\n"
+"POT-Creation-Date: 2011-07-15 12:08+0200\n"
 "PO-Revision-Date: 2007-11-21 14:56+0100\n"
 "Last-Translator: Yvette Agostini <yvette at yvetteagostini.it>\n"
 "Language-Team: Kolab development coordination <kolab-devel at kolab.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tpl_messages.php:2
-msgid "The address with DN"
-msgstr "L'indirizzo con il DN"
-
-#: tpl_messages.php:3 tpl_messages.php:21 tpl_messages.php:77
-#: tpl_messages.php:130 tpl_messages.php:192 tpl_messages.php:210
-msgid "has been deleted"
-msgstr "Ã¨ stato cancellato"
+#: tpl_messages.php:2 tpl_messages.php:62
+msgid "Errors:"
+msgstr "Errori:"
 
-#: tpl_messages.php:4
-msgid "Back to list of addresses"
-msgstr "Torna all'elenco degli indirizzi"
+#: tpl_messages.php:3 tpl_messages.php:63
+msgid "Message:"
+msgstr "Messaggi:"
 
-#: tpl_messages.php:5 tpl_messages.php:10
-msgid "(only external addresses without a kolab user account)"
-msgstr "(solo indirizzi esterni senza account utente Kolab)"
+#: tpl_messages.php:4 ../../lib/KolabAdmin/include/menu.php:77
+msgid "Administrators"
+msgstr "Amministratori"
 
-#: tpl_messages.php:6 tpl_messages.php:15 tpl_messages.php:24
-#: tpl_messages.php:80 tpl_messages.php:133 tpl_messages.php:195
-#: tpl_messages.php:218 ../../../www/admin/addressbook/index.php.in:121
-#: ../../../www/admin/user/index.php.in:183
+#: tpl_messages.php:5 tpl_messages.php:69 tpl_messages.php:87
+#: tpl_messages.php:111 tpl_messages.php:210 tpl_messages.php:215
+#: tpl_messages.php:278 ../../www/admin/user/index.php:181
+#: ../../www/admin/addressbook/index.php:121
 msgid "Name"
 msgstr "Nome"
 
-#: tpl_messages.php:7 tpl_messages.php:16 tpl_messages.php:26
-#: tpl_messages.php:70 tpl_messages.php:82 tpl_messages.php:135
-#: tpl_messages.php:175 tpl_messages.php:188 tpl_messages.php:198
-#: tpl_messages.php:221
+#: tpl_messages.php:6 tpl_messages.php:216 tpl_messages.php:279
+#: ../../www/admin/user/index.php:183
+msgid "UID"
+msgstr "UID"
+
+#: tpl_messages.php:7 tpl_messages.php:70 tpl_messages.php:90
+#: tpl_messages.php:114 tpl_messages.php:190 tpl_messages.php:211
+#: tpl_messages.php:217 tpl_messages.php:251 tpl_messages.php:264
+#: tpl_messages.php:280
 msgid "Action"
 msgstr "Azione"
 
-#: tpl_messages.php:8 tpl_messages.php:18 tpl_messages.php:28
-#: tpl_messages.php:74 tpl_messages.php:84 tpl_messages.php:137
-#: tpl_messages.php:200 tpl_messages.php:223
+#: tpl_messages.php:8 tpl_messages.php:218 tpl_messages.php:281
+msgid "Object Deleted, awaiting cleanup..."
+msgstr "Oggetto cancellato, in attesa della pulizia..."
+
+#: tpl_messages.php:9 tpl_messages.php:72 tpl_messages.php:92
+#: tpl_messages.php:116 tpl_messages.php:194 tpl_messages.php:212
+#: tpl_messages.php:219 tpl_messages.php:282
 msgid "Modify"
 msgstr "Modifica"
 
-#: tpl_messages.php:9 tpl_messages.php:19 tpl_messages.php:29
-#: tpl_messages.php:75 tpl_messages.php:85 tpl_messages.php:138
-#: tpl_messages.php:176 tpl_messages.php:189 tpl_messages.php:201
-#: tpl_messages.php:224 ../../../www/admin/addressbook/addr.php.in:277
-#: ../../../www/admin/administrator/admin.php.in:307
-#: ../../../www/admin/distributionlist/list.php.in:300
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:310
-#: ../../../www/admin/sharedfolder/sf.php.in:310
-#: ../../../www/admin/user/user.php.in:764
-#: ../../../www/admin/user/user.php.in:822
+#: tpl_messages.php:10 tpl_messages.php:73 tpl_messages.php:93
+#: tpl_messages.php:117 tpl_messages.php:195 tpl_messages.php:213
+#: tpl_messages.php:220 tpl_messages.php:252 tpl_messages.php:265
+#: tpl_messages.php:283 ../../www/admin/user/user.php:862
+#: ../../www/admin/user/user.php:920
+#: ../../www/admin/administrator/admin.php:311
+#: ../../www/admin/addressbook/addr.php:277
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:314
+#: ../../www/admin/sharedfolder/sf.php:314
+#: ../../www/admin/distributionlist/list.php:304
 msgid "Delete"
 msgstr "Cancella"
 
-#: tpl_messages.php:11 tpl_messages.php:213 tpl_messages.php:226
-msgid "[ ALL ]"
-msgstr "[ TUTTI ]"
+#: tpl_messages.php:11
+msgid "Email Forwarding"
+msgstr "Inoltro Email"
 
-#: tpl_messages.php:12 tpl_messages.php:214 tpl_messages.php:227
-msgid "[ OTHER ]"
-msgstr "[ ALTRI ]"
+#: tpl_messages.php:12
+#, fuzzy
+msgid "Activate email forwarding"
+msgstr "Inoltro Email"
 
-#: tpl_messages.php:13 tpl_messages.php:215 tpl_messages.php:228
-msgid "Filter:"
-msgstr "Filtro:"
+#: tpl_messages.php:13
+msgid "Forward mail to"
+msgstr "Inoltra email a"
 
-#: tpl_messages.php:14 tpl_messages.php:216 tpl_messages.php:229
-msgid "Filter"
-msgstr "Filtro"
+#: tpl_messages.php:14
+msgid "Keep copy on server"
+msgstr "Mantieni una copia sul server"
 
-#: tpl_messages.php:17
-msgid "Entry deleted, awaiting cleanup..."
-msgstr "Cartella cancellata, in attesa della pulizia..."
+#: tpl_messages.php:15 tpl_messages.php:77 tpl_messages.php:229
+#: tpl_messages.php:233 tpl_messages.php:236 tpl_messages.php:239
+#: tpl_messages.php:242 tpl_messages.php:245 tpl_messages.php:248
+#: tpl_messages.php:261 tpl_messages.php:333
+msgid "Update"
+msgstr "Aggiorna"
 
-#: tpl_messages.php:20
-msgid "The administrator with DN"
-msgstr "L'amministratore con il DN"
+#: tpl_messages.php:16
+msgid "ActiveSync Configuration"
+msgstr ""
 
-#: tpl_messages.php:22
-msgid "Back to list of administrators"
-msgstr "Ritorna alla lista degli amministratori"
+#: tpl_messages.php:17
+#, fuzzy
+msgid "Device Alias"
+msgstr "Alias Email"
 
-#: tpl_messages.php:23 ../include/menu.php:70
-msgid "Administrators"
-msgstr "Amministratori"
+#: tpl_messages.php:18
+msgid "Device Mode"
+msgstr ""
 
-#: tpl_messages.php:25 tpl_messages.php:81 tpl_messages.php:134
-#: ../../../www/admin/user/index.php.in:185
-msgid "UID"
-msgstr "UID"
+#: tpl_messages.php:19
+#, fuzzy
+msgid "Picture Settings"
+msgstr "Gestione Servizi"
 
-#: tpl_messages.php:27 tpl_messages.php:83 tpl_messages.php:136
-msgid "Object Deleted, awaiting cleanup..."
-msgstr "Oggetto cancellato, in attesa della pulizia..."
+#: tpl_messages.php:20
+msgid "Enable PNG and GIF formats while syncing"
+msgstr ""
 
-#: tpl_messages.php:30
-msgid ""
-"<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> is a specialist "
-"email solution provider based in Johannesburg, South Africa specialising in "
-"the deployment and support of Kolab."
+#: tpl_messages.php:21
+msgid "Save"
 msgstr ""
-"<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> Ã¨ un provider "
-"specialista in soluzioni email con base a Johannesburg, South Africa  ed Ã¨ "
-"specializzato nell'installazione e nel supporto a Kolab."
 
-#: tpl_messages.php:31
-msgid ""
-"Code Fusion has played, and continues to play, an integral part in "
-"developing and extending the Kolab server; specifically with regards to "
-"enhancing the base Kolab engine, adding in support for Microsoft Active "
-"Directory ® as an LDAP backend, as well as extending the <a href="
-"\"http://www.horde.org/\">Horde project</a> to provide a web-based groupware "
-"client for the Kolab server."
+#: tpl_messages.php:22
+msgid "Clear"
 msgstr ""
-"Code Fusion ha giocato, e continua a giocare, un ruolo integrante nello "
-"sviluppo e nell'estensione del server Kolab; specificamente a riguardo del "
-"miglioramento del motore di base di Kolab, aggiungendo il supporot per "
-"Microsoft Active Directory come backed LDAP, cosÃ¬ come estendendo il <a href="
-"\"http://www.horde.org/\">progetto Horde</a> per fornire un client web per "
-"il server Kolab."
 
-#: tpl_messages.php:32
-msgid ""
-"The following people from Code Fusion are involved in the Kolab project (in "
-"alphabetical order):"
+#: tpl_messages.php:23
+msgid "Forget Device"
 msgstr ""
-"Il seguente personale di Code Fusion prendono parte al progetto Kolab (in "
-"ordine alfabetico):"
 
-#: tpl_messages.php:33
+#: tpl_messages.php:24
+msgid "Are you sure?"
+msgstr ""
+
+#: tpl_messages.php:25
+msgid "The maintainer with DN"
+msgstr "Il Maintainer con DN"
+
+#: tpl_messages.php:26 tpl_messages.php:29 tpl_messages.php:204
+#: tpl_messages.php:207 tpl_messages.php:286 tpl_messages.php:309
+msgid "has been deleted"
+msgstr "Ã¨ stato cancellato"
+
+#: tpl_messages.php:27
+msgid "Back to list of maintainers"
+msgstr "Torna all'elenco dei maintainer"
+
+#: tpl_messages.php:28
+#, fuzzy
+msgid "The distribution list with DN"
+msgstr "L'amministratore con il DN"
+
+#: tpl_messages.php:30
+#, fuzzy
+msgid "Back to list of distribution lists"
+msgstr "Ritorna alla lista degli amministratori"
+
+#: tpl_messages.php:31
 msgid "Attribute"
 msgstr "Attributo"
 
-#: tpl_messages.php:34
+#: tpl_messages.php:32
 msgid "Value"
 msgstr "Valore"
 
-#: tpl_messages.php:35
+#: tpl_messages.php:33
 msgid "Comment"
 msgstr "Commento"
 
-#: tpl_messages.php:36 ../../../www/admin/addressbook/addr.php.in:88
-#: ../../../www/admin/administrator/admin.php.in:139
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:114
-#: ../../../www/admin/maintainer/maintainer.php.in:136
-#: ../../../www/admin/user/user.php.in:384
+#: tpl_messages.php:34 ../../www/admin/user/user.php:449
+#: ../../www/admin/administrator/admin.php:139
+#: ../../www/admin/addressbook/addr.php:88
+#: ../../www/admin/maintainer/maintainer.php:136
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:114
 msgid "First Name"
 msgstr "Nome"
 
-#: tpl_messages.php:37 tpl_messages.php:39 tpl_messages.php:41
-#: tpl_messages.php:43 ../../../www/admin/addressbook/addr.php.in:90
-#: ../../../www/admin/addressbook/addr.php.in:93
-#: ../../../www/admin/administrator/admin.php.in:133
-#: ../../../www/admin/administrator/admin.php.in:141
-#: ../../../www/admin/administrator/admin.php.in:144
-#: ../../../www/admin/distributionlist/list.php.in:117
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:108
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:116
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:119
-#: ../../../www/admin/maintainer/maintainer.php.in:130
-#: ../../../www/admin/maintainer/maintainer.php.in:138
-#: ../../../www/admin/maintainer/maintainer.php.in:141
-#: ../../../www/admin/sharedfolder/sf.php.in:123
-#: ../../../www/admin/user/user.php.in:376
-#: ../../../www/admin/user/user.php.in:386
-#: ../../../www/admin/user/user.php.in:389
+#: tpl_messages.php:35 tpl_messages.php:38 tpl_messages.php:40
+#: tpl_messages.php:42 ../../www/admin/user/user.php:441
+#: ../../www/admin/user/user.php:451 ../../www/admin/user/user.php:455
+#: ../../www/admin/administrator/admin.php:133
+#: ../../www/admin/administrator/admin.php:141
+#: ../../www/admin/administrator/admin.php:144
+#: ../../www/admin/addressbook/addr.php:90
+#: ../../www/admin/addressbook/addr.php:93
+#: ../../www/admin/maintainer/maintainer.php:130
+#: ../../www/admin/maintainer/maintainer.php:138
+#: ../../www/admin/maintainer/maintainer.php:141
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:108
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:116
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:119
+#: ../../www/admin/sharedfolder/sf.php:125
+#: ../../www/admin/distributionlist/list.php:120
 msgid "Required"
 msgstr "Richiesto"
 
-#: tpl_messages.php:38 ../../../www/admin/addressbook/addr.php.in:91
-#: ../../../www/admin/administrator/admin.php.in:142
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:117
-#: ../../../www/admin/maintainer/maintainer.php.in:139
-#: ../../../www/admin/user/user.php.in:387
+#: tpl_messages.php:36 ../../www/admin/user/user.php:452
+#, fuzzy
+msgid "Middle Name"
+msgstr "Nome Cartella"
+
+#: tpl_messages.php:37 ../../www/admin/user/user.php:453
+#: ../../www/admin/administrator/admin.php:142
+#: ../../www/admin/addressbook/addr.php:91
+#: ../../www/admin/maintainer/maintainer.php:139
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:117
 msgid "Last Name"
 msgstr "Cognome"
 
-#: tpl_messages.php:40 ../../../www/admin/administrator/admin.php.in:145
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:120
-#: ../../../www/admin/maintainer/maintainer.php.in:142
-#: ../../../www/admin/user/user.php.in:390
+#: tpl_messages.php:39 ../../www/admin/user/user.php:456
+#: ../../www/admin/administrator/admin.php:145
+#: ../../www/admin/maintainer/maintainer.php:142
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:120
 msgid "Password"
 msgstr "Password"
 
-#: tpl_messages.php:42 ../../../www/admin/administrator/admin.php.in:149
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:124
-#: ../../../www/admin/maintainer/maintainer.php.in:146
-#: ../../../www/admin/user/user.php.in:394
+#: tpl_messages.php:41 ../../www/admin/user/user.php:460
+#: ../../www/admin/administrator/admin.php:149
+#: ../../www/admin/maintainer/maintainer.php:146
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:124
 msgid "Verify Password"
 msgstr "Verifica Password"
 
-#: tpl_messages.php:44 ../../../www/admin/user/user.php.in:398
+#: tpl_messages.php:43 ../../www/admin/user/user.php:464
 msgid "Primary Email Address"
 msgstr "Indirizzo Email principale"
 
-#: tpl_messages.php:45 ../../../www/admin/administrator/admin.php.in:132
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:107
-#: ../../../www/admin/maintainer/maintainer.php.in:129
-#: ../../../www/admin/sharedfolder/sf.php.in:126
-#: ../../../www/admin/user/user.php.in:375
-#: ../../../www/admin/user/user.php.in:377
+#: tpl_messages.php:44 ../../www/admin/user/user.php:440
+#: ../../www/admin/user/user.php:442
+#: ../../www/admin/administrator/admin.php:132
+#: ../../www/admin/maintainer/maintainer.php:129
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:107
+#: ../../www/admin/sharedfolder/sf.php:128
 msgid "Required, non volatile"
 msgstr "Richiesto, permanente"
 
-#: tpl_messages.php:46 ../../../www/admin/addressbook/addr.php.in:94
-#: ../../../www/admin/user/user.php.in:433
+#: tpl_messages.php:45 ../../www/admin/user/user.php:505
+#: ../../www/admin/addressbook/addr.php:94
 msgid "Title"
 msgstr "Titolo"
 
-#: tpl_messages.php:47
+#: tpl_messages.php:46
 msgid "Email Alias"
 msgstr "Alias Email"
 
-#: tpl_messages.php:48 ../../../www/admin/addressbook/addr.php.in:101
-#: ../../../www/admin/user/user.php.in:434
+#: tpl_messages.php:47 ../../www/admin/user/user.php:506
+#: ../../www/admin/addressbook/addr.php:101
 msgid "Organisation"
 msgstr "Organizzazione"
 
-#: tpl_messages.php:49 ../../../www/admin/addressbook/addr.php.in:102
-#: ../../../www/admin/user/user.php.in:435
+#: tpl_messages.php:48 ../../www/admin/user/user.php:507
+#: ../../www/admin/addressbook/addr.php:102
 msgid "Organisational Unit"
 msgstr "UnitÃ  Organizzativa"
 
-#: tpl_messages.php:50 ../../../www/admin/addressbook/addr.php.in:103
-#: ../../../www/admin/user/user.php.in:436
+#: tpl_messages.php:49 ../../www/admin/user/user.php:508
+#: ../../www/admin/addressbook/addr.php:103
 msgid "Room Number"
 msgstr "Numero di stanza"
 
-#: tpl_messages.php:51 ../../../www/admin/addressbook/addr.php.in:104
-#: ../../../www/admin/user/user.php.in:437
+#: tpl_messages.php:50 ../../www/admin/user/user.php:509
+#: ../../www/admin/addressbook/addr.php:104
 msgid "Street Address"
 msgstr "Indirizzo"
 
-#: tpl_messages.php:52 ../../../www/admin/user/user.php.in:438
+#: tpl_messages.php:51 ../../www/admin/user/user.php:510
 msgid "Postbox"
 msgstr "Casella postale"
 
-#: tpl_messages.php:53 ../../../www/admin/addressbook/addr.php.in:106
-#: ../../../www/admin/user/user.php.in:439
+#: tpl_messages.php:52 ../../www/admin/user/user.php:511
+#: ../../www/admin/addressbook/addr.php:106
 msgid "Postal Code"
 msgstr "CAP"
 
-#: tpl_messages.php:54 ../../../www/admin/addressbook/addr.php.in:107
-#: ../../../www/admin/user/user.php.in:440
+#: tpl_messages.php:53 ../../www/admin/user/user.php:512
+#: ../../www/admin/addressbook/addr.php:107
 msgid "City"
 msgstr "CittÃ "
 
-#: tpl_messages.php:55 ../../../www/admin/addressbook/addr.php.in:108
-#: ../../../www/admin/user/user.php.in:441
+#: tpl_messages.php:54 ../../www/admin/user/user.php:513
+#: ../../www/admin/addressbook/addr.php:108
 msgid "Country"
 msgstr "Stato"
 
-#: tpl_messages.php:56 ../../../www/admin/addressbook/addr.php.in:109
-#: ../../../www/admin/user/user.php.in:442
+#: tpl_messages.php:55 ../../www/admin/user/user.php:515
+#: ../../www/admin/addressbook/addr.php:109
 msgid "Telephone Number"
 msgstr "Numero di telefono"
 
-#: tpl_messages.php:57 ../../../www/admin/addressbook/addr.php.in:111
-#: ../../../www/admin/user/user.php.in:444
+#: tpl_messages.php:56 ../../www/admin/user/user.php:517
+#: ../../www/admin/addressbook/addr.php:111
 msgid "Fax Number"
 msgstr "Numero di fax"
 
-#: tpl_messages.php:58 ../include/menu.php:45
+#: tpl_messages.php:57 tpl_messages.php:96 tpl_messages.php:313
+#: ../../lib/KolabAdmin/include/menu.php:52
 msgid "Addressbook"
 msgstr "Agenda"
 
-#: tpl_messages.php:59
+#: tpl_messages.php:58
 msgid "check here to make this users address <br/> visible in the address book"
 msgstr ""
 "Selezionare qui per rendere l'indirizzo di questo utente <br/> visibile "
 "nella rubrica"
 
-#: tpl_messages.php:60
+#: tpl_messages.php:59
 msgid "User Quota in KB"
 msgstr "Quota utente in KB"
 
-#: tpl_messages.php:61 ../../../www/admin/user/user.php.in:448
+#: tpl_messages.php:60 ../../www/admin/user/user.php:521
 msgid "Leave blank for unlimited"
 msgstr "Lasciare bianco per illimitata"
 
-#: tpl_messages.php:62 ../include/form.class.php:76
+#: tpl_messages.php:61 ../../lib/KolabAdmin/include/form.class.php:75
 msgid "Submit"
 msgstr "Invia"
 
-#: tpl_messages.php:63
+#: tpl_messages.php:64 tpl_messages.php:209
+msgid "(only external addresses without a kolab user account)"
+msgstr "(solo indirizzi esterni senza account utente Kolab)"
+
+#: tpl_messages.php:65 tpl_messages.php:82 tpl_messages.php:103
+msgid "[ ALL ]"
+msgstr "[ TUTTI ]"
+
+#: tpl_messages.php:66 tpl_messages.php:83 tpl_messages.php:104
+msgid "[ OTHER ]"
+msgstr "[ ALTRI ]"
+
+#: tpl_messages.php:67 tpl_messages.php:84 tpl_messages.php:105
+msgid "Filter:"
+msgstr "Filtro:"
+
+#: tpl_messages.php:68 tpl_messages.php:85 tpl_messages.php:106
+msgid "Filter"
+msgstr "Filtro"
+
+#: tpl_messages.php:71
+msgid "Entry deleted, awaiting cleanup..."
+msgstr "Cartella cancellata, in attesa della pulizia..."
+
+#: tpl_messages.php:74
 msgid "Email Delivery"
 msgstr "Consegna Email"
 
-#: tpl_messages.php:64
-msgid ""
-"Activate delivery to folder (only one of vacation, forward and delivery to "
-"folder can be active at any time)"
+#: tpl_messages.php:75
+msgid "Activate delivery to folder"
 msgstr ""
-"Attiva invio in cartella (solo uno tra assenza, inoltro e invio in cartella "
-"puÃ² essere attivo allo stesso tempo)"
 
-#: tpl_messages.php:65
+#: tpl_messages.php:76
 msgid "Deliver regular mail to folder"
 msgstr "Consegna la mail normale nella cartella"
 
-#: tpl_messages.php:66 tpl_messages.php:93 tpl_messages.php:153
-#: tpl_messages.php:157 tpl_messages.php:160 tpl_messages.php:163
-#: tpl_messages.php:166 tpl_messages.php:169 tpl_messages.php:172
-#: tpl_messages.php:185 tpl_messages.php:239
-msgid "Update"
-msgstr "Aggiorna"
+#: tpl_messages.php:78
+msgid ""
+"<a href=\"http://www.kde.org\">KDE</a> is a powerful <a href=\"http://www."
+"gnu.org/philosophy/free-sw.html\">Free Software</a> graphical desktop "
+"environment for Linux and Unix workstations. It combines ease of use, "
+"contemporary functionality, and outstanding graphical design with the "
+"technological superiority of the Unix operating system."
+msgstr ""
+"<a href=\"http://www.kde.org\">KDE</a> Ã¨ un potente <a href=\"http://www.gnu."
+"org/philosophy/free-sw.html\">Free Software</a>, un ambiente grafico per "
+"workstation Linux e Unix. Combina facilitÃ  d'uso, funzionalitÃ , e un design "
+"grafico incredibile con le superiori tecnologie del sistema operativo Unix."
 
-#: tpl_messages.php:67 ../include/menu.php:62
-msgid "Distribution Lists"
-msgstr "Liste di distribuzione"
+#: tpl_messages.php:79
+msgid ""
+"<b>KDE</b> is an Internet project that is truly open in every sense. "
+"Development takes place on the Internet and is discussed on our <a href="
+"\"http://www.kde.org/mailinglists.html\">mailing lists</a>, USENET news "
+"groups, and IRC channels to which we invite and welcome everyone."
+msgstr ""
+"<b>KDE</b> Ã¨ un progetto internet che Ã¨ veramente aperto in ogni senso. Lo "
+"sviluppo ha luogo su Internet ed Ã¨ discusso sulle nostre  <a href=\"http://"
+"www.kde.org/mailinglists.html\">mailing list</a>, news group, e canali IRC "
+"in cui invitiamo e diamo il benvenuto a chiunque."
 
-#: tpl_messages.php:68
-msgid "Listname"
-msgstr "Nome della lista"
+#: tpl_messages.php:80
+#, fuzzy
+msgid ""
+"<b>KDE</b> is a mature desktop suite providing a solid basis to an ever "
+"growing number of <a href=\"http://www.kde-apps.org\">applications</a> for "
+"Unix workstations.  KDE has developed a high quality development framework "
+"for Unix, which allows for the rapid and efficient creation of applications."
+msgstr ""
+"<b>KDE</b> Ã¨ una matura desktop suite che provvede una base solida per un "
+"numero sempre crescente di <a href=\"http://apps.kde.com\">applicazioni</a> "
+"per workstation Unix. KDE ha sviluppato un framework di sviluppo di alta "
+"qualitÃ  per Unix, che permette una rapida ed efficiente creazione di "
+"applicazioni."
 
-#: tpl_messages.php:69
-msgid "Visibility"
-msgstr "VisibilitÃ "
+#: tpl_messages.php:81 tpl_messages.php:102
+msgid "Email Users"
+msgstr "Utenti Email"
 
-#: tpl_messages.php:71
-msgid "Internal"
-msgstr "Interno"
+#: tpl_messages.php:86 tpl_messages.php:113
+msgid "Type"
+msgstr "Tipo"
 
-#: tpl_messages.php:72
-msgid "Public"
-msgstr "Pubblico"
+#: tpl_messages.php:88 ../../www/admin/user/activesync.php:496
+msgid "E-mail"
+msgstr "E-mail"
 
-#: tpl_messages.php:73
-msgid "List deleted, awaiting cleanup..."
+#: tpl_messages.php:89
+msgid "uid"
+msgstr "uid"
+
+#: tpl_messages.php:91
+msgid "User Deleted, awaiting cleanup..."
 msgstr "Utente cancellato, in attesa di pulizia..."
 
-#: tpl_messages.php:76
+#: tpl_messages.php:94 tpl_messages.php:151
 #, fuzzy
-msgid "The distribution list with DN"
-msgstr "L'amministratore con il DN"
+msgid "Welcome to the Kolab Groupware Server Maintenance"
+msgstr "Benvenuto all'interfaccia di amministrazione di Kolab"
 
-#: tpl_messages.php:78
+#: tpl_messages.php:95 tpl_messages.php:152 tpl_messages.php:155
+#: tpl_messages.php:312
 #, fuzzy
-msgid "Back to list of distribution lists"
-msgstr "Ritorna alla lista degli amministratori"
-
-#: tpl_messages.php:79 ../include/menu.php:76 ../include/menu.php:93
-#: ../include/menu.php:101
-msgid "Domain Maintainers"
-msgstr "Gestione Maintainer"
+msgid "Manage Users"
+msgstr "Gestione Utenti Email"
 
-#: tpl_messages.php:86
+#: tpl_messages.php:97 tpl_messages.php:153 tpl_messages.php:156
+#: tpl_messages.php:314
 #, fuzzy
-msgid ""
-"Kolab's architecture was done by <a href=\"http://www.erfrakon.com"
-"\">erfrakon</a>; the company also designed and implemented the Kolab 1 "
-"Server and did the design and architecture for the Kolab 2 Server while "
-"providing consulting for the implementation of the Kolab 2 server and the "
-"Kolab 2 clients."
-msgstr ""
-"Il concetto alla base di Kolab Ã¨ nato da <a href=\"http://www.erfrakon.com"
-"\">Erfrakon</a>; la societÃ  ha anche progettato e implementato il Server "
-"Kolab 1 e ha progettato l'architettura del Server Kolab 2 mentre forniva "
-"consulenza per l'implementazione del Server Kolab 2 e dei Client Kolab 2."
-
-#: tpl_messages.php:87
-msgid ""
-"<a href=\"http://www.erfrakon.com\">erfrakon</a> is a consulting company "
-"dedicated to opensource software and Linux. The main tasks of erfrakon "
-"within the Kolab project are the principle design and architecure of the "
-"Kolab groupware solution and the creation of the Kolab 1 server."
-msgstr ""
-"<a href=\"http://www.erfrakon.com\">erfrakon</a> Ã¨ una compagnia di "
-"consulenza dedicata al software opensource e Linux. I compiti principali "
-"della efrakon nel progetto Kolab sono il progetto dell'architettura della "
-"soluzione di groupware Kolab e la crezione del server Kolab 1."
-
-#: tpl_messages.php:88
-msgid "The following people worked on Kolab for erfrakon:"
-msgstr "Le seguenti persone hanno lavorato a Kolab per conto della erfrakon:"
+msgid "Shared Folders"
+msgstr "Cartella Condivisa"
 
-#: tpl_messages.php:89
-msgid "Email Forwarding"
-msgstr "Inoltro Email"
+#: tpl_messages.php:98 tpl_messages.php:157 tpl_messages.php:187
+#: tpl_messages.php:315 ../../lib/KolabAdmin/include/menu.php:69
+msgid "Distribution Lists"
+msgstr "Liste di distribuzione"
 
-#: tpl_messages.php:90
-msgid ""
-"Activate email forwarding (only one of vacation, forward and delivery to "
-"folder can be active at any time)"
-msgstr ""
-"Attiva inoltro email (solo uno tra assenza, inoltro e invio in cartella puÃ² "
-"essere attivo allo stesso tempo)"
+#: tpl_messages.php:99 tpl_messages.php:214 tpl_messages.php:317
+#: ../../lib/KolabAdmin/include/menu.php:89
+#: ../../lib/KolabAdmin/include/menu.php:97
+msgid "Maintainers"
+msgstr "Maintainer"
 
-#: tpl_messages.php:91
-msgid "Forward mail to"
-msgstr "Inoltra email a"
+#: tpl_messages.php:100 tpl_messages.php:158 tpl_messages.php:277
+#: tpl_messages.php:318 ../../lib/KolabAdmin/include/menu.php:83
+#: ../../lib/KolabAdmin/include/menu.php:100
+#: ../../lib/KolabAdmin/include/menu.php:108
+msgid "Domain Maintainers"
+msgstr "Gestione Maintainer"
 
-#: tpl_messages.php:92
-msgid "Keep copy on server"
-msgstr "Mantieni una copia sul server"
+#: tpl_messages.php:101 tpl_messages.php:154 tpl_messages.php:159
+#: tpl_messages.php:276 tpl_messages.php:320
+#, fuzzy
+msgid "About"
+msgstr "Informazioni su Kolab"
 
-#: tpl_messages.php:94
+#: tpl_messages.php:107
 msgid ""
 "Intevation GmbH coordinated the Projects: Kroupware and Proko2, which are "
 "the main driving force behind Kolab1&2. In addition to project management "
@@ -416,7 +460,7 @@ msgstr ""
 "principale forza guida dietro Kolab1&2. In aggiunta al management del "
 "progetto Intevation ha effettuato buona parte del controllo qualitÃ ."
 
-#: tpl_messages.php:95
+#: tpl_messages.php:108
 msgid ""
 "Intevation GmbH is a IT-company exclusively focusing on Free Software. Its "
 "business units are strategic consulting, project management and geographic "
@@ -426,139 +470,130 @@ msgstr ""
 "Software. Le sue business units sono la consulenza strategica, il project "
 "management e i sistemi di informazioni geografiche."
 
-#: tpl_messages.php:96
+#: tpl_messages.php:109
 msgid "The following people worked on Kolab for Intevation:"
 msgstr "Le seguenti persone hanno lavorato a Kolab per Intevation:"
 
-#: tpl_messages.php:97
-msgid ""
-"The Kolab 1 KDE client and the Kolab 2 KDE Client (Kontact) was developed by"
-msgstr ""
-"Il client KDE Kolab 1 e il client KDE Kolab 2 (Kontact) sono stati "
-"sviluppati da"
-
-#: tpl_messages.php:98
-msgid ""
-"Klarälvdalens Datakonsult AB is a consulting company dedicated to "
-"opensource software, Linux, and the <a href=\"http://www.trolltech.com/"
-"products/qt/\">Qt</a> library. The main tasks of KDAB within the Kolab "
-"project are design and implementation of the Kolab KDE clients and the "
-"implementation of the current Kolab 2 server."
-msgstr ""
-"Klarälvdalens Datakonsult AB Ã¨ un'azienda di consulenza dedicata al "
-"software opensource, Linux,e la libreria<a href=\"http://www.trolltech.com/"
-"products/qt/\">Qt</a>.I compiti principali di KDAB all'interno del progetto "
-"Kolab sono il design e l'implementazione dei client KDE e l'implementazione "
-"del corrente server Kolab 2."
-
-#: tpl_messages.php:99
-msgid ""
-"The following people worked on Kolab for Klarälvdalens Datakonsult AB:"
-msgstr ""
-"Le seguenti persone hanno lavorato a Kolab per la Klarälvdalens "
-"Datakonsult AB:"
+#: tpl_messages.php:110
+msgid "Shared folders"
+msgstr "Cartelle condivise"
 
-#: tpl_messages.php:100
-msgid ""
-"<a href=\"http://www.kde.org\">KDE</a> is a powerful <a href=\"http://www."
-"gnu.org/philosophy/free-sw.html\">Free Software</a> graphical desktop "
-"environment for Linux and Unix workstations. It combines ease of use, "
-"contemporary functionality, and outstanding graphical design with the "
-"technological superiority of the Unix operating system."
-msgstr ""
-"<a href=\"http://www.kde.org\">KDE</a> Ã¨ un potente <a href=\"http://www.gnu."
-"org/philosophy/free-sw.html\">Free Software</a>, un ambiente grafico per "
-"workstation Linux e Unix. Combina facilitÃ  d'uso, funzionalitÃ , e un design "
-"grafico incredibile con le superiori tecnologie del sistema operativo Unix."
+#: tpl_messages.php:112
+msgid "Server"
+msgstr "Server"
 
-#: tpl_messages.php:101
-msgid ""
-"<b>KDE</b> is an Internet project that is truly open in every sense. "
-"Development takes place on the Internet and is discussed on our <a href="
-"\"http://www.kde.org/mailinglists.html\">mailing lists</a>, USENET news "
-"groups, and IRC channels to which we invite and welcome everyone."
-msgstr ""
-"<b>KDE</b> Ã¨ un progetto internet che Ã¨ veramente aperto in ogni senso. Lo "
-"sviluppo ha luogo su Internet ed Ã¨ discusso sulle nostre  <a href=\"http://"
-"www.kde.org/mailinglists.html\">mailing list</a>, news group, e canali IRC "
-"in cui invitiamo e diamo il benvenuto a chiunque."
+#: tpl_messages.php:115
+msgid "Folder deleted, awaiting cleanup..."
+msgstr "Cartella cancellata, in attesa della pulizia..."
 
-#: tpl_messages.php:102
+#: tpl_messages.php:118
 #, fuzzy
-msgid ""
-"<b>KDE</b> is a mature desktop suite providing a solid basis to an ever "
-"growing number of <a href=\"http://www.kde-apps.org\">applications</a> for "
-"Unix workstations.  KDE has developed a high quality development framework "
-"for Unix, which allows for the rapid and efficient creation of applications."
-msgstr ""
-"<b>KDE</b> Ã¨ una matura desktop suite che provvede una base solida per un "
-"numero sempre crescente di <a href=\"http://apps.kde.com\">applicazioni</a> "
-"per workstation Unix. KDE ha sviluppato un framework di sviluppo di alta "
-"qualitÃ  per Unix, che permette una rapida ed efficiente creazione di "
-"applicazioni."
-
-#: tpl_messages.php:103
-msgid "Kolab2 Groupware Server"
-msgstr "Kolab2 Groupware Server"
+msgid "Kolab Groupware Solution - Technologies"
+msgstr "Kolab Groupware login"
 
-#: tpl_messages.php:104
+#: tpl_messages.php:119
 msgid ""
-"This is the Kolab2 Server. It is Free Software developed by the <a href="
-"\"http://www.kolab.org/\">Kolab Project</a>, with the intention of bringing "
-"groupware functionality to Unix/KDE users as well as Windows desktops."
+"This is the server of the Kolab Groupware Solution. It is <a href=\"http://"
+"fsfe.org/about/basics/freesoftware\">Free Software</a> developed by the <a "
+"href=\"http://www.kolab.org/\">Kolab Community</a>, which works in "
+"collaboration with and as part of many other communities and projects to "
+"bring you this software."
 msgstr ""
-"Questo Ã¨ il Server Kolab2. E' un Free Software sviluppato da <a href="
-"\"http://www.kolab.org/\">Kolab Project</a>, con l'intenzione di portare "
-"funzionalitÃ  groupware agli utenti Unix/KDE cosÃ¬ come ai desktop Windows."
 
-#: tpl_messages.php:105
-msgid "Kolab builds upon many other Free Software projects, namely:"
+#: tpl_messages.php:120
+msgid ""
+"For this server, Free Software communities and projects that the Kolab "
+"Community is a part of and builds upon include:"
 msgstr ""
-"Kolab Ã¨ costruito sulla base di molti altri progetti Free Software, "
-"precisamente:"
 
-#: tpl_messages.php:106
+#: tpl_messages.php:121
 msgid "(Mail Scanner)"
 msgstr ""
 
-#: tpl_messages.php:107
+#: tpl_messages.php:122
 msgid "(HTTP Server)"
 msgstr "(Server HTTP)"
 
-#: tpl_messages.php:108
+#: tpl_messages.php:123
 msgid "(Virus Scanner)"
 msgstr ""
 
-#: tpl_messages.php:109
-msgid "(IMAP Server)"
+#: tpl_messages.php:124
+#, fuzzy
+msgid "(IMAP Server & Database)"
 msgstr "(Server IMAP)"
 
-#: tpl_messages.php:110
+#: tpl_messages.php:125
 msgid "(LDAP Server)"
 msgstr "(Server LDAP)"
 
-#: tpl_messages.php:111
+#: tpl_messages.php:126
 msgid "(MTA)"
 msgstr "(Server SMTP)"
 
-#: tpl_messages.php:112
+#: tpl_messages.php:127
 #, fuzzy
 msgid "(SPAM Filter)"
 msgstr "Filtro"
 
-#: tpl_messages.php:113
+#: tpl_messages.php:128
+msgid "(ActiveSync Support)"
+msgstr ""
+
+#: tpl_messages.php:129
+msgid "(Web client)"
+msgstr ""
+
+#: tpl_messages.php:130 tpl_messages.php:131
+msgid "(Server side scripting & glue)"
+msgstr ""
+
+#: tpl_messages.php:132
+msgid "(This interface)"
+msgstr ""
+
+#: tpl_messages.php:133
 msgid ""
-"The following projects are used in binding the above together, in order to "
-"create the Kolab Server:"
+"For the clients, Free Software communities and projects that the Kolab "
+"Community is a part of and builds upon include:"
 msgstr ""
-"I seguenti progetti sono stati usati come collegamento di quelli suindicati, "
-"per creare il Server Kolab:"
 
-#: tpl_messages.php:114
-msgid "The following projects are used as a base for the Kolab Clients:"
-msgstr "I seguenti progetti sono stati usati come base per i Client Kolab:"
+#: tpl_messages.php:134
+msgid "History & Credits"
+msgstr ""
 
-#: tpl_messages.php:115
+#: tpl_messages.php:135
+msgid ""
+"In 2010, <a href=\"http://www.intevation.de\">Intevation</a>, <a href="
+"\"http://www.kdab.com/\">KDAB</a>, <a href=\"http://uk.linkedin.com/in/"
+"pauljadams\">Dr. Paul Adams</a> and <a href=\"http://ch.linkedin.com/in/"
+"georggreve\">Georg Greve</a> worked together to re-launch the professional "
+"support of the Kolab Groupware Solution into the <a href=\"http://kolabsys."
+"com\">Kolab Systems AG</a>, which took the place of the Kolab-Konsortium."
+msgstr ""
+
+#: tpl_messages.php:136
+msgid ""
+"Kolab Systems together with its partner network, the Kolab Enterprise "
+"Community, has since been the primary facilitator of the Kolab Community, "
+"including for the provision of infrastructure, and the focal point for "
+"further development of the Kolab Groupware Solution, e.g. for inclusion of "
+"ActiveSync support in version 2.3 of the server, or for native packaging on "
+"the various platforms."
+msgstr ""
+
+#: tpl_messages.php:137
+msgid ""
+"If you want to join the community, please visit <a href=\"http://wiki.kolab."
+"org\">http://wiki.kolab.org</a> and <a href=\"http://kolab.org\">http://"
+"kolab.org</a>."
+msgstr ""
+
+#: tpl_messages.php:138
+msgid "History before 2010"
+msgstr ""
+
+#: tpl_messages.php:139
 msgid ""
 "The Kolab project owes a great deal of thanks to the people of the <a href="
 "\"http://www.openpkg.org/\">OpenPKG</a> project. OpenPKG allows Kolab to run "
@@ -571,7 +606,7 @@ msgstr ""
 "fornendo una base comune, facile da installare, cross-platform su cui "
 "costruire il server."
 
-#: tpl_messages.php:116
+#: tpl_messages.php:140
 msgid ""
 "To use all Kolab2 features you need an interoperable client. The KDE Kolab "
 "Client was the first such client to be developed and is still considered the "
@@ -587,7 +622,7 @@ msgstr ""
 "Molti ringraziamenti vanno al <a href=\"http://www.kde.org\">KDE Project</a> "
 "per aver fornito una base cosÃ¬ potente su cui costruire questo client."
 
-#: tpl_messages.php:117
+#: tpl_messages.php:141
 msgid ""
 "Users of Outlook on Microsoft Windows are able to use a proprietary plug-in "
 "to inter-operate with the Kolab server. For Kolab2 the preferred plug-in is "
@@ -601,7 +636,7 @@ msgstr ""
 "Technologies CC. Radley ha lavorato a stretto contatto con la comunitÃ  Kolab "
 "ed ha aiutato nello sviluppo del formato di memorizzazione di Kolab2."
 
-#: tpl_messages.php:118
+#: tpl_messages.php:142
 msgid ""
 "A list of additional Outlook plug-ins that provide interoperability with the "
 "Kolab server is <a href=\"http://www.kolab.org/kolab-plugins.html"
@@ -611,7 +646,7 @@ msgstr ""
 "con il server Kolab Ã¨ <a href=\"http://www.kolab.org/kolab-plugins.html"
 "\">tenuta sul sito web di Kolab</a>."
 
-#: tpl_messages.php:119
+#: tpl_messages.php:143
 msgid ""
 "There is also a <a href=\"http://www.kolab.org/webclient.html\">web-based "
 "client</a> in development which provides full groupware functionality to "
@@ -629,7 +664,7 @@ msgstr ""
 "possibile senza l'eccellente <a href=\"http://www.horde.org/\">Horde "
 "project</a> su cui Ã¨ costruito."
 
-#: tpl_messages.php:120
+#: tpl_messages.php:144
 msgid ""
 "As Kolab is a Free Software project, anyone can help to extend the "
 "functionality of the software. An active community has developed around the "
@@ -649,13 +684,13 @@ msgstr ""
 "(gestione progetto) e <a href=\"http://www.klaralvdalens-datakonsult.se/"
 "\">Klarälvdalens Datakonsult</a> (client)."
 
-#: tpl_messages.php:121
+#: tpl_messages.php:145
+#, fuzzy
 msgid ""
-"<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> joined the "
-"project soon after the original Kolab1 server was released. Its developers "
-"are primarily responsible for an updated engine (which forms the base of the "
-"Kolab2 server), the web client, as well as contributing to development of "
-"the Kolab2 storage format."
+"Code Fusion cc joined the project soon after the original Kolab1 server was "
+"released. Its developers are primarily responsible for an updated engine "
+"(which forms the base of the Kolab2 server), the web client, as well as "
+"contributing to development of the Kolab2 storage format."
 msgstr ""
 "<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> si Ã¨ unita al "
 "progetto poco dopo il rilascio del server Kolab1 originale. I suoi "
@@ -663,83 +698,260 @@ msgstr ""
 "forma la base del server Kolab2), il client web, cosÃ¬ come hanno contribuito "
 "allo sviluppo del formato di memorizzazione di Kolab2."
 
-#: tpl_messages.php:122
+#: tpl_messages.php:146
 msgid "Other contributors:"
 msgstr "Altri partecipanti:"
 
-#: tpl_messages.php:123
+#: tpl_messages.php:147
 msgid "CSSified the Kolab1 web admin GUI"
 msgstr "Modifica dell'interfaccia Web per l'uso dei CSS"
 
-#: tpl_messages.php:124
+#: tpl_messages.php:148
+msgid "Kudos"
+msgstr ""
+
+#: tpl_messages.php:149
+#, fuzzy
 msgid ""
-"The principal authors of the Kolab client and server software are (in "
-"alphabetical order):"
+"Principal contributors of the Kolab Groupware Solution are (in alphabetical "
+"order):"
 msgstr ""
 "I principali autori dei client e del server Kolab sono (in ordine "
 "alfabetico):"
 
-#: tpl_messages.php:125
-msgid "Enter UID and password to login"
-msgstr "Inserisci il nome utente e la password per entrare"
+#: tpl_messages.php:150
+msgid ""
+"...and anyone we forgot. Please let us know at <a href=\"mail:kolab-"
+"devel at kolab.org\">kolab-devel at kolab.org</a> so we can add you to this list."
+msgstr ""
 
-#: tpl_messages.php:126
-msgid "Username:"
-msgstr "Nome utente:"
+#: tpl_messages.php:160
+#, fuzzy
+msgid "Kolab Groupware Solution"
+msgstr "Kolab Groupware login"
 
-#: tpl_messages.php:127
-msgid "Password:"
-msgstr "Password:"
+#: tpl_messages.php:161
+msgid ""
+"This is the server of the Kolab Groupware Solution, a <a href=\"http://fsfe."
+"org/about/basics/freesoftware\">Free Software</a> Personal Information "
+"Management (PIM) solution developed by the <a href=\"http://www.kolab.org/"
+"\">Kolab Community</a>. Any installation of the Kolab Groupware Solution "
+"would normally include one or more of these servers, in combination with a "
+"variety of clients for its users. If you are interested in the technology, "
+"you can read more about it <a href=\"/admin/kolab/technology.php\">here</a>."
+msgstr ""
 
-#: tpl_messages.php:128 ../include/auth.class.php.in:124
-msgid "Kolab Groupware login"
-msgstr "Kolab Groupware login"
+#: tpl_messages.php:162
+msgid "Why Kolab?"
+msgstr ""
 
-#: tpl_messages.php:129
-msgid "The maintainer with DN"
-msgstr "Il Maintainer con DN"
+#: tpl_messages.php:163
+msgid ""
+"There is a wide variety of reasons why Kolab should be your choice. Several "
+"of them have been put together for different target groups in the"
+msgstr ""
 
-#: tpl_messages.php:131
-msgid "Back to list of maintainers"
-msgstr "Torna all'elenco dei maintainer"
+#: tpl_messages.php:164 tpl_messages.php:179
+msgid "Handouts for the Kolab Groupware Solution by Kolab Systems"
+msgstr ""
 
-#: tpl_messages.php:132 ../include/menu.php:82 ../include/menu.php:90
-msgid "Maintainers"
-msgstr "Maintainer"
+#: tpl_messages.php:165
+msgid "To summarize just some points, Kolab is your solution, if"
+msgstr ""
 
-#: tpl_messages.php:139
-msgid "User:"
-msgstr "Utente:"
+#: tpl_messages.php:166
+msgid ""
+"you want a solution that seamlessly integrates into your existing "
+"environment;"
+msgstr ""
 
-#: tpl_messages.php:140
-msgid "Role:"
-msgstr "Ruolo:"
+#: tpl_messages.php:167
+msgid ""
+"you want full control over your data, with all the convenience of the cloud;"
+msgstr ""
 
-#: tpl_messages.php:141
-msgid "Logout"
-msgstr "Disconnetti"
+#: tpl_messages.php:168
+msgid "you have elevated security needs for your data;"
+msgstr ""
 
-#: tpl_messages.php:142
-msgid "Not logged in"
-msgstr "Non connesso"
+#: tpl_messages.php:169
+msgid ""
+"you have a very large installation, or want to reduce your hardware "
+"footprint;"
+msgstr ""
 
-#: tpl_messages.php:143
-msgid "Errors:"
-msgstr "Errori:"
+#: tpl_messages.php:170
+msgid "you have to operate in diverse environments and installations;"
+msgstr ""
 
-#: tpl_messages.php:144
-msgid "Message:"
-msgstr "Messaggi:"
+#: tpl_messages.php:171
+msgid ""
+"strategic issues are important to you, e.g. you need sovereignty of the "
+"software you deploy;"
+msgstr ""
 
-#: tpl_messages.php:145
+#: tpl_messages.php:172
+msgid "your users should be fully productive whether they are on- or offline;"
+msgstr ""
+
+#: tpl_messages.php:173
+msgid ""
+"you want the flexibility to create solutions for your specialised needs;"
+msgstr ""
+
+#: tpl_messages.php:174
+msgid ""
+"you want Free Software/Open Source, but also want the professional support "
+"without having to resort to proprietary lock-in."
+msgstr ""
+
+#: tpl_messages.php:175
+msgid "More Information"
+msgstr ""
+
+#: tpl_messages.php:176
+msgid "Kolab Community Web Site"
+msgstr ""
+
+#: tpl_messages.php:177
+msgid "Kolab Community Wiki"
+msgstr ""
+
+#: tpl_messages.php:178
+msgid "Article: "
+msgstr ""
+
+#: tpl_messages.php:180
+msgid "Warranties & Commercial Support"
+msgstr ""
+
+#: tpl_messages.php:181
+msgid ""
+"This is the <b>Community Edition</b> of the Kolab Groupware Server. It is "
+"provided by Kolab Systems as fully <a href=\"http://fsfe.org/about/basics/"
+"freesoftware\">Free Software</a> and you can use it to the fullest extent "
+"and any purpose. There are no license costs or other obligations other than "
+"those set forth in the respective Free Software licenses of the various "
+"components. <b>There are no warranties or guarantees of any kind, nor is "
+"there any guaranteed support. You are running this software entirely at your "
+"own risk.</b>"
+msgstr ""
+
+#: tpl_messages.php:182
+msgid ""
+"There is a wide variety of commercial support options and warranties "
+"available by <a href=\"/admin/kolab/kolabsystems.php\">Kolab Systems AG</a> "
+"and its network of partners, the Kolab Enterprise Community. This support "
+"comes with access to the additionally quality assured and hardened "
+"<b>Certified Kolab</b> edition, which like the community edition is fully "
+"available as Free Software, so has all the advantages of the Community "
+"Edition and is free of hidden lock-in."
+msgstr ""
+
+#: tpl_messages.php:183
+msgid ""
+"Kolab Systems AG will provide limited support for the Community Edition on a "
+"case-by-case basis, but with no guaranteed response times, as availability "
+"permits, and at rates that may be adjusted due to the work load at the time "
+"of the request. <b>It is strongly recommended that for mission-critical "
+"professional deployments of the Kolab Groupware Solution you at least choose "
+"one of the partially self-supported On Demand support models.</b>"
+msgstr ""
+
+#: tpl_messages.php:184
+msgid ""
+"Kolab Systems provides an overview of all available <a href=\"http://"
+"kolabsys.com/index.php/solutions/101\">Service Level Agreements (SLA)</a>. "
+"To upgrade your installation to Certified Kolab, please contact"
+msgstr ""
+
+#: tpl_messages.php:185 tpl_messages.php:301
+msgid "or visit our"
+msgstr ""
+
+#: tpl_messages.php:186 tpl_messages.php:302
+msgid "web page"
+msgstr ""
+
+#: tpl_messages.php:188
+msgid "Listname"
+msgstr "Nome della lista"
+
+#: tpl_messages.php:189
+msgid "Visibility"
+msgstr "VisibilitÃ "
+
+#: tpl_messages.php:191
+msgid "Internal"
+msgstr "Interno"
+
+#: tpl_messages.php:192
+msgid "Public"
+msgstr "Pubblico"
+
+#: tpl_messages.php:193
+msgid "List deleted, awaiting cleanup..."
+msgstr "Utente cancellato, in attesa di pulizia..."
+
+#: tpl_messages.php:196
+msgid "Welcome to the Kolab administration interface"
+msgstr "Benvenuto all'interfaccia di amministrazione di Kolab"
+
+#: tpl_messages.php:197
+msgid "NOTE:"
+msgstr "NOTA:"
+
+#: tpl_messages.php:198
+#, fuzzy
+msgid ""
+"No account is configured to receive mail for administrative addresses. If "
+"you have not yet created an account for this, "
+msgstr ""
+"Nessun account Ã¨ configurato per ricevere mail per gli indirizzi "
+"amministrativi. Se non Ã¨ stato ancora creato un account per questo, fatelo "
+"prima di proseguire"
+
+#: tpl_messages.php:199
+msgid "please do so"
+msgstr ""
+
+#: tpl_messages.php:200
+msgid "and then go"
+msgstr ""
+
+#: tpl_messages.php:201
+msgid "here"
+msgstr "qui"
+
+#: tpl_messages.php:202
+msgid "to set up forwarding of mail to administrative email addresses."
+msgstr "per impostare l'inoltro delle email a degli indirizzi amministrativi."
+
+#: tpl_messages.php:203
+msgid "The address with DN"
+msgstr "L'indirizzo con il DN"
+
+#: tpl_messages.php:205
+msgid "Back to list of addresses"
+msgstr "Torna all'elenco degli indirizzi"
+
+#: tpl_messages.php:206
+msgid "The administrator with DN"
+msgstr "L'amministratore con il DN"
+
+#: tpl_messages.php:208
+msgid "Back to list of administrators"
+msgstr "Ritorna alla lista degli amministratori"
+
+#: tpl_messages.php:221
 msgid "Kolab Server Settings"
 msgstr "Impostazioni Server Kolab"
 
-#: tpl_messages.php:146
+#: tpl_messages.php:222
 msgid "Administrative email addresses"
 msgstr "Indirizzi email amministrativi"
 
-#: tpl_messages.php:147
+#: tpl_messages.php:223
 msgid ""
 "You have not yet set up a receiving account for the administrative email "
 "addresses hostmaster at yourdomain.tld, postmaster at yourdomain.tld, MAILER-"
@@ -756,66 +968,66 @@ msgstr ""
 "indirizzi. PiÃ¹ tardi sarÃ  possibile aggiungere o rimuovere indirizzi dalle "
 "liste come per ogni altra lista di distribuzione"
 
-#: tpl_messages.php:148
+#: tpl_messages.php:224
 #, fuzzy
 msgid ""
 "Email address of account that should receive administrative mail for domain "
 msgstr ""
 "Indirizzi email degli account che dovranno ricevere la posta amministrativa:"
 
-#: tpl_messages.php:149
+#: tpl_messages.php:225
 msgid "Create Distribution Lists"
 msgstr "Crea liste di distribuzione"
 
-#: tpl_messages.php:150
+#: tpl_messages.php:226
 msgid "Enable or Disable individual Services"
 msgstr "Abilitazione o Disabilitazione individuale dei servizi"
 
-#: tpl_messages.php:151
+#: tpl_messages.php:227
 msgid "Service"
 msgstr "Servizio"
 
-#: tpl_messages.php:152
+#: tpl_messages.php:228
 msgid "Enabled"
 msgstr "Attivo"
 
-#: tpl_messages.php:154
+#: tpl_messages.php:230
 msgid "Quota settings"
 msgstr "Impostazioni della quota"
 
-#: tpl_messages.php:155
+#: tpl_messages.php:231
 msgid "Warn users when they have used"
 msgstr "Avvisa gli utenti quando hanno usato"
 
-#: tpl_messages.php:156
+#: tpl_messages.php:232
 #, php-format
 msgid "% of their quota"
 msgstr "% della loro quota"
 
-#: tpl_messages.php:158
+#: tpl_messages.php:234
 msgid "Free/Busy settings"
 msgstr "Impostazioni disponibilitÃ  (FreeBusy)"
 
-#: tpl_messages.php:159
+#: tpl_messages.php:235
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 "Permetti a utenti non autenticati di scaricare le informazioni di "
 "disponibilitÃ  (Free/Busy)"
 
-#: tpl_messages.php:161
+#: tpl_messages.php:237
 msgid "When creating free/busy lists, include data from"
 msgstr ""
 "Quando vengono create le liste di disponibilitÃ , includi le informazioni da"
 
-#: tpl_messages.php:162
+#: tpl_messages.php:238
 msgid "days in the past"
 msgstr "giorni nel passato"
 
-#: tpl_messages.php:164
+#: tpl_messages.php:240
 msgid "Privileged Networks"
 msgstr "Reti privilegiate"
 
-#: tpl_messages.php:165
+#: tpl_messages.php:241
 msgid ""
 "Networks allowed to relay and send mail through unauthenticated SMTP "
 "connections to the Kolab server (comma separated networks in x.x.x.x/y "
@@ -825,11 +1037,11 @@ msgstr ""
 "connessioni SMTP non autenticate al server Kolab (lista di reti x.x.x.x/y  "
 "separate da virgola):"
 
-#: tpl_messages.php:167
+#: tpl_messages.php:243
 msgid "SMTP \"smarthost/relayhost\""
 msgstr "Server Relay SMTP ( \"smarthost/relayhost\")"
 
-#: tpl_messages.php:168
+#: tpl_messages.php:244
 msgid ""
 "Smarthost (and optional port) to use to send outgoing mail (host.domain."
 "tld). Leave empty for no relayhost."
@@ -837,11 +1049,11 @@ msgstr ""
 "Smarthost da usare per inviare la posta verso l'esterno (host.domain.tld). "
 "Lasciare vuoto per non usarlo."
 
-#: tpl_messages.php:170
+#: tpl_messages.php:246
 msgid "Accept Internet Mail"
 msgstr "Accetta Email Internet"
 
-#: tpl_messages.php:171
+#: tpl_messages.php:247
 #, fuzzy
 msgid ""
 "Accept mail from other domains over unauthenticated SMTP. This must be "
@@ -853,30 +1065,30 @@ msgstr ""
 "essere abilitato se si vuole usare il server Kolab per ricevere email da "
 "altri domini internet."
 
-#: tpl_messages.php:173
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:134
+#: tpl_messages.php:249
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:134
 msgid "Domains"
 msgstr "Domini"
 
-#: tpl_messages.php:174
+#: tpl_messages.php:250
 msgid "Domain"
 msgstr "Dominio"
 
-#: tpl_messages.php:177 tpl_messages.php:190
+#: tpl_messages.php:253 tpl_messages.php:266
 msgid "Add"
 msgstr "Aggiungi"
 
-#: tpl_messages.php:178
+#: tpl_messages.php:254
 msgid "Mail Filter Settings"
 msgstr "Impostazioni Filtro Mail"
 
-#: tpl_messages.php:179
+#: tpl_messages.php:255
 msgid "Check messages for mismatching From header and envelope from."
 msgstr ""
 "Controlla i messaggi per verificare che il mittente nell'header sia lo "
 "stesso dell'email"
 
-#: tpl_messages.php:180
+#: tpl_messages.php:256
 msgid ""
 "Use the Sender header instead of From for the above checks if Sender is "
 "present."
@@ -884,11 +1096,11 @@ msgstr ""
 "Usa l'intestazione Sender invece del From per i controlli precedenti se "
 "Sender Ã¨ presente."
 
-#: tpl_messages.php:181
+#: tpl_messages.php:257
 msgid "Action to take for messages that fail the check:"
 msgstr ""
 
-#: tpl_messages.php:182
+#: tpl_messages.php:258
 msgid ""
 "Reject the message, except if it originates from the outside and the From "
 "header matches one of Kolab server's domains. In that case rewrite the From "
@@ -899,11 +1111,11 @@ msgstr ""
 "riscrivi l'intestazione From in maniera tale che il destinatario possa "
 "constatare la possibile falsificazione."
 
-#: tpl_messages.php:183
+#: tpl_messages.php:259
 msgid "Always reject the message."
 msgstr "Rifiuta sempre il messaggio"
 
-#: tpl_messages.php:184
+#: tpl_messages.php:260
 msgid ""
 "Note that enabling this setting will make the server reject any mail with "
 "non-matching sender and From header if the sender is an account on this "
@@ -914,1439 +1126,1655 @@ msgstr ""
 "il mittente Ã¨ un account sul server. Questo Ã¨ una riconosciuta fonte di "
 "problemi come ad esempio le mailinglist."
 
-#: tpl_messages.php:186
+#: tpl_messages.php:262
 msgid "Kolab Hostnames (for Master and Slaves)"
 msgstr ""
 
-#: tpl_messages.php:187
+#: tpl_messages.php:263
 msgid "Host"
 msgstr "Server"
 
-#: tpl_messages.php:191
-#, fuzzy
-msgid "The shared folder with DN"
-msgstr "L'utente con DN"
+#: tpl_messages.php:267
+msgid ""
+"<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> is a specialist "
+"email solution provider based in Johannesburg, South Africa specialising in "
+"the deployment and support of Kolab."
+msgstr ""
+"<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> Ã¨ un provider "
+"specialista in soluzioni email con base a Johannesburg, South Africa  ed Ã¨ "
+"specializzato nell'installazione e nel supporto a Kolab."
 
-#: tpl_messages.php:193
+#: tpl_messages.php:268
+msgid ""
+"Code Fusion has played, and continues to play, an integral part in "
+"developing and extending the Kolab server; specifically with regards to "
+"enhancing the base Kolab engine, adding in support for Microsoft Active "
+"Directory ® as an LDAP backend, as well as extending the <a href="
+"\"http://www.horde.org/\">Horde project</a> to provide a web-based groupware "
+"client for the Kolab server."
+msgstr ""
+"Code Fusion ha giocato, e continua a giocare, un ruolo integrante nello "
+"sviluppo e nell'estensione del server Kolab; specificamente a riguardo del "
+"miglioramento del motore di base di Kolab, aggiungendo il supporot per "
+"Microsoft Active Directory come backed LDAP, cosÃ¬ come estendendo il <a href="
+"\"http://www.horde.org/\">progetto Horde</a> per fornire un client web per "
+"il server Kolab."
+
+#: tpl_messages.php:269
+msgid ""
+"The following people from Code Fusion are involved in the Kolab project (in "
+"alphabetical order):"
+msgstr ""
+"Il seguente personale di Code Fusion prendono parte al progetto Kolab (in "
+"ordine alfabetico):"
+
+#: tpl_messages.php:270
 #, fuzzy
-msgid "Back to list of shared folders"
-msgstr "Ritorna alla lista degli utenti"
+msgid ""
+"Kolab's architecture was done by <a href=\"http://www.erfrakon.com"
+"\">erfrakon</a>; the company also designed and implemented the Kolab 1 "
+"Server and did the design and architecture for the Kolab 2 Server while "
+"providing consulting for the implementation of the Kolab 2 server and the "
+"Kolab 2 clients."
+msgstr ""
+"Il concetto alla base di Kolab Ã¨ nato da <a href=\"http://www.erfrakon.com"
+"\">Erfrakon</a>; la societÃ  ha anche progettato e implementato il Server "
+"Kolab 1 e ha progettato l'architettura del Server Kolab 2 mentre forniva "
+"consulenza per l'implementazione del Server Kolab 2 e dei Client Kolab 2."
 
-#: tpl_messages.php:194
-msgid "Shared folders"
-msgstr "Cartelle condivise"
+#: tpl_messages.php:271
+msgid ""
+"<a href=\"http://www.erfrakon.com\">erfrakon</a> is a consulting company "
+"dedicated to opensource software and Linux. The main tasks of erfrakon "
+"within the Kolab project are the principle design and architecure of the "
+"Kolab groupware solution and the creation of the Kolab 1 server."
+msgstr ""
+"<a href=\"http://www.erfrakon.com\">erfrakon</a> Ã¨ una compagnia di "
+"consulenza dedicata al software opensource e Linux. I compiti principali "
+"della efrakon nel progetto Kolab sono il progetto dell'architettura della "
+"soluzione di groupware Kolab e la crezione del server Kolab 1."
 
-#: tpl_messages.php:196
-msgid "Server"
-msgstr "Server"
+#: tpl_messages.php:272
+msgid "The following people worked on Kolab for erfrakon:"
+msgstr "Le seguenti persone hanno lavorato a Kolab per conto della erfrakon:"
 
-#: tpl_messages.php:197 tpl_messages.php:217
-msgid "Type"
-msgstr "Tipo"
+#: tpl_messages.php:273
+#, fuzzy
+msgid "Welcome to the Kolab Groupware Server"
+msgstr "Kolab2 Groupware Server"
 
-#: tpl_messages.php:199
-msgid "Folder deleted, awaiting cleanup..."
-msgstr "Cartella cancellata, in attesa della pulizia..."
+#: tpl_messages.php:274
+#, fuzzy
+msgid "My settings"
+msgstr "Impostazioni personali"
 
-#: tpl_messages.php:202 tpl_messages.php:245
-msgid "Welcome to the Kolab administration interface"
+#: tpl_messages.php:275 ../../lib/KolabAdmin/include/menu.php:43
+#: ../../lib/KolabAdmin/include/menu.php:47
+#: ../../lib/KolabAdmin/include/menu.php:49
+#, fuzzy
+msgid "ActiveSync"
+msgstr "Azione"
+
+#: tpl_messages.php:284 tpl_messages.php:311
+#, fuzzy
+msgid "Welcome to the Kolab Groupware Server Administration"
 msgstr "Benvenuto all'interfaccia di amministrazione di Kolab"
 
-#: tpl_messages.php:203
-msgid "NOTE:"
-msgstr "NOTA:"
+#: tpl_messages.php:285
+msgid "The user with DN"
+msgstr "L'utente con DN"
+
+#: tpl_messages.php:287
+msgid "Back to list of users"
+msgstr "Ritorna alla lista degli utenti"
 
-#: tpl_messages.php:204
+#: tpl_messages.php:288
+msgid "Enter UID and password to login"
+msgstr "Inserisci il nome utente e la password per entrare"
+
+#: tpl_messages.php:289
+msgid "Username:"
+msgstr "Nome utente:"
+
+#: tpl_messages.php:290
+msgid "Password:"
+msgstr "Password:"
+
+#: tpl_messages.php:291
+msgid "Login"
+msgstr ""
+
+#: tpl_messages.php:292
 #, fuzzy
+msgid "Kolab Groupware Server Version"
+msgstr "Versione Server Groupware Kolab2 "
+
+#: tpl_messages.php:293
+#, fuzzy
+msgid "Kolab Groupware Server Component Versions"
+msgstr "Versione Componenti Server Groupware Kolab2"
+
+#: tpl_messages.php:294
+msgid "PEAR/Horde Versions"
+msgstr ""
+
+#: tpl_messages.php:295
+msgid "Kolab2 Patched OpenPKG Package Versions"
+msgstr "Versioni Modificate dei Pacchetti OpenPKG"
+
+#: tpl_messages.php:296
+msgid "OpenPKG Version"
+msgstr "Versione OpenPKG"
+
+#: tpl_messages.php:297
+msgid "Founded in Zürich in 2010, "
+msgstr ""
+
+#: tpl_messages.php:298
 msgid ""
-"No account is configured to receive mail for administrative addresses. If "
-"you have not yet created an account for this, "
+"is the global leader in Kolab Technology. Together with its partners in the "
+"Kolab Enterprise Community, Kolab Systems provides quality assurance, "
+"integration, support, training, certification of individuals and third-party "
+"products, as well as ongoing development for the Kolab Groupware Solution. "
+"The strong partnering model and a highly competent enterprise community "
+"provides users of the Kolab Groupware Solution with the right level of "
+"professional consulting, support and warranties to enable productivity and "
+"collaboration."
 msgstr ""
-"Nessun account Ã¨ configurato per ricevere mail per gli indirizzi "
-"amministrativi. Se non Ã¨ stato ancora creato un account per questo, fatelo "
-"prima di proseguire"
 
-#: tpl_messages.php:205
-msgid "please do so"
+#: tpl_messages.php:299
+msgid "Looking for professional support for your Kolab Groupware Solution?"
 msgstr ""
 
-#: tpl_messages.php:206
-msgid "and then go"
+#: tpl_messages.php:300
+msgid "Kolab Systems provides a wide range of "
 msgstr ""
 
-#: tpl_messages.php:207
-msgid "here"
-msgstr "qui"
+#: tpl_messages.php:303
+msgid "Our Development Partners"
+msgstr ""
 
-#: tpl_messages.php:208
-msgid "to set up forwarding of mail to administrative email addresses."
-msgstr "per impostare l'inoltro delle email a degli indirizzi amministrativi."
+#: tpl_messages.php:304
+msgid ""
+"In continuously improvingall parts of the Kolab Groupware Solution, Kolab "
+"Systems is working closely with development partners, such as (in "
+"alphabetical order):"
+msgstr ""
 
-#: tpl_messages.php:209
-msgid "The user with DN"
+#: tpl_messages.php:305
+msgid "Thank you for being part of this awesome community!"
+msgstr ""
+
+#: tpl_messages.php:306
+msgid "If <b>you</b> want to join the community, please go to "
+msgstr ""
+
+#: tpl_messages.php:307
+msgid "and"
+msgstr ""
+
+#: tpl_messages.php:308
+#, fuzzy
+msgid "The shared folder with DN"
 msgstr "L'utente con DN"
 
-#: tpl_messages.php:211
-msgid "Back to list of users"
+#: tpl_messages.php:310
+#, fuzzy
+msgid "Back to list of shared folders"
 msgstr "Ritorna alla lista degli utenti"
 
-#: tpl_messages.php:212 tpl_messages.php:225
-msgid "Email Users"
-msgstr "Utenti Email"
+#: tpl_messages.php:316
+#, fuzzy
+msgid "Administrator"
+msgstr "Amministratori"
 
-#: tpl_messages.php:219
-msgid "E-mail"
-msgstr "E-mail"
+#: tpl_messages.php:319 ../../lib/KolabAdmin/include/menu.php:113
+msgid "Settings"
+msgstr "Servizi"
 
-#: tpl_messages.php:220
-msgid "uid"
-msgstr "uid"
+#: tpl_messages.php:321
+msgid ""
+"The Kolab 1 KDE client and the Kolab 2 KDE Client (Kontact) was developed by"
+msgstr ""
+"Il client KDE Kolab 1 e il client KDE Kolab 2 (Kontact) sono stati "
+"sviluppati da"
 
-#: tpl_messages.php:222
-msgid "User Deleted, awaiting cleanup..."
-msgstr "Utente cancellato, in attesa di pulizia..."
+#: tpl_messages.php:322
+msgid ""
+"Klarälvdalens Datakonsult AB is a consulting company dedicated to "
+"opensource software, Linux, and the <a href=\"http://www.trolltech.com/"
+"products/qt/\">Qt</a> library. The main tasks of KDAB within the Kolab "
+"project are design and implementation of the Kolab KDE clients and the "
+"implementation of the current Kolab 2 server."
+msgstr ""
+"Klarälvdalens Datakonsult AB Ã¨ un'azienda di consulenza dedicata al "
+"software opensource, Linux,e la libreria<a href=\"http://www.trolltech.com/"
+"products/qt/\">Qt</a>.I compiti principali di KDAB all'interno del progetto "
+"Kolab sono il design e l'implementazione dei client KDE e l'implementazione "
+"del corrente server Kolab 2."
 
-#: tpl_messages.php:230
+#: tpl_messages.php:323
+msgid ""
+"The following people worked on Kolab for Klarälvdalens Datakonsult AB:"
+msgstr ""
+"Le seguenti persone hanno lavorato a Kolab per la Klarälvdalens "
+"Datakonsult AB:"
+
+#: tpl_messages.php:324
 msgid "Vacation Notification"
 msgstr "Notifica di assenza"
 
-#: tpl_messages.php:231
-msgid ""
-"Activate vacation notification (only one of vacation, forward and delivery "
-"to folder can be active at any time)"
-msgstr ""
-"Attiva notifica d'assenza  (solo uno tra assenza, inoltro e invio in "
-"cartella puÃ² essere attivo allo stesso tempo)"
+#: tpl_messages.php:325
+#, fuzzy
+msgid "Activate vacation notification"
+msgstr "Notifica di assenza"
 
-#: tpl_messages.php:232
+#: tpl_messages.php:326
 msgid "Resend notification only after"
 msgstr "Rispedisci la notifica solo dopo"
 
-#: tpl_messages.php:233
+#: tpl_messages.php:327
 msgid "days"
 msgstr "giorni"
 
-#: tpl_messages.php:234
+#: tpl_messages.php:328
 msgid "Send responses for these addresses:"
 msgstr "Invia risposte per questi indirizzi:"
 
-#: tpl_messages.php:235
+#: tpl_messages.php:329
 msgid "(one address per line)"
 msgstr "(un indirizzo per linea)"
 
-#: tpl_messages.php:236
+#: tpl_messages.php:330
 msgid "Do not send vacation replies to spam messages"
 msgstr "Non inviare le risposte automatiche di assenza ai messaggi di spam"
 
-#: tpl_messages.php:237
+#: tpl_messages.php:331
 msgid "Only react to mail coming from domain"
 msgstr "Reagisci solo alle mail in arrivo dal dominio"
 
-#: tpl_messages.php:238
+#: tpl_messages.php:332
 msgid "(leave empty for all domains)"
 msgstr "(lasciare vuoto per tutti i domini)"
 
-#: tpl_messages.php:240
-msgid "Kolab2 Groupware Server Version"
-msgstr "Versione Server Groupware Kolab2 "
+#: ../../www/admin/user/index.php:34
+#: ../../www/admin/administrator/index.php:33
+#: ../../www/admin/addressbook/index.php:23
+#: ../../www/admin/addressbook/addr.php:17
+#: ../../www/admin/maintainer/index.php:33
+#: ../../www/admin/domainmaintainer/index.php:33
+#: ../../www/admin/sharedfolder/index.php:22
+#: ../../www/admin/sharedfolder/sf.php:25
+#: ../../www/admin/distributionlist/index.php:35
+#: ../../www/admin/distributionlist/list.php:37
+#: ../../www/admin/settings/index.php:13
+msgid "Error: You don't have Permissions to access this Menu"
+msgstr "Errore: non si hanno i permessi per accedere a questo MenÃ¹"
 
-#: tpl_messages.php:241
-msgid "Kolab2 Groupware Server Component Versions"
-msgstr "Versione Componenti Server Groupware Kolab2"
+#: ../../www/admin/user/index.php:120
+#, php-format
+msgid "Manage Email User (%d Users)"
+msgstr "Gestione Utenti Email"
 
-#: tpl_messages.php:242
-msgid "PEAR/Horde Versions"
+#: ../../www/admin/user/index.php:182
+#: ../../www/admin/addressbook/index.php:122
+msgid "Email"
+msgstr "Email"
+
+#: ../../www/admin/user/index.php:184
+#: ../../www/admin/addressbook/index.php:123
+msgid "contains"
+msgstr "contiene"
+
+#: ../../www/admin/user/index.php:185
+#: ../../www/admin/addressbook/index.php:124
+msgid "is"
+msgstr "Ã¨"
+
+#: ../../www/admin/user/index.php:186
+#: ../../www/admin/addressbook/index.php:125
+msgid "begins with"
+msgstr "inizia con"
+
+#: ../../www/admin/user/index.php:187
+#: ../../www/admin/addressbook/index.php:126
+msgid "ends with"
+msgstr "finisce con"
+
+#: ../../www/admin/user/vacation.php:36 ../../www/admin/user/deliver.php:46
+#: ../../www/admin/user/forward.php:47
+msgid "Error while connecting to Sieve service:"
 msgstr ""
 
-#: tpl_messages.php:243
-msgid "Kolab2 Patched OpenPKG Package Versions"
-msgstr "Versioni Modificate dei Pacchetti OpenPKG"
+#: ../../www/admin/user/vacation.php:55
+msgid "Vacation message successfully activated"
+msgstr "Messagio di assenza attivato con successo"
 
-#: tpl_messages.php:244
-msgid "OpenPKG Version"
-msgstr "Versione OpenPKG"
+#: ../../www/admin/user/vacation.php:57
+msgid "Vacation message successfully deactivated"
+msgstr "Messagio di assenza disattivato con successo"
 
-#: ../../../www/admin/addressbook/addr.php.in:17
-#: ../../../www/admin/addressbook/index.php.in:23
-#: ../../../www/admin/administrator/index.php.in:33
-#: ../../../www/admin/distributionlist/index.php.in:35
-#: ../../../www/admin/distributionlist/list.php.in:37
-#: ../../../www/admin/domainmaintainer/index.php.in:33
-#: ../../../www/admin/maintainer/index.php.in:33
-#: ../../../www/admin/settings/index.php.in:13
-#: ../../../www/admin/sharedfolder/index.php.in:22
-#: ../../../www/admin/sharedfolder/sf.php.in:25
-#: ../../../www/admin/user/index.php.in:34
-msgid "Error: You don't have Permissions to access this Menu"
-msgstr "Errore: non si hanno i permessi per accedere a questo MenÃ¹"
+#: ../../www/admin/user/vacation.php:62 ../../www/admin/user/deliver.php:65
+#: ../../www/admin/user/forward.php:67
+#, php-format
+msgid ""
+"Warning: You currently have a sieve script named %s active for your account."
+msgstr ""
+
+#: ../../www/admin/user/vacation.php:63 ../../www/admin/user/deliver.php:66
+#: ../../www/admin/user/forward.php:68
+msgid ""
+"Warning: This script will be overwritten without further warnings if you "
+"press \"Update\"!"
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:43
+msgid "zPush in not enabled in your system."
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:468
+msgid ""
+"There are currently no devices known for your user.<br/><br/>In order to "
+"register a device, please connect it to the server first, using <a "
+"href='http://wiki.kolab.org/Z_push#Clients'>the instructions in the Wiki</"
+"a>. Afterwards the device should become available for configuration in this "
+"dialogue."
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:496
+#, fuzzy
+msgid "Address Books"
+msgstr "Agenda"
+
+#: ../../www/admin/user/activesync.php:496
+msgid "Calendars"
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:496
+#: ../../www/admin/sharedfolder/index.php:65
+#: ../../lib/KolabAdmin/include/form.class.php:254
+msgid "Tasks"
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:496
+#: ../../www/admin/sharedfolder/index.php:69
+#: ../../lib/KolabAdmin/include/form.class.php:256
+msgid "Notes"
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:500
+msgid "Automatic"
+msgstr ""
 
-#: ../../../www/admin/addressbook/addr.php.in:65
-#: ../../../www/admin/user/user.php.in:114
+#: ../../www/admin/user/activesync.php:501
+msgid "Flat Mode"
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:502
+#, fuzzy
+msgid "Folder Mode"
+msgstr "Nome Cartella"
+
+#: ../../www/admin/user/activesync.php:506
+#: ../../lib/KolabAdmin/include/form.class.php:204
+msgid "No"
+msgstr "No"
+
+#: ../../www/admin/user/activesync.php:507
+#: ../../lib/KolabAdmin/include/form.class.php:204
+msgid "Yes"
+msgstr "SÃ¬"
+
+#: ../../www/admin/user/user.php:94
+msgid "Please enter an email address"
+msgstr "Si prega di inserire un indirizzo email"
+
+#: ../../www/admin/user/user.php:111
+#, php-format
+msgid "Email address %1$s not in domains %2$s"
+msgstr "L'indirizzo email non Ã¨ nel dominio "
+
+#: ../../www/admin/user/user.php:114 ../../www/admin/addressbook/addr.php:65
 msgid "User, vCard or distribution list with this email address already exists"
 msgstr ""
 "Utente, vCard o lista di distribuzione giÃ  esistente con questo indirizzo"
 
-#: ../../../www/admin/addressbook/addr.php.in:78
-#: ../../../www/admin/administrator/admin.php.in:121
-#: ../../../www/admin/distributionlist/list.php.in:106
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:96
-#: ../../../www/admin/maintainer/maintainer.php.in:118
-#: ../../../www/admin/sharedfolder/sf.php.in:112
-#: ../../../www/admin/user/user.php.in:349
+#: ../../www/admin/user/user.php:130
+msgid "UID "
+msgstr "UID "
+
+#: ../../www/admin/user/user.php:130
+#: ../../lib/KolabAdmin/include/form.class.php:34
+msgid ""
+" collides with an address already used for another user, a vCard or a "
+"distribution list.<br />"
+msgstr ""
+
+#: ../../www/admin/user/user.php:145
+#, fuzzy, php-format
+msgid "Email-Delegate %s does not exist"
+msgstr "Il delegato non esiste"
+
+#: ../../www/admin/user/user.php:165
+#, php-format
+msgid "Syntax for Recipient %s is invalid"
+msgstr ""
+
+#: ../../www/admin/user/user.php:211
+#, php-format
+msgid "Illegal user or group %s"
+msgstr "Utente o gruppo non lecito "
+
+#: ../../www/admin/user/user.php:220
+#, fuzzy
+msgid "Free/Busy interval can not be negative"
+msgstr "Intervallo della lista di disponibilitÃ  in giorni"
+
+#: ../../www/admin/user/user.php:221
+#, fuzzy
+msgid "Free/Busy interval must be a number"
+msgstr "Intervallo della lista di disponibilitÃ  in giorni"
+
+#: ../../www/admin/user/user.php:222
+#, fuzzy
+msgid "Free/Busy interval must be an integer"
+msgstr "Intervallo della lista di disponibilitÃ  in giorni"
+
+#: ../../www/admin/user/user.php:414
+#: ../../www/admin/administrator/admin.php:121
+#: ../../www/admin/addressbook/addr.php:78
+#: ../../www/admin/maintainer/maintainer.php:118
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:96
+#: ../../www/admin/sharedfolder/sf.php:114
+#: ../../www/admin/distributionlist/list.php:109
 msgid "Error: need valid action to proceed"
 msgstr "Errore: Ã¨ richiesta un'azione valida per proseguire"
 
-#: ../../../www/admin/addressbook/addr.php.in:81
-#: ../../../www/admin/administrator/admin.php.in:127
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:102
-#: ../../../www/admin/maintainer/maintainer.php.in:124
-#: ../../../www/admin/user/user.php.in:361
-#: ../../../www/admin/user/user.php.in:364
-#: ../../../www/admin/user/user.php.in:370
-#: ../../../www/admin/user/user.php.in:772
+#: ../../www/admin/user/user.php:426 ../../www/admin/user/user.php:429
+#: ../../www/admin/user/user.php:435 ../../www/admin/user/user.php:870
+#: ../../www/admin/administrator/admin.php:127
+#: ../../www/admin/addressbook/addr.php:81
+#: ../../www/admin/maintainer/maintainer.php:124
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:102
 msgid "Error: You don't have the required Permissions"
 msgstr "Errore: non si hanno i permessi richiesti"
 
-#: ../../../www/admin/addressbook/addr.php.in:95
-msgid "Primary E-Mail Address"
-msgstr "Indirizzo Email principale"
+#: ../../www/admin/user/user.php:444 ../../www/admin/user/user.php:446
+#: ../../www/admin/sharedfolder/sf.php:128
+msgid "Non volatile"
+msgstr "Permanente"
 
-#: ../../../www/admin/addressbook/addr.php.in:97
-msgid "E-Mail Aliases"
+#: ../../www/admin/user/user.php:445
+#: ../../www/admin/administrator/admin.php:136
+#: ../../www/admin/maintainer/maintainer.php:133
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:111
+msgid "Leave blank to keep password unchanged"
+msgstr "Lasciare vuoto per mantenere la stessa password"
+
+#: ../../www/admin/user/user.php:469
+msgid "Unique Identity (UID)"
+msgstr "Identificatore univoco (UID)"
+
+#: ../../www/admin/user/user.php:471
+msgid "Optional - Defaults to Primary Email Address"
+msgstr "Opzionale - di default Ã¨ l'Indirizzo Email Primario"
+
+#: ../../www/admin/user/user.php:472
+msgid "Mailbox Home Server"
+msgstr "Server contenente la Mailbox"
+
+#: ../../www/admin/user/user.php:476
+msgid "Account Type"
+msgstr "Tipo account"
+
+#: ../../www/admin/user/user.php:478
+msgid "User Account"
+msgstr "Account Utente"
+
+#: ../../www/admin/user/user.php:478
+msgid "Internal User Account"
+msgstr "Account Utente Interno"
+
+#: ../../www/admin/user/user.php:478
+msgid "Group Account"
+msgstr "Account di Gruppo"
+
+#: ../../www/admin/user/user.php:478
+msgid "Resource Account"
+msgstr "Account di Risorsa"
+
+#: ../../www/admin/user/user.php:480
+msgid ""
+"NOTE: An internal user is a user that will not be visible in the address book"
+msgstr ""
+"NOTA: Un utente interno Ã¨ un utente che non sarÃ  visibile nella rubrica"
+
+#: ../../www/admin/user/user.php:481
+msgid "Invitation Policy"
+msgstr "Policy di Invito"
+
+#: ../../www/admin/user/user.php:485
+msgid "For automatic invitation handling"
+msgstr "Per la gestione automatica degli inviti"
+
+#: ../../www/admin/user/user.php:486
+msgid ""
+"NOTE: For regular accounts to use this feature, give the 'calendar' user "
+"access to the Calendar folder"
+msgstr ""
+"NOTA: affinchÃ¨ gli utenti normali possano usare questa funzionalitÃ , date "
+"all'utente 'calendar' accesso all cartella Calendar"
+
+#: ../../www/admin/user/user.php:488
+msgid "Email Aliases"
 msgstr "Alias Email"
 
-#: ../../../www/admin/addressbook/addr.php.in:100
-#: ../../../www/admin/user/user.php.in:425
+#: ../../www/admin/user/user.php:491 ../../www/admin/addressbook/addr.php:100
 msgid "One address per line"
 msgstr "Un indirizzo per linea"
 
-#: ../../../www/admin/addressbook/addr.php.in:105
-msgid "Post Box"
-msgstr "Casella Postale"
+#: ../../www/admin/user/user.php:493
+#, fuzzy
+msgid "Email-Delegates"
+msgstr "Delegati"
 
-#: ../../../www/admin/addressbook/addr.php.in:121
-#: ../../../www/admin/distributionlist/list.php.in:135
-#: ../../../www/admin/sharedfolder/sf.php.in:148
-#, php-format
-msgid "Error: DN required for %s operation"
-msgstr "Errore: per l'operazione di cancellazione Ã¨ necessario il DN"
+#: ../../www/admin/user/user.php:496
+msgid "Others allowed to send emails with a \"from\" address of this account."
+msgstr ""
 
-#: ../../../www/admin/addressbook/addr.php.in:131
-msgid "Add External Address"
-msgstr "Aggiungi indirizzi esterni"
+#: ../../www/admin/user/user.php:497
+#, fuzzy
+msgid "One email address per line."
+msgstr "Un indirizzo email per linea"
 
-#: ../../../www/admin/addressbook/addr.php.in:178
-#, fuzzy, php-format
+#: ../../www/admin/user/user.php:499
+msgid "Allowed Recipients"
+msgstr ""
+
+#: ../../www/admin/user/user.php:502
+msgid "Restrict allowed recipients of SMTP messages"
+msgstr ""
+
+#: ../../www/admin/user/user.php:503
+#, fuzzy
+msgid "One entry per line."
+msgstr "Un indirizzo per linea"
+
+#: ../../www/admin/user/user.php:514
 msgid ""
-"Addressbook entry DN could not be modified, distribution list <a "
-"href='@kolab_wui@/distributionlist/list.php?action=modify&dn=%s'>'%s'</a> "
-"depends on it. To modify this entry, first remove it from the distribution "
-"list."
+"2 letter code from <a href=\"http://www.iso.org/iso/"
+"english_country_names_and_code_elements\" target=\"_blank\">ISO 3166</a>"
 msgstr ""
-"Il DN dell'account non puÃ² essere modificato, la lista di distribuzione <a "
-"href='/admin/distributionlist/list.php?action=modify&dn="
 
-#: ../../../www/admin/addressbook/addr.php.in:189
-#: ../../../www/admin/administrator/admin.php.in:216
-#: ../../../www/admin/distributionlist/list.php.in:196
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:200
-#: ../../../www/admin/maintainer/maintainer.php.in:213
-#: ../../../www/admin/sharedfolder/sf.php.in:227
-#: ../../../www/admin/user/user.php.in:617
+#: ../../www/admin/user/user.php:520
+msgid "User Quota in MBytes"
+msgstr "Quota utente in MByte"
+
+#: ../../www/admin/user/user.php:536
+msgid "Free/Busy interval in days"
+msgstr "Intervallo della lista di disponibilitÃ  in giorni"
+
+#: ../../www/admin/user/user.php:537
+msgid "Leave blank for default (60 days)"
+msgstr "Lasciare vuoto per il default (60 giorni)"
+
+#: ../../www/admin/user/user.php:547
+#: ../../www/admin/administrator/admin.php:165
+#: ../../www/admin/maintainer/maintainer.php:162
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:149
+#, php-format
+msgid "LDAP Error: No such dn: %s: %s"
+msgstr "Errore LDAP: non esiste un dn "
+
+#: ../../www/admin/user/user.php:711
+#: ../../www/admin/administrator/admin.php:217
+#: ../../www/admin/addressbook/addr.php:189
+#: ../../www/admin/maintainer/maintainer.php:215
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:202
+#: ../../www/admin/sharedfolder/sf.php:231
+#: ../../www/admin/distributionlist/list.php:200
 #, php-format
 msgid "LDAP Error: could not rename %s to %s: %s"
 msgstr "Errore LDAP: impossibile rinominare"
 
-#: ../../../www/admin/addressbook/addr.php.in:197
-#: ../../../www/admin/administrator/admin.php.in:224
-#: ../../../www/admin/distributionlist/list.php.in:204
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:208
-#: ../../../www/admin/maintainer/maintainer.php.in:221
-#: ../../../www/admin/sharedfolder/sf.php.in:235
-#: ../../../www/admin/user/user.php.in:625
+#: ../../www/admin/user/user.php:719
 #, fuzzy, php-format
-msgid "LDAP Error: could not modify %s to %s: %s"
+msgid "LDAP Error: could not modify %s: %s"
 msgstr "Errore LDAP: Ã¨ impossibile modificare l'oggetto"
 
-#: ../../../www/admin/addressbook/addr.php.in:203
-#: ../../../www/admin/addressbook/addr.php.in:218
-#: ../../../www/admin/administrator/admin.php.in:230
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:214
-#: ../../../www/admin/maintainer/maintainer.php.in:227
-#: ../../../www/admin/user/user.php.in:631
+#: ../../www/admin/user/user.php:725
+#: ../../www/admin/administrator/admin.php:231
+#: ../../www/admin/addressbook/addr.php:203
+#: ../../www/admin/addressbook/addr.php:218
+#: ../../www/admin/maintainer/maintainer.php:229
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:216
 #, php-format
 msgid "%s successfully updated"
 msgstr " creato con successo"
 
-#: ../../../www/admin/addressbook/addr.php.in:209
-#: ../../../www/admin/administrator/admin.php.in:234
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:226
-#: ../../../www/admin/maintainer/maintainer.php.in:231
-#: ../../../www/admin/sharedfolder/sf.php.in:247
+#: ../../www/admin/user/user.php:731
+#: ../../www/admin/distributionlist/list.php:220
 #, php-format
-msgid "LDAP Error: could not read %s: %s"
+msgid "LDAP Error: Could not read %s: %s"
 msgstr "Errore LDAP: Ã¨ impossibile leggere"
 
-#: ../../../www/admin/addressbook/addr.php.in:215
-#: ../../../www/admin/administrator/admin.php.in:238
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:230
-#: ../../../www/admin/maintainer/maintainer.php.in:235
-#: ../../../www/admin/sharedfolder/sf.php.in:251
+#: ../../www/admin/user/user.php:745 ../../www/admin/user/user.php:758
+#: ../../www/admin/user/user.php:797 ../../www/admin/user/user.php:812
+#: ../../www/admin/distributionlist/list.php:224
+#: ../../www/admin/distributionlist/list.php:253
 #, php-format
-msgid "LDAP Error: could not modify object %s: %s"
+msgid "LDAP Error: Could not modify object %s: %s"
 msgstr "Errore LDAP: Ã¨ impossibile modificare l'oggetto"
 
-#: ../../../www/admin/addressbook/addr.php.in:227
-#: ../../../www/admin/administrator/admin.php.in:256
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:261
-#: ../../../www/admin/maintainer/maintainer.php.in:257
-#: ../../../www/admin/sharedfolder/sf.php.in:261
-#: ../../../www/admin/user/user.php.in:689
+#: ../../www/admin/user/user.php:761 ../../www/admin/user/user.php:815
+#, php-format
+msgid "Mid-air collision detected, alias %1$s renamed to %2$s"
+msgstr "Collisione. L'alias Ã¨ stato rinominato "
+
+#: ../../www/admin/user/user.php:766 ../../www/admin/user/user.php:848
+msgid "Modify User"
+msgstr "Modifica utente"
+
+#: ../../www/admin/user/user.php:767
+#, php-format
+msgid "User '%s' successfully modified"
+msgstr "L'utente Ã¨ stato modificato con successo"
+
+#: ../../www/admin/user/user.php:787
+#: ../../www/admin/administrator/admin.php:260
+#: ../../www/admin/addressbook/addr.php:227
+#: ../../www/admin/maintainer/maintainer.php:261
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:265
+#: ../../www/admin/sharedfolder/sf.php:265
 #, php-format
 msgid "LDAP Error: could not add object %s: %s"
 msgstr "Errore LDAP: non Ã¨ possibile aggiungere l'oggetto"
 
-#: ../../../www/admin/addressbook/addr.php.in:230
+#: ../../www/admin/user/user.php:800
+#: ../../www/admin/distributionlist/list.php:256
 #, php-format
-msgid "%s successfully added"
+msgid "Mid-air collision detected, email address %1$s renamed to %2$s"
+msgstr "Collisione. L'indirizzo email Ã¨ stato rinominato"
+
+#: ../../www/admin/user/user.php:821
+msgid "User "
+msgstr "Utente"
+
+#: ../../www/admin/user/user.php:821
+#: ../../www/admin/administrator/admin.php:270
+#: ../../www/admin/maintainer/maintainer.php:269
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:276
+msgid " successfully created"
 msgstr " creato con successo"
 
-#: ../../../www/admin/addressbook/addr.php.in:240
-#: ../../../www/admin/addressbook/addr.php.in:258
-msgid "Modify External Address"
-msgstr "Modifica Indirizzo Esterno"
+#: ../../www/admin/user/user.php:822 ../../www/admin/user/user.php:828
+#: ../../www/admin/user/user.php:839 ../../lib/KolabAdmin/include/menu.php:30
+msgid "Create New User"
+msgstr "Crea Nuovo Utente"
 
-#: ../../../www/admin/addressbook/addr.php.in:261
-#: ../../../www/admin/addressbook/addr.php.in:281
-#, fuzzy, php-format
-msgid "Error: No entry with DN %s found"
-msgstr "La voce di Rubrica Ã¨ stata cancellata"
+#: ../../www/admin/user/user.php:854 ../../www/admin/user/user.php:912
+msgid "Delete User"
+msgstr "Cancella Utente"
 
-#: ../../../www/admin/addressbook/addr.php.in:278
-msgid "Delete External Address"
-msgstr "Cancella Indirizzo Esterno"
+#: ../../www/admin/user/user.php:867
+#: ../../www/admin/administrator/admin.php:315
+#: ../../www/admin/maintainer/maintainer.php:314
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:318
+msgid "Error: need DN for delete operation"
+msgstr "Errore: per l'operazione di cancellazione Ã¨ richiesto il DN"
+
+#: ../../www/admin/user/user.php:873
+#: ../../www/admin/maintainer/maintainer.php:316
+msgid "Error: you need administrative permissions to delete users"
+msgstr ""
+"Errore: sono necessari i permessi di amministratore per cancellare utenti"
 
-#: ../../../www/admin/addressbook/addr.php.in:295
-#: ../../../www/admin/user/user.php.in:788
+#: ../../www/admin/user/user.php:886 ../../www/admin/addressbook/addr.php:295
 #, php-format
 msgid "Account could not be deleted, distribution list '%s' depends on it."
 msgstr ""
 "Il DN dell'account non puÃ² essere modificato, la lista di distribuzione <a "
 "href='/admin/distributionlist/list.php?action=modify&dn="
 
-#: ../../../www/admin/addressbook/addr.php.in:302
-#, fuzzy, php-format
-msgid "Addressbook entry removed from distribution list '%s'."
+#: ../../www/admin/user/user.php:893
+#, php-format
+msgid "Account removed from distribution list '%s'."
 msgstr "L'account Ã¨ stato rimosso dalla lista di distribuzione"
 
-#: ../../../www/admin/addressbook/addr.php.in:304
+#: ../../www/admin/user/user.php:895
 #, fuzzy, php-format
 msgid ""
-"Failure to remove addressbook entry from distribution list '%s', entry will "
-"not be deleted."
+"Failure to remove account from distribution list '%s', account will not be "
+"deleted."
 msgstr ""
 "Rimozione dell'account dalla lista di distribuzione fallito. L'account non "
 "sarÃ  cancellato."
 
-#: ../../../www/admin/addressbook/addr.php.in:312
+#: ../../www/admin/user/user.php:903
 #, php-format
-msgid "LDAP Error: could not delete %s: %s"
+msgid "LDAP Error: could not mark '%s' for deletion: %s"
 msgstr "Errore LDAP: Ã¨ impossibile cancellare"
 
-#: ../../../www/admin/addressbook/addr.php.in:315
-#: ../../../www/admin/distributionlist/list.php.in:312
-#: ../../../www/admin/sharedfolder/sf.php.in:321
-msgid "Entry Deleted"
-msgstr "Voce Cancellata"
+#: ../../www/admin/user/user.php:906
+msgid "User Deleted"
+msgstr "Utente cancellato"
 
-#: ../../../www/admin/addressbook/addr.php.in:316
+#: ../../www/admin/user/deliver.php:58
 #, php-format
-msgid "Address book entry with DN %s was deleted"
-msgstr "La voce di Rubrica Ã¨ stata cancellata"
+msgid "Delivery to '%s' successfully activated"
+msgstr "Messagio di assenza attivato con successo"
 
-#: ../../../www/admin/addressbook/index.php.in:122
-#: ../../../www/admin/user/index.php.in:184
-msgid "Email"
-msgstr "Email"
+#: ../../www/admin/user/deliver.php:60
+#, php-format
+msgid "Delivery to '%s' successfully deactivated"
+msgstr "Messagio di assenza disattivato con successo"
 
-#: ../../../www/admin/addressbook/index.php.in:123
-#: ../../../www/admin/user/index.php.in:186
-msgid "contains"
-msgstr "contiene"
+#: ../../www/admin/user/forward.php:60
+#, php-format
+msgid "Forwarding to '%s' successfully activated"
+msgstr "Messaggio di assenza attivato con successo"
 
-#: ../../../www/admin/addressbook/index.php.in:124
-#: ../../../www/admin/user/index.php.in:187
-msgid "is"
-msgstr "Ã¨"
+#: ../../www/admin/user/forward.php:62
+#, php-format
+msgid "Forwarding to '%s' successfully deactivated"
+msgstr "Messaggio di assenza disattivato con successo"
 
-#: ../../../www/admin/addressbook/index.php.in:125
-#: ../../../www/admin/user/index.php.in:188
-msgid "begins with"
-msgstr "inizia con"
+#: ../../www/admin/administrator/index.php:62
+msgid "Manage Administrators ("
+msgstr "Gestione Amministratore ("
 
-#: ../../../www/admin/addressbook/index.php.in:126
-#: ../../../www/admin/user/index.php.in:189
-msgid "ends with"
-msgstr "finisce con"
+#: ../../www/admin/administrator/index.php:62
+msgid " Administrators)"
+msgstr " Amministratori)"
 
-#: ../../../www/admin/administrator/admin.php.in:52
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:53
-#: ../../../www/admin/maintainer/maintainer.php.in:52
+#: ../../www/admin/administrator/admin.php:52
+#: ../../www/admin/maintainer/maintainer.php:52
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:53
 msgid "Account with this UID already exists"
 msgstr "Esiste giÃ  un account con questo UID"
 
-#: ../../../www/admin/administrator/admin.php.in:75
+#: ../../www/admin/administrator/admin.php:75
 msgid "Manager's password can't be changed from the webgui"
 msgstr "La password del Manager non puÃ² essere modificata dall'interfaccia web"
 
-#: ../../../www/admin/administrator/admin.php.in:135
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:110
-#: ../../../www/admin/maintainer/maintainer.php.in:132
+#: ../../www/admin/administrator/admin.php:135
+#: ../../www/admin/maintainer/maintainer.php:132
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:110
 msgid "non volatile"
 msgstr "permanente"
 
-#: ../../../www/admin/administrator/admin.php.in:136
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:111
-#: ../../../www/admin/maintainer/maintainer.php.in:133
-#: ../../../www/admin/user/user.php.in:380
-msgid "Leave blank to keep password unchanged"
-msgstr "Lasciare vuoto per mantenere la stessa password"
-
-#: ../../../www/admin/administrator/admin.php.in:153
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:128
-#: ../../../www/admin/maintainer/maintainer.php.in:150
+#: ../../www/admin/administrator/admin.php:153
+#: ../../www/admin/maintainer/maintainer.php:150
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:128
 msgid "Unique User ID"
 msgstr "ID univoco dell'utilizzatore"
 
-#: ../../../www/admin/administrator/admin.php.in:165
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:149
-#: ../../../www/admin/maintainer/maintainer.php.in:162
-#: ../../../www/admin/user/user.php.in:471
+#: ../../www/admin/administrator/admin.php:225
+#: ../../www/admin/addressbook/addr.php:197
+#: ../../www/admin/maintainer/maintainer.php:223
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:210
+#: ../../www/admin/sharedfolder/sf.php:239
+#: ../../www/admin/distributionlist/list.php:208
+#, fuzzy, php-format
+msgid "LDAP Error: could not modify %s to %s: %s"
+msgstr "Errore LDAP: Ã¨ impossibile modificare l'oggetto"
+
+#: ../../www/admin/administrator/admin.php:235
+#: ../../www/admin/addressbook/addr.php:209
+#: ../../www/admin/maintainer/maintainer.php:233
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:228
+#: ../../www/admin/sharedfolder/sf.php:251
 #, php-format
-msgid "LDAP Error: No such dn: %s: %s"
-msgstr "Errore LDAP: non esiste un dn "
+msgid "LDAP Error: could not read %s: %s"
+msgstr "Errore LDAP: Ã¨ impossibile leggere"
+
+#: ../../www/admin/administrator/admin.php:239
+#: ../../www/admin/addressbook/addr.php:215
+#: ../../www/admin/maintainer/maintainer.php:237
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:232
+#: ../../www/admin/sharedfolder/sf.php:255
+#, php-format
+msgid "LDAP Error: could not modify object %s: %s"
+msgstr "Errore LDAP: Ã¨ impossibile modificare l'oggetto"
 
-#: ../../../www/admin/administrator/admin.php.in:243
-#: ../../../www/admin/administrator/admin.php.in:293
+#: ../../www/admin/administrator/admin.php:244
+#: ../../www/admin/administrator/admin.php:297
 msgid "Modify Administrator"
 msgstr "Modifica l'Amministratore"
 
-#: ../../../www/admin/administrator/admin.php.in:244
-#: ../../../www/admin/administrator/admin.php.in:266
+#: ../../www/admin/administrator/admin.php:245
+#: ../../www/admin/administrator/admin.php:270
 msgid "Administrator "
 msgstr "Amministratore"
 
-#: ../../../www/admin/administrator/admin.php.in:244
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:244
-#: ../../../www/admin/maintainer/maintainer.php.in:241
+#: ../../www/admin/administrator/admin.php:245
+#: ../../www/admin/maintainer/maintainer.php:243
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:246
 msgid " successfully modified"
 msgstr " modificato con successo"
 
-#: ../../../www/admin/administrator/admin.php.in:262
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:265
-#: ../../../www/admin/maintainer/maintainer.php.in:261
+#: ../../www/admin/administrator/admin.php:266
+#: ../../www/admin/maintainer/maintainer.php:265
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:269
 #, php-format
 msgid "LDAP Error: could not add object %s to maintainer group: %s"
 msgstr "Errore LDAP: non Ã¨ possibile aggiungere l'oggetto"
 
-#: ../../../www/admin/administrator/admin.php.in:266
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:272
-#: ../../../www/admin/maintainer/maintainer.php.in:265
-#: ../../../www/admin/user/user.php.in:723
-msgid " successfully created"
-msgstr " creato con successo"
-
-#: ../../../www/admin/administrator/admin.php.in:267
-#: ../../../www/admin/administrator/admin.php.in:273
-#: ../../../www/admin/administrator/admin.php.in:284 ../include/menu.php:74
+#: ../../www/admin/administrator/admin.php:271
+#: ../../www/admin/administrator/admin.php:277
+#: ../../www/admin/administrator/admin.php:288
+#: ../../lib/KolabAdmin/include/menu.php:81
 msgid "Create New Administrator"
 msgstr "Crea nuovo amministratore"
 
-#: ../../../www/admin/administrator/admin.php.in:299
+#: ../../www/admin/administrator/admin.php:303
 msgid "Delete Administrator"
 msgstr "Cancella amministratore"
 
-#: ../../../www/admin/administrator/admin.php.in:311
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:314
-#: ../../../www/admin/maintainer/maintainer.php.in:310
-#: ../../../www/admin/user/user.php.in:769
-msgid "Error: need DN for delete operation"
-msgstr "Errore: per l'operazione di cancellazione Ã¨ richiesto il DN"
-
-#: ../../../www/admin/administrator/admin.php.in:313
+#: ../../www/admin/administrator/admin.php:317
 msgid "Error: you need administrative permissions to delete administrators"
 msgstr ""
 "Errore: sono necessari i permessi di amministrazione per cancellare degli "
 "amministratori"
 
-#: ../../../www/admin/administrator/admin.php.in:317
+#: ../../www/admin/administrator/admin.php:321
 #, php-format
 msgid "LDAP Error: Could not remove %s from admin group: %s"
 msgstr ""
 "Errore LDAP: la rimozione dal gruppo degli amministratori non Ã¨ possibile:"
 
-#: ../../../www/admin/administrator/admin.php.in:322
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:326
-#: ../../../www/admin/maintainer/maintainer.php.in:322
+#: ../../www/admin/administrator/admin.php:326
+#: ../../www/admin/maintainer/maintainer.php:326
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:330
 #, php-format
 msgid "LDAP Error: could not mark %s for deletion: %s"
 msgstr "Errore LDAP: Ã¨ impossibile cancellare"
 
-#: ../../../www/admin/administrator/admin.php.in:328
+#: ../../www/admin/administrator/admin.php:332
 msgid "Administrator Deleted"
 msgstr "Amministratore cancellato"
 
-#: ../../../www/admin/administrator/index.php.in:62
-msgid "Manage Administrators ("
-msgstr "Gestione Amministratore ("
+#: ../../www/admin/addressbook/addr.php:95
+msgid "Primary E-Mail Address"
+msgstr "Indirizzo Email principale"
 
-#: ../../../www/admin/administrator/index.php.in:62
-msgid " Administrators)"
-msgstr " Amministratori)"
+#: ../../www/admin/addressbook/addr.php:97
+msgid "E-Mail Aliases"
+msgstr "Alias Email"
+
+#: ../../www/admin/addressbook/addr.php:105
+msgid "Post Box"
+msgstr "Casella Postale"
 
-#: ../../../www/admin/distributionlist/index.php.in:63
+#: ../../www/admin/addressbook/addr.php:121
+#: ../../www/admin/sharedfolder/sf.php:150
+#: ../../www/admin/distributionlist/list.php:138
 #, php-format
-msgid "Manage Distribution Lists (%d Lists)"
-msgstr "Gestione Liste di Distribuzione"
+msgid "Error: DN required for %s operation"
+msgstr "Errore: per l'operazione di cancellazione Ã¨ necessario il DN"
 
-#: ../../../www/admin/distributionlist/index.php.in:74
-msgid "not yet implemented"
-msgstr "non ancora implementato"
+#: ../../www/admin/addressbook/addr.php:131
+msgid "Add External Address"
+msgstr "Aggiungi indirizzi esterni"
 
-#: ../../../www/admin/distributionlist/list.php.in:46
-msgid "Please add at least one member"
-msgstr "Aggiungere almeno un membro"
+#: ../../www/admin/addressbook/addr.php:178
+#, fuzzy, php-format
+msgid "Addressbook entry DN could not be modified, distribution list <a href='"
+msgstr "L'account Ã¨ stato rimosso dalla lista di distribuzione"
 
-#: ../../../www/admin/distributionlist/list.php.in:50
+#: ../../www/admin/addressbook/addr.php:230
 #, php-format
-msgid "No user with email address, UID or alias %s"
-msgstr "Nessun utente presente con questo indirizzo email, UID o alias "
-
-#: ../../../www/admin/distributionlist/list.php.in:62
-msgid "User or distribution list with this email address already exists"
-msgstr ""
-"Esiste giÃ  un utente o una lista di distribuzione con questo indirizzo email"
+msgid "%s successfully added"
+msgstr " creato con successo"
 
-#: ../../../www/admin/distributionlist/list.php.in:111
-msgid "List Name"
-msgstr "Nome Lista"
+#: ../../www/admin/addressbook/addr.php:240
+#: ../../www/admin/addressbook/addr.php:258
+msgid "Modify External Address"
+msgstr "Modifica Indirizzo Esterno"
 
-#: ../../../www/admin/distributionlist/list.php.in:118
-msgid "Members"
-msgstr "Membri"
+#: ../../www/admin/addressbook/addr.php:261
+#: ../../www/admin/addressbook/addr.php:281
+#, fuzzy, php-format
+msgid "Error: No entry with DN %s found"
+msgstr "La voce di Rubrica Ã¨ stata cancellata"
 
-#: ../../../www/admin/distributionlist/list.php.in:120
-msgid "One email address per line"
-msgstr "Un indirizzo email per linea"
+#: ../../www/admin/addressbook/addr.php:278
+msgid "Delete External Address"
+msgstr "Cancella Indirizzo Esterno"
 
-#: ../../../www/admin/distributionlist/list.php.in:123
-msgid "Hidden"
-msgstr "Nascosto"
+#: ../../www/admin/addressbook/addr.php:302
+#, fuzzy, php-format
+msgid "Addressbook entry removed from distribution list '%s'."
+msgstr "L'account Ã¨ stato rimosso dalla lista di distribuzione"
 
-#: ../../../www/admin/distributionlist/list.php.in:126
+#: ../../www/admin/addressbook/addr.php:304
+#, fuzzy, php-format
 msgid ""
-"Check here to make this distribution list available only to authenticated "
-"users"
+"Failure to remove addressbook entry from distribution list '%s', entry will "
+"not be deleted."
 msgstr ""
-"Selezionare qui per rendere questa lista di distribuzione disponibile solo "
-"agli utenti autenticati"
-
-#: ../../../www/admin/distributionlist/list.php.in:145
-msgid "Add Distribution List"
-msgstr "Aggiungi una Lista di Distribuzione"
-
-#: ../../../www/admin/distributionlist/list.php.in:179
-#, php-format
-msgid "No user with address %s"
-msgstr "Non sono presenti utenti con questo indirizzo"
-
-#: ../../../www/admin/distributionlist/list.php.in:210
-#: ../../../www/admin/distributionlist/list.php.in:222
-msgid "Distribution List updated"
-msgstr "Lista di Distribuzione aggiornata"
-
-#: ../../../www/admin/distributionlist/list.php.in:216
-#: ../../../www/admin/user/user.php.in:637
-#, php-format
-msgid "LDAP Error: Could not read %s: %s"
-msgstr "Errore LDAP: Ã¨ impossibile leggere"
+"Rimozione dell'account dalla lista di distribuzione fallito. L'account non "
+"sarÃ  cancellato."
 
-#: ../../../www/admin/distributionlist/list.php.in:220
-#: ../../../www/admin/distributionlist/list.php.in:249
-#: ../../../www/admin/user/user.php.in:649
-#: ../../../www/admin/user/user.php.in:662
-#: ../../../www/admin/user/user.php.in:699
-#: ../../../www/admin/user/user.php.in:714
+#: ../../www/admin/addressbook/addr.php:312
 #, php-format
-msgid "LDAP Error: Could not modify object %s: %s"
-msgstr "Errore LDAP: Ã¨ impossibile modificare l'oggetto"
+msgid "LDAP Error: could not delete %s: %s"
+msgstr "Errore LDAP: Ã¨ impossibile cancellare"
 
-#: ../../../www/admin/distributionlist/list.php.in:231
-#, php-format
-msgid "LDAP Error: Could not add object %s: %s"
-msgstr "Errore LDAP: non Ã¨ possibile aggiungere l'oggetto"
+#: ../../www/admin/addressbook/addr.php:315
+#: ../../www/admin/sharedfolder/sf.php:325
+#: ../../www/admin/distributionlist/list.php:316
+msgid "Entry Deleted"
+msgstr "Voce Cancellata"
 
-#: ../../../www/admin/distributionlist/list.php.in:252
-#: ../../../www/admin/user/user.php.in:702
+#: ../../www/admin/addressbook/addr.php:316
 #, php-format
-msgid "Mid-air collision detected, email address %1$s renamed to %2$s"
-msgstr "Collisione. L'indirizzo email Ã¨ stato rinominato"
+msgid "Address book entry with DN %s was deleted"
+msgstr "La voce di Rubrica Ã¨ stata cancellata"
 
-#: ../../../www/admin/distributionlist/list.php.in:260
-#, php-format
-msgid "Distribution List '%s' added"
-msgstr "Lista di Distribuzione aggiornata"
+#: ../../www/admin/maintainer/index.php:62
+#: ../../www/admin/domainmaintainer/index.php:62
+msgid "Manage Maintainers ("
+msgstr "Gestione Maintainer ("
 
-#: ../../../www/admin/distributionlist/list.php.in:272
-#: ../../../www/admin/distributionlist/list.php.in:286
-msgid "Modify Distribution List"
-msgstr "Modifica Lista di Distribuzione"
+#: ../../www/admin/maintainer/index.php:62
+#: ../../www/admin/domainmaintainer/index.php:62
+msgid " Maintainers)"
+msgstr " Maintainer)"
 
-#: ../../../www/admin/distributionlist/list.php.in:289
-#: ../../../www/admin/distributionlist/list.php.in:304
-#: ../../../www/admin/sharedfolder/sf.php.in:298
-#: ../../../www/admin/sharedfolder/sf.php.in:314
-#, php-format
-msgid "Error: No results returned for DN '%s'"
-msgstr "Errore: nessun risultato per il DN '%s'"
+#: ../../www/admin/maintainer/maintainer.php:242
+#: ../../www/admin/maintainer/maintainer.php:296
+msgid "Modify Maintainer"
+msgstr "Modifica Maintainer"
 
-#: ../../../www/admin/distributionlist/list.php.in:301
-msgid "Delete Distribution List"
-msgstr "Cancella Lista di Distribuzione"
+#: ../../www/admin/maintainer/maintainer.php:243
+#: ../../www/admin/maintainer/maintainer.php:269
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:246
+msgid "Maintainer "
+msgstr "Maintainer "
 
-#: ../../../www/admin/distributionlist/list.php.in:311
-msgid "Distribution List "
-msgstr "Lista di Distribuzione"
+#: ../../www/admin/maintainer/maintainer.php:270
+#: ../../www/admin/maintainer/maintainer.php:276
+#: ../../www/admin/maintainer/maintainer.php:287
+#: ../../lib/KolabAdmin/include/menu.php:93
+msgid "Create New Maintainer"
+msgstr "Crea un nuovo Maintainer"
 
-#: ../../../www/admin/distributionlist/list.php.in:311
-msgid " deleted"
-msgstr " cancellata"
+#: ../../www/admin/maintainer/maintainer.php:302
+msgid "Delete Maintainer"
+msgstr "Cancella un Maintainer"
 
-#: ../../../www/admin/distributionlist/list.php.in:315
+#: ../../www/admin/maintainer/maintainer.php:320
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:324
 #, php-format
-msgid "LDAP Error: Could not delete %s: %s"
-msgstr "Errore LDAP: Ã¨ impossibile cancellare"
+msgid "LDAP Error: Could not remove %s from maintainer group: %s"
+msgstr "Errore LDAP: Ã¨ impossibile la rimozione dal gruppo dei maintainer:"
+
+#: ../../www/admin/maintainer/maintainer.php:332
+msgid "Maintainer Deleted"
+msgstr "Maintainer Cancellato"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:49
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:49
 #, fuzzy
 msgid "Please enter a uid value"
 msgstr "Si prega di inserire un indirizzo email"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:137
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:137
 msgid "Check domains this domain maintainer should be able to maintain"
 msgstr "Selezionare quali domini il maintainer puÃ² amministrare"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:243
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:296
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:245
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:300
 msgid "Modify Domain Maintainer"
 msgstr "Modifica Maintainer"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:244
-#: ../../../www/admin/maintainer/maintainer.php.in:241
-#: ../../../www/admin/maintainer/maintainer.php.in:265
-msgid "Maintainer "
-msgstr "Maintainer "
-
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:272
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:276
 msgid "Domain maintainer "
 msgstr "Maintainer "
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:273
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:277
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:287
-#: ../include/menu.php:80 ../include/menu.php:97
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:277
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:281
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:291
+#: ../../lib/KolabAdmin/include/menu.php:87
+#: ../../lib/KolabAdmin/include/menu.php:104
 msgid "Create New Domain Maintainer"
 msgstr "Crea un nuovo Maintainer"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:302
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:306
 msgid "Delete Domain Maintainer"
 msgstr "Cancella un Maintainer"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:316
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:320
 msgid "Error: you need administrative permissions to delete domain maintainers"
 msgstr ""
 "Errore: sono necessari permessi di amministrazione per cancellare degli "
 "amministratori"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:320
-#: ../../../www/admin/maintainer/maintainer.php.in:316
-#, php-format
-msgid "LDAP Error: Could not remove %s from maintainer group: %s"
-msgstr "Errore LDAP: Ã¨ impossibile la rimozione dal gruppo dei maintainer:"
-
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:332
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:336
 msgid "Domain Maintainer Deleted"
 msgstr "Maintainer Cancellato"
 
-#: ../../../www/admin/domainmaintainer/index.php.in:62
-#: ../../../www/admin/maintainer/index.php.in:62
-msgid "Manage Maintainers ("
-msgstr "Gestione Maintainer ("
-
-#: ../../../www/admin/domainmaintainer/index.php.in:62
-#: ../../../www/admin/maintainer/index.php.in:62
-msgid " Maintainers)"
-msgstr " Maintainer)"
-
-#: ../../../www/admin/maintainer/maintainer.php.in:240
-#: ../../../www/admin/maintainer/maintainer.php.in:292
-msgid "Modify Maintainer"
-msgstr "Modifica Maintainer"
-
-#: ../../../www/admin/maintainer/maintainer.php.in:266
-#: ../../../www/admin/maintainer/maintainer.php.in:272
-#: ../../../www/admin/maintainer/maintainer.php.in:283 ../include/menu.php:86
-msgid "Create New Maintainer"
-msgstr "Crea un nuovo Maintainer"
-
-#: ../../../www/admin/maintainer/maintainer.php.in:298
-msgid "Delete Maintainer"
-msgstr "Cancella un Maintainer"
-
-#: ../../../www/admin/maintainer/maintainer.php.in:312
-#: ../../../www/admin/user/user.php.in:775
-msgid "Error: you need administrative permissions to delete users"
-msgstr ""
-"Errore: sono necessari i permessi di amministratore per cancellare utenti"
-
-#: ../../../www/admin/maintainer/maintainer.php.in:328
-msgid "Maintainer Deleted"
-msgstr "Maintainer Cancellato"
-
-#: ../../../www/admin/settings/index.php.in:98
-#, php-format
-msgid "No account found for email address %s"
-msgstr "Nessun account Ã¨ stato trovato per l'indirizzo email "
-
-#: ../../../www/admin/settings/index.php.in:107
-#, php-format
-msgid "LDAP Error: Failed to add distribution list %s: %s"
-msgstr ""
-"Errore LDAP: errore nella modifica dell'oggetto di configurazione kolab: "
-
-#: ../../../www/admin/settings/index.php.in:109
-#, php-format
-msgid "Successfully created distribution list %s"
-msgstr "Crea liste di distribuzione"
-
-#: ../../../www/admin/settings/index.php.in:128
-#: ../../../www/admin/settings/index.php.in:137
-#: ../../../www/admin/settings/index.php.in:146
-#: ../../../www/admin/settings/index.php.in:155
-#: ../../../www/admin/settings/index.php.in:165
-#: ../../../www/admin/settings/index.php.in:174
-#: ../../../www/admin/settings/index.php.in:185
-#: ../../../www/admin/settings/index.php.in:199
-#: ../../../www/admin/settings/index.php.in:217
-#: ../../../www/admin/settings/index.php.in:235
-#: ../../../www/admin/settings/index.php.in:252
-#: ../../../www/admin/settings/index.php.in:265
-#, php-format
-msgid "LDAP Error: failed to modify kolab configuration object: %s"
-msgstr ""
-"Errore LDAP: errore nella modifica dell'oggetto di configurazione kolab: "
-
-#: ../../../www/admin/settings/index.php.in:223
-#, php-format
-msgid "LDAP Error: Failed to delete domain object %s: %s"
-msgstr ""
-"Errore LDAP: errore nella modifica dell'oggetto di configurazione kolab: "
-
-#: ../../../www/admin/settings/index.php.in:273
-msgid "POP3 Service"
-msgstr "Servizio POP3"
-
-#: ../../../www/admin/settings/index.php.in:274
-msgid "POP3/SSL service (TCP port 995)"
-msgstr "Servizio POP3/SSL (Porta TCP 995)"
-
-#: ../../../www/admin/settings/index.php.in:275
-msgid "IMAP Service"
-msgstr "Servizio IMAP"
-
-#: ../../../www/admin/settings/index.php.in:276
-msgid "IMAP/SSL Service (TCP port 993)"
-msgstr "Servizio IMAP/SSL (Porta TCP 993)"
-
-#: ../../../www/admin/settings/index.php.in:277
-msgid "Sieve service (TCP port %s)"
-msgstr "Servizio Sieve (Porta TCP %s)"
-
-#: ../../../www/admin/settings/index.php.in:278
-msgid "FreeBusy Service via HTTP (in addition to HTTPS)"
-msgstr ""
-
-#: ../../../www/admin/settings/index.php.in:279
-msgid "Amavis Email Scanning (Virus/Spam)"
-msgstr "Servizio di verifica Email Amavis (Virus/Spam)"
-
-#: ../../../www/admin/sharedfolder/index.php.in:53
+#: ../../www/admin/sharedfolder/index.php:53
 #, php-format
 msgid "Manage Shared Folders (%d Folders)"
 msgstr "Gestione Cartelle Condivise"
 
-#: ../../../www/admin/sharedfolder/index.php.in:63
-#: ../include/form.class.php:255
+#: ../../www/admin/sharedfolder/index.php:63
+#: ../../lib/KolabAdmin/include/form.class.php:254
 msgid "Unspecified"
 msgstr ""
 
-#: ../../../www/admin/sharedfolder/index.php.in:64
-#: ../include/form.class.php:255
+#: ../../www/admin/sharedfolder/index.php:64
+#: ../../lib/KolabAdmin/include/form.class.php:254
 #, fuzzy
 msgid "Mails"
 msgstr "Email"
 
-#: ../../../www/admin/sharedfolder/index.php.in:65
-#: ../include/form.class.php:255
-msgid "Tasks"
-msgstr ""
-
-#: ../../../www/admin/sharedfolder/index.php.in:66
-#: ../include/form.class.php:256
+#: ../../www/admin/sharedfolder/index.php:66
+#: ../../lib/KolabAdmin/include/form.class.php:255
 msgid "Journals"
 msgstr ""
 
-#: ../../../www/admin/sharedfolder/index.php.in:67
-#: ../include/form.class.php:256
+#: ../../www/admin/sharedfolder/index.php:67
+#: ../../lib/KolabAdmin/include/form.class.php:255
 msgid "Events"
 msgstr ""
 
-#: ../../../www/admin/sharedfolder/index.php.in:68
-#: ../include/form.class.php:257
+#: ../../www/admin/sharedfolder/index.php:68
+#: ../../lib/KolabAdmin/include/form.class.php:256
 msgid "Contacts"
 msgstr ""
 
-#: ../../../www/admin/sharedfolder/index.php.in:69
-#: ../include/form.class.php:257
-msgid "Notes"
-msgstr ""
-
-#: ../../../www/admin/sharedfolder/sf.php.in:60
-#: ../../../www/admin/sharedfolder/sf.php.in:67
+#: ../../www/admin/sharedfolder/sf.php:62
+#: ../../www/admin/sharedfolder/sf.php:69
 msgid "Permission for UID/email/GID"
 msgstr "Permessi per UID/messaggio/GID"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:101
+#: ../../www/admin/sharedfolder/sf.php:103
 #, php-format
 msgid "No UID or GID %s"
 msgstr "Nessun UID o GID "
 
-#: ../../../www/admin/sharedfolder/sf.php.in:117
+#: ../../www/admin/sharedfolder/sf.php:119
 msgid "Folder Name"
 msgstr "Nome Cartella"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:124
+#: ../../www/admin/sharedfolder/sf.php:126
 msgid "Folder Location"
 msgstr "Posizione Cartella"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:126
-#: ../../../www/admin/user/user.php.in:379
-#: ../../../www/admin/user/user.php.in:381
-msgid "Non volatile"
-msgstr "Permanente"
-
-#: ../../../www/admin/sharedfolder/sf.php.in:128
+#: ../../www/admin/sharedfolder/sf.php:130
 #, fuzzy
 msgid "Folder Type"
 msgstr "Nome Cartella"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:132
+#: ../../www/admin/sharedfolder/sf.php:134
 msgid "Quota Limit"
 msgstr "Limite quota"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:133
+#: ../../www/admin/sharedfolder/sf.php:135
 msgid "MBytes (empty for unlimited)"
 msgstr "MByte (vuoto per illimitato)"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:135
+#: ../../www/admin/sharedfolder/sf.php:137
 msgid "Permission for UID/GID"
 msgstr "Permessi per UID/GID"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:158 ../include/menu.php:58
+#: ../../www/admin/sharedfolder/sf.php:160
+#: ../../lib/KolabAdmin/include/menu.php:65
 msgid "Add Shared Folder"
 msgstr "Aggiungi Cartella condivisa"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:241
-#: ../../../www/admin/sharedfolder/sf.php.in:253
+#: ../../www/admin/sharedfolder/sf.php:245
+#: ../../www/admin/sharedfolder/sf.php:257
 msgid "Shared folder updated"
 msgstr "La cartella condivisa Ã¨ stata aggiornata"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:263
+#: ../../www/admin/sharedfolder/sf.php:267
 #, php-format
 msgid "Shared folder '%s' added"
 msgstr "La cartella condivisa Ã¨ stata aggiornata"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:275
-#: ../../../www/admin/sharedfolder/sf.php.in:295
+#: ../../www/admin/sharedfolder/sf.php:279
+#: ../../www/admin/sharedfolder/sf.php:299
 msgid "Modify Shared Folder"
 msgstr "Modifica Cartella Condivisa"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:311
+#: ../../www/admin/sharedfolder/sf.php:302
+#: ../../www/admin/sharedfolder/sf.php:318
+#: ../../www/admin/distributionlist/list.php:293
+#: ../../www/admin/distributionlist/list.php:308
+#, php-format
+msgid "Error: No results returned for DN '%s'"
+msgstr "Errore: nessun risultato per il DN '%s'"
+
+#: ../../www/admin/sharedfolder/sf.php:315
 msgid "Delete Shared Folder"
 msgstr "Cancella Cartella Condivisa"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:320
+#: ../../www/admin/sharedfolder/sf.php:324
 msgid "Shared folder "
 msgstr "Cartella Condivisa"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:320
+#: ../../www/admin/sharedfolder/sf.php:324
 msgid " marked for deletion"
 msgstr " segnata per la cancellazione"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:324
+#: ../../www/admin/sharedfolder/sf.php:328
 #, php-format
 msgid "LDAP Error: Could not mark %s for deletion: %s"
 msgstr "Errore LDAP: Ã¨ impossibile cancellare"
 
-#: ../../../www/admin/user/deliver.php.in:37
-msgid ""
-"Net/Sieve.php is missing. Without that, filter settings are not available"
-msgstr ""
-"Net/sieve.php Ã¨ mancante. Senza di esso le impostazioni dei filtri non sono "
-"disponibili"
-
-#: ../../../www/admin/user/deliver.php.in:38
-#: ../../../www/admin/user/forward.php.in:39
-#: ../../../www/admin/user/vacation.php.in:18
-msgid ""
-"Suggest your system administrator to run \"pear install http://pear.php.net/"
-"get/Net_Sieve\" on the server"
-msgstr ""
-
-#: ../../../www/admin/user/deliver.php.in:66
-#: ../../../www/admin/user/forward.php.in:70
-msgid "Script was:"
-msgstr "Lo script era:"
-
-#: ../../../www/admin/user/deliver.php.in:74
-#, php-format
-msgid "Delivery to '%s' successfully activated"
-msgstr "Messagio di assenza attivato con successo"
-
-#: ../../../www/admin/user/deliver.php.in:75
+#: ../../www/admin/distributionlist/index.php:63
 #, php-format
-msgid "Delivery to '%s' successfully deactivated"
-msgstr "Messagio di assenza disattivato con successo"
-
-#: ../../../www/admin/user/forward.php.in:38
-#: ../../../www/admin/user/vacation.php.in:17
-msgid ""
-"Net/Sieve.php is missing. Without that, vacation settings are not available"
-msgstr ""
-"Net/sieve.php Ã¨ mancante. Senza di esso le impostazioni dei messaggi di "
-"assenza non sono disponibili"
-
-#: ../../../www/admin/user/forward.php.in:64
-#: ../../../www/admin/user/user.php.in:94
-msgid "Please enter an email address"
-msgstr "Si prega di inserire un indirizzo email"
-
-#: ../../../www/admin/user/forward.php.in:78
-#, php-format
-msgid "Forwarding to '%s' successfully activated"
-msgstr "Messaggio di assenza attivato con successo"
+msgid "Manage Distribution Lists (%d Lists)"
+msgstr "Gestione Liste di Distribuzione"
 
-#: ../../../www/admin/user/forward.php.in:79
-#, php-format
-msgid "Forwarding to '%s' successfully deactivated"
-msgstr "Messaggio di assenza disattivato con successo"
+#: ../../www/admin/distributionlist/index.php:74
+msgid "not yet implemented"
+msgstr "non ancora implementato"
 
-#: ../../../www/admin/user/index.php.in:122
-#, php-format
-msgid "Manage Email User (%d Users)"
-msgstr "Gestione Utenti Email"
+#: ../../www/admin/distributionlist/list.php:46
+msgid "Please add at least one member"
+msgstr "Aggiungere almeno un membro"
 
-#: ../../../www/admin/user/user.php.in:111
+#: ../../www/admin/distributionlist/list.php:50
 #, php-format
-msgid "Email address %1$s not in domains %2$s"
-msgstr "L'indirizzo email non Ã¨ nel dominio "
-
-#: ../../../www/admin/user/user.php.in:130
-msgid "UID "
-msgstr "UID "
+msgid "No user with email address, UID or alias %s"
+msgstr "Nessun utente presente con questo indirizzo email, UID o alias "
 
-#: ../../../www/admin/user/user.php.in:130 ../include/form.class.php:34
-msgid ""
-" collides with an address already used for another user, a vCard or a "
-"distribution list.<br />"
+#: ../../www/admin/distributionlist/list.php:62
+msgid "User or distribution list with this email address already exists"
 msgstr ""
+"Esiste giÃ  un utente o una lista di distribuzione con questo indirizzo email"
 
-#: ../../../www/admin/user/user.php.in:145
-#, fuzzy, php-format
-msgid "Email-Delegate %s does not exist"
-msgstr "Il delegato non esiste"
-
-#: ../../../www/admin/user/user.php.in:158
-#, php-format
-msgid "Illegal user or group %s"
-msgstr "Utente o gruppo non lecito "
-
-#: ../../../www/admin/user/user.php.in:167
-#, fuzzy
-msgid "Free/Busy interval can not be negative"
-msgstr "Intervallo della lista di disponibilitÃ  in giorni"
-
-#: ../../../www/admin/user/user.php.in:168
-#, fuzzy
-msgid "Free/Busy interval must be a number"
-msgstr "Intervallo della lista di disponibilitÃ  in giorni"
-
-#: ../../../www/admin/user/user.php.in:169
-#, fuzzy
-msgid "Free/Busy interval must be an integer"
-msgstr "Intervallo della lista di disponibilitÃ  in giorni"
-
-#: ../../../www/admin/user/user.php.in:403
-msgid "Unique Identity (UID)"
-msgstr "Identificatore univoco (UID)"
-
-#: ../../../www/admin/user/user.php.in:405
-msgid "Optional - Defaults to Primary Email Address"
-msgstr "Opzionale - di default Ã¨ l'Indirizzo Email Primario"
-
-#: ../../../www/admin/user/user.php.in:406
-msgid "Mailbox Home Server"
-msgstr "Server contenente la Mailbox"
-
-#: ../../../www/admin/user/user.php.in:410
-msgid "Account Type"
-msgstr "Tipo account"
-
-#: ../../../www/admin/user/user.php.in:412
-msgid "User Account"
-msgstr "Account Utente"
-
-#: ../../../www/admin/user/user.php.in:412
-msgid "Internal User Account"
-msgstr "Account Utente Interno"
-
-#: ../../../www/admin/user/user.php.in:412
-msgid "Group Account"
-msgstr "Account di Gruppo"
-
-#: ../../../www/admin/user/user.php.in:412
-msgid "Resource Account"
-msgstr "Account di Risorsa"
+#: ../../www/admin/distributionlist/list.php:114
+msgid "List Name"
+msgstr "Nome Lista"
 
-#: ../../../www/admin/user/user.php.in:414
-msgid ""
-"NOTE: An internal user is a user that will not be visible in the address book"
-msgstr ""
-"NOTA: Un utente interno Ã¨ un utente che non sarÃ  visibile nella rubrica"
+#: ../../www/admin/distributionlist/list.php:121
+msgid "Members"
+msgstr "Membri"
 
-#: ../../../www/admin/user/user.php.in:415
-msgid "Invitation Policy"
-msgstr "Policy di Invito"
+#: ../../www/admin/distributionlist/list.php:123
+msgid "One email address per line"
+msgstr "Un indirizzo email per linea"
 
-#: ../../../www/admin/user/user.php.in:419
-msgid "For automatic invitation handling"
-msgstr "Per la gestione automatica degli inviti"
+#: ../../www/admin/distributionlist/list.php:126
+msgid "Hidden"
+msgstr "Nascosto"
 
-#: ../../../www/admin/user/user.php.in:420
+#: ../../www/admin/distributionlist/list.php:129
 msgid ""
-"NOTE: For regular accounts to use this feature, give the 'calendar' user "
-"access to the Calendar folder"
-msgstr ""
-"NOTA: affinchÃ¨ gli utenti normali possano usare questa funzionalitÃ , date "
-"all'utente 'calendar' accesso all cartella Calendar"
-
-#: ../../../www/admin/user/user.php.in:422
-msgid "Email Aliases"
-msgstr "Alias Email"
-
-#: ../../../www/admin/user/user.php.in:427
-#, fuzzy
-msgid "Email-Delegates"
-msgstr "Delegati"
-
-#: ../../../www/admin/user/user.php.in:430
-msgid "Others allowed to send emails with a \"from\" address of this account."
+"Check here to make this distribution list available only to authenticated "
+"users"
 msgstr ""
+"Selezionare qui per rendere questa lista di distribuzione disponibile solo "
+"agli utenti autenticati"
 
-#: ../../../www/admin/user/user.php.in:431
-#, fuzzy
-msgid "One email address per line."
-msgstr "Un indirizzo email per linea"
-
-#: ../../../www/admin/user/user.php.in:447
-msgid "User Quota in MBytes"
-msgstr "Quota utente in MByte"
-
-#: ../../../www/admin/user/user.php.in:460
-msgid "Free/Busy interval in days"
-msgstr "Intervallo della lista di disponibilitÃ  in giorni"
-
-#: ../../../www/admin/user/user.php.in:461
-msgid "Leave blank for default (60 days)"
-msgstr "Lasciare vuoto per il default (60 giorni)"
-
-#: ../../../www/admin/user/user.php.in:665
-#: ../../../www/admin/user/user.php.in:717
-#, php-format
-msgid "Mid-air collision detected, alias %1$s renamed to %2$s"
-msgstr "Collisione. L'alias Ã¨ stato rinominato "
-
-#: ../../../www/admin/user/user.php.in:670
-#: ../../../www/admin/user/user.php.in:750
-msgid "Modify User"
-msgstr "Modifica utente"
+#: ../../www/admin/distributionlist/list.php:148
+msgid "Add Distribution List"
+msgstr "Aggiungi una Lista di Distribuzione"
 
-#: ../../../www/admin/user/user.php.in:671
+#: ../../www/admin/distributionlist/list.php:183
 #, php-format
-msgid "User '%s' successfully modified"
-msgstr "L'utente Ã¨ stato modificato con successo"
-
-#: ../../../www/admin/user/user.php.in:723
-msgid "User "
-msgstr "Utente"
-
-#: ../../../www/admin/user/user.php.in:724
-#: ../../../www/admin/user/user.php.in:730
-#: ../../../www/admin/user/user.php.in:741 ../include/menu.php:30
-msgid "Create New User"
-msgstr "Crea Nuovo Utente"
+msgid "No user with address %s"
+msgstr "Non sono presenti utenti con questo indirizzo"
 
-#: ../../../www/admin/user/user.php.in:756
-#: ../../../www/admin/user/user.php.in:814
-msgid "Delete User"
-msgstr "Cancella Utente"
+#: ../../www/admin/distributionlist/list.php:214
+#: ../../www/admin/distributionlist/list.php:226
+msgid "Distribution List updated"
+msgstr "Lista di Distribuzione aggiornata"
 
-#: ../../../www/admin/user/user.php.in:795
+#: ../../www/admin/distributionlist/list.php:235
 #, php-format
-msgid "Account removed from distribution list '%s'."
-msgstr "L'account Ã¨ stato rimosso dalla lista di distribuzione"
-
-#: ../../../www/admin/user/user.php.in:797
-#, fuzzy, php-format
-msgid ""
-"Failure to remove account from distribution list '%s', account will not be "
-"deleted."
-msgstr ""
-"Rimozione dell'account dalla lista di distribuzione fallito. L'account non "
-"sarÃ  cancellato."
+msgid "LDAP Error: Could not add object %s: %s"
+msgstr "Errore LDAP: non Ã¨ possibile aggiungere l'oggetto"
 
-#: ../../../www/admin/user/user.php.in:805
+#: ../../www/admin/distributionlist/list.php:264
 #, php-format
-msgid "LDAP Error: could not mark '%s' for deletion: %s"
-msgstr "Errore LDAP: Ã¨ impossibile cancellare"
+msgid "Distribution List '%s' added"
+msgstr "Lista di Distribuzione aggiornata"
 
-#: ../../../www/admin/user/user.php.in:808
-msgid "User Deleted"
-msgstr "Utente cancellato"
+#: ../../www/admin/distributionlist/list.php:276
+#: ../../www/admin/distributionlist/list.php:290
+msgid "Modify Distribution List"
+msgstr "Modifica Lista di Distribuzione"
 
-#: ../../../www/admin/user/vacation.php.in:43
-msgid "Days must be at least one"
-msgstr ""
+#: ../../www/admin/distributionlist/list.php:305
+msgid "Delete Distribution List"
+msgstr "Cancella Lista di Distribuzione"
 
-#: ../../../www/admin/user/vacation.php.in:65
-msgid "Vacation message successfully activated"
-msgstr "Messagio di assenza attivato con successo"
+#: ../../www/admin/distributionlist/list.php:315
+msgid "Distribution List "
+msgstr "Lista di Distribuzione"
 
-#: ../../../www/admin/user/vacation.php.in:66
-msgid "Vacation message successfully deactivated"
-msgstr "Messagio di assenza disattivato con successo"
+#: ../../www/admin/distributionlist/list.php:315
+msgid " deleted"
+msgstr " cancellata"
 
-#: ../../../www/admin/user/vacation.php.in:87
+#: ../../www/admin/distributionlist/list.php:319
 #, php-format
-msgid "%x"
-msgstr "%x"
+msgid "LDAP Error: Could not delete %s: %s"
+msgstr "Errore LDAP: Ã¨ impossibile cancellare"
 
-#: ../../../www/admin/user/vacation.php.in:89
+#: ../../www/admin/settings/index.php:99
 #, php-format
-msgid "I am out of office until %s.\r\n"
-msgstr "Sono fuori ufficio fino a %s.\r\n"
+msgid "No account found for email address %s"
+msgstr "Nessun account Ã¨ stato trovato per l'indirizzo email "
 
-#: ../../../www/admin/user/vacation.php.in:90
+#: ../../www/admin/settings/index.php:108
 #, php-format
-msgid ""
-"In urgent cases, please contact Mrs. <vacation replacement>\r\n"
-"\r\n"
+msgid "LDAP Error: Failed to add distribution list %s: %s"
 msgstr ""
-"In casi urgenti, prego contattare Sig. <rimpiazzo assenza>\r\n"
-"\r\n"
+"Errore LDAP: errore nella modifica dell'oggetto di configurazione kolab: "
 
-#: ../../../www/admin/user/vacation.php.in:91
+#: ../../www/admin/settings/index.php:110
 #, php-format
-msgid "email: <email address of vacation replacement>\r\n"
-msgstr "email: <indirizzo email del rimpiazzio dell'assenza>\r\n"
+msgid "Successfully created distribution list %s"
+msgstr "Crea liste di distribuzione"
 
-#: ../../../www/admin/user/vacation.php.in:92
+#: ../../www/admin/settings/index.php:129
+#: ../../www/admin/settings/index.php:138
+#: ../../www/admin/settings/index.php:147
+#: ../../www/admin/settings/index.php:158
+#: ../../www/admin/settings/index.php:168
+#: ../../www/admin/settings/index.php:177
+#: ../../www/admin/settings/index.php:188
+#: ../../www/admin/settings/index.php:202
+#: ../../www/admin/settings/index.php:220
+#: ../../www/admin/settings/index.php:238
+#: ../../www/admin/settings/index.php:255
+#: ../../www/admin/settings/index.php:268
 #, php-format
-msgid "phone: +49 711 1111 11\r\n"
-msgstr "Telefono: +49 711 1111 11\r\n"
+msgid "LDAP Error: failed to modify kolab configuration object: %s"
+msgstr ""
+"Errore LDAP: errore nella modifica dell'oggetto di configurazione kolab: "
 
-#: ../../../www/admin/user/vacation.php.in:93
+#: ../../www/admin/settings/index.php:226
 #, php-format
-msgid ""
-"fax.:  +49 711 1111 12\r\n"
-"\r\n"
+msgid "LDAP Error: Failed to delete domain object %s: %s"
 msgstr ""
-"fax.:  +49 711 1111 12\r\n"
-"\r\n"
+"Errore LDAP: errore nella modifica dell'oggetto di configurazione kolab: "
 
-#: ../../../www/admin/user/vacation.php.in:94
-#, php-format
-msgid "Yours sincerely,\r\n"
-msgstr "Cordiali saluti,\r\n"
+#: ../../www/admin/settings/index.php:276
+msgid "POP3 Service"
+msgstr "Servizio POP3"
 
-#: ../../../www/admin/user/vacation.php.in:95
-#, php-format
-msgid "-- \r\n"
-msgstr "-- \r\n"
+#: ../../www/admin/settings/index.php:277
+msgid "POP3/SSL service (TCP port 995)"
+msgstr "Servizio POP3/SSL (Porta TCP 995)"
 
-#: ../../../www/admin/user/vacation.php.in:96
-#, php-format
-msgid "<enter your name and email address here>"
-msgstr "<inserite qui il vostro nome e il vostro indirizzo email>"
+#: ../../www/admin/settings/index.php:278
+msgid "IMAP Service"
+msgstr "Servizio IMAP"
 
-#: ../include/auth.class.php.in:40
-msgid "Server error, no ldap object!"
-msgstr "Errore nel server, oggetto ldap non presente!"
+#: ../../www/admin/settings/index.php:279
+msgid "IMAP/SSL Service (TCP port 993)"
+msgstr "Servizio IMAP/SSL (Porta TCP 993)"
 
-#: ../include/auth.class.php.in:45
-msgid "Could not bind to LDAP server: "
-msgstr "Non Ã¨ possibile il collegamento con il server LDAP:"
+#: ../../www/admin/settings/index.php:280
+#, php-format
+msgid "Sieve service (TCP port %s)"
+msgstr "Servizio Sieve (Porta TCP %s)"
 
-#: ../include/auth.class.php.in:56
-msgid "Could not bind to LDAP server"
-msgstr "Il collegamento con il server LDAP non Ã¨ possibile"
+#: ../../www/admin/settings/index.php:281
+msgid "FreeBusy Service via HTTP (in addition to HTTPS)"
+msgstr ""
 
-#: ../include/auth.class.php.in:83 ../include/auth.class.php.in:87
-msgid "Wrong username or password"
-msgstr "Nome utente o password errati"
+#: ../../www/admin/settings/index.php:282
+msgid "Amavis Email Scanning (Virus/Spam)"
+msgstr "Servizio di verifica Email Amavis (Virus/Spam)"
 
-#: ../include/form.class.php:34
+#: ../../lib/KolabAdmin/include/form.class.php:34
 msgid "Email address "
 msgstr "Indirizzo Email"
 
-#: ../include/form.class.php:45
-msgid "Quota must be smaller than 4096"
-msgstr ""
-
-#: ../include/form.class.php:46
+#: ../../lib/KolabAdmin/include/form.class.php:45
 msgid "Quota can not be negative"
 msgstr ""
 
-#: ../include/form.class.php:47
+#: ../../lib/KolabAdmin/include/form.class.php:46
 msgid "Quota must be a number"
 msgstr ""
 
-#: ../include/form.class.php:48
+#: ../../lib/KolabAdmin/include/form.class.php:47
 msgid "Quota must be an integer"
 msgstr ""
 
-#: ../include/form.class.php:55
+#: ../../lib/KolabAdmin/include/form.class.php:54
 msgid ""
 "Phone entries may only contain a-z, numbers, spaces and the characters ()-+/."
 "=?:"
 msgstr ""
 
-#: ../include/form.class.php:118
+#: ../../lib/KolabAdmin/include/form.class.php:117
 msgid "<tr><th>Attribute</th><th>Value</th><th>Comment</th></tr>"
 msgstr "<tr><th>Attributo</th><th>Valore</th><th>Commento</th></tr>"
 
-#: ../include/form.class.php:205
-msgid "Yes"
-msgstr "SÃ¬"
-
-#: ../include/form.class.php:205
-msgid "No"
-msgstr "No"
-
-#: ../include/form.class.php:323
+#: ../../lib/KolabAdmin/include/form.class.php:322
 msgid "Always accept"
 msgstr "Accetta sempre"
 
-#: ../include/form.class.php:324
+#: ../../lib/KolabAdmin/include/form.class.php:323
 msgid "Always reject"
 msgstr "Rifiuta sempre"
 
-#: ../include/form.class.php:325
+#: ../../lib/KolabAdmin/include/form.class.php:324
 msgid "Reject if conflicts"
 msgstr "Rifiuta se in conflitto"
 
-#: ../include/form.class.php:326
+#: ../../lib/KolabAdmin/include/form.class.php:325
 msgid "Manual if conflicts"
 msgstr "Passa in manuale se in conflitto"
 
-#: ../include/form.class.php:327
+#: ../../lib/KolabAdmin/include/form.class.php:326
 msgid "Manual"
 msgstr "Manuale"
 
-#: ../include/form.class.php:333 ../include/form.class.php:339
+#: ../../lib/KolabAdmin/include/form.class.php:332
+#: ../../lib/KolabAdmin/include/form.class.php:338
 msgid "Anyone"
 msgstr "Chiunque"
 
-#: ../include/form.class.php:375
+#: ../../lib/KolabAdmin/include/form.class.php:374
 #, fuzzy
 msgid "* Required field."
 msgstr "Campo obbligatorio"
 
-#: ../include/form.class.php:396 ../include/form.class.php:399
+#: ../../lib/KolabAdmin/include/form.class.php:395
+#: ../../lib/KolabAdmin/include/form.class.php:398
 msgid "Required field "
 msgstr "Campo obbligatorio"
 
-#: ../include/form.class.php:396 ../include/form.class.php:399
+#: ../../lib/KolabAdmin/include/form.class.php:395
+#: ../../lib/KolabAdmin/include/form.class.php:398
 msgid " is empty"
 msgstr " Ã¨ vuoto"
 
-#: ../include/ldap.class.php.in:54
-msgid ""
-"Error setting LDAP protocol to v3. Please contact your system administrator"
-msgstr ""
-"Si Ã¨ verificato un errore impostando il protocollo LDAP alla versione 3. "
-"Contattare l'amministratore di sistema"
-
-#: ../include/ldap.class.php.in:184 ../include/ldap.class.php.in:214
-#: ../include/ldap.class.php.in:244
-#, php-format
-msgid "No such object %s"
-msgstr "Questo oggetto non esiste"
-
-#: ../include/ldap.class.php.in:187 ../include/ldap.class.php.in:217
-#: ../include/ldap.class.php.in:247
-#, php-format
-msgid "LDAP Error searching for DN %s: %s"
-msgstr ""
-
-#: ../include/ldap.class.php.in:200
-#, php-format
-msgid "Error searching for DN for UID=%s"
-msgstr "Errore nella ricerca del DN per l'utente"
-
-#: ../include/ldap.class.php.in:230
-#, php-format
-msgid "Error searching for DN for Mail=%s"
-msgstr "Errore nella ricerca del DN per la Mail"
-
-#: ../include/ldap.class.php.in:260
-#, php-format
-msgid "Error searching for DN for alias=%s: %s"
-msgstr "Errore nella ricerca del DN per l'alias: "
-
-#: ../include/ldap.class.php.in:273
-#, php-format
-msgid "Error searching for DN for mail or alias %s: %s"
-msgstr "Errore nella ricerca del DN per la mail o l'alias: "
-
-#: ../include/ldap.class.php.in:336
-msgid "LDAP Error: Can't read maintainers group: "
-msgstr "Errore LDAP: Ã¨ impossibile leggere il gruppo dei maintainer:"
-
-#: ../include/menu.php:26
+#: ../../lib/KolabAdmin/include/menu.php:26
 msgid "Users"
 msgstr "Utenti"
 
-#: ../include/menu.php:28
+#: ../../lib/KolabAdmin/include/menu.php:28
 msgid "Manage Email Users"
 msgstr "Gestione Utenti Email"
 
-#: ../include/menu.php:33 ../include/menu.php:35
+#: ../../lib/KolabAdmin/include/menu.php:33
+#: ../../lib/KolabAdmin/include/menu.php:35
 msgid "My User Settings"
 msgstr "Impostazioni personali"
 
-#: ../include/menu.php:37
+#: ../../lib/KolabAdmin/include/menu.php:37
 msgid "Mail Delivery"
 msgstr "Consegna Email"
 
-#: ../include/menu.php:39
+#: ../../lib/KolabAdmin/include/menu.php:39
 msgid "Forward Email"
 msgstr "Inoltro Email"
 
-#: ../include/menu.php:41
+#: ../../lib/KolabAdmin/include/menu.php:41
 msgid "Vacation"
 msgstr "Assenza"
 
-#: ../include/menu.php:47
+#: ../../lib/KolabAdmin/include/menu.php:54
 msgid "Manage Address Book"
 msgstr "Gestione Rubrica"
 
-#: ../include/menu.php:49
+#: ../../lib/KolabAdmin/include/menu.php:56
 msgid "Create New vCard"
 msgstr "Crea nuova vCard"
 
-#: ../include/menu.php:54
+#: ../../lib/KolabAdmin/include/menu.php:61
 msgid "Shared Folder"
 msgstr "Cartella Condivisa"
 
-#: ../include/menu.php:56
+#: ../../lib/KolabAdmin/include/menu.php:63
 msgid "Manage Shared Folders"
 msgstr "Gestione Cartelle Condivise"
 
-#: ../include/menu.php:64
+#: ../../lib/KolabAdmin/include/menu.php:71
 msgid "Manage Distribution Lists"
 msgstr "Gestione Liste di Distribuzione"
 
-#: ../include/menu.php:66
+#: ../../lib/KolabAdmin/include/menu.php:73
 msgid "Create New List"
 msgstr "Crea una Nuova Lista"
 
-#: ../include/menu.php:72
+#: ../../lib/KolabAdmin/include/menu.php:79
 msgid "Manage Administrators"
 msgstr "Gestione Amministratori"
 
-#: ../include/menu.php:78 ../include/menu.php:95
+#: ../../lib/KolabAdmin/include/menu.php:85
+#: ../../lib/KolabAdmin/include/menu.php:102
 msgid "Manage Domain Maintainers"
 msgstr "Gestione Maintainer"
 
-#: ../include/menu.php:84
+#: ../../lib/KolabAdmin/include/menu.php:91
 msgid "Manage Maintainers"
 msgstr "Gestione Maintainer"
 
-#: ../include/menu.php:92
+#: ../../lib/KolabAdmin/include/menu.php:99
 msgid "Manage Maintainer"
 msgstr "Gestione Maintainer"
 
-#: ../include/menu.php:103
+#: ../../lib/KolabAdmin/include/menu.php:110
 #, fuzzy
 msgid "Manage Domain Maintainer"
 msgstr "Gestione Maintainer"
 
-#: ../include/menu.php:106
-msgid "Settings"
-msgstr "Servizi"
-
-#: ../include/menu.php:108
+#: ../../lib/KolabAdmin/include/menu.php:115
 msgid "System Settings"
 msgstr "Gestione Servizi"
 
-#: ../include/menu.php:111 ../include/menu.php:113
+#: ../../lib/KolabAdmin/include/menu.php:118
+#: ../../lib/KolabAdmin/include/menu.php:120
 msgid "About Kolab"
 msgstr "Informazioni su Kolab"
 
-#: ../include/menu.php:115
-msgid "Erfrakon"
-msgstr "Erfrakon"
+#: ../../lib/KolabAdmin/include/menu.php:122
+#, fuzzy
+msgid "Kolab Systems"
+msgstr "Server Kolab"
 
-#: ../include/menu.php:117
-msgid "Intevation"
-msgstr "Intevation"
+#: ../../lib/KolabAdmin/include/menu.php:124
+msgid "Technology"
+msgstr ""
 
-#: ../include/menu.php:119
-msgid "Klarälvdalens Datakonsult"
-msgstr "Klarälvdalens Datakonsult"
+#: ../../lib/KolabAdmin/include/menu.php:128
+msgid "Versions"
+msgstr "Versioni"
 
-#: ../include/menu.php:121
-msgid "Code Fusion"
-msgstr "Code Fusion"
+#: ../../lib/KolabAdmin/include/auth.class.php:40
+msgid "Server error, no ldap object!"
+msgstr "Errore nel server, oggetto ldap non presente!"
 
-#: ../include/menu.php:123
-msgid "KDE"
-msgstr "KDE"
+#: ../../lib/KolabAdmin/include/auth.class.php:45
+msgid "Could not bind to LDAP server: "
+msgstr "Non Ã¨ possibile il collegamento con il server LDAP:"
 
-#: ../include/menu.php:127
-msgid "Versions"
-msgstr "Versioni"
+#: ../../lib/KolabAdmin/include/auth.class.php:56
+msgid "Could not bind to LDAP server"
+msgstr "Il collegamento con il server LDAP non Ã¨ possibile"
 
-#: ../include/passwd.php:33
+#: ../../lib/KolabAdmin/include/auth.class.php:83
+#: ../../lib/KolabAdmin/include/auth.class.php:87
+msgid "Wrong username or password"
+msgstr "Nome utente o password errati"
+
+#: ../../lib/KolabAdmin/include/auth.class.php:124
+msgid "Kolab Groupware login"
+msgstr "Kolab Groupware login"
+
+#: ../../lib/KolabAdmin/include/passwd.php:33
 msgid "Password is empty"
 msgstr "La password Ã¨ vuota"
 
-#: ../include/passwd.php:36 ../include/passwd.php:41
+#: ../../lib/KolabAdmin/include/passwd.php:36
+#: ../../lib/KolabAdmin/include/passwd.php:41
 msgid "Passwords dont match"
 msgstr "Le password non corrispondono"
 
 #~ msgid ""
+#~ "Activate delivery to folder (only one of vacation, forward and delivery "
+#~ "to folder can be active at any time)"
+#~ msgstr ""
+#~ "Attiva invio in cartella (solo uno tra assenza, inoltro e invio in "
+#~ "cartella puÃ² essere attivo allo stesso tempo)"
+
+#~ msgid ""
+#~ "Activate email forwarding (only one of vacation, forward and delivery to "
+#~ "folder can be active at any time)"
+#~ msgstr ""
+#~ "Attiva inoltro email (solo uno tra assenza, inoltro e invio in cartella "
+#~ "puÃ² essere attivo allo stesso tempo)"
+
+#~ msgid ""
+#~ "This is the Kolab2 Server. It is Free Software developed by the <a href="
+#~ "\"http://www.kolab.org/\">Kolab Project</a>, with the intention of "
+#~ "bringing groupware functionality to Unix/KDE users as well as Windows "
+#~ "desktops."
+#~ msgstr ""
+#~ "Questo Ã¨ il Server Kolab2. E' un Free Software sviluppato da <a href="
+#~ "\"http://www.kolab.org/\">Kolab Project</a>, con l'intenzione di portare "
+#~ "funzionalitÃ  groupware agli utenti Unix/KDE cosÃ¬ come ai desktop Windows."
+
+#~ msgid "Kolab builds upon many other Free Software projects, namely:"
+#~ msgstr ""
+#~ "Kolab Ã¨ costruito sulla base di molti altri progetti Free Software, "
+#~ "precisamente:"
+
+#~ msgid ""
+#~ "The following projects are used in binding the above together, in order "
+#~ "to create the Kolab Server:"
+#~ msgstr ""
+#~ "I seguenti progetti sono stati usati come collegamento di quelli "
+#~ "suindicati, per creare il Server Kolab:"
+
+#~ msgid "The following projects are used as a base for the Kolab Clients:"
+#~ msgstr "I seguenti progetti sono stati usati come base per i Client Kolab:"
+
+#~ msgid "User:"
+#~ msgstr "Utente:"
+
+#~ msgid "Role:"
+#~ msgstr "Ruolo:"
+
+#~ msgid "Logout"
+#~ msgstr "Disconnetti"
+
+#~ msgid "Not logged in"
+#~ msgstr "Non connesso"
+
+#~ msgid ""
+#~ "Activate vacation notification (only one of vacation, forward and "
+#~ "delivery to folder can be active at any time)"
+#~ msgstr ""
+#~ "Attiva notifica d'assenza  (solo uno tra assenza, inoltro e invio in "
+#~ "cartella puÃ² essere attivo allo stesso tempo)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Addressbook entry DN could not be modified, distribution list <a "
+#~ "href='@kolab_wui@/distributionlist/list.php?action=modify&dn=%s'>'%s'</a> "
+#~ "depends on it. To modify this entry, first remove it from the "
+#~ "distribution list."
+#~ msgstr ""
+#~ "Il DN dell'account non puÃ² essere modificato, la lista di distribuzione "
+#~ "<a href='/admin/distributionlist/list.php?action=modify&dn="
+
+#~ msgid ""
+#~ "Net/Sieve.php is missing. Without that, filter settings are not available"
+#~ msgstr ""
+#~ "Net/sieve.php Ã¨ mancante. Senza di esso le impostazioni dei filtri non "
+#~ "sono disponibili"
+
+#~ msgid "Script was:"
+#~ msgstr "Lo script era:"
+
+#~ msgid ""
+#~ "Net/Sieve.php is missing. Without that, vacation settings are not "
+#~ "available"
+#~ msgstr ""
+#~ "Net/sieve.php Ã¨ mancante. Senza di esso le impostazioni dei messaggi di "
+#~ "assenza non sono disponibili"
+
+#~ msgid "%x"
+#~ msgstr "%x"
+
+#~ msgid "I am out of office until %s.\r\n"
+#~ msgstr "Sono fuori ufficio fino a %s.\r\n"
+
+#~ msgid ""
+#~ "In urgent cases, please contact Mrs. <vacation replacement>\r\n"
+#~ "\r\n"
+#~ msgstr ""
+#~ "In casi urgenti, prego contattare Sig. <rimpiazzo assenza>\r\n"
+#~ "\r\n"
+
+#~ msgid "email: <email address of vacation replacement>\r\n"
+#~ msgstr "email: <indirizzo email del rimpiazzio dell'assenza>\r\n"
+
+#~ msgid "phone: +49 711 1111 11\r\n"
+#~ msgstr "Telefono: +49 711 1111 11\r\n"
+
+#~ msgid ""
+#~ "fax.:  +49 711 1111 12\r\n"
+#~ "\r\n"
+#~ msgstr ""
+#~ "fax.:  +49 711 1111 12\r\n"
+#~ "\r\n"
+
+#~ msgid "Yours sincerely,\r\n"
+#~ msgstr "Cordiali saluti,\r\n"
+
+#~ msgid "-- \r\n"
+#~ msgstr "-- \r\n"
+
+#~ msgid "<enter your name and email address here>"
+#~ msgstr "<inserite qui il vostro nome e il vostro indirizzo email>"
+
+#~ msgid ""
+#~ "Error setting LDAP protocol to v3. Please contact your system "
+#~ "administrator"
+#~ msgstr ""
+#~ "Si Ã¨ verificato un errore impostando il protocollo LDAP alla versione 3. "
+#~ "Contattare l'amministratore di sistema"
+
+#~ msgid "No such object %s"
+#~ msgstr "Questo oggetto non esiste"
+
+#~ msgid "Error searching for DN for UID=%s"
+#~ msgstr "Errore nella ricerca del DN per l'utente"
+
+#~ msgid "Error searching for DN for Mail=%s"
+#~ msgstr "Errore nella ricerca del DN per la Mail"
+
+#~ msgid "Error searching for DN for alias=%s: %s"
+#~ msgstr "Errore nella ricerca del DN per l'alias: "
+
+#~ msgid "Error searching for DN for mail or alias %s: %s"
+#~ msgstr "Errore nella ricerca del DN per la mail o l'alias: "
+
+#~ msgid "LDAP Error: Can't read maintainers group: "
+#~ msgstr "Errore LDAP: Ã¨ impossibile leggere il gruppo dei maintainer:"
+
+#~ msgid "Erfrakon"
+#~ msgstr "Erfrakon"
+
+#~ msgid "Intevation"
+#~ msgstr "Intevation"
+
+#~ msgid "Klarälvdalens Datakonsult"
+#~ msgstr "Klarälvdalens Datakonsult"
+
+#~ msgid "Code Fusion"
+#~ msgstr "Code Fusion"
+
+#~ msgid "KDE"
+#~ msgstr "KDE"
+
+#~ msgid ""
 #~ "Using legacy services poses a security thread due to leakage of cleartext "
 #~ "passwords, lack of authenticity and privacy."
 #~ msgstr ""
@@ -2421,9 +2849,6 @@ msgstr "Le password non corrispondono"
 #~ msgid "LDAP Error: Could not remove old entry %s,%s: %s"
 #~ msgstr "Errore LDAP: Ã¨ impossibile rinominare"
 
-#~ msgid "Kolab Hosts"
-#~ msgstr "Server Kolab"
-
 #~ msgid "One Email address per line"
 #~ msgstr "Un indirizzo email per linea"
 
diff --git a/data/locale/messages.pot b/data/locale/messages.pot
new file mode 100644
index 0000000..dfa7935
--- /dev/null
+++ b/data/locale/messages.pot
@@ -0,0 +1,2427 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-07-15 12:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: tpl_messages.php:2 tpl_messages.php:62
+msgid "Errors:"
+msgstr ""
+
+#: tpl_messages.php:3 tpl_messages.php:63
+msgid "Message:"
+msgstr ""
+
+#: tpl_messages.php:4 ../../lib/KolabAdmin/include/menu.php:77
+msgid "Administrators"
+msgstr ""
+
+#: tpl_messages.php:5 tpl_messages.php:69 tpl_messages.php:87
+#: tpl_messages.php:111 tpl_messages.php:210 tpl_messages.php:215
+#: tpl_messages.php:278 ../../www/admin/user/index.php:181
+#: ../../www/admin/addressbook/index.php:121
+msgid "Name"
+msgstr ""
+
+#: tpl_messages.php:6 tpl_messages.php:216 tpl_messages.php:279
+#: ../../www/admin/user/index.php:183
+msgid "UID"
+msgstr ""
+
+#: tpl_messages.php:7 tpl_messages.php:70 tpl_messages.php:90
+#: tpl_messages.php:114 tpl_messages.php:190 tpl_messages.php:211
+#: tpl_messages.php:217 tpl_messages.php:251 tpl_messages.php:264
+#: tpl_messages.php:280
+msgid "Action"
+msgstr ""
+
+#: tpl_messages.php:8 tpl_messages.php:218 tpl_messages.php:281
+msgid "Object Deleted, awaiting cleanup..."
+msgstr ""
+
+#: tpl_messages.php:9 tpl_messages.php:72 tpl_messages.php:92
+#: tpl_messages.php:116 tpl_messages.php:194 tpl_messages.php:212
+#: tpl_messages.php:219 tpl_messages.php:282
+msgid "Modify"
+msgstr ""
+
+#: tpl_messages.php:10 tpl_messages.php:73 tpl_messages.php:93
+#: tpl_messages.php:117 tpl_messages.php:195 tpl_messages.php:213
+#: tpl_messages.php:220 tpl_messages.php:252 tpl_messages.php:265
+#: tpl_messages.php:283 ../../www/admin/user/user.php:862
+#: ../../www/admin/user/user.php:920
+#: ../../www/admin/administrator/admin.php:311
+#: ../../www/admin/addressbook/addr.php:277
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:314
+#: ../../www/admin/sharedfolder/sf.php:314
+#: ../../www/admin/distributionlist/list.php:304
+msgid "Delete"
+msgstr ""
+
+#: tpl_messages.php:11
+msgid "Email Forwarding"
+msgstr ""
+
+#: tpl_messages.php:12
+msgid "Activate email forwarding"
+msgstr ""
+
+#: tpl_messages.php:13
+msgid "Forward mail to"
+msgstr ""
+
+#: tpl_messages.php:14
+msgid "Keep copy on server"
+msgstr ""
+
+#: tpl_messages.php:15 tpl_messages.php:77 tpl_messages.php:229
+#: tpl_messages.php:233 tpl_messages.php:236 tpl_messages.php:239
+#: tpl_messages.php:242 tpl_messages.php:245 tpl_messages.php:248
+#: tpl_messages.php:261 tpl_messages.php:333
+msgid "Update"
+msgstr ""
+
+#: tpl_messages.php:16
+msgid "ActiveSync Configuration"
+msgstr ""
+
+#: tpl_messages.php:17
+msgid "Device Alias"
+msgstr ""
+
+#: tpl_messages.php:18
+msgid "Device Mode"
+msgstr ""
+
+#: tpl_messages.php:19
+msgid "Picture Settings"
+msgstr ""
+
+#: tpl_messages.php:20
+msgid "Enable PNG and GIF formats while syncing"
+msgstr ""
+
+#: tpl_messages.php:21
+msgid "Save"
+msgstr ""
+
+#: tpl_messages.php:22
+msgid "Clear"
+msgstr ""
+
+#: tpl_messages.php:23
+msgid "Forget Device"
+msgstr ""
+
+#: tpl_messages.php:24
+msgid "Are you sure?"
+msgstr ""
+
+#: tpl_messages.php:25
+msgid "The maintainer with DN"
+msgstr ""
+
+#: tpl_messages.php:26 tpl_messages.php:29 tpl_messages.php:204
+#: tpl_messages.php:207 tpl_messages.php:286 tpl_messages.php:309
+msgid "has been deleted"
+msgstr ""
+
+#: tpl_messages.php:27
+msgid "Back to list of maintainers"
+msgstr ""
+
+#: tpl_messages.php:28
+msgid "The distribution list with DN"
+msgstr ""
+
+#: tpl_messages.php:30
+msgid "Back to list of distribution lists"
+msgstr ""
+
+#: tpl_messages.php:31
+msgid "Attribute"
+msgstr ""
+
+#: tpl_messages.php:32
+msgid "Value"
+msgstr ""
+
+#: tpl_messages.php:33
+msgid "Comment"
+msgstr ""
+
+#: tpl_messages.php:34 ../../www/admin/user/user.php:449
+#: ../../www/admin/administrator/admin.php:139
+#: ../../www/admin/addressbook/addr.php:88
+#: ../../www/admin/maintainer/maintainer.php:136
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:114
+msgid "First Name"
+msgstr ""
+
+#: tpl_messages.php:35 tpl_messages.php:38 tpl_messages.php:40
+#: tpl_messages.php:42 ../../www/admin/user/user.php:441
+#: ../../www/admin/user/user.php:451 ../../www/admin/user/user.php:455
+#: ../../www/admin/administrator/admin.php:133
+#: ../../www/admin/administrator/admin.php:141
+#: ../../www/admin/administrator/admin.php:144
+#: ../../www/admin/addressbook/addr.php:90
+#: ../../www/admin/addressbook/addr.php:93
+#: ../../www/admin/maintainer/maintainer.php:130
+#: ../../www/admin/maintainer/maintainer.php:138
+#: ../../www/admin/maintainer/maintainer.php:141
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:108
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:116
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:119
+#: ../../www/admin/sharedfolder/sf.php:125
+#: ../../www/admin/distributionlist/list.php:120
+msgid "Required"
+msgstr ""
+
+#: tpl_messages.php:36 ../../www/admin/user/user.php:452
+msgid "Middle Name"
+msgstr ""
+
+#: tpl_messages.php:37 ../../www/admin/user/user.php:453
+#: ../../www/admin/administrator/admin.php:142
+#: ../../www/admin/addressbook/addr.php:91
+#: ../../www/admin/maintainer/maintainer.php:139
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:117
+msgid "Last Name"
+msgstr ""
+
+#: tpl_messages.php:39 ../../www/admin/user/user.php:456
+#: ../../www/admin/administrator/admin.php:145
+#: ../../www/admin/maintainer/maintainer.php:142
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:120
+msgid "Password"
+msgstr ""
+
+#: tpl_messages.php:41 ../../www/admin/user/user.php:460
+#: ../../www/admin/administrator/admin.php:149
+#: ../../www/admin/maintainer/maintainer.php:146
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:124
+msgid "Verify Password"
+msgstr ""
+
+#: tpl_messages.php:43 ../../www/admin/user/user.php:464
+msgid "Primary Email Address"
+msgstr ""
+
+#: tpl_messages.php:44 ../../www/admin/user/user.php:440
+#: ../../www/admin/user/user.php:442
+#: ../../www/admin/administrator/admin.php:132
+#: ../../www/admin/maintainer/maintainer.php:129
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:107
+#: ../../www/admin/sharedfolder/sf.php:128
+msgid "Required, non volatile"
+msgstr ""
+
+#: tpl_messages.php:45 ../../www/admin/user/user.php:505
+#: ../../www/admin/addressbook/addr.php:94
+msgid "Title"
+msgstr ""
+
+#: tpl_messages.php:46
+msgid "Email Alias"
+msgstr ""
+
+#: tpl_messages.php:47 ../../www/admin/user/user.php:506
+#: ../../www/admin/addressbook/addr.php:101
+msgid "Organisation"
+msgstr ""
+
+#: tpl_messages.php:48 ../../www/admin/user/user.php:507
+#: ../../www/admin/addressbook/addr.php:102
+msgid "Organisational Unit"
+msgstr ""
+
+#: tpl_messages.php:49 ../../www/admin/user/user.php:508
+#: ../../www/admin/addressbook/addr.php:103
+msgid "Room Number"
+msgstr ""
+
+#: tpl_messages.php:50 ../../www/admin/user/user.php:509
+#: ../../www/admin/addressbook/addr.php:104
+msgid "Street Address"
+msgstr ""
+
+#: tpl_messages.php:51 ../../www/admin/user/user.php:510
+msgid "Postbox"
+msgstr ""
+
+#: tpl_messages.php:52 ../../www/admin/user/user.php:511
+#: ../../www/admin/addressbook/addr.php:106
+msgid "Postal Code"
+msgstr ""
+
+#: tpl_messages.php:53 ../../www/admin/user/user.php:512
+#: ../../www/admin/addressbook/addr.php:107
+msgid "City"
+msgstr ""
+
+#: tpl_messages.php:54 ../../www/admin/user/user.php:513
+#: ../../www/admin/addressbook/addr.php:108
+msgid "Country"
+msgstr ""
+
+#: tpl_messages.php:55 ../../www/admin/user/user.php:515
+#: ../../www/admin/addressbook/addr.php:109
+msgid "Telephone Number"
+msgstr ""
+
+#: tpl_messages.php:56 ../../www/admin/user/user.php:517
+#: ../../www/admin/addressbook/addr.php:111
+msgid "Fax Number"
+msgstr ""
+
+#: tpl_messages.php:57 tpl_messages.php:96 tpl_messages.php:313
+#: ../../lib/KolabAdmin/include/menu.php:52
+msgid "Addressbook"
+msgstr ""
+
+#: tpl_messages.php:58
+msgid "check here to make this users address <br/> visible in the address book"
+msgstr ""
+
+#: tpl_messages.php:59
+msgid "User Quota in KB"
+msgstr ""
+
+#: tpl_messages.php:60 ../../www/admin/user/user.php:521
+msgid "Leave blank for unlimited"
+msgstr ""
+
+#: tpl_messages.php:61 ../../lib/KolabAdmin/include/form.class.php:75
+msgid "Submit"
+msgstr ""
+
+#: tpl_messages.php:64 tpl_messages.php:209
+msgid "(only external addresses without a kolab user account)"
+msgstr ""
+
+#: tpl_messages.php:65 tpl_messages.php:82 tpl_messages.php:103
+msgid "[ ALL ]"
+msgstr ""
+
+#: tpl_messages.php:66 tpl_messages.php:83 tpl_messages.php:104
+msgid "[ OTHER ]"
+msgstr ""
+
+#: tpl_messages.php:67 tpl_messages.php:84 tpl_messages.php:105
+msgid "Filter:"
+msgstr ""
+
+#: tpl_messages.php:68 tpl_messages.php:85 tpl_messages.php:106
+msgid "Filter"
+msgstr ""
+
+#: tpl_messages.php:71
+msgid "Entry deleted, awaiting cleanup..."
+msgstr ""
+
+#: tpl_messages.php:74
+msgid "Email Delivery"
+msgstr ""
+
+#: tpl_messages.php:75
+msgid "Activate delivery to folder"
+msgstr ""
+
+#: tpl_messages.php:76
+msgid "Deliver regular mail to folder"
+msgstr ""
+
+#: tpl_messages.php:78
+msgid ""
+"<a href=\"http://www.kde.org\">KDE</a> is a powerful <a href=\"http://www."
+"gnu.org/philosophy/free-sw.html\">Free Software</a> graphical desktop "
+"environment for Linux and Unix workstations. It combines ease of use, "
+"contemporary functionality, and outstanding graphical design with the "
+"technological superiority of the Unix operating system."
+msgstr ""
+
+#: tpl_messages.php:79
+msgid ""
+"<b>KDE</b> is an Internet project that is truly open in every sense. "
+"Development takes place on the Internet and is discussed on our <a href="
+"\"http://www.kde.org/mailinglists.html\">mailing lists</a>, USENET news "
+"groups, and IRC channels to which we invite and welcome everyone."
+msgstr ""
+
+#: tpl_messages.php:80
+msgid ""
+"<b>KDE</b> is a mature desktop suite providing a solid basis to an ever "
+"growing number of <a href=\"http://www.kde-apps.org\">applications</a> for "
+"Unix workstations.  KDE has developed a high quality development framework "
+"for Unix, which allows for the rapid and efficient creation of applications."
+msgstr ""
+
+#: tpl_messages.php:81 tpl_messages.php:102
+msgid "Email Users"
+msgstr ""
+
+#: tpl_messages.php:86 tpl_messages.php:113
+msgid "Type"
+msgstr ""
+
+#: tpl_messages.php:88 ../../www/admin/user/activesync.php:496
+msgid "E-mail"
+msgstr ""
+
+#: tpl_messages.php:89
+msgid "uid"
+msgstr ""
+
+#: tpl_messages.php:91
+msgid "User Deleted, awaiting cleanup..."
+msgstr ""
+
+#: tpl_messages.php:94 tpl_messages.php:151
+msgid "Welcome to the Kolab Groupware Server Maintenance"
+msgstr ""
+
+#: tpl_messages.php:95 tpl_messages.php:152 tpl_messages.php:155
+#: tpl_messages.php:312
+msgid "Manage Users"
+msgstr ""
+
+#: tpl_messages.php:97 tpl_messages.php:153 tpl_messages.php:156
+#: tpl_messages.php:314
+msgid "Shared Folders"
+msgstr ""
+
+#: tpl_messages.php:98 tpl_messages.php:157 tpl_messages.php:187
+#: tpl_messages.php:315 ../../lib/KolabAdmin/include/menu.php:69
+msgid "Distribution Lists"
+msgstr ""
+
+#: tpl_messages.php:99 tpl_messages.php:214 tpl_messages.php:317
+#: ../../lib/KolabAdmin/include/menu.php:89
+#: ../../lib/KolabAdmin/include/menu.php:97
+msgid "Maintainers"
+msgstr ""
+
+#: tpl_messages.php:100 tpl_messages.php:158 tpl_messages.php:277
+#: tpl_messages.php:318 ../../lib/KolabAdmin/include/menu.php:83
+#: ../../lib/KolabAdmin/include/menu.php:100
+#: ../../lib/KolabAdmin/include/menu.php:108
+msgid "Domain Maintainers"
+msgstr ""
+
+#: tpl_messages.php:101 tpl_messages.php:154 tpl_messages.php:159
+#: tpl_messages.php:276 tpl_messages.php:320
+msgid "About"
+msgstr ""
+
+#: tpl_messages.php:107
+msgid ""
+"Intevation GmbH coordinated the Projects: Kroupware and Proko2, which are "
+"the main driving force behind Kolab1&2. In addition to project management "
+"Intevation did most of the quality assurance."
+msgstr ""
+
+#: tpl_messages.php:108
+msgid ""
+"Intevation GmbH is a IT-company exclusively focusing on Free Software. Its "
+"business units are strategic consulting, project management and geographic "
+"information systems."
+msgstr ""
+
+#: tpl_messages.php:109
+msgid "The following people worked on Kolab for Intevation:"
+msgstr ""
+
+#: tpl_messages.php:110
+msgid "Shared folders"
+msgstr ""
+
+#: tpl_messages.php:112
+msgid "Server"
+msgstr ""
+
+#: tpl_messages.php:115
+msgid "Folder deleted, awaiting cleanup..."
+msgstr ""
+
+#: tpl_messages.php:118
+msgid "Kolab Groupware Solution - Technologies"
+msgstr ""
+
+#: tpl_messages.php:119
+msgid ""
+"This is the server of the Kolab Groupware Solution. It is <a href=\"http://"
+"fsfe.org/about/basics/freesoftware\">Free Software</a> developed by the <a "
+"href=\"http://www.kolab.org/\">Kolab Community</a>, which works in "
+"collaboration with and as part of many other communities and projects to "
+"bring you this software."
+msgstr ""
+
+#: tpl_messages.php:120
+msgid ""
+"For this server, Free Software communities and projects that the Kolab "
+"Community is a part of and builds upon include:"
+msgstr ""
+
+#: tpl_messages.php:121
+msgid "(Mail Scanner)"
+msgstr ""
+
+#: tpl_messages.php:122
+msgid "(HTTP Server)"
+msgstr ""
+
+#: tpl_messages.php:123
+msgid "(Virus Scanner)"
+msgstr ""
+
+#: tpl_messages.php:124
+msgid "(IMAP Server & Database)"
+msgstr ""
+
+#: tpl_messages.php:125
+msgid "(LDAP Server)"
+msgstr ""
+
+#: tpl_messages.php:126
+msgid "(MTA)"
+msgstr ""
+
+#: tpl_messages.php:127
+msgid "(SPAM Filter)"
+msgstr ""
+
+#: tpl_messages.php:128
+msgid "(ActiveSync Support)"
+msgstr ""
+
+#: tpl_messages.php:129
+msgid "(Web client)"
+msgstr ""
+
+#: tpl_messages.php:130 tpl_messages.php:131
+msgid "(Server side scripting & glue)"
+msgstr ""
+
+#: tpl_messages.php:132
+msgid "(This interface)"
+msgstr ""
+
+#: tpl_messages.php:133
+msgid ""
+"For the clients, Free Software communities and projects that the Kolab "
+"Community is a part of and builds upon include:"
+msgstr ""
+
+#: tpl_messages.php:134
+msgid "History & Credits"
+msgstr ""
+
+#: tpl_messages.php:135
+msgid ""
+"In 2010, <a href=\"http://www.intevation.de\">Intevation</a>, <a href="
+"\"http://www.kdab.com/\">KDAB</a>, <a href=\"http://uk.linkedin.com/in/"
+"pauljadams\">Dr. Paul Adams</a> and <a href=\"http://ch.linkedin.com/in/"
+"georggreve\">Georg Greve</a> worked together to re-launch the professional "
+"support of the Kolab Groupware Solution into the <a href=\"http://kolabsys."
+"com\">Kolab Systems AG</a>, which took the place of the Kolab-Konsortium."
+msgstr ""
+
+#: tpl_messages.php:136
+msgid ""
+"Kolab Systems together with its partner network, the Kolab Enterprise "
+"Community, has since been the primary facilitator of the Kolab Community, "
+"including for the provision of infrastructure, and the focal point for "
+"further development of the Kolab Groupware Solution, e.g. for inclusion of "
+"ActiveSync support in version 2.3 of the server, or for native packaging on "
+"the various platforms."
+msgstr ""
+
+#: tpl_messages.php:137
+msgid ""
+"If you want to join the community, please visit <a href=\"http://wiki.kolab."
+"org\">http://wiki.kolab.org</a> and <a href=\"http://kolab.org\">http://"
+"kolab.org</a>."
+msgstr ""
+
+#: tpl_messages.php:138
+msgid "History before 2010"
+msgstr ""
+
+#: tpl_messages.php:139
+msgid ""
+"The Kolab project owes a great deal of thanks to the people of the <a href="
+"\"http://www.openpkg.org/\">OpenPKG</a> project. OpenPKG allows Kolab to run "
+"on many diverse platforms in a reliable and predictable manner, by providing "
+"a common, easy-to-install, cross-platform base on which to build the server."
+msgstr ""
+
+#: tpl_messages.php:140
+msgid ""
+"To use all Kolab2 features you need an interoperable client. The KDE Kolab "
+"Client was the first such client to be developed and is still considered the "
+"reference platform for others to follow. The KDE groupware component Kontact "
+"can act as Kolab2 Client. Many thanks to the <a href=\"http://www.kde.org"
+"\">KDE Project</a> for providing such a powerful base on which to build this "
+"client solution."
+msgstr ""
+
+#: tpl_messages.php:141
+msgid ""
+"Users of Outlook on Microsoft Windows are able to use a proprietary plug-in "
+"to inter-operate with the Kolab server. For Kolab2 the preferred plug-in is "
+"the <a href=\"http://www.toltec.co.za/\">Toltec Plug-in</a> by Radley "
+"Network Technologies CC. Radley has worked closely with the Kolab community "
+"to help develop the Kolab2 storage format."
+msgstr ""
+
+#: tpl_messages.php:142
+msgid ""
+"A list of additional Outlook plug-ins that provide interoperability with the "
+"Kolab server is <a href=\"http://www.kolab.org/kolab-plugins.html"
+"\">maintained on the Kolab website</a>."
+msgstr ""
+
+#: tpl_messages.php:143
+msgid ""
+"There is also a <a href=\"http://www.kolab.org/webclient.html\">web-based "
+"client</a> in development which provides full groupware functionality to "
+"mobile users through a web interface. It allows users to access their email, "
+"calendars, tasks, etc. from anywhere in the world, by simply connecting "
+"through a standard web browser. The web client would not have been possible "
+"without the excellent <a href=\"http://www.horde.org/\">Horde project</a> on "
+"which to build."
+msgstr ""
+
+#: tpl_messages.php:144
+msgid ""
+"As Kolab is a Free Software project, anyone can help to extend the "
+"functionality of the software. An active community has developed around the "
+"software with many people throughout the world contributing. The project was "
+"originally started in 2002 by a joint-venture of three companies: <a href="
+"\"http://www.erfrakon.com/\">erfrakon</a> (design, architecture and server); "
+"<a href=\"http://www.intevation.de\">Intevation</a> (project management) and "
+"<a href=\"http://www.klaralvdalens-datakonsult.se/\">Klarälvdalens "
+"Datakonsult</a> (client)."
+msgstr ""
+
+#: tpl_messages.php:145
+msgid ""
+"Code Fusion cc joined the project soon after the original Kolab1 server was "
+"released. Its developers are primarily responsible for an updated engine "
+"(which forms the base of the Kolab2 server), the web client, as well as "
+"contributing to development of the Kolab2 storage format."
+msgstr ""
+
+#: tpl_messages.php:146
+msgid "Other contributors:"
+msgstr ""
+
+#: tpl_messages.php:147
+msgid "CSSified the Kolab1 web admin GUI"
+msgstr ""
+
+#: tpl_messages.php:148
+msgid "Kudos"
+msgstr ""
+
+#: tpl_messages.php:149
+msgid ""
+"Principal contributors of the Kolab Groupware Solution are (in alphabetical "
+"order):"
+msgstr ""
+
+#: tpl_messages.php:150
+msgid ""
+"...and anyone we forgot. Please let us know at <a href=\"mail:kolab-"
+"devel at kolab.org\">kolab-devel at kolab.org</a> so we can add you to this list."
+msgstr ""
+
+#: tpl_messages.php:160
+msgid "Kolab Groupware Solution"
+msgstr ""
+
+#: tpl_messages.php:161
+msgid ""
+"This is the server of the Kolab Groupware Solution, a <a href=\"http://fsfe."
+"org/about/basics/freesoftware\">Free Software</a> Personal Information "
+"Management (PIM) solution developed by the <a href=\"http://www.kolab.org/"
+"\">Kolab Community</a>. Any installation of the Kolab Groupware Solution "
+"would normally include one or more of these servers, in combination with a "
+"variety of clients for its users. If you are interested in the technology, "
+"you can read more about it <a href=\"/admin/kolab/technology.php\">here</a>."
+msgstr ""
+
+#: tpl_messages.php:162
+msgid "Why Kolab?"
+msgstr ""
+
+#: tpl_messages.php:163
+msgid ""
+"There is a wide variety of reasons why Kolab should be your choice. Several "
+"of them have been put together for different target groups in the"
+msgstr ""
+
+#: tpl_messages.php:164 tpl_messages.php:179
+msgid "Handouts for the Kolab Groupware Solution by Kolab Systems"
+msgstr ""
+
+#: tpl_messages.php:165
+msgid "To summarize just some points, Kolab is your solution, if"
+msgstr ""
+
+#: tpl_messages.php:166
+msgid ""
+"you want a solution that seamlessly integrates into your existing "
+"environment;"
+msgstr ""
+
+#: tpl_messages.php:167
+msgid ""
+"you want full control over your data, with all the convenience of the cloud;"
+msgstr ""
+
+#: tpl_messages.php:168
+msgid "you have elevated security needs for your data;"
+msgstr ""
+
+#: tpl_messages.php:169
+msgid ""
+"you have a very large installation, or want to reduce your hardware "
+"footprint;"
+msgstr ""
+
+#: tpl_messages.php:170
+msgid "you have to operate in diverse environments and installations;"
+msgstr ""
+
+#: tpl_messages.php:171
+msgid ""
+"strategic issues are important to you, e.g. you need sovereignty of the "
+"software you deploy;"
+msgstr ""
+
+#: tpl_messages.php:172
+msgid "your users should be fully productive whether they are on- or offline;"
+msgstr ""
+
+#: tpl_messages.php:173
+msgid ""
+"you want the flexibility to create solutions for your specialised needs;"
+msgstr ""
+
+#: tpl_messages.php:174
+msgid ""
+"you want Free Software/Open Source, but also want the professional support "
+"without having to resort to proprietary lock-in."
+msgstr ""
+
+#: tpl_messages.php:175
+msgid "More Information"
+msgstr ""
+
+#: tpl_messages.php:176
+msgid "Kolab Community Web Site"
+msgstr ""
+
+#: tpl_messages.php:177
+msgid "Kolab Community Wiki"
+msgstr ""
+
+#: tpl_messages.php:178
+msgid "Article: "
+msgstr ""
+
+#: tpl_messages.php:180
+msgid "Warranties & Commercial Support"
+msgstr ""
+
+#: tpl_messages.php:181
+msgid ""
+"This is the <b>Community Edition</b> of the Kolab Groupware Server. It is "
+"provided by Kolab Systems as fully <a href=\"http://fsfe.org/about/basics/"
+"freesoftware\">Free Software</a> and you can use it to the fullest extent "
+"and any purpose. There are no license costs or other obligations other than "
+"those set forth in the respective Free Software licenses of the various "
+"components. <b>There are no warranties or guarantees of any kind, nor is "
+"there any guaranteed support. You are running this software entirely at your "
+"own risk.</b>"
+msgstr ""
+
+#: tpl_messages.php:182
+msgid ""
+"There is a wide variety of commercial support options and warranties "
+"available by <a href=\"/admin/kolab/kolabsystems.php\">Kolab Systems AG</a> "
+"and its network of partners, the Kolab Enterprise Community. This support "
+"comes with access to the additionally quality assured and hardened "
+"<b>Certified Kolab</b> edition, which like the community edition is fully "
+"available as Free Software, so has all the advantages of the Community "
+"Edition and is free of hidden lock-in."
+msgstr ""
+
+#: tpl_messages.php:183
+msgid ""
+"Kolab Systems AG will provide limited support for the Community Edition on a "
+"case-by-case basis, but with no guaranteed response times, as availability "
+"permits, and at rates that may be adjusted due to the work load at the time "
+"of the request. <b>It is strongly recommended that for mission-critical "
+"professional deployments of the Kolab Groupware Solution you at least choose "
+"one of the partially self-supported On Demand support models.</b>"
+msgstr ""
+
+#: tpl_messages.php:184
+msgid ""
+"Kolab Systems provides an overview of all available <a href=\"http://"
+"kolabsys.com/index.php/solutions/101\">Service Level Agreements (SLA)</a>. "
+"To upgrade your installation to Certified Kolab, please contact"
+msgstr ""
+
+#: tpl_messages.php:185 tpl_messages.php:301
+msgid "or visit our"
+msgstr ""
+
+#: tpl_messages.php:186 tpl_messages.php:302
+msgid "web page"
+msgstr ""
+
+#: tpl_messages.php:188
+msgid "Listname"
+msgstr ""
+
+#: tpl_messages.php:189
+msgid "Visibility"
+msgstr ""
+
+#: tpl_messages.php:191
+msgid "Internal"
+msgstr ""
+
+#: tpl_messages.php:192
+msgid "Public"
+msgstr ""
+
+#: tpl_messages.php:193
+msgid "List deleted, awaiting cleanup..."
+msgstr ""
+
+#: tpl_messages.php:196
+msgid "Welcome to the Kolab administration interface"
+msgstr ""
+
+#: tpl_messages.php:197
+msgid "NOTE:"
+msgstr ""
+
+#: tpl_messages.php:198
+msgid ""
+"No account is configured to receive mail for administrative addresses. If "
+"you have not yet created an account for this, "
+msgstr ""
+
+#: tpl_messages.php:199
+msgid "please do so"
+msgstr ""
+
+#: tpl_messages.php:200
+msgid "and then go"
+msgstr ""
+
+#: tpl_messages.php:201
+msgid "here"
+msgstr ""
+
+#: tpl_messages.php:202
+msgid "to set up forwarding of mail to administrative email addresses."
+msgstr ""
+
+#: tpl_messages.php:203
+msgid "The address with DN"
+msgstr ""
+
+#: tpl_messages.php:205
+msgid "Back to list of addresses"
+msgstr ""
+
+#: tpl_messages.php:206
+msgid "The administrator with DN"
+msgstr ""
+
+#: tpl_messages.php:208
+msgid "Back to list of administrators"
+msgstr ""
+
+#: tpl_messages.php:221
+msgid "Kolab Server Settings"
+msgstr ""
+
+#: tpl_messages.php:222
+msgid "Administrative email addresses"
+msgstr ""
+
+#: tpl_messages.php:223
+msgid ""
+"You have not yet set up a receiving account for the administrative email "
+"addresses hostmaster at yourdomain.tld, postmaster at yourdomain.tld, MAILER-"
+"DAEMON at yourdomain.tld, abuse at yourdomain.tld and virusalert at yourdomain.tld. "
+"Enter the email address of a kolab account below and press the button to "
+"create a distribution list for each of those addresses. Later you can add or "
+"remove people from the lists like any other distribution list"
+msgstr ""
+
+#: tpl_messages.php:224
+msgid ""
+"Email address of account that should receive administrative mail for domain "
+msgstr ""
+
+#: tpl_messages.php:225
+msgid "Create Distribution Lists"
+msgstr ""
+
+#: tpl_messages.php:226
+msgid "Enable or Disable individual Services"
+msgstr ""
+
+#: tpl_messages.php:227
+msgid "Service"
+msgstr ""
+
+#: tpl_messages.php:228
+msgid "Enabled"
+msgstr ""
+
+#: tpl_messages.php:230
+msgid "Quota settings"
+msgstr ""
+
+#: tpl_messages.php:231
+msgid "Warn users when they have used"
+msgstr ""
+
+#: tpl_messages.php:232
+#, php-format
+msgid "% of their quota"
+msgstr ""
+
+#: tpl_messages.php:234
+msgid "Free/Busy settings"
+msgstr ""
+
+#: tpl_messages.php:235
+msgid "Allow unauthenticated downloading of Free/Busy information"
+msgstr ""
+
+#: tpl_messages.php:237
+msgid "When creating free/busy lists, include data from"
+msgstr ""
+
+#: tpl_messages.php:238
+msgid "days in the past"
+msgstr ""
+
+#: tpl_messages.php:240
+msgid "Privileged Networks"
+msgstr ""
+
+#: tpl_messages.php:241
+msgid ""
+"Networks allowed to relay and send mail through unauthenticated SMTP "
+"connections to the Kolab server (comma separated networks in x.x.x.x/y "
+"format):"
+msgstr ""
+
+#: tpl_messages.php:243
+msgid "SMTP \"smarthost/relayhost\""
+msgstr ""
+
+#: tpl_messages.php:244
+msgid ""
+"Smarthost (and optional port) to use to send outgoing mail (host.domain."
+"tld). Leave empty for no relayhost."
+msgstr ""
+
+#: tpl_messages.php:246
+msgid "Accept Internet Mail"
+msgstr ""
+
+#: tpl_messages.php:247
+msgid ""
+"Accept mail from other domains over unauthenticated SMTP. This must be "
+"enabled if you want to use the Kolab Server to receive mail from other "
+"internet domains directly. Leave disabled to accept mail only from SMTP "
+"gateways that are within the privileged network."
+msgstr ""
+
+#: tpl_messages.php:249
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:134
+msgid "Domains"
+msgstr ""
+
+#: tpl_messages.php:250
+msgid "Domain"
+msgstr ""
+
+#: tpl_messages.php:253 tpl_messages.php:266
+msgid "Add"
+msgstr ""
+
+#: tpl_messages.php:254
+msgid "Mail Filter Settings"
+msgstr ""
+
+#: tpl_messages.php:255
+msgid "Check messages for mismatching From header and envelope from."
+msgstr ""
+
+#: tpl_messages.php:256
+msgid ""
+"Use the Sender header instead of From for the above checks if Sender is "
+"present."
+msgstr ""
+
+#: tpl_messages.php:257
+msgid "Action to take for messages that fail the check:"
+msgstr ""
+
+#: tpl_messages.php:258
+msgid ""
+"Reject the message, except if it originates from the outside and the From "
+"header matches one of Kolab server's domains. In that case rewrite the From "
+"header so the recipient can see the potential forgery."
+msgstr ""
+
+#: tpl_messages.php:259
+msgid "Always reject the message."
+msgstr ""
+
+#: tpl_messages.php:260
+msgid ""
+"Note that enabling this setting will make the server reject any mail with "
+"non-matching sender and From header if the sender is an account on this "
+"server. This is known to cause trouble for example with mailinglists."
+msgstr ""
+
+#: tpl_messages.php:262
+msgid "Kolab Hostnames (for Master and Slaves)"
+msgstr ""
+
+#: tpl_messages.php:263
+msgid "Host"
+msgstr ""
+
+#: tpl_messages.php:267
+msgid ""
+"<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> is a specialist "
+"email solution provider based in Johannesburg, South Africa specialising in "
+"the deployment and support of Kolab."
+msgstr ""
+
+#: tpl_messages.php:268
+msgid ""
+"Code Fusion has played, and continues to play, an integral part in "
+"developing and extending the Kolab server; specifically with regards to "
+"enhancing the base Kolab engine, adding in support for Microsoft Active "
+"Directory ® as an LDAP backend, as well as extending the <a href="
+"\"http://www.horde.org/\">Horde project</a> to provide a web-based groupware "
+"client for the Kolab server."
+msgstr ""
+
+#: tpl_messages.php:269
+msgid ""
+"The following people from Code Fusion are involved in the Kolab project (in "
+"alphabetical order):"
+msgstr ""
+
+#: tpl_messages.php:270
+msgid ""
+"Kolab's architecture was done by <a href=\"http://www.erfrakon.com"
+"\">erfrakon</a>; the company also designed and implemented the Kolab 1 "
+"Server and did the design and architecture for the Kolab 2 Server while "
+"providing consulting for the implementation of the Kolab 2 server and the "
+"Kolab 2 clients."
+msgstr ""
+
+#: tpl_messages.php:271
+msgid ""
+"<a href=\"http://www.erfrakon.com\">erfrakon</a> is a consulting company "
+"dedicated to opensource software and Linux. The main tasks of erfrakon "
+"within the Kolab project are the principle design and architecure of the "
+"Kolab groupware solution and the creation of the Kolab 1 server."
+msgstr ""
+
+#: tpl_messages.php:272
+msgid "The following people worked on Kolab for erfrakon:"
+msgstr ""
+
+#: tpl_messages.php:273
+msgid "Welcome to the Kolab Groupware Server"
+msgstr ""
+
+#: tpl_messages.php:274
+msgid "My settings"
+msgstr ""
+
+#: tpl_messages.php:275 ../../lib/KolabAdmin/include/menu.php:43
+#: ../../lib/KolabAdmin/include/menu.php:47
+#: ../../lib/KolabAdmin/include/menu.php:49
+msgid "ActiveSync"
+msgstr ""
+
+#: tpl_messages.php:284 tpl_messages.php:311
+msgid "Welcome to the Kolab Groupware Server Administration"
+msgstr ""
+
+#: tpl_messages.php:285
+msgid "The user with DN"
+msgstr ""
+
+#: tpl_messages.php:287
+msgid "Back to list of users"
+msgstr ""
+
+#: tpl_messages.php:288
+msgid "Enter UID and password to login"
+msgstr ""
+
+#: tpl_messages.php:289
+msgid "Username:"
+msgstr ""
+
+#: tpl_messages.php:290
+msgid "Password:"
+msgstr ""
+
+#: tpl_messages.php:291
+msgid "Login"
+msgstr ""
+
+#: tpl_messages.php:292
+msgid "Kolab Groupware Server Version"
+msgstr ""
+
+#: tpl_messages.php:293
+msgid "Kolab Groupware Server Component Versions"
+msgstr ""
+
+#: tpl_messages.php:294
+msgid "PEAR/Horde Versions"
+msgstr ""
+
+#: tpl_messages.php:295
+msgid "Kolab2 Patched OpenPKG Package Versions"
+msgstr ""
+
+#: tpl_messages.php:296
+msgid "OpenPKG Version"
+msgstr ""
+
+#: tpl_messages.php:297
+msgid "Founded in Zürich in 2010, "
+msgstr ""
+
+#: tpl_messages.php:298
+msgid ""
+"is the global leader in Kolab Technology. Together with its partners in the "
+"Kolab Enterprise Community, Kolab Systems provides quality assurance, "
+"integration, support, training, certification of individuals and third-party "
+"products, as well as ongoing development for the Kolab Groupware Solution. "
+"The strong partnering model and a highly competent enterprise community "
+"provides users of the Kolab Groupware Solution with the right level of "
+"professional consulting, support and warranties to enable productivity and "
+"collaboration."
+msgstr ""
+
+#: tpl_messages.php:299
+msgid "Looking for professional support for your Kolab Groupware Solution?"
+msgstr ""
+
+#: tpl_messages.php:300
+msgid "Kolab Systems provides a wide range of "
+msgstr ""
+
+#: tpl_messages.php:303
+msgid "Our Development Partners"
+msgstr ""
+
+#: tpl_messages.php:304
+msgid ""
+"In continuously improvingall parts of the Kolab Groupware Solution, Kolab "
+"Systems is working closely with development partners, such as (in "
+"alphabetical order):"
+msgstr ""
+
+#: tpl_messages.php:305
+msgid "Thank you for being part of this awesome community!"
+msgstr ""
+
+#: tpl_messages.php:306
+msgid "If <b>you</b> want to join the community, please go to "
+msgstr ""
+
+#: tpl_messages.php:307
+msgid "and"
+msgstr ""
+
+#: tpl_messages.php:308
+msgid "The shared folder with DN"
+msgstr ""
+
+#: tpl_messages.php:310
+msgid "Back to list of shared folders"
+msgstr ""
+
+#: tpl_messages.php:316
+msgid "Administrator"
+msgstr ""
+
+#: tpl_messages.php:319 ../../lib/KolabAdmin/include/menu.php:113
+msgid "Settings"
+msgstr ""
+
+#: tpl_messages.php:321
+msgid ""
+"The Kolab 1 KDE client and the Kolab 2 KDE Client (Kontact) was developed by"
+msgstr ""
+
+#: tpl_messages.php:322
+msgid ""
+"Klarälvdalens Datakonsult AB is a consulting company dedicated to "
+"opensource software, Linux, and the <a href=\"http://www.trolltech.com/"
+"products/qt/\">Qt</a> library. The main tasks of KDAB within the Kolab "
+"project are design and implementation of the Kolab KDE clients and the "
+"implementation of the current Kolab 2 server."
+msgstr ""
+
+#: tpl_messages.php:323
+msgid ""
+"The following people worked on Kolab for Klarälvdalens Datakonsult AB:"
+msgstr ""
+
+#: tpl_messages.php:324
+msgid "Vacation Notification"
+msgstr ""
+
+#: tpl_messages.php:325
+msgid "Activate vacation notification"
+msgstr ""
+
+#: tpl_messages.php:326
+msgid "Resend notification only after"
+msgstr ""
+
+#: tpl_messages.php:327
+msgid "days"
+msgstr ""
+
+#: tpl_messages.php:328
+msgid "Send responses for these addresses:"
+msgstr ""
+
+#: tpl_messages.php:329
+msgid "(one address per line)"
+msgstr ""
+
+#: tpl_messages.php:330
+msgid "Do not send vacation replies to spam messages"
+msgstr ""
+
+#: tpl_messages.php:331
+msgid "Only react to mail coming from domain"
+msgstr ""
+
+#: tpl_messages.php:332
+msgid "(leave empty for all domains)"
+msgstr ""
+
+#: ../../www/admin/user/index.php:34
+#: ../../www/admin/administrator/index.php:33
+#: ../../www/admin/addressbook/index.php:23
+#: ../../www/admin/addressbook/addr.php:17
+#: ../../www/admin/maintainer/index.php:33
+#: ../../www/admin/domainmaintainer/index.php:33
+#: ../../www/admin/sharedfolder/index.php:22
+#: ../../www/admin/sharedfolder/sf.php:25
+#: ../../www/admin/distributionlist/index.php:35
+#: ../../www/admin/distributionlist/list.php:37
+#: ../../www/admin/settings/index.php:13
+msgid "Error: You don't have Permissions to access this Menu"
+msgstr ""
+
+#: ../../www/admin/user/index.php:120
+#, php-format
+msgid "Manage Email User (%d Users)"
+msgstr ""
+
+#: ../../www/admin/user/index.php:182
+#: ../../www/admin/addressbook/index.php:122
+msgid "Email"
+msgstr ""
+
+#: ../../www/admin/user/index.php:184
+#: ../../www/admin/addressbook/index.php:123
+msgid "contains"
+msgstr ""
+
+#: ../../www/admin/user/index.php:185
+#: ../../www/admin/addressbook/index.php:124
+msgid "is"
+msgstr ""
+
+#: ../../www/admin/user/index.php:186
+#: ../../www/admin/addressbook/index.php:125
+msgid "begins with"
+msgstr ""
+
+#: ../../www/admin/user/index.php:187
+#: ../../www/admin/addressbook/index.php:126
+msgid "ends with"
+msgstr ""
+
+#: ../../www/admin/user/vacation.php:36 ../../www/admin/user/deliver.php:46
+#: ../../www/admin/user/forward.php:47
+msgid "Error while connecting to Sieve service:"
+msgstr ""
+
+#: ../../www/admin/user/vacation.php:55
+msgid "Vacation message successfully activated"
+msgstr ""
+
+#: ../../www/admin/user/vacation.php:57
+msgid "Vacation message successfully deactivated"
+msgstr ""
+
+#: ../../www/admin/user/vacation.php:62 ../../www/admin/user/deliver.php:65
+#: ../../www/admin/user/forward.php:67
+#, php-format
+msgid ""
+"Warning: You currently have a sieve script named %s active for your account."
+msgstr ""
+
+#: ../../www/admin/user/vacation.php:63 ../../www/admin/user/deliver.php:66
+#: ../../www/admin/user/forward.php:68
+msgid ""
+"Warning: This script will be overwritten without further warnings if you "
+"press \"Update\"!"
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:43
+msgid "zPush in not enabled in your system."
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:468
+msgid ""
+"There are currently no devices known for your user.<br/><br/>In order to "
+"register a device, please connect it to the server first, using <a "
+"href='http://wiki.kolab.org/Z_push#Clients'>the instructions in the Wiki</"
+"a>. Afterwards the device should become available for configuration in this "
+"dialogue."
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:496
+msgid "Address Books"
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:496
+msgid "Calendars"
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:496
+#: ../../www/admin/sharedfolder/index.php:65
+#: ../../lib/KolabAdmin/include/form.class.php:254
+msgid "Tasks"
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:496
+#: ../../www/admin/sharedfolder/index.php:69
+#: ../../lib/KolabAdmin/include/form.class.php:256
+msgid "Notes"
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:500
+msgid "Automatic"
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:501
+msgid "Flat Mode"
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:502
+msgid "Folder Mode"
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:506
+#: ../../lib/KolabAdmin/include/form.class.php:204
+msgid "No"
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:507
+#: ../../lib/KolabAdmin/include/form.class.php:204
+msgid "Yes"
+msgstr ""
+
+#: ../../www/admin/user/user.php:94
+msgid "Please enter an email address"
+msgstr ""
+
+#: ../../www/admin/user/user.php:111
+#, php-format
+msgid "Email address %1$s not in domains %2$s"
+msgstr ""
+
+#: ../../www/admin/user/user.php:114 ../../www/admin/addressbook/addr.php:65
+msgid "User, vCard or distribution list with this email address already exists"
+msgstr ""
+
+#: ../../www/admin/user/user.php:130
+msgid "UID "
+msgstr ""
+
+#: ../../www/admin/user/user.php:130
+#: ../../lib/KolabAdmin/include/form.class.php:34
+msgid ""
+" collides with an address already used for another user, a vCard or a "
+"distribution list.<br />"
+msgstr ""
+
+#: ../../www/admin/user/user.php:145
+#, php-format
+msgid "Email-Delegate %s does not exist"
+msgstr ""
+
+#: ../../www/admin/user/user.php:165
+#, php-format
+msgid "Syntax for Recipient %s is invalid"
+msgstr ""
+
+#: ../../www/admin/user/user.php:211
+#, php-format
+msgid "Illegal user or group %s"
+msgstr ""
+
+#: ../../www/admin/user/user.php:220
+msgid "Free/Busy interval can not be negative"
+msgstr ""
+
+#: ../../www/admin/user/user.php:221
+msgid "Free/Busy interval must be a number"
+msgstr ""
+
+#: ../../www/admin/user/user.php:222
+msgid "Free/Busy interval must be an integer"
+msgstr ""
+
+#: ../../www/admin/user/user.php:414
+#: ../../www/admin/administrator/admin.php:121
+#: ../../www/admin/addressbook/addr.php:78
+#: ../../www/admin/maintainer/maintainer.php:118
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:96
+#: ../../www/admin/sharedfolder/sf.php:114
+#: ../../www/admin/distributionlist/list.php:109
+msgid "Error: need valid action to proceed"
+msgstr ""
+
+#: ../../www/admin/user/user.php:426 ../../www/admin/user/user.php:429
+#: ../../www/admin/user/user.php:435 ../../www/admin/user/user.php:870
+#: ../../www/admin/administrator/admin.php:127
+#: ../../www/admin/addressbook/addr.php:81
+#: ../../www/admin/maintainer/maintainer.php:124
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:102
+msgid "Error: You don't have the required Permissions"
+msgstr ""
+
+#: ../../www/admin/user/user.php:444 ../../www/admin/user/user.php:446
+#: ../../www/admin/sharedfolder/sf.php:128
+msgid "Non volatile"
+msgstr ""
+
+#: ../../www/admin/user/user.php:445
+#: ../../www/admin/administrator/admin.php:136
+#: ../../www/admin/maintainer/maintainer.php:133
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:111
+msgid "Leave blank to keep password unchanged"
+msgstr ""
+
+#: ../../www/admin/user/user.php:469
+msgid "Unique Identity (UID)"
+msgstr ""
+
+#: ../../www/admin/user/user.php:471
+msgid "Optional - Defaults to Primary Email Address"
+msgstr ""
+
+#: ../../www/admin/user/user.php:472
+msgid "Mailbox Home Server"
+msgstr ""
+
+#: ../../www/admin/user/user.php:476
+msgid "Account Type"
+msgstr ""
+
+#: ../../www/admin/user/user.php:478
+msgid "User Account"
+msgstr ""
+
+#: ../../www/admin/user/user.php:478
+msgid "Internal User Account"
+msgstr ""
+
+#: ../../www/admin/user/user.php:478
+msgid "Group Account"
+msgstr ""
+
+#: ../../www/admin/user/user.php:478
+msgid "Resource Account"
+msgstr ""
+
+#: ../../www/admin/user/user.php:480
+msgid ""
+"NOTE: An internal user is a user that will not be visible in the address book"
+msgstr ""
+
+#: ../../www/admin/user/user.php:481
+msgid "Invitation Policy"
+msgstr ""
+
+#: ../../www/admin/user/user.php:485
+msgid "For automatic invitation handling"
+msgstr ""
+
+#: ../../www/admin/user/user.php:486
+msgid ""
+"NOTE: For regular accounts to use this feature, give the 'calendar' user "
+"access to the Calendar folder"
+msgstr ""
+
+#: ../../www/admin/user/user.php:488
+msgid "Email Aliases"
+msgstr ""
+
+#: ../../www/admin/user/user.php:491 ../../www/admin/addressbook/addr.php:100
+msgid "One address per line"
+msgstr ""
+
+#: ../../www/admin/user/user.php:493
+msgid "Email-Delegates"
+msgstr ""
+
+#: ../../www/admin/user/user.php:496
+msgid "Others allowed to send emails with a \"from\" address of this account."
+msgstr ""
+
+#: ../../www/admin/user/user.php:497
+msgid "One email address per line."
+msgstr ""
+
+#: ../../www/admin/user/user.php:499
+msgid "Allowed Recipients"
+msgstr ""
+
+#: ../../www/admin/user/user.php:502
+msgid "Restrict allowed recipients of SMTP messages"
+msgstr ""
+
+#: ../../www/admin/user/user.php:503
+msgid "One entry per line."
+msgstr ""
+
+#: ../../www/admin/user/user.php:514
+msgid ""
+"2 letter code from <a href=\"http://www.iso.org/iso/"
+"english_country_names_and_code_elements\" target=\"_blank\">ISO 3166</a>"
+msgstr ""
+
+#: ../../www/admin/user/user.php:520
+msgid "User Quota in MBytes"
+msgstr ""
+
+#: ../../www/admin/user/user.php:536
+msgid "Free/Busy interval in days"
+msgstr ""
+
+#: ../../www/admin/user/user.php:537
+msgid "Leave blank for default (60 days)"
+msgstr ""
+
+#: ../../www/admin/user/user.php:547
+#: ../../www/admin/administrator/admin.php:165
+#: ../../www/admin/maintainer/maintainer.php:162
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:149
+#, php-format
+msgid "LDAP Error: No such dn: %s: %s"
+msgstr ""
+
+#: ../../www/admin/user/user.php:711
+#: ../../www/admin/administrator/admin.php:217
+#: ../../www/admin/addressbook/addr.php:189
+#: ../../www/admin/maintainer/maintainer.php:215
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:202
+#: ../../www/admin/sharedfolder/sf.php:231
+#: ../../www/admin/distributionlist/list.php:200
+#, php-format
+msgid "LDAP Error: could not rename %s to %s: %s"
+msgstr ""
+
+#: ../../www/admin/user/user.php:719
+#, php-format
+msgid "LDAP Error: could not modify %s: %s"
+msgstr ""
+
+#: ../../www/admin/user/user.php:725
+#: ../../www/admin/administrator/admin.php:231
+#: ../../www/admin/addressbook/addr.php:203
+#: ../../www/admin/addressbook/addr.php:218
+#: ../../www/admin/maintainer/maintainer.php:229
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:216
+#, php-format
+msgid "%s successfully updated"
+msgstr ""
+
+#: ../../www/admin/user/user.php:731
+#: ../../www/admin/distributionlist/list.php:220
+#, php-format
+msgid "LDAP Error: Could not read %s: %s"
+msgstr ""
+
+#: ../../www/admin/user/user.php:745 ../../www/admin/user/user.php:758
+#: ../../www/admin/user/user.php:797 ../../www/admin/user/user.php:812
+#: ../../www/admin/distributionlist/list.php:224
+#: ../../www/admin/distributionlist/list.php:253
+#, php-format
+msgid "LDAP Error: Could not modify object %s: %s"
+msgstr ""
+
+#: ../../www/admin/user/user.php:761 ../../www/admin/user/user.php:815
+#, php-format
+msgid "Mid-air collision detected, alias %1$s renamed to %2$s"
+msgstr ""
+
+#: ../../www/admin/user/user.php:766 ../../www/admin/user/user.php:848
+msgid "Modify User"
+msgstr ""
+
+#: ../../www/admin/user/user.php:767
+#, php-format
+msgid "User '%s' successfully modified"
+msgstr ""
+
+#: ../../www/admin/user/user.php:787
+#: ../../www/admin/administrator/admin.php:260
+#: ../../www/admin/addressbook/addr.php:227
+#: ../../www/admin/maintainer/maintainer.php:261
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:265
+#: ../../www/admin/sharedfolder/sf.php:265
+#, php-format
+msgid "LDAP Error: could not add object %s: %s"
+msgstr ""
+
+#: ../../www/admin/user/user.php:800
+#: ../../www/admin/distributionlist/list.php:256
+#, php-format
+msgid "Mid-air collision detected, email address %1$s renamed to %2$s"
+msgstr ""
+
+#: ../../www/admin/user/user.php:821
+msgid "User "
+msgstr ""
+
+#: ../../www/admin/user/user.php:821
+#: ../../www/admin/administrator/admin.php:270
+#: ../../www/admin/maintainer/maintainer.php:269
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:276
+msgid " successfully created"
+msgstr ""
+
+#: ../../www/admin/user/user.php:822 ../../www/admin/user/user.php:828
+#: ../../www/admin/user/user.php:839 ../../lib/KolabAdmin/include/menu.php:30
+msgid "Create New User"
+msgstr ""
+
+#: ../../www/admin/user/user.php:854 ../../www/admin/user/user.php:912
+msgid "Delete User"
+msgstr ""
+
+#: ../../www/admin/user/user.php:867
+#: ../../www/admin/administrator/admin.php:315
+#: ../../www/admin/maintainer/maintainer.php:314
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:318
+msgid "Error: need DN for delete operation"
+msgstr ""
+
+#: ../../www/admin/user/user.php:873
+#: ../../www/admin/maintainer/maintainer.php:316
+msgid "Error: you need administrative permissions to delete users"
+msgstr ""
+
+#: ../../www/admin/user/user.php:886 ../../www/admin/addressbook/addr.php:295
+#, php-format
+msgid "Account could not be deleted, distribution list '%s' depends on it."
+msgstr ""
+
+#: ../../www/admin/user/user.php:893
+#, php-format
+msgid "Account removed from distribution list '%s'."
+msgstr ""
+
+#: ../../www/admin/user/user.php:895
+#, php-format
+msgid ""
+"Failure to remove account from distribution list '%s', account will not be "
+"deleted."
+msgstr ""
+
+#: ../../www/admin/user/user.php:903
+#, php-format
+msgid "LDAP Error: could not mark '%s' for deletion: %s"
+msgstr ""
+
+#: ../../www/admin/user/user.php:906
+msgid "User Deleted"
+msgstr ""
+
+#: ../../www/admin/user/deliver.php:58
+#, php-format
+msgid "Delivery to '%s' successfully activated"
+msgstr ""
+
+#: ../../www/admin/user/deliver.php:60
+#, php-format
+msgid "Delivery to '%s' successfully deactivated"
+msgstr ""
+
+#: ../../www/admin/user/forward.php:60
+#, php-format
+msgid "Forwarding to '%s' successfully activated"
+msgstr ""
+
+#: ../../www/admin/user/forward.php:62
+#, php-format
+msgid "Forwarding to '%s' successfully deactivated"
+msgstr ""
+
+#: ../../www/admin/administrator/index.php:62
+msgid "Manage Administrators ("
+msgstr ""
+
+#: ../../www/admin/administrator/index.php:62
+msgid " Administrators)"
+msgstr ""
+
+#: ../../www/admin/administrator/admin.php:52
+#: ../../www/admin/maintainer/maintainer.php:52
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:53
+msgid "Account with this UID already exists"
+msgstr ""
+
+#: ../../www/admin/administrator/admin.php:75
+msgid "Manager's password can't be changed from the webgui"
+msgstr ""
+
+#: ../../www/admin/administrator/admin.php:135
+#: ../../www/admin/maintainer/maintainer.php:132
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:110
+msgid "non volatile"
+msgstr ""
+
+#: ../../www/admin/administrator/admin.php:153
+#: ../../www/admin/maintainer/maintainer.php:150
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:128
+msgid "Unique User ID"
+msgstr ""
+
+#: ../../www/admin/administrator/admin.php:225
+#: ../../www/admin/addressbook/addr.php:197
+#: ../../www/admin/maintainer/maintainer.php:223
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:210
+#: ../../www/admin/sharedfolder/sf.php:239
+#: ../../www/admin/distributionlist/list.php:208
+#, php-format
+msgid "LDAP Error: could not modify %s to %s: %s"
+msgstr ""
+
+#: ../../www/admin/administrator/admin.php:235
+#: ../../www/admin/addressbook/addr.php:209
+#: ../../www/admin/maintainer/maintainer.php:233
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:228
+#: ../../www/admin/sharedfolder/sf.php:251
+#, php-format
+msgid "LDAP Error: could not read %s: %s"
+msgstr ""
+
+#: ../../www/admin/administrator/admin.php:239
+#: ../../www/admin/addressbook/addr.php:215
+#: ../../www/admin/maintainer/maintainer.php:237
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:232
+#: ../../www/admin/sharedfolder/sf.php:255
+#, php-format
+msgid "LDAP Error: could not modify object %s: %s"
+msgstr ""
+
+#: ../../www/admin/administrator/admin.php:244
+#: ../../www/admin/administrator/admin.php:297
+msgid "Modify Administrator"
+msgstr ""
+
+#: ../../www/admin/administrator/admin.php:245
+#: ../../www/admin/administrator/admin.php:270
+msgid "Administrator "
+msgstr ""
+
+#: ../../www/admin/administrator/admin.php:245
+#: ../../www/admin/maintainer/maintainer.php:243
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:246
+msgid " successfully modified"
+msgstr ""
+
+#: ../../www/admin/administrator/admin.php:266
+#: ../../www/admin/maintainer/maintainer.php:265
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:269
+#, php-format
+msgid "LDAP Error: could not add object %s to maintainer group: %s"
+msgstr ""
+
+#: ../../www/admin/administrator/admin.php:271
+#: ../../www/admin/administrator/admin.php:277
+#: ../../www/admin/administrator/admin.php:288
+#: ../../lib/KolabAdmin/include/menu.php:81
+msgid "Create New Administrator"
+msgstr ""
+
+#: ../../www/admin/administrator/admin.php:303
+msgid "Delete Administrator"
+msgstr ""
+
+#: ../../www/admin/administrator/admin.php:317
+msgid "Error: you need administrative permissions to delete administrators"
+msgstr ""
+
+#: ../../www/admin/administrator/admin.php:321
+#, php-format
+msgid "LDAP Error: Could not remove %s from admin group: %s"
+msgstr ""
+
+#: ../../www/admin/administrator/admin.php:326
+#: ../../www/admin/maintainer/maintainer.php:326
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:330
+#, php-format
+msgid "LDAP Error: could not mark %s for deletion: %s"
+msgstr ""
+
+#: ../../www/admin/administrator/admin.php:332
+msgid "Administrator Deleted"
+msgstr ""
+
+#: ../../www/admin/addressbook/addr.php:95
+msgid "Primary E-Mail Address"
+msgstr ""
+
+#: ../../www/admin/addressbook/addr.php:97
+msgid "E-Mail Aliases"
+msgstr ""
+
+#: ../../www/admin/addressbook/addr.php:105
+msgid "Post Box"
+msgstr ""
+
+#: ../../www/admin/addressbook/addr.php:121
+#: ../../www/admin/sharedfolder/sf.php:150
+#: ../../www/admin/distributionlist/list.php:138
+#, php-format
+msgid "Error: DN required for %s operation"
+msgstr ""
+
+#: ../../www/admin/addressbook/addr.php:131
+msgid "Add External Address"
+msgstr ""
+
+#: ../../www/admin/addressbook/addr.php:178
+#, php-format
+msgid "Addressbook entry DN could not be modified, distribution list <a href='"
+msgstr ""
+
+#: ../../www/admin/addressbook/addr.php:230
+#, php-format
+msgid "%s successfully added"
+msgstr ""
+
+#: ../../www/admin/addressbook/addr.php:240
+#: ../../www/admin/addressbook/addr.php:258
+msgid "Modify External Address"
+msgstr ""
+
+#: ../../www/admin/addressbook/addr.php:261
+#: ../../www/admin/addressbook/addr.php:281
+#, php-format
+msgid "Error: No entry with DN %s found"
+msgstr ""
+
+#: ../../www/admin/addressbook/addr.php:278
+msgid "Delete External Address"
+msgstr ""
+
+#: ../../www/admin/addressbook/addr.php:302
+#, php-format
+msgid "Addressbook entry removed from distribution list '%s'."
+msgstr ""
+
+#: ../../www/admin/addressbook/addr.php:304
+#, php-format
+msgid ""
+"Failure to remove addressbook entry from distribution list '%s', entry will "
+"not be deleted."
+msgstr ""
+
+#: ../../www/admin/addressbook/addr.php:312
+#, php-format
+msgid "LDAP Error: could not delete %s: %s"
+msgstr ""
+
+#: ../../www/admin/addressbook/addr.php:315
+#: ../../www/admin/sharedfolder/sf.php:325
+#: ../../www/admin/distributionlist/list.php:316
+msgid "Entry Deleted"
+msgstr ""
+
+#: ../../www/admin/addressbook/addr.php:316
+#, php-format
+msgid "Address book entry with DN %s was deleted"
+msgstr ""
+
+#: ../../www/admin/maintainer/index.php:62
+#: ../../www/admin/domainmaintainer/index.php:62
+msgid "Manage Maintainers ("
+msgstr ""
+
+#: ../../www/admin/maintainer/index.php:62
+#: ../../www/admin/domainmaintainer/index.php:62
+msgid " Maintainers)"
+msgstr ""
+
+#: ../../www/admin/maintainer/maintainer.php:242
+#: ../../www/admin/maintainer/maintainer.php:296
+msgid "Modify Maintainer"
+msgstr ""
+
+#: ../../www/admin/maintainer/maintainer.php:243
+#: ../../www/admin/maintainer/maintainer.php:269
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:246
+msgid "Maintainer "
+msgstr ""
+
+#: ../../www/admin/maintainer/maintainer.php:270
+#: ../../www/admin/maintainer/maintainer.php:276
+#: ../../www/admin/maintainer/maintainer.php:287
+#: ../../lib/KolabAdmin/include/menu.php:93
+msgid "Create New Maintainer"
+msgstr ""
+
+#: ../../www/admin/maintainer/maintainer.php:302
+msgid "Delete Maintainer"
+msgstr ""
+
+#: ../../www/admin/maintainer/maintainer.php:320
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:324
+#, php-format
+msgid "LDAP Error: Could not remove %s from maintainer group: %s"
+msgstr ""
+
+#: ../../www/admin/maintainer/maintainer.php:332
+msgid "Maintainer Deleted"
+msgstr ""
+
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:49
+msgid "Please enter a uid value"
+msgstr ""
+
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:137
+msgid "Check domains this domain maintainer should be able to maintain"
+msgstr ""
+
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:245
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:300
+msgid "Modify Domain Maintainer"
+msgstr ""
+
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:276
+msgid "Domain maintainer "
+msgstr ""
+
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:277
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:281
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:291
+#: ../../lib/KolabAdmin/include/menu.php:87
+#: ../../lib/KolabAdmin/include/menu.php:104
+msgid "Create New Domain Maintainer"
+msgstr ""
+
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:306
+msgid "Delete Domain Maintainer"
+msgstr ""
+
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:320
+msgid "Error: you need administrative permissions to delete domain maintainers"
+msgstr ""
+
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:336
+msgid "Domain Maintainer Deleted"
+msgstr ""
+
+#: ../../www/admin/sharedfolder/index.php:53
+#, php-format
+msgid "Manage Shared Folders (%d Folders)"
+msgstr ""
+
+#: ../../www/admin/sharedfolder/index.php:63
+#: ../../lib/KolabAdmin/include/form.class.php:254
+msgid "Unspecified"
+msgstr ""
+
+#: ../../www/admin/sharedfolder/index.php:64
+#: ../../lib/KolabAdmin/include/form.class.php:254
+msgid "Mails"
+msgstr ""
+
+#: ../../www/admin/sharedfolder/index.php:66
+#: ../../lib/KolabAdmin/include/form.class.php:255
+msgid "Journals"
+msgstr ""
+
+#: ../../www/admin/sharedfolder/index.php:67
+#: ../../lib/KolabAdmin/include/form.class.php:255
+msgid "Events"
+msgstr ""
+
+#: ../../www/admin/sharedfolder/index.php:68
+#: ../../lib/KolabAdmin/include/form.class.php:256
+msgid "Contacts"
+msgstr ""
+
+#: ../../www/admin/sharedfolder/sf.php:62
+#: ../../www/admin/sharedfolder/sf.php:69
+msgid "Permission for UID/email/GID"
+msgstr ""
+
+#: ../../www/admin/sharedfolder/sf.php:103
+#, php-format
+msgid "No UID or GID %s"
+msgstr ""
+
+#: ../../www/admin/sharedfolder/sf.php:119
+msgid "Folder Name"
+msgstr ""
+
+#: ../../www/admin/sharedfolder/sf.php:126
+msgid "Folder Location"
+msgstr ""
+
+#: ../../www/admin/sharedfolder/sf.php:130
+msgid "Folder Type"
+msgstr ""
+
+#: ../../www/admin/sharedfolder/sf.php:134
+msgid "Quota Limit"
+msgstr ""
+
+#: ../../www/admin/sharedfolder/sf.php:135
+msgid "MBytes (empty for unlimited)"
+msgstr ""
+
+#: ../../www/admin/sharedfolder/sf.php:137
+msgid "Permission for UID/GID"
+msgstr ""
+
+#: ../../www/admin/sharedfolder/sf.php:160
+#: ../../lib/KolabAdmin/include/menu.php:65
+msgid "Add Shared Folder"
+msgstr ""
+
+#: ../../www/admin/sharedfolder/sf.php:245
+#: ../../www/admin/sharedfolder/sf.php:257
+msgid "Shared folder updated"
+msgstr ""
+
+#: ../../www/admin/sharedfolder/sf.php:267
+#, php-format
+msgid "Shared folder '%s' added"
+msgstr ""
+
+#: ../../www/admin/sharedfolder/sf.php:279
+#: ../../www/admin/sharedfolder/sf.php:299
+msgid "Modify Shared Folder"
+msgstr ""
+
+#: ../../www/admin/sharedfolder/sf.php:302
+#: ../../www/admin/sharedfolder/sf.php:318
+#: ../../www/admin/distributionlist/list.php:293
+#: ../../www/admin/distributionlist/list.php:308
+#, php-format
+msgid "Error: No results returned for DN '%s'"
+msgstr ""
+
+#: ../../www/admin/sharedfolder/sf.php:315
+msgid "Delete Shared Folder"
+msgstr ""
+
+#: ../../www/admin/sharedfolder/sf.php:324
+msgid "Shared folder "
+msgstr ""
+
+#: ../../www/admin/sharedfolder/sf.php:324
+msgid " marked for deletion"
+msgstr ""
+
+#: ../../www/admin/sharedfolder/sf.php:328
+#, php-format
+msgid "LDAP Error: Could not mark %s for deletion: %s"
+msgstr ""
+
+#: ../../www/admin/distributionlist/index.php:63
+#, php-format
+msgid "Manage Distribution Lists (%d Lists)"
+msgstr ""
+
+#: ../../www/admin/distributionlist/index.php:74
+msgid "not yet implemented"
+msgstr ""
+
+#: ../../www/admin/distributionlist/list.php:46
+msgid "Please add at least one member"
+msgstr ""
+
+#: ../../www/admin/distributionlist/list.php:50
+#, php-format
+msgid "No user with email address, UID or alias %s"
+msgstr ""
+
+#: ../../www/admin/distributionlist/list.php:62
+msgid "User or distribution list with this email address already exists"
+msgstr ""
+
+#: ../../www/admin/distributionlist/list.php:114
+msgid "List Name"
+msgstr ""
+
+#: ../../www/admin/distributionlist/list.php:121
+msgid "Members"
+msgstr ""
+
+#: ../../www/admin/distributionlist/list.php:123
+msgid "One email address per line"
+msgstr ""
+
+#: ../../www/admin/distributionlist/list.php:126
+msgid "Hidden"
+msgstr ""
+
+#: ../../www/admin/distributionlist/list.php:129
+msgid ""
+"Check here to make this distribution list available only to authenticated "
+"users"
+msgstr ""
+
+#: ../../www/admin/distributionlist/list.php:148
+msgid "Add Distribution List"
+msgstr ""
+
+#: ../../www/admin/distributionlist/list.php:183
+#, php-format
+msgid "No user with address %s"
+msgstr ""
+
+#: ../../www/admin/distributionlist/list.php:214
+#: ../../www/admin/distributionlist/list.php:226
+msgid "Distribution List updated"
+msgstr ""
+
+#: ../../www/admin/distributionlist/list.php:235
+#, php-format
+msgid "LDAP Error: Could not add object %s: %s"
+msgstr ""
+
+#: ../../www/admin/distributionlist/list.php:264
+#, php-format
+msgid "Distribution List '%s' added"
+msgstr ""
+
+#: ../../www/admin/distributionlist/list.php:276
+#: ../../www/admin/distributionlist/list.php:290
+msgid "Modify Distribution List"
+msgstr ""
+
+#: ../../www/admin/distributionlist/list.php:305
+msgid "Delete Distribution List"
+msgstr ""
+
+#: ../../www/admin/distributionlist/list.php:315
+msgid "Distribution List "
+msgstr ""
+
+#: ../../www/admin/distributionlist/list.php:315
+msgid " deleted"
+msgstr ""
+
+#: ../../www/admin/distributionlist/list.php:319
+#, php-format
+msgid "LDAP Error: Could not delete %s: %s"
+msgstr ""
+
+#: ../../www/admin/settings/index.php:99
+#, php-format
+msgid "No account found for email address %s"
+msgstr ""
+
+#: ../../www/admin/settings/index.php:108
+#, php-format
+msgid "LDAP Error: Failed to add distribution list %s: %s"
+msgstr ""
+
+#: ../../www/admin/settings/index.php:110
+#, php-format
+msgid "Successfully created distribution list %s"
+msgstr ""
+
+#: ../../www/admin/settings/index.php:129
+#: ../../www/admin/settings/index.php:138
+#: ../../www/admin/settings/index.php:147
+#: ../../www/admin/settings/index.php:158
+#: ../../www/admin/settings/index.php:168
+#: ../../www/admin/settings/index.php:177
+#: ../../www/admin/settings/index.php:188
+#: ../../www/admin/settings/index.php:202
+#: ../../www/admin/settings/index.php:220
+#: ../../www/admin/settings/index.php:238
+#: ../../www/admin/settings/index.php:255
+#: ../../www/admin/settings/index.php:268
+#, php-format
+msgid "LDAP Error: failed to modify kolab configuration object: %s"
+msgstr ""
+
+#: ../../www/admin/settings/index.php:226
+#, php-format
+msgid "LDAP Error: Failed to delete domain object %s: %s"
+msgstr ""
+
+#: ../../www/admin/settings/index.php:276
+msgid "POP3 Service"
+msgstr ""
+
+#: ../../www/admin/settings/index.php:277
+msgid "POP3/SSL service (TCP port 995)"
+msgstr ""
+
+#: ../../www/admin/settings/index.php:278
+msgid "IMAP Service"
+msgstr ""
+
+#: ../../www/admin/settings/index.php:279
+msgid "IMAP/SSL Service (TCP port 993)"
+msgstr ""
+
+#: ../../www/admin/settings/index.php:280
+#, php-format
+msgid "Sieve service (TCP port %s)"
+msgstr ""
+
+#: ../../www/admin/settings/index.php:281
+msgid "FreeBusy Service via HTTP (in addition to HTTPS)"
+msgstr ""
+
+#: ../../www/admin/settings/index.php:282
+msgid "Amavis Email Scanning (Virus/Spam)"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/form.class.php:34
+msgid "Email address "
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/form.class.php:45
+msgid "Quota can not be negative"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/form.class.php:46
+msgid "Quota must be a number"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/form.class.php:47
+msgid "Quota must be an integer"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/form.class.php:54
+msgid ""
+"Phone entries may only contain a-z, numbers, spaces and the characters ()-+/."
+"=?:"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/form.class.php:117
+msgid "<tr><th>Attribute</th><th>Value</th><th>Comment</th></tr>"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/form.class.php:322
+msgid "Always accept"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/form.class.php:323
+msgid "Always reject"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/form.class.php:324
+msgid "Reject if conflicts"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/form.class.php:325
+msgid "Manual if conflicts"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/form.class.php:326
+msgid "Manual"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/form.class.php:332
+#: ../../lib/KolabAdmin/include/form.class.php:338
+msgid "Anyone"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/form.class.php:374
+msgid "* Required field."
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/form.class.php:395
+#: ../../lib/KolabAdmin/include/form.class.php:398
+msgid "Required field "
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/form.class.php:395
+#: ../../lib/KolabAdmin/include/form.class.php:398
+msgid " is empty"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/menu.php:26
+msgid "Users"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/menu.php:28
+msgid "Manage Email Users"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/menu.php:33
+#: ../../lib/KolabAdmin/include/menu.php:35
+msgid "My User Settings"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/menu.php:37
+msgid "Mail Delivery"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/menu.php:39
+msgid "Forward Email"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/menu.php:41
+msgid "Vacation"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/menu.php:54
+msgid "Manage Address Book"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/menu.php:56
+msgid "Create New vCard"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/menu.php:61
+msgid "Shared Folder"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/menu.php:63
+msgid "Manage Shared Folders"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/menu.php:71
+msgid "Manage Distribution Lists"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/menu.php:73
+msgid "Create New List"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/menu.php:79
+msgid "Manage Administrators"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/menu.php:85
+#: ../../lib/KolabAdmin/include/menu.php:102
+msgid "Manage Domain Maintainers"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/menu.php:91
+msgid "Manage Maintainers"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/menu.php:99
+msgid "Manage Maintainer"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/menu.php:110
+msgid "Manage Domain Maintainer"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/menu.php:115
+msgid "System Settings"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/menu.php:118
+#: ../../lib/KolabAdmin/include/menu.php:120
+msgid "About Kolab"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/menu.php:122
+msgid "Kolab Systems"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/menu.php:124
+msgid "Technology"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/menu.php:128
+msgid "Versions"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/auth.class.php:40
+msgid "Server error, no ldap object!"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/auth.class.php:45
+msgid "Could not bind to LDAP server: "
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/auth.class.php:56
+msgid "Could not bind to LDAP server"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/auth.class.php:83
+#: ../../lib/KolabAdmin/include/auth.class.php:87
+msgid "Wrong username or password"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/auth.class.php:124
+msgid "Kolab Groupware login"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/passwd.php:33
+msgid "Password is empty"
+msgstr ""
+
+#: ../../lib/KolabAdmin/include/passwd.php:36
+#: ../../lib/KolabAdmin/include/passwd.php:41
+msgid "Passwords dont match"
+msgstr ""
diff --git a/data/locale/nl/LC_MESSAGES/messages.po b/data/locale/nl/LC_MESSAGES/messages.po
index 9a0e475..7a333b0 100644
--- a/data/locale/nl/LC_MESSAGES/messages.po
+++ b/data/locale/nl/LC_MESSAGES/messages.po
@@ -7,403 +7,448 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kolab-Webadmin Dutch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-25 18:29+0200\n"
+"POT-Creation-Date: 2011-07-15 12:08+0200\n"
 "PO-Revision-Date: 2007-11-21 14:56+0100\n"
 "Last-Translator: Richard Bos <richard at radoeka.nl>\n"
 "Language-Team: Kolab development coordination <kolab-devel at kolab.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tpl_messages.php:2
-msgid "The address with DN"
-msgstr "Het adres met DN"
-
-#: tpl_messages.php:3 tpl_messages.php:21 tpl_messages.php:77
-#: tpl_messages.php:130 tpl_messages.php:192 tpl_messages.php:210
-msgid "has been deleted"
-msgstr "Is verwijderd"
+#: tpl_messages.php:2 tpl_messages.php:62
+msgid "Errors:"
+msgstr "fouten"
 
-#: tpl_messages.php:4
-msgid "Back to list of addresses"
-msgstr "Terug naar de lijst van adressen"
+#: tpl_messages.php:3 tpl_messages.php:63
+msgid "Message:"
+msgstr "Bericht"
 
-#: tpl_messages.php:5 tpl_messages.php:10
-msgid "(only external addresses without a kolab user account)"
-msgstr " (alleen externe adressen zonder Kolab gebruikersaccount) "
+#: tpl_messages.php:4 ../../lib/KolabAdmin/include/menu.php:77
+msgid "Administrators"
+msgstr "Administrators"
 
-#: tpl_messages.php:6 tpl_messages.php:15 tpl_messages.php:24
-#: tpl_messages.php:80 tpl_messages.php:133 tpl_messages.php:195
-#: tpl_messages.php:218 ../../../www/admin/addressbook/index.php.in:121
-#: ../../../www/admin/user/index.php.in:183
+#: tpl_messages.php:5 tpl_messages.php:69 tpl_messages.php:87
+#: tpl_messages.php:111 tpl_messages.php:210 tpl_messages.php:215
+#: tpl_messages.php:278 ../../www/admin/user/index.php:181
+#: ../../www/admin/addressbook/index.php:121
 msgid "Name"
 msgstr "Naam"
 
-#: tpl_messages.php:7 tpl_messages.php:16 tpl_messages.php:26
-#: tpl_messages.php:70 tpl_messages.php:82 tpl_messages.php:135
-#: tpl_messages.php:175 tpl_messages.php:188 tpl_messages.php:198
-#: tpl_messages.php:221
+#: tpl_messages.php:6 tpl_messages.php:216 tpl_messages.php:279
+#: ../../www/admin/user/index.php:183
+msgid "UID"
+msgstr "UID"
+
+#: tpl_messages.php:7 tpl_messages.php:70 tpl_messages.php:90
+#: tpl_messages.php:114 tpl_messages.php:190 tpl_messages.php:211
+#: tpl_messages.php:217 tpl_messages.php:251 tpl_messages.php:264
+#: tpl_messages.php:280
 msgid "Action"
 msgstr "Actie"
 
-#: tpl_messages.php:8 tpl_messages.php:18 tpl_messages.php:28
-#: tpl_messages.php:74 tpl_messages.php:84 tpl_messages.php:137
-#: tpl_messages.php:200 tpl_messages.php:223
+#: tpl_messages.php:8 tpl_messages.php:218 tpl_messages.php:281
+msgid "Object Deleted, awaiting cleanup..."
+msgstr "Object verwijderd, wacht op opruiming..."
+
+#: tpl_messages.php:9 tpl_messages.php:72 tpl_messages.php:92
+#: tpl_messages.php:116 tpl_messages.php:194 tpl_messages.php:212
+#: tpl_messages.php:219 tpl_messages.php:282
 msgid "Modify"
 msgstr "Wijzigen"
 
-#: tpl_messages.php:9 tpl_messages.php:19 tpl_messages.php:29
-#: tpl_messages.php:75 tpl_messages.php:85 tpl_messages.php:138
-#: tpl_messages.php:176 tpl_messages.php:189 tpl_messages.php:201
-#: tpl_messages.php:224 ../../../www/admin/addressbook/addr.php.in:277
-#: ../../../www/admin/administrator/admin.php.in:307
-#: ../../../www/admin/distributionlist/list.php.in:300
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:310
-#: ../../../www/admin/sharedfolder/sf.php.in:310
-#: ../../../www/admin/user/user.php.in:764
-#: ../../../www/admin/user/user.php.in:822
+#: tpl_messages.php:10 tpl_messages.php:73 tpl_messages.php:93
+#: tpl_messages.php:117 tpl_messages.php:195 tpl_messages.php:213
+#: tpl_messages.php:220 tpl_messages.php:252 tpl_messages.php:265
+#: tpl_messages.php:283 ../../www/admin/user/user.php:862
+#: ../../www/admin/user/user.php:920
+#: ../../www/admin/administrator/admin.php:311
+#: ../../www/admin/addressbook/addr.php:277
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:314
+#: ../../www/admin/sharedfolder/sf.php:314
+#: ../../www/admin/distributionlist/list.php:304
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: tpl_messages.php:11 tpl_messages.php:213 tpl_messages.php:226
-msgid "[ ALL ]"
-msgstr "[ ALLE ]"
+#: tpl_messages.php:11
+msgid "Email Forwarding"
+msgstr "Verzending van E-mail"
 
-#: tpl_messages.php:12 tpl_messages.php:214 tpl_messages.php:227
-msgid "[ OTHER ]"
-msgstr "[ Andere ]"
+#: tpl_messages.php:12
+#, fuzzy
+msgid "Activate email forwarding"
+msgstr "Verzending van E-mail"
 
-#: tpl_messages.php:13 tpl_messages.php:215 tpl_messages.php:228
-msgid "Filter:"
-msgstr "Filter"
+#: tpl_messages.php:13
+msgid "Forward mail to"
+msgstr "Stuur E-mail door naar"
 
-#: tpl_messages.php:14 tpl_messages.php:216 tpl_messages.php:229
-msgid "Filter"
-msgstr "Filter"
+#: tpl_messages.php:14
+msgid "Keep copy on server"
+msgstr "Bewaar een kopie op de server"
 
-#: tpl_messages.php:17
-msgid "Entry deleted, awaiting cleanup..."
-msgstr "Map verwijderd, wacht op opruiming... "
+#: tpl_messages.php:15 tpl_messages.php:77 tpl_messages.php:229
+#: tpl_messages.php:233 tpl_messages.php:236 tpl_messages.php:239
+#: tpl_messages.php:242 tpl_messages.php:245 tpl_messages.php:248
+#: tpl_messages.php:261 tpl_messages.php:333
+msgid "Update"
+msgstr "Bijwerken"
 
-#: tpl_messages.php:20
-msgid "The administrator with DN"
-msgstr "De beheerder met DN"
+#: tpl_messages.php:16
+msgid "ActiveSync Configuration"
+msgstr ""
 
-#: tpl_messages.php:22
-msgid "Back to list of administrators"
-msgstr "Terug naar de lijst van de beheerders"
+#: tpl_messages.php:17
+#, fuzzy
+msgid "Device Alias"
+msgstr "E-mail Alias"
 
-#: tpl_messages.php:23 ../include/menu.php:70
-msgid "Administrators"
-msgstr "Administrators"
+#: tpl_messages.php:18
+msgid "Device Mode"
+msgstr ""
 
-#: tpl_messages.php:25 tpl_messages.php:81 tpl_messages.php:134
-#: ../../../www/admin/user/index.php.in:185
-msgid "UID"
-msgstr "UID"
+#: tpl_messages.php:19
+#, fuzzy
+msgid "Picture Settings"
+msgstr "Systeem Instellingen"
 
-#: tpl_messages.php:27 tpl_messages.php:83 tpl_messages.php:136
-msgid "Object Deleted, awaiting cleanup..."
-msgstr "Object verwijderd, wacht op opruiming..."
+#: tpl_messages.php:20
+msgid "Enable PNG and GIF formats while syncing"
+msgstr ""
 
-#: tpl_messages.php:30
-msgid ""
-"<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> is a specialist "
-"email solution provider based in Johannesburg, South Africa specialising in "
-"the deployment and support of Kolab."
+#: tpl_messages.php:21
+msgid "Save"
 msgstr ""
-"<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> is een "
-"gespecialiseerde provider voor E-mailoplossingen gevestigd in Johannesburg, "
-"Zuid Afrika gespecialiseerd in de verspreiding en ondersteuning van Kolab "
 
-#: tpl_messages.php:31
-msgid ""
-"Code Fusion has played, and continues to play, an integral part in "
-"developing and extending the Kolab server; specifically with regards to "
-"enhancing the base Kolab engine, adding in support for Microsoft Active "
-"Directory ® as an LDAP backend, as well as extending the <a href="
-"\"http://www.horde.org/\">Horde project</a> to provide a web-based groupware "
-"client for the Kolab server."
+#: tpl_messages.php:22
+msgid "Clear"
 msgstr ""
-"Code Fusion heeft een rol gespeeld, en blijft die nog spelen in de "
-"ontwikkeling en de uitbreiding van de Kolab server; vooral met betrekking "
-"tot de verbetering van de basis Kolab engine, door de ondersteuning voor "
-"Microsoft Active Directory &reg toe te voegen; als een LDAP backend en door "
-"het <a href=\"http://www.horde.org/\">Horde-project</a> te verbeteren door "
-"een web-based groupware client voor de Kolab server te voorzien.."
 
-#: tpl_messages.php:32
-msgid ""
-"The following people from Code Fusion are involved in the Kolab project (in "
-"alphabetical order):"
+#: tpl_messages.php:23
+msgid "Forget Device"
 msgstr ""
-"De volgende mensen van Code Fusion zijn betrokken bij het Kolab project (in "
-"de alfabetische volgorde):"
 
-#: tpl_messages.php:33
+#: tpl_messages.php:24
+msgid "Are you sure?"
+msgstr ""
+
+#: tpl_messages.php:25
+msgid "The maintainer with DN"
+msgstr "de maintainer met DN"
+
+#: tpl_messages.php:26 tpl_messages.php:29 tpl_messages.php:204
+#: tpl_messages.php:207 tpl_messages.php:286 tpl_messages.php:309
+msgid "has been deleted"
+msgstr "Is verwijderd"
+
+#: tpl_messages.php:27
+msgid "Back to list of maintainers"
+msgstr "Terug naar de lijst van de handhavers"
+
+#: tpl_messages.php:28
+msgid "The distribution list with DN"
+msgstr "De distributielijst met DN"
+
+#: tpl_messages.php:30
+msgid "Back to list of distribution lists"
+msgstr "Terug naar de lijst van de beheerders"
+
+#: tpl_messages.php:31
 msgid "Attribute"
 msgstr "Toewijzing"
 
-#: tpl_messages.php:34
+#: tpl_messages.php:32
 msgid "Value"
 msgstr "Waarde"
 
-#: tpl_messages.php:35
+#: tpl_messages.php:33
 msgid "Comment"
 msgstr "Commentaar"
 
-#: tpl_messages.php:36 ../../../www/admin/addressbook/addr.php.in:88
-#: ../../../www/admin/administrator/admin.php.in:139
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:114
-#: ../../../www/admin/maintainer/maintainer.php.in:136
-#: ../../../www/admin/user/user.php.in:384
+#: tpl_messages.php:34 ../../www/admin/user/user.php:449
+#: ../../www/admin/administrator/admin.php:139
+#: ../../www/admin/addressbook/addr.php:88
+#: ../../www/admin/maintainer/maintainer.php:136
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:114
 msgid "First Name"
 msgstr "Voornaam"
 
-#: tpl_messages.php:37 tpl_messages.php:39 tpl_messages.php:41
-#: tpl_messages.php:43 ../../../www/admin/addressbook/addr.php.in:90
-#: ../../../www/admin/addressbook/addr.php.in:93
-#: ../../../www/admin/administrator/admin.php.in:133
-#: ../../../www/admin/administrator/admin.php.in:141
-#: ../../../www/admin/administrator/admin.php.in:144
-#: ../../../www/admin/distributionlist/list.php.in:117
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:108
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:116
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:119
-#: ../../../www/admin/maintainer/maintainer.php.in:130
-#: ../../../www/admin/maintainer/maintainer.php.in:138
-#: ../../../www/admin/maintainer/maintainer.php.in:141
-#: ../../../www/admin/sharedfolder/sf.php.in:123
-#: ../../../www/admin/user/user.php.in:376
-#: ../../../www/admin/user/user.php.in:386
-#: ../../../www/admin/user/user.php.in:389
+#: tpl_messages.php:35 tpl_messages.php:38 tpl_messages.php:40
+#: tpl_messages.php:42 ../../www/admin/user/user.php:441
+#: ../../www/admin/user/user.php:451 ../../www/admin/user/user.php:455
+#: ../../www/admin/administrator/admin.php:133
+#: ../../www/admin/administrator/admin.php:141
+#: ../../www/admin/administrator/admin.php:144
+#: ../../www/admin/addressbook/addr.php:90
+#: ../../www/admin/addressbook/addr.php:93
+#: ../../www/admin/maintainer/maintainer.php:130
+#: ../../www/admin/maintainer/maintainer.php:138
+#: ../../www/admin/maintainer/maintainer.php:141
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:108
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:116
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:119
+#: ../../www/admin/sharedfolder/sf.php:125
+#: ../../www/admin/distributionlist/list.php:120
 msgid "Required"
 msgstr "Vereist"
 
-#: tpl_messages.php:38 ../../../www/admin/addressbook/addr.php.in:91
-#: ../../../www/admin/administrator/admin.php.in:142
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:117
-#: ../../../www/admin/maintainer/maintainer.php.in:139
-#: ../../../www/admin/user/user.php.in:387
+#: tpl_messages.php:36 ../../www/admin/user/user.php:452
+#, fuzzy
+msgid "Middle Name"
+msgstr "Map naam"
+
+#: tpl_messages.php:37 ../../www/admin/user/user.php:453
+#: ../../www/admin/administrator/admin.php:142
+#: ../../www/admin/addressbook/addr.php:91
+#: ../../www/admin/maintainer/maintainer.php:139
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:117
 msgid "Last Name"
 msgstr "Achternaam"
 
-#: tpl_messages.php:40 ../../../www/admin/administrator/admin.php.in:145
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:120
-#: ../../../www/admin/maintainer/maintainer.php.in:142
-#: ../../../www/admin/user/user.php.in:390
+#: tpl_messages.php:39 ../../www/admin/user/user.php:456
+#: ../../www/admin/administrator/admin.php:145
+#: ../../www/admin/maintainer/maintainer.php:142
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:120
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: tpl_messages.php:42 ../../../www/admin/administrator/admin.php.in:149
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:124
-#: ../../../www/admin/maintainer/maintainer.php.in:146
-#: ../../../www/admin/user/user.php.in:394
+#: tpl_messages.php:41 ../../www/admin/user/user.php:460
+#: ../../www/admin/administrator/admin.php:149
+#: ../../www/admin/maintainer/maintainer.php:146
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:124
 msgid "Verify Password"
 msgstr "Wachtwoord controleren"
 
-#: tpl_messages.php:44 ../../../www/admin/user/user.php.in:398
+#: tpl_messages.php:43 ../../www/admin/user/user.php:464
 msgid "Primary Email Address"
 msgstr "Primair E-mailadres"
 
-#: tpl_messages.php:45 ../../../www/admin/administrator/admin.php.in:132
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:107
-#: ../../../www/admin/maintainer/maintainer.php.in:129
-#: ../../../www/admin/sharedfolder/sf.php.in:126
-#: ../../../www/admin/user/user.php.in:375
-#: ../../../www/admin/user/user.php.in:377
+#: tpl_messages.php:44 ../../www/admin/user/user.php:440
+#: ../../www/admin/user/user.php:442
+#: ../../www/admin/administrator/admin.php:132
+#: ../../www/admin/maintainer/maintainer.php:129
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:107
+#: ../../www/admin/sharedfolder/sf.php:128
 msgid "Required, non volatile"
 msgstr "Vereist, permanent"
 
-#: tpl_messages.php:46 ../../../www/admin/addressbook/addr.php.in:94
-#: ../../../www/admin/user/user.php.in:433
+#: tpl_messages.php:45 ../../www/admin/user/user.php:505
+#: ../../www/admin/addressbook/addr.php:94
 msgid "Title"
 msgstr "Titel"
 
-#: tpl_messages.php:47
+#: tpl_messages.php:46
 msgid "Email Alias"
 msgstr "E-mail Alias"
 
-#: tpl_messages.php:48 ../../../www/admin/addressbook/addr.php.in:101
-#: ../../../www/admin/user/user.php.in:434
+#: tpl_messages.php:47 ../../www/admin/user/user.php:506
+#: ../../www/admin/addressbook/addr.php:101
 msgid "Organisation"
 msgstr "Organisatie"
 
-#: tpl_messages.php:49 ../../../www/admin/addressbook/addr.php.in:102
-#: ../../../www/admin/user/user.php.in:435
+#: tpl_messages.php:48 ../../www/admin/user/user.php:507
+#: ../../www/admin/addressbook/addr.php:102
 msgid "Organisational Unit"
 msgstr "Organisatorische unit"
 
-#: tpl_messages.php:50 ../../../www/admin/addressbook/addr.php.in:103
-#: ../../../www/admin/user/user.php.in:436
+#: tpl_messages.php:49 ../../www/admin/user/user.php:508
+#: ../../www/admin/addressbook/addr.php:103
 msgid "Room Number"
 msgstr "Kantoornummer"
 
-#: tpl_messages.php:51 ../../../www/admin/addressbook/addr.php.in:104
-#: ../../../www/admin/user/user.php.in:437
+#: tpl_messages.php:50 ../../www/admin/user/user.php:509
+#: ../../www/admin/addressbook/addr.php:104
 msgid "Street Address"
 msgstr "Straat + Adres"
 
-#: tpl_messages.php:52 ../../../www/admin/user/user.php.in:438
+#: tpl_messages.php:51 ../../www/admin/user/user.php:510
 msgid "Postbox"
 msgstr "Nummer"
 
-#: tpl_messages.php:53 ../../../www/admin/addressbook/addr.php.in:106
-#: ../../../www/admin/user/user.php.in:439
+#: tpl_messages.php:52 ../../www/admin/user/user.php:511
+#: ../../www/admin/addressbook/addr.php:106
 msgid "Postal Code"
 msgstr "Postcode"
 
-#: tpl_messages.php:54 ../../../www/admin/addressbook/addr.php.in:107
-#: ../../../www/admin/user/user.php.in:440
+#: tpl_messages.php:53 ../../www/admin/user/user.php:512
+#: ../../www/admin/addressbook/addr.php:107
 msgid "City"
 msgstr "Stad"
 
-#: tpl_messages.php:55 ../../../www/admin/addressbook/addr.php.in:108
-#: ../../../www/admin/user/user.php.in:441
+#: tpl_messages.php:54 ../../www/admin/user/user.php:513
+#: ../../www/admin/addressbook/addr.php:108
 msgid "Country"
 msgstr "Land"
 
-#: tpl_messages.php:56 ../../../www/admin/addressbook/addr.php.in:109
-#: ../../../www/admin/user/user.php.in:442
+#: tpl_messages.php:55 ../../www/admin/user/user.php:515
+#: ../../www/admin/addressbook/addr.php:109
 msgid "Telephone Number"
 msgstr "Telefoonnummer"
 
-#: tpl_messages.php:57 ../../../www/admin/addressbook/addr.php.in:111
-#: ../../../www/admin/user/user.php.in:444
+#: tpl_messages.php:56 ../../www/admin/user/user.php:517
+#: ../../www/admin/addressbook/addr.php:111
 msgid "Fax Number"
 msgstr "Faxnummer"
 
-#: tpl_messages.php:58 ../include/menu.php:45
+#: tpl_messages.php:57 tpl_messages.php:96 tpl_messages.php:313
+#: ../../lib/KolabAdmin/include/menu.php:52
 msgid "Addressbook"
 msgstr "Adresboek"
 
-#: tpl_messages.php:59
+#: tpl_messages.php:58
 msgid "check here to make this users address <br/> visible in the address book"
 msgstr ""
 "hier aankruisen om dit gebruikersadres zichtbaar te maken in het adresboek"
 
-#: tpl_messages.php:60
+#: tpl_messages.php:59
 msgid "User Quota in KB"
 msgstr "Beschikbare schijfruimte in KB per gebruiker "
 
-#: tpl_messages.php:61 ../../../www/admin/user/user.php.in:448
+#: tpl_messages.php:60 ../../www/admin/user/user.php:521
 msgid "Leave blank for unlimited"
 msgstr "Laat leeg indien onbeperkt"
 
-#: tpl_messages.php:62 ../include/form.class.php:76
+#: tpl_messages.php:61 ../../lib/KolabAdmin/include/form.class.php:75
 msgid "Submit"
 msgstr "Verzenden"
 
-#: tpl_messages.php:63
-msgid "Email Delivery"
-msgstr "Email aflevering"
-
-#: tpl_messages.php:64
-msgid ""
-"Activate delivery to folder (only one of vacation, forward and delivery to "
-"folder can be active at any time)"
-msgstr ""
-"Aflevering naar een map activeren (er kan maar Ã©Ã©n van E-mail aflevering, "
-"E-mail doorsturen of Vakantie aktief zijn)"
-
-#: tpl_messages.php:65
-msgid "Deliver regular mail to folder"
-msgstr "Plaats reguliere email in map"
+#: tpl_messages.php:64 tpl_messages.php:209
+msgid "(only external addresses without a kolab user account)"
+msgstr " (alleen externe adressen zonder Kolab gebruikersaccount) "
 
-#: tpl_messages.php:66 tpl_messages.php:93 tpl_messages.php:153
-#: tpl_messages.php:157 tpl_messages.php:160 tpl_messages.php:163
-#: tpl_messages.php:166 tpl_messages.php:169 tpl_messages.php:172
-#: tpl_messages.php:185 tpl_messages.php:239
-msgid "Update"
-msgstr "Bijwerken"
+#: tpl_messages.php:65 tpl_messages.php:82 tpl_messages.php:103
+msgid "[ ALL ]"
+msgstr "[ ALLE ]"
 
-#: tpl_messages.php:67 ../include/menu.php:62
-msgid "Distribution Lists"
-msgstr "Distributielijsten"
+#: tpl_messages.php:66 tpl_messages.php:83 tpl_messages.php:104
+msgid "[ OTHER ]"
+msgstr "[ Andere ]"
 
-#: tpl_messages.php:68
-msgid "Listname"
-msgstr "Lijstnaam"
+#: tpl_messages.php:67 tpl_messages.php:84 tpl_messages.php:105
+msgid "Filter:"
+msgstr "Filter"
 
-#: tpl_messages.php:69
-msgid "Visibility"
-msgstr "Zichtbaarheid"
+#: tpl_messages.php:68 tpl_messages.php:85 tpl_messages.php:106
+msgid "Filter"
+msgstr "Filter"
 
 #: tpl_messages.php:71
-msgid "Internal"
-msgstr "Intern"
+msgid "Entry deleted, awaiting cleanup..."
+msgstr "Map verwijderd, wacht op opruiming... "
 
-#: tpl_messages.php:72
-msgid "Public"
-msgstr "Openbaar"
+#: tpl_messages.php:74
+msgid "Email Delivery"
+msgstr "Email aflevering"
 
-#: tpl_messages.php:73
-msgid "List deleted, awaiting cleanup..."
-msgstr "Gebruiker verwijderd, wacht op opruiming..."
+#: tpl_messages.php:75
+msgid "Activate delivery to folder"
+msgstr ""
 
 #: tpl_messages.php:76
-msgid "The distribution list with DN"
-msgstr "De distributielijst met DN"
+msgid "Deliver regular mail to folder"
+msgstr "Plaats reguliere email in map"
 
 #: tpl_messages.php:78
-msgid "Back to list of distribution lists"
-msgstr "Terug naar de lijst van de beheerders"
-
-#: tpl_messages.php:79 ../include/menu.php:76 ../include/menu.php:93
-#: ../include/menu.php:101
-msgid "Domain Maintainers"
-msgstr "Domein beheerders"
+msgid ""
+"<a href=\"http://www.kde.org\">KDE</a> is a powerful <a href=\"http://www."
+"gnu.org/philosophy/free-sw.html\">Free Software</a> graphical desktop "
+"environment for Linux and Unix workstations. It combines ease of use, "
+"contemporary functionality, and outstanding graphical design with the "
+"technological superiority of the Unix operating system."
+msgstr ""
+"<a href=\"http://www.kde.nl\">KDE</a> is een krachtige <a href=\"http://www."
+"gnu.org/philosophy/free-sw.html\"> Vrije Software </a> grafische bureau "
+"omgeving voor Linux en Unix werkstations. Het combineert gebruiksgemak, "
+"hedendaagse functionaliteit, een opmerkelijke grafische interface en de "
+"grote technologische superioriteit van het Unix besturingssysteem."
 
-#: tpl_messages.php:86
+#: tpl_messages.php:79
 msgid ""
-"Kolab's architecture was done by <a href=\"http://www.erfrakon.com"
-"\">erfrakon</a>; the company also designed and implemented the Kolab 1 "
-"Server and did the design and architecture for the Kolab 2 Server while "
-"providing consulting for the implementation of the Kolab 2 server and the "
-"Kolab 2 clients."
+"<b>KDE</b> is an Internet project that is truly open in every sense. "
+"Development takes place on the Internet and is discussed on our <a href="
+"\"http://www.kde.org/mailinglists.html\">mailing lists</a>, USENET news "
+"groups, and IRC channels to which we invite and welcome everyone."
 msgstr ""
-"Het Kolab concept is gerealiseerd door <a href=\"http://www.erfrakon.com"
-"\">erfrakon</a>; het bedrijf ontwierp en implementeerde de Kolab -1 server "
-"en ontwierp en bouwde de kolab-2 server en levert advies over het "
-"implementeren van de Kolab-2 server en Kolab-2 clients."
+"<b>KDE</b> is een internetproject dat in elk opzicht open is. De "
+"ontwikkeling vindt plaats op het internet en wordt bediscussieerd op onze <a "
+"href=\"http://www.kde.org/mailinglists.html\">discussielijsten</a>,  USENET "
+"nieuwsgroepen, en IRC kanalen waarop iedereen uitgenodigd en welkom is."
 
-#: tpl_messages.php:87
+#: tpl_messages.php:80
 msgid ""
-"<a href=\"http://www.erfrakon.com\">erfrakon</a> is a consulting company "
-"dedicated to opensource software and Linux. The main tasks of erfrakon "
-"within the Kolab project are the principle design and architecure of the "
-"Kolab groupware solution and the creation of the Kolab 1 server."
+"<b>KDE</b> is a mature desktop suite providing a solid basis to an ever "
+"growing number of <a href=\"http://www.kde-apps.org\">applications</a> for "
+"Unix workstations.  KDE has developed a high quality development framework "
+"for Unix, which allows for the rapid and efficient creation of applications."
 msgstr ""
-"<a href=\"http://www.erfrakon.com\">erfrakon</a> is een consultancy bedrijf "
-"gewijd aan opensource software en Linux. De hoofdopdrachten van Efrakon "
-"binnen het kolab project zijn het ontwerp en de architectuur van Kolab "
-"groupware oplossingen en de creatie van de Kolab 1 server."
+"<b>KDE</b> is een geÃ«volueerde desktop suite die een solide basis biedt voor "
+"een groeiend aantal <a href=\"http://www.kde-apps.org\">toepassingen</a> "
+"voor Unix werkstations.  KDE heeft voor Unix een ontwikkelingsomgeving van "
+"hoge kwaliteit ontwikkeld, die een snelle en efficiÃ«nte ontwikkeling van "
+"toepassingen toelaat."
 
-#: tpl_messages.php:88
-msgid "The following people worked on Kolab for erfrakon:"
-msgstr "De volgende mensen hebben op Kolab gewerkt voor erfrakon"
+#: tpl_messages.php:81 tpl_messages.php:102
+msgid "Email Users"
+msgstr "Email gebruikers"
 
-#: tpl_messages.php:89
-msgid "Email Forwarding"
-msgstr "Verzending van E-mail"
+#: tpl_messages.php:86 tpl_messages.php:113
+msgid "Type"
+msgstr "Soort"
 
-#: tpl_messages.php:90
-msgid ""
-"Activate email forwarding (only one of vacation, forward and delivery to "
-"folder can be active at any time)"
-msgstr ""
-"Activeer doorsturen E-mail (er kan maar Ã©Ã©n van E-mail aflevering, "
-"E-mail doorsturen of Vakantie aktief zijn)"
+#: tpl_messages.php:88 ../../www/admin/user/activesync.php:496
+msgid "E-mail"
+msgstr "E-mail"
+
+#: tpl_messages.php:89
+msgid "uid"
+msgstr "uid"
 
 #: tpl_messages.php:91
-msgid "Forward mail to"
-msgstr "Stuur E-mail door naar"
+msgid "User Deleted, awaiting cleanup..."
+msgstr "Gebruiker verwijderd, wacht op opruiming..."
 
-#: tpl_messages.php:92
-msgid "Keep copy on server"
-msgstr "Bewaar een kopie op de server"
+#: tpl_messages.php:94 tpl_messages.php:151
+#, fuzzy
+msgid "Welcome to the Kolab Groupware Server Maintenance"
+msgstr "Welkom op Kolab beheersinterface"
+
+#: tpl_messages.php:95 tpl_messages.php:152 tpl_messages.php:155
+#: tpl_messages.php:312
+#, fuzzy
+msgid "Manage Users"
+msgstr "Beheer email gebruikers"
+
+#: tpl_messages.php:97 tpl_messages.php:153 tpl_messages.php:156
+#: tpl_messages.php:314
+#, fuzzy
+msgid "Shared Folders"
+msgstr "Gedeelde map"
+
+#: tpl_messages.php:98 tpl_messages.php:157 tpl_messages.php:187
+#: tpl_messages.php:315 ../../lib/KolabAdmin/include/menu.php:69
+msgid "Distribution Lists"
+msgstr "Distributielijsten"
+
+#: tpl_messages.php:99 tpl_messages.php:214 tpl_messages.php:317
+#: ../../lib/KolabAdmin/include/menu.php:89
+#: ../../lib/KolabAdmin/include/menu.php:97
+msgid "Maintainers"
+msgstr "Beheerders"
+
+#: tpl_messages.php:100 tpl_messages.php:158 tpl_messages.php:277
+#: tpl_messages.php:318 ../../lib/KolabAdmin/include/menu.php:83
+#: ../../lib/KolabAdmin/include/menu.php:100
+#: ../../lib/KolabAdmin/include/menu.php:108
+msgid "Domain Maintainers"
+msgstr "Domein beheerders"
+
+#: tpl_messages.php:101 tpl_messages.php:154 tpl_messages.php:159
+#: tpl_messages.php:276 tpl_messages.php:320
+#, fuzzy
+msgid "About"
+msgstr "Info over Kolab"
 
-#: tpl_messages.php:94
+#: tpl_messages.php:107
 msgid ""
 "Intevation GmbH coordinated the Projects: Kroupware and Proko2, which are "
 "the main driving force behind Kolab1&2. In addition to project management "
@@ -413,7 +458,7 @@ msgstr ""
 "voornaamste drijvende krachten waren achter Kolab1&2. Naast het project "
 "management verzorgde Intevation de meeste kwaliteitscontrole."
 
-#: tpl_messages.php:95
+#: tpl_messages.php:108
 msgid ""
 "Intevation GmbH is a IT-company exclusively focusing on Free Software. Its "
 "business units are strategic consulting, project management and geographic "
@@ -423,137 +468,129 @@ msgstr ""
 "business units zijn strategische consulting, projectmanagement en "
 "geografische informatiesystemen."
 
-#: tpl_messages.php:96
+#: tpl_messages.php:109
 msgid "The following people worked on Kolab for Intevation:"
 msgstr "De volgende mensen hebben op Kolab gewerkt voor Intevation:"
 
-#: tpl_messages.php:97
-msgid ""
-"The Kolab 1 KDE client and the Kolab 2 KDE Client (Kontact) was developed by"
-msgstr ""
-"The Kolab 1 KDE client en de Kolab 2 KDE client (Kontact) werd ontworpen door"
-
-#: tpl_messages.php:98
-msgid ""
-"Klarälvdalens Datakonsult AB is a consulting company dedicated to "
-"opensource software, Linux, and the <a href=\"http://www.trolltech.com/"
-"products/qt/\">Qt</a> library. The main tasks of KDAB within the Kolab "
-"project are design and implementation of the Kolab KDE clients and the "
-"implementation of the current Kolab 2 server."
-msgstr ""
-"Klarälvdalens Datakonsult AB is een consulting bedrijf gewijd aan "
-"opensource software, Linux, en de <a href=\"http://www.trolltech.com/"
-"products/qt/\">Qt</a> bibliotheek. De hoofdopdrachten van KDAB binnen het "
-"Kolab project zijn ontwerp en implementatie van de Kolab KDE clients en de "
-"implementatie van de huidige Kolab 2 server."
+#: tpl_messages.php:110
+msgid "Shared folders"
+msgstr "Gedeelde mappen"
 
-#: tpl_messages.php:99
-msgid ""
-"The following people worked on Kolab for Klarälvdalens Datakonsult AB:"
-msgstr ""
-"De volgende mensen hebben aan Kolab gewerkt van Klarälvdalens "
-"Datakonsult AB:"
+#: tpl_messages.php:112
+msgid "Server"
+msgstr "Server"
 
-#: tpl_messages.php:100
-msgid ""
-"<a href=\"http://www.kde.org\">KDE</a> is a powerful <a href=\"http://www."
-"gnu.org/philosophy/free-sw.html\">Free Software</a> graphical desktop "
-"environment for Linux and Unix workstations. It combines ease of use, "
-"contemporary functionality, and outstanding graphical design with the "
-"technological superiority of the Unix operating system."
-msgstr ""
-"<a href=\"http://www.kde.nl\">KDE</a> is een krachtige <a href=\"http://www."
-"gnu.org/philosophy/free-sw.html\"> Vrije Software </a> grafische bureau "
-"omgeving voor Linux en Unix werkstations. Het combineert gebruiksgemak, "
-"hedendaagse functionaliteit, een opmerkelijke grafische interface en de "
-"grote technologische superioriteit van het Unix besturingssysteem."
+#: tpl_messages.php:115
+msgid "Folder deleted, awaiting cleanup..."
+msgstr "Map verwijderd, wacht op opruiming... "
 
-#: tpl_messages.php:101
-msgid ""
-"<b>KDE</b> is an Internet project that is truly open in every sense. "
-"Development takes place on the Internet and is discussed on our <a href="
-"\"http://www.kde.org/mailinglists.html\">mailing lists</a>, USENET news "
-"groups, and IRC channels to which we invite and welcome everyone."
-msgstr ""
-"<b>KDE</b> is een internetproject dat in elk opzicht open is. De "
-"ontwikkeling vindt plaats op het internet en wordt bediscussieerd op onze <a "
-"href=\"http://www.kde.org/mailinglists.html\">discussielijsten</a>,  USENET "
-"nieuwsgroepen, en IRC kanalen waarop iedereen uitgenodigd en welkom is."
+#: tpl_messages.php:118
+#, fuzzy
+msgid "Kolab Groupware Solution - Technologies"
+msgstr "Kolab Groupware login"
 
-#: tpl_messages.php:102
+#: tpl_messages.php:119
 msgid ""
-"<b>KDE</b> is a mature desktop suite providing a solid basis to an ever "
-"growing number of <a href=\"http://www.kde-apps.org\">applications</a> for "
-"Unix workstations.  KDE has developed a high quality development framework "
-"for Unix, which allows for the rapid and efficient creation of applications."
+"This is the server of the Kolab Groupware Solution. It is <a href=\"http://"
+"fsfe.org/about/basics/freesoftware\">Free Software</a> developed by the <a "
+"href=\"http://www.kolab.org/\">Kolab Community</a>, which works in "
+"collaboration with and as part of many other communities and projects to "
+"bring you this software."
 msgstr ""
-"<b>KDE</b> is een geÃ«volueerde desktop suite die een solide basis biedt voor "
-"een groeiend aantal <a href=\"http://www.kde-apps.org\">toepassingen</a> "
-"voor Unix werkstations.  KDE heeft voor Unix een ontwikkelingsomgeving van "
-"hoge kwaliteit ontwikkeld, die een snelle en efficiÃ«nte ontwikkeling van "
-"toepassingen toelaat."
-
-#: tpl_messages.php:103
-msgid "Kolab2 Groupware Server"
-msgstr "Kolab2 Groupware Server"
 
-#: tpl_messages.php:104
+#: tpl_messages.php:120
 msgid ""
-"This is the Kolab2 Server. It is Free Software developed by the <a href="
-"\"http://www.kolab.org/\">Kolab Project</a>, with the intention of bringing "
-"groupware functionality to Unix/KDE users as well as Windows desktops."
-msgstr ""
-"Dit is de Kolab2 Server. Het is Free Software ontworpen door het  <a href="
-"\"http://www.kolab.org/\">Kolab Project</a>, met de bedoeling groupware "
-"functionaliteit te bieden voor Unix/KDE gebruikers evenals voor Microsoft Windows "
-"desktops."
-
-#: tpl_messages.php:105
-msgid "Kolab builds upon many other Free Software projects, namely:"
+"For this server, Free Software communities and projects that the Kolab "
+"Community is a part of and builds upon include:"
 msgstr ""
-"Kolab is gebaseerd op verschillende Free Software projecten, namelijk:"
 
-#: tpl_messages.php:106
+#: tpl_messages.php:121
 msgid "(Mail Scanner)"
 msgstr "(E-mail scanner)"
 
-#: tpl_messages.php:107
+#: tpl_messages.php:122
 msgid "(HTTP Server)"
 msgstr "(HTTP server)"
 
-#: tpl_messages.php:108
+#: tpl_messages.php:123
 msgid "(Virus Scanner)"
 msgstr "(Virus scanner)"
 
-#: tpl_messages.php:109
-msgid "(IMAP Server)"
+#: tpl_messages.php:124
+#, fuzzy
+msgid "(IMAP Server & Database)"
 msgstr "(IMAP server)"
 
-#: tpl_messages.php:110
+#: tpl_messages.php:125
 msgid "(LDAP Server)"
 msgstr "(LDAP server)"
 
-#: tpl_messages.php:111
+#: tpl_messages.php:126
 msgid "(MTA)"
 msgstr "(MTA)"
 
-#: tpl_messages.php:112
+#: tpl_messages.php:127
 msgid "(SPAM Filter)"
 msgstr "(Spam filter)"
 
-#: tpl_messages.php:113
+#: tpl_messages.php:128
+msgid "(ActiveSync Support)"
+msgstr ""
+
+#: tpl_messages.php:129
+msgid "(Web client)"
+msgstr ""
+
+#: tpl_messages.php:130 tpl_messages.php:131
+msgid "(Server side scripting & glue)"
+msgstr ""
+
+#: tpl_messages.php:132
+msgid "(This interface)"
+msgstr ""
+
+#: tpl_messages.php:133
 msgid ""
-"The following projects are used in binding the above together, in order to "
-"create the Kolab Server:"
+"For the clients, Free Software communities and projects that the Kolab "
+"Community is a part of and builds upon include:"
 msgstr ""
-"De volgende projecten worden gebruikt om in combinatie met de bovenstaanden "
-"projecten de Kolab server te creÃ«ren:"
 
-#: tpl_messages.php:114
-msgid "The following projects are used as a base for the Kolab Clients:"
-msgstr "De volgende projecten worden gebruikt als basis voor de Kolab Clients:"
+#: tpl_messages.php:134
+msgid "History & Credits"
+msgstr ""
 
-#: tpl_messages.php:115
+#: tpl_messages.php:135
+msgid ""
+"In 2010, <a href=\"http://www.intevation.de\">Intevation</a>, <a href="
+"\"http://www.kdab.com/\">KDAB</a>, <a href=\"http://uk.linkedin.com/in/"
+"pauljadams\">Dr. Paul Adams</a> and <a href=\"http://ch.linkedin.com/in/"
+"georggreve\">Georg Greve</a> worked together to re-launch the professional "
+"support of the Kolab Groupware Solution into the <a href=\"http://kolabsys."
+"com\">Kolab Systems AG</a>, which took the place of the Kolab-Konsortium."
+msgstr ""
+
+#: tpl_messages.php:136
+msgid ""
+"Kolab Systems together with its partner network, the Kolab Enterprise "
+"Community, has since been the primary facilitator of the Kolab Community, "
+"including for the provision of infrastructure, and the focal point for "
+"further development of the Kolab Groupware Solution, e.g. for inclusion of "
+"ActiveSync support in version 2.3 of the server, or for native packaging on "
+"the various platforms."
+msgstr ""
+
+#: tpl_messages.php:137
+msgid ""
+"If you want to join the community, please visit <a href=\"http://wiki.kolab."
+"org\">http://wiki.kolab.org</a> and <a href=\"http://kolab.org\">http://"
+"kolab.org</a>."
+msgstr ""
+
+#: tpl_messages.php:138
+msgid "History before 2010"
+msgstr ""
+
+#: tpl_messages.php:139
 msgid ""
 "The Kolab project owes a great deal of thanks to the people of the <a href="
 "\"http://www.openpkg.org/\">OpenPKG</a> project. OpenPKG allows Kolab to run "
@@ -565,7 +602,7 @@ msgstr ""
 "voorspelbare manier op verschillende platformen te draaien, door te zorgen "
 "voor een gemeenschappelijke basis, een gemakkelijke installatie."
 
-#: tpl_messages.php:116
+#: tpl_messages.php:140
 msgid ""
 "To use all Kolab2 features you need an interoperable client. The KDE Kolab "
 "Client was the first such client to be developed and is still considered the "
@@ -582,7 +619,7 @@ msgstr ""
 "project</a> voor het ter beschikking stellen van het krachtige platform "
 "waarop de client gebouwd is."
 
-#: tpl_messages.php:117
+#: tpl_messages.php:141
 msgid ""
 "Users of Outlook on Microsoft Windows are able to use a proprietary plug-in "
 "to inter-operate with the Kolab server. For Kolab2 the preferred plug-in is "
@@ -597,7 +634,7 @@ msgstr ""
 "heeft nauw samengewerkt met de Kolab gemeenschap om te helpen bij de "
 "ontwikkeling van het opslagformaat van Kolab2."
 
-#: tpl_messages.php:118
+#: tpl_messages.php:142
 msgid ""
 "A list of additional Outlook plug-ins that provide interoperability with the "
 "Kolab server is <a href=\"http://www.kolab.org/kolab-plugins.html"
@@ -607,7 +644,7 @@ msgstr ""
 "Kolab server zijn <a href=\"http://www.kolab.org/kolab-plugins.html\">wordt "
 "onderhouden op de Kolab website</a>."
 
-#: tpl_messages.php:119
+#: tpl_messages.php:143
 msgid ""
 "There is also a <a href=\"http://www.kolab.org/webclient.html\">web-based "
 "client</a> in development which provides full groupware functionality to "
@@ -625,7 +662,7 @@ msgstr ""
 "niet mogelijk geweest zijn zonder het uitstekende <a href=\"http://www.horde."
 "org/\">Horde project</a>"
 
-#: tpl_messages.php:120
+#: tpl_messages.php:144
 msgid ""
 "As Kolab is a Free Software project, anyone can help to extend the "
 "functionality of the software. An active community has developed around the "
@@ -645,13 +682,13 @@ msgstr ""
 "(project management) en <a href=\"http://www.klaralvdalens-datakonsult.se/"
 "\">Klarälvdalens Datakonsult</a> (client)."
 
-#: tpl_messages.php:121
+#: tpl_messages.php:145
+#, fuzzy
 msgid ""
-"<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> joined the "
-"project soon after the original Kolab1 server was released. Its developers "
-"are primarily responsible for an updated engine (which forms the base of the "
-"Kolab2 server), the web client, as well as contributing to development of "
-"the Kolab2 storage format."
+"Code Fusion cc joined the project soon after the original Kolab1 server was "
+"released. Its developers are primarily responsible for an updated engine "
+"(which forms the base of the Kolab2 server), the web client, as well as "
+"contributing to development of the Kolab2 storage format."
 msgstr ""
 "<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> voegde zich bij "
 "het project net nadat de Kolab1 server was uitgebracht. Het zijn "
@@ -659,83 +696,260 @@ msgstr ""
 "engine (die de basis vormt voor de Kolab2 server), de webclient, evenals "
 "voor de bijdrage tot de ontwikkeling van het Kolab2 opslagformaat."
 
-#: tpl_messages.php:122
+#: tpl_messages.php:146
 msgid "Other contributors:"
 msgstr "Andere medewerkers"
 
-#: tpl_messages.php:123
+#: tpl_messages.php:147
 msgid "CSSified the Kolab1 web admin GUI"
 msgstr "CSSified de Kolab1 webbeheerder GUI"
 
-#: tpl_messages.php:124
+#: tpl_messages.php:148
+msgid "Kudos"
+msgstr ""
+
+#: tpl_messages.php:149
+#, fuzzy
 msgid ""
-"The principal authors of the Kolab client and server software are (in "
-"alphabetical order):"
+"Principal contributors of the Kolab Groupware Solution are (in alphabetical "
+"order):"
 msgstr ""
-"De grondleggers van de Kolab client en server software zijn (in "
-"alfabetische volgorde):"
+"De grondleggers van de Kolab client en server software zijn (in alfabetische "
+"volgorde):"
 
-#: tpl_messages.php:125
-msgid "Enter UID and password to login"
-msgstr "Vul je UID en wachtwoord in om in te loggen"
+#: tpl_messages.php:150
+msgid ""
+"...and anyone we forgot. Please let us know at <a href=\"mail:kolab-"
+"devel at kolab.org\">kolab-devel at kolab.org</a> so we can add you to this list."
+msgstr ""
 
-#: tpl_messages.php:126
-msgid "Username:"
-msgstr "Gebruikersnaam"
+#: tpl_messages.php:160
+#, fuzzy
+msgid "Kolab Groupware Solution"
+msgstr "Kolab Groupware login"
 
-#: tpl_messages.php:127
-msgid "Password:"
-msgstr "Wachtwoord"
+#: tpl_messages.php:161
+msgid ""
+"This is the server of the Kolab Groupware Solution, a <a href=\"http://fsfe."
+"org/about/basics/freesoftware\">Free Software</a> Personal Information "
+"Management (PIM) solution developed by the <a href=\"http://www.kolab.org/"
+"\">Kolab Community</a>. Any installation of the Kolab Groupware Solution "
+"would normally include one or more of these servers, in combination with a "
+"variety of clients for its users. If you are interested in the technology, "
+"you can read more about it <a href=\"/admin/kolab/technology.php\">here</a>."
+msgstr ""
 
-#: tpl_messages.php:128 ../include/auth.class.php.in:124
-msgid "Kolab Groupware login"
-msgstr "Kolab Groupware login"
+#: tpl_messages.php:162
+msgid "Why Kolab?"
+msgstr ""
 
-#: tpl_messages.php:129
-msgid "The maintainer with DN"
-msgstr "de maintainer met DN"
+#: tpl_messages.php:163
+msgid ""
+"There is a wide variety of reasons why Kolab should be your choice. Several "
+"of them have been put together for different target groups in the"
+msgstr ""
 
-#: tpl_messages.php:131
-msgid "Back to list of maintainers"
-msgstr "Terug naar de lijst van de handhavers"
+#: tpl_messages.php:164 tpl_messages.php:179
+msgid "Handouts for the Kolab Groupware Solution by Kolab Systems"
+msgstr ""
 
-#: tpl_messages.php:132 ../include/menu.php:82 ../include/menu.php:90
-msgid "Maintainers"
-msgstr "Beheerders"
+#: tpl_messages.php:165
+msgid "To summarize just some points, Kolab is your solution, if"
+msgstr ""
 
-#: tpl_messages.php:139
-msgid "User:"
-msgstr "Gebruiker:"
+#: tpl_messages.php:166
+msgid ""
+"you want a solution that seamlessly integrates into your existing "
+"environment;"
+msgstr ""
 
-#: tpl_messages.php:140
-msgid "Role:"
-msgstr "Rol:"
+#: tpl_messages.php:167
+msgid ""
+"you want full control over your data, with all the convenience of the cloud;"
+msgstr ""
 
-#: tpl_messages.php:141
-msgid "Logout"
-msgstr "Logout"
+#: tpl_messages.php:168
+msgid "you have elevated security needs for your data;"
+msgstr ""
 
-#: tpl_messages.php:142
-msgid "Not logged in"
-msgstr "niet ingelogd"
+#: tpl_messages.php:169
+msgid ""
+"you have a very large installation, or want to reduce your hardware "
+"footprint;"
+msgstr ""
 
-#: tpl_messages.php:143
-msgid "Errors:"
-msgstr "fouten"
+#: tpl_messages.php:170
+msgid "you have to operate in diverse environments and installations;"
+msgstr ""
 
-#: tpl_messages.php:144
-msgid "Message:"
-msgstr "Bericht"
+#: tpl_messages.php:171
+msgid ""
+"strategic issues are important to you, e.g. you need sovereignty of the "
+"software you deploy;"
+msgstr ""
 
-#: tpl_messages.php:145
+#: tpl_messages.php:172
+msgid "your users should be fully productive whether they are on- or offline;"
+msgstr ""
+
+#: tpl_messages.php:173
+msgid ""
+"you want the flexibility to create solutions for your specialised needs;"
+msgstr ""
+
+#: tpl_messages.php:174
+msgid ""
+"you want Free Software/Open Source, but also want the professional support "
+"without having to resort to proprietary lock-in."
+msgstr ""
+
+#: tpl_messages.php:175
+msgid "More Information"
+msgstr ""
+
+#: tpl_messages.php:176
+msgid "Kolab Community Web Site"
+msgstr ""
+
+#: tpl_messages.php:177
+msgid "Kolab Community Wiki"
+msgstr ""
+
+#: tpl_messages.php:178
+msgid "Article: "
+msgstr ""
+
+#: tpl_messages.php:180
+msgid "Warranties & Commercial Support"
+msgstr ""
+
+#: tpl_messages.php:181
+msgid ""
+"This is the <b>Community Edition</b> of the Kolab Groupware Server. It is "
+"provided by Kolab Systems as fully <a href=\"http://fsfe.org/about/basics/"
+"freesoftware\">Free Software</a> and you can use it to the fullest extent "
+"and any purpose. There are no license costs or other obligations other than "
+"those set forth in the respective Free Software licenses of the various "
+"components. <b>There are no warranties or guarantees of any kind, nor is "
+"there any guaranteed support. You are running this software entirely at your "
+"own risk.</b>"
+msgstr ""
+
+#: tpl_messages.php:182
+msgid ""
+"There is a wide variety of commercial support options and warranties "
+"available by <a href=\"/admin/kolab/kolabsystems.php\">Kolab Systems AG</a> "
+"and its network of partners, the Kolab Enterprise Community. This support "
+"comes with access to the additionally quality assured and hardened "
+"<b>Certified Kolab</b> edition, which like the community edition is fully "
+"available as Free Software, so has all the advantages of the Community "
+"Edition and is free of hidden lock-in."
+msgstr ""
+
+#: tpl_messages.php:183
+msgid ""
+"Kolab Systems AG will provide limited support for the Community Edition on a "
+"case-by-case basis, but with no guaranteed response times, as availability "
+"permits, and at rates that may be adjusted due to the work load at the time "
+"of the request. <b>It is strongly recommended that for mission-critical "
+"professional deployments of the Kolab Groupware Solution you at least choose "
+"one of the partially self-supported On Demand support models.</b>"
+msgstr ""
+
+#: tpl_messages.php:184
+msgid ""
+"Kolab Systems provides an overview of all available <a href=\"http://"
+"kolabsys.com/index.php/solutions/101\">Service Level Agreements (SLA)</a>. "
+"To upgrade your installation to Certified Kolab, please contact"
+msgstr ""
+
+#: tpl_messages.php:185 tpl_messages.php:301
+msgid "or visit our"
+msgstr ""
+
+#: tpl_messages.php:186 tpl_messages.php:302
+msgid "web page"
+msgstr ""
+
+#: tpl_messages.php:188
+msgid "Listname"
+msgstr "Lijstnaam"
+
+#: tpl_messages.php:189
+msgid "Visibility"
+msgstr "Zichtbaarheid"
+
+#: tpl_messages.php:191
+msgid "Internal"
+msgstr "Intern"
+
+#: tpl_messages.php:192
+msgid "Public"
+msgstr "Openbaar"
+
+#: tpl_messages.php:193
+msgid "List deleted, awaiting cleanup..."
+msgstr "Gebruiker verwijderd, wacht op opruiming..."
+
+#: tpl_messages.php:196
+msgid "Welcome to the Kolab administration interface"
+msgstr "Welkom op Kolab beheersinterface"
+
+#: tpl_messages.php:197
+msgid "NOTE:"
+msgstr "Opmerking:"
+
+#: tpl_messages.php:198
+msgid ""
+"No account is configured to receive mail for administrative addresses. If "
+"you have not yet created an account for this, "
+msgstr ""
+"Er is nog geen account ingesteld om email te ontvangen voor administratieve "
+"emailadressen. Als daarvoor nog geen account beschikbaar is, gelieve er Ã©Ã©n "
+"aan te maken en ga dan verder met het configureren van kolab; "
+
+#: tpl_messages.php:199
+msgid "please do so"
+msgstr "aanmaken account voor administratieve emailadressen"
+
+#: tpl_messages.php:200
+msgid "and then go"
+msgstr "en ga dan naar"
+
+#: tpl_messages.php:201
+msgid "here"
+msgstr "instellen administratief emailadres "
+
+#: tpl_messages.php:202
+msgid "to set up forwarding of mail to administrative email addresses."
+msgstr ""
+"om het doorsturen van email naar administratieve emailadressen in te stellen."
+
+#: tpl_messages.php:203
+msgid "The address with DN"
+msgstr "Het adres met DN"
+
+#: tpl_messages.php:205
+msgid "Back to list of addresses"
+msgstr "Terug naar de lijst van adressen"
+
+#: tpl_messages.php:206
+msgid "The administrator with DN"
+msgstr "De beheerder met DN"
+
+#: tpl_messages.php:208
+msgid "Back to list of administrators"
+msgstr "Terug naar de lijst van de beheerders"
+
+#: tpl_messages.php:221
 msgid "Kolab Server Settings"
 msgstr "Kolab Server Instellingen"
 
-#: tpl_messages.php:146
+#: tpl_messages.php:222
 msgid "Administrative email addresses"
 msgstr "Administratief E-mailadres"
 
-#: tpl_messages.php:147
+#: tpl_messages.php:223
 msgid ""
 "You have not yet set up a receiving account for the administrative email "
 "addresses hostmaster at yourdomain.tld, postmaster at yourdomain.tld, MAILER-"
@@ -752,78 +966,78 @@ msgstr ""
 "personen toevoegen of verwijderen van deze lijst zoals op elke andere "
 "distributielijst."
 
-#: tpl_messages.php:148
+#: tpl_messages.php:224
 msgid ""
 "Email address of account that should receive administrative mail for domain "
 msgstr ""
 "Het E-mailadres van de account die de administratieve E-mail van dit domein "
 "moet ontvangen:"
 
-#: tpl_messages.php:149
+#: tpl_messages.php:225
 msgid "Create Distribution Lists"
 msgstr "Maak distributielijsten"
 
-#: tpl_messages.php:150
+#: tpl_messages.php:226
 msgid "Enable or Disable individual Services"
 msgstr "Aanzetten of uitzetten van individuele services"
 
-#: tpl_messages.php:151
+#: tpl_messages.php:227
 msgid "Service"
 msgstr "Service"
 
-#: tpl_messages.php:152
+#: tpl_messages.php:228
 msgid "Enabled"
 msgstr "Ingeschakeld"
 
-#: tpl_messages.php:154
+#: tpl_messages.php:230
 msgid "Quota settings"
 msgstr "Quota instellingen"
 
-#: tpl_messages.php:155
+#: tpl_messages.php:231
 msgid "Warn users when they have used"
 msgstr "Waarschuw gebruikers wanneer ze"
 
-#: tpl_messages.php:156
+#: tpl_messages.php:232
 #, php-format
 msgid "% of their quota"
 msgstr "% van hun quota hebben gebruikt"
 
-#: tpl_messages.php:158
+#: tpl_messages.php:234
 msgid "Free/Busy settings"
 msgstr "Vrij/bezet instellingen"
 
-#: tpl_messages.php:159
+#: tpl_messages.php:235
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 "Laat niet ge-authenticeerde downloading toe van vrij/bezet informatie  "
 
-#: tpl_messages.php:161
+#: tpl_messages.php:237
 msgid "When creating free/busy lists, include data from"
 msgstr "Wanneer vrij/bezet lijsten worden gecreÃ«erd, voeg gegevens in van"
 
-#: tpl_messages.php:162
+#: tpl_messages.php:238
 msgid "days in the past"
 msgstr "voorgaande dagen"
 
-#: tpl_messages.php:164
+#: tpl_messages.php:240
 msgid "Privileged Networks"
 msgstr "Bevoorrechte netwerken"
 
-#: tpl_messages.php:165
+#: tpl_messages.php:241
 msgid ""
 "Networks allowed to relay and send mail through unauthenticated SMTP "
 "connections to the Kolab server (comma separated networks in x.x.x.x/y "
 "format):"
 msgstr ""
-"Netwerken die toestemming hebben om mail te zenden en door te sturen via "
-"een niet geautentificeerde SMTP verbinding met de Kolab server (netwerken "
+"Netwerken die toestemming hebben om mail te zenden en door te sturen via een "
+"niet geautentificeerde SMTP verbinding met de Kolab server (netwerken "
 "gescheiden door komma's in het formaat x.x.x.x/y ):"
 
-#: tpl_messages.php:167
+#: tpl_messages.php:243
 msgid "SMTP \"smarthost/relayhost\""
 msgstr "SMTP \"smarthost/relayhost\""
 
-#: tpl_messages.php:168
+#: tpl_messages.php:244
 msgid ""
 "Smarthost (and optional port) to use to send outgoing mail (host.domain."
 "tld). Leave empty for no relayhost."
@@ -831,11 +1045,11 @@ msgstr ""
 "Smarthost (en optionele poort) gebruiken om uitgaande mail te versturen "
 "(host.domain.tld, leeg laten indien geen relayhost):"
 
-#: tpl_messages.php:170
+#: tpl_messages.php:246
 msgid "Accept Internet Mail"
 msgstr "Internet mail aanvaarden"
 
-#: tpl_messages.php:171
+#: tpl_messages.php:247
 msgid ""
 "Accept mail from other domains over unauthenticated SMTP. This must be "
 "enabled if you want to use the Kolab Server to receive mail from other "
@@ -846,29 +1060,29 @@ msgstr ""
 "ingeschakeld zijn wanneer de Kolab server wordt gebruikt om mail te "
 "ontvangen via andere internetdomeinen. "
 
-#: tpl_messages.php:173
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:134
+#: tpl_messages.php:249
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:134
 msgid "Domains"
 msgstr "Domeinen"
 
-#: tpl_messages.php:174
+#: tpl_messages.php:250
 msgid "Domain"
 msgstr "Domein"
 
-#: tpl_messages.php:177 tpl_messages.php:190
+#: tpl_messages.php:253 tpl_messages.php:266
 msgid "Add"
 msgstr "Toevoegen"
 
-#: tpl_messages.php:178
+#: tpl_messages.php:254
 msgid "Mail Filter Settings"
 msgstr "Mail filter instellingen"
 
-#: tpl_messages.php:179
+#: tpl_messages.php:255
 msgid "Check messages for mismatching From header and envelope from."
 msgstr ""
 "Controleer berichten op niet overeenkomstige From header en envelope From"
 
-#: tpl_messages.php:180
+#: tpl_messages.php:256
 msgid ""
 "Use the Sender header instead of From for the above checks if Sender is "
 "present."
@@ -876,11 +1090,11 @@ msgstr ""
 "Gebruik de Sender header in plaats van From voor de bovenstaande controles "
 "indien Sender aanwezig is"
 
-#: tpl_messages.php:181
+#: tpl_messages.php:257
 msgid "Action to take for messages that fail the check:"
 msgstr "Welke actie uitvoeren voor berichten die de test falen"
 
-#: tpl_messages.php:182
+#: tpl_messages.php:258
 msgid ""
 "Reject the message, except if it originates from the outside and the From "
 "header matches one of Kolab server's domains. In that case rewrite the From "
@@ -891,11 +1105,11 @@ msgstr ""
 "de From header herschreven, zodat de ontvanger het mogelijke misbruik kan "
 "zien"
 
-#: tpl_messages.php:183
+#: tpl_messages.php:259
 msgid "Always reject the message."
 msgstr "Het bericht altijd afwijzen. "
 
-#: tpl_messages.php:184
+#: tpl_messages.php:260
 msgid ""
 "Note that enabling this setting will make the server reject any mail with "
 "non-matching sender and From header if the sender is an account on this "
@@ -907,1431 +1121,1661 @@ msgstr ""
 "afzender een account heeft op deze server. Dit gebeurt soms met "
 "mailinglijsten."
 
-#: tpl_messages.php:186
+#: tpl_messages.php:262
 msgid "Kolab Hostnames (for Master and Slaves)"
 msgstr "Kolab hostnamen (voor Master en Slaves)"
 
-#: tpl_messages.php:187
+#: tpl_messages.php:263
 msgid "Host"
 msgstr "Host"
 
-#: tpl_messages.php:191
-msgid "The shared folder with DN"
-msgstr "De gedeelde folder met DN"
+#: tpl_messages.php:267
+msgid ""
+"<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> is a specialist "
+"email solution provider based in Johannesburg, South Africa specialising in "
+"the deployment and support of Kolab."
+msgstr ""
+"<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> is een "
+"gespecialiseerde provider voor E-mailoplossingen gevestigd in Johannesburg, "
+"Zuid Afrika gespecialiseerd in de verspreiding en ondersteuning van Kolab "
 
-#: tpl_messages.php:193
-msgid "Back to list of shared folders"
-msgstr "Terug naar de lijst van de gebruikers"
+#: tpl_messages.php:268
+msgid ""
+"Code Fusion has played, and continues to play, an integral part in "
+"developing and extending the Kolab server; specifically with regards to "
+"enhancing the base Kolab engine, adding in support for Microsoft Active "
+"Directory ® as an LDAP backend, as well as extending the <a href="
+"\"http://www.horde.org/\">Horde project</a> to provide a web-based groupware "
+"client for the Kolab server."
+msgstr ""
+"Code Fusion heeft een rol gespeeld, en blijft die nog spelen in de "
+"ontwikkeling en de uitbreiding van de Kolab server; vooral met betrekking "
+"tot de verbetering van de basis Kolab engine, door de ondersteuning voor "
+"Microsoft Active Directory &reg toe te voegen; als een LDAP backend en door "
+"het <a href=\"http://www.horde.org/\">Horde-project</a> te verbeteren door "
+"een web-based groupware client voor de Kolab server te voorzien.."
 
-#: tpl_messages.php:194
-msgid "Shared folders"
-msgstr "Gedeelde mappen"
+#: tpl_messages.php:269
+msgid ""
+"The following people from Code Fusion are involved in the Kolab project (in "
+"alphabetical order):"
+msgstr ""
+"De volgende mensen van Code Fusion zijn betrokken bij het Kolab project (in "
+"de alfabetische volgorde):"
 
-#: tpl_messages.php:196
-msgid "Server"
-msgstr "Server"
+#: tpl_messages.php:270
+msgid ""
+"Kolab's architecture was done by <a href=\"http://www.erfrakon.com"
+"\">erfrakon</a>; the company also designed and implemented the Kolab 1 "
+"Server and did the design and architecture for the Kolab 2 Server while "
+"providing consulting for the implementation of the Kolab 2 server and the "
+"Kolab 2 clients."
+msgstr ""
+"Het Kolab concept is gerealiseerd door <a href=\"http://www.erfrakon.com"
+"\">erfrakon</a>; het bedrijf ontwierp en implementeerde de Kolab -1 server "
+"en ontwierp en bouwde de kolab-2 server en levert advies over het "
+"implementeren van de Kolab-2 server en Kolab-2 clients."
 
-#: tpl_messages.php:197 tpl_messages.php:217
-msgid "Type"
-msgstr "Soort"
+#: tpl_messages.php:271
+msgid ""
+"<a href=\"http://www.erfrakon.com\">erfrakon</a> is a consulting company "
+"dedicated to opensource software and Linux. The main tasks of erfrakon "
+"within the Kolab project are the principle design and architecure of the "
+"Kolab groupware solution and the creation of the Kolab 1 server."
+msgstr ""
+"<a href=\"http://www.erfrakon.com\">erfrakon</a> is een consultancy bedrijf "
+"gewijd aan opensource software en Linux. De hoofdopdrachten van Efrakon "
+"binnen het kolab project zijn het ontwerp en de architectuur van Kolab "
+"groupware oplossingen en de creatie van de Kolab 1 server."
 
-#: tpl_messages.php:199
-msgid "Folder deleted, awaiting cleanup..."
-msgstr "Map verwijderd, wacht op opruiming... "
+#: tpl_messages.php:272
+msgid "The following people worked on Kolab for erfrakon:"
+msgstr "De volgende mensen hebben op Kolab gewerkt voor erfrakon"
 
-#: tpl_messages.php:202 tpl_messages.php:245
-msgid "Welcome to the Kolab administration interface"
+#: tpl_messages.php:273
+#, fuzzy
+msgid "Welcome to the Kolab Groupware Server"
+msgstr "Kolab2 Groupware Server"
+
+#: tpl_messages.php:274
+#, fuzzy
+msgid "My settings"
+msgstr "Mijn gebruiker instellingen"
+
+#: tpl_messages.php:275 ../../lib/KolabAdmin/include/menu.php:43
+#: ../../lib/KolabAdmin/include/menu.php:47
+#: ../../lib/KolabAdmin/include/menu.php:49
+#, fuzzy
+msgid "ActiveSync"
+msgstr "Actie"
+
+#: tpl_messages.php:284 tpl_messages.php:311
+#, fuzzy
+msgid "Welcome to the Kolab Groupware Server Administration"
 msgstr "Welkom op Kolab beheersinterface"
 
-#: tpl_messages.php:203
-msgid "NOTE:"
-msgstr "Opmerking:"
+#: tpl_messages.php:285
+msgid "The user with DN"
+msgstr "De gebruiker met DN"
+
+#: tpl_messages.php:287
+msgid "Back to list of users"
+msgstr "Terug naar de lijst van de gebruikers"
+
+#: tpl_messages.php:288
+msgid "Enter UID and password to login"
+msgstr "Vul je UID en wachtwoord in om in te loggen"
+
+#: tpl_messages.php:289
+msgid "Username:"
+msgstr "Gebruikersnaam"
+
+#: tpl_messages.php:290
+msgid "Password:"
+msgstr "Wachtwoord"
 
-#: tpl_messages.php:204
+#: tpl_messages.php:291
+msgid "Login"
+msgstr ""
+
+#: tpl_messages.php:292
+#, fuzzy
+msgid "Kolab Groupware Server Version"
+msgstr "Kolab2 Groupware Server Versie"
+
+#: tpl_messages.php:293
+#, fuzzy
+msgid "Kolab Groupware Server Component Versions"
+msgstr "Kolab2 Groupware Server Component Versies"
+
+#: tpl_messages.php:294
+msgid "PEAR/Horde Versions"
+msgstr ""
+
+#: tpl_messages.php:295
+msgid "Kolab2 Patched OpenPKG Package Versions"
+msgstr "Kolab2 Patched OpenPKG Package Versies"
+
+#: tpl_messages.php:296
+msgid "OpenPKG Version"
+msgstr "OpenPKG Versie"
+
+#: tpl_messages.php:297
+msgid "Founded in Zürich in 2010, "
+msgstr ""
+
+#: tpl_messages.php:298
 msgid ""
-"No account is configured to receive mail for administrative addresses. If "
-"you have not yet created an account for this, "
+"is the global leader in Kolab Technology. Together with its partners in the "
+"Kolab Enterprise Community, Kolab Systems provides quality assurance, "
+"integration, support, training, certification of individuals and third-party "
+"products, as well as ongoing development for the Kolab Groupware Solution. "
+"The strong partnering model and a highly competent enterprise community "
+"provides users of the Kolab Groupware Solution with the right level of "
+"professional consulting, support and warranties to enable productivity and "
+"collaboration."
 msgstr ""
-"Er is nog geen account ingesteld om email te ontvangen voor administratieve "
-"emailadressen. Als daarvoor nog geen account beschikbaar is, gelieve er Ã©Ã©n "
-"aan te maken en ga dan verder met het configureren van kolab; "
 
-#: tpl_messages.php:205
-msgid "please do so"
-msgstr "aanmaken account voor administratieve emailadressen"
+#: tpl_messages.php:299
+msgid "Looking for professional support for your Kolab Groupware Solution?"
+msgstr ""
 
-#: tpl_messages.php:206
-msgid "and then go"
-msgstr "en ga dan naar"
+#: tpl_messages.php:300
+msgid "Kolab Systems provides a wide range of "
+msgstr ""
 
-#: tpl_messages.php:207
-msgid "here"
-msgstr "instellen administratief emailadres "
+#: tpl_messages.php:303
+msgid "Our Development Partners"
+msgstr ""
 
-#: tpl_messages.php:208
-msgid "to set up forwarding of mail to administrative email addresses."
-msgstr "om het doorsturen van email naar administratieve emailadressen in te stellen."
+#: tpl_messages.php:304
+msgid ""
+"In continuously improvingall parts of the Kolab Groupware Solution, Kolab "
+"Systems is working closely with development partners, such as (in "
+"alphabetical order):"
+msgstr ""
 
-#: tpl_messages.php:209
-msgid "The user with DN"
-msgstr "De gebruiker met DN"
+#: tpl_messages.php:305
+msgid "Thank you for being part of this awesome community!"
+msgstr ""
 
-#: tpl_messages.php:211
-msgid "Back to list of users"
+#: tpl_messages.php:306
+msgid "If <b>you</b> want to join the community, please go to "
+msgstr ""
+
+#: tpl_messages.php:307
+msgid "and"
+msgstr ""
+
+#: tpl_messages.php:308
+msgid "The shared folder with DN"
+msgstr "De gedeelde folder met DN"
+
+#: tpl_messages.php:310
+msgid "Back to list of shared folders"
 msgstr "Terug naar de lijst van de gebruikers"
 
-#: tpl_messages.php:212 tpl_messages.php:225
-msgid "Email Users"
-msgstr "Email gebruikers"
+#: tpl_messages.php:316
+#, fuzzy
+msgid "Administrator"
+msgstr "Administrators"
 
-#: tpl_messages.php:219
-msgid "E-mail"
-msgstr "E-mail"
+#: tpl_messages.php:319 ../../lib/KolabAdmin/include/menu.php:113
+msgid "Settings"
+msgstr "Instellingen"
 
-#: tpl_messages.php:220
-msgid "uid"
-msgstr "uid"
+#: tpl_messages.php:321
+msgid ""
+"The Kolab 1 KDE client and the Kolab 2 KDE Client (Kontact) was developed by"
+msgstr ""
+"The Kolab 1 KDE client en de Kolab 2 KDE client (Kontact) werd ontworpen door"
 
-#: tpl_messages.php:222
-msgid "User Deleted, awaiting cleanup..."
-msgstr "Gebruiker verwijderd, wacht op opruiming..."
+#: tpl_messages.php:322
+msgid ""
+"Klarälvdalens Datakonsult AB is a consulting company dedicated to "
+"opensource software, Linux, and the <a href=\"http://www.trolltech.com/"
+"products/qt/\">Qt</a> library. The main tasks of KDAB within the Kolab "
+"project are design and implementation of the Kolab KDE clients and the "
+"implementation of the current Kolab 2 server."
+msgstr ""
+"Klarälvdalens Datakonsult AB is een consulting bedrijf gewijd aan "
+"opensource software, Linux, en de <a href=\"http://www.trolltech.com/"
+"products/qt/\">Qt</a> bibliotheek. De hoofdopdrachten van KDAB binnen het "
+"Kolab project zijn ontwerp en implementatie van de Kolab KDE clients en de "
+"implementatie van de huidige Kolab 2 server."
 
-#: tpl_messages.php:230
+#: tpl_messages.php:323
+msgid ""
+"The following people worked on Kolab for Klarälvdalens Datakonsult AB:"
+msgstr ""
+"De volgende mensen hebben aan Kolab gewerkt van Klarälvdalens "
+"Datakonsult AB:"
+
+#: tpl_messages.php:324
 msgid "Vacation Notification"
 msgstr "Afwezigheidsbericht"
 
-#: tpl_messages.php:231
-msgid ""
-"Activate vacation notification (only one of vacation, forward and delivery "
-"to folder can be active at any time)"
-msgstr ""
-"Activeer afwezigheidsbericht (er kan maar Ã©Ã©n van E-mail aflevering, "
-"E-mail doorsturen of Vakantie aktief zijn)"
+#: tpl_messages.php:325
+#, fuzzy
+msgid "Activate vacation notification"
+msgstr "Afwezigheidsbericht"
 
-#: tpl_messages.php:232
+#: tpl_messages.php:326
 msgid "Resend notification only after"
 msgstr "Stuur mededeling opnieuw na "
 
-#: tpl_messages.php:233
+#: tpl_messages.php:327
 msgid "days"
 msgstr "dagen"
 
-#: tpl_messages.php:234
+#: tpl_messages.php:328
 msgid "Send responses for these addresses:"
 msgstr "Stuur antwoorden voor deze adressen:"
 
-#: tpl_messages.php:235
+#: tpl_messages.php:329
 msgid "(one address per line)"
 msgstr "(een adres per lijn)"
 
-#: tpl_messages.php:236
+#: tpl_messages.php:330
 msgid "Do not send vacation replies to spam messages"
 msgstr "Geen afwezigheidsberichten sturen naar spam"
 
-#: tpl_messages.php:237
+#: tpl_messages.php:331
 msgid "Only react to mail coming from domain"
 msgstr "Reageer alleen op mail afkomstig van het domein"
 
-#: tpl_messages.php:238
+#: tpl_messages.php:332
 msgid "(leave empty for all domains)"
 msgstr "(leeg laten voor alle domeinen)"
 
-#: tpl_messages.php:240
-msgid "Kolab2 Groupware Server Version"
-msgstr "Kolab2 Groupware Server Versie"
+#: ../../www/admin/user/index.php:34
+#: ../../www/admin/administrator/index.php:33
+#: ../../www/admin/addressbook/index.php:23
+#: ../../www/admin/addressbook/addr.php:17
+#: ../../www/admin/maintainer/index.php:33
+#: ../../www/admin/domainmaintainer/index.php:33
+#: ../../www/admin/sharedfolder/index.php:22
+#: ../../www/admin/sharedfolder/sf.php:25
+#: ../../www/admin/distributionlist/index.php:35
+#: ../../www/admin/distributionlist/list.php:37
+#: ../../www/admin/settings/index.php:13
+msgid "Error: You don't have Permissions to access this Menu"
+msgstr "Fout: je hebt geen toegangsrechten voor dit menu "
 
-#: tpl_messages.php:241
-msgid "Kolab2 Groupware Server Component Versions"
-msgstr "Kolab2 Groupware Server Component Versies"
+#: ../../www/admin/user/index.php:120
+#, php-format
+msgid "Manage Email User (%d Users)"
+msgstr "Beheer gebruikers E-mails (%d gebruikers)"
 
-#: tpl_messages.php:242
-msgid "PEAR/Horde Versions"
+#: ../../www/admin/user/index.php:182
+#: ../../www/admin/addressbook/index.php:122
+msgid "Email"
+msgstr "E-mail"
+
+#: ../../www/admin/user/index.php:184
+#: ../../www/admin/addressbook/index.php:123
+msgid "contains"
+msgstr "bevat"
+
+#: ../../www/admin/user/index.php:185
+#: ../../www/admin/addressbook/index.php:124
+msgid "is"
+msgstr "is"
+
+#: ../../www/admin/user/index.php:186
+#: ../../www/admin/addressbook/index.php:125
+msgid "begins with"
+msgstr "begint met"
+
+#: ../../www/admin/user/index.php:187
+#: ../../www/admin/addressbook/index.php:126
+msgid "ends with"
+msgstr "Eindigt met"
+
+#: ../../www/admin/user/vacation.php:36 ../../www/admin/user/deliver.php:46
+#: ../../www/admin/user/forward.php:47
+msgid "Error while connecting to Sieve service:"
 msgstr ""
 
-#: tpl_messages.php:243
-msgid "Kolab2 Patched OpenPKG Package Versions"
-msgstr "Kolab2 Patched OpenPKG Package Versies"
+#: ../../www/admin/user/vacation.php:55
+msgid "Vacation message successfully activated"
+msgstr "Vakantiemededeling succesvol geactiveerd"
 
-#: tpl_messages.php:244
-msgid "OpenPKG Version"
-msgstr "OpenPKG Versie"
+#: ../../www/admin/user/vacation.php:57
+msgid "Vacation message successfully deactivated"
+msgstr "Vakantiemededeling succesvol uitgeschakeld"
 
-#: ../../../www/admin/addressbook/addr.php.in:17
-#: ../../../www/admin/addressbook/index.php.in:23
-#: ../../../www/admin/administrator/index.php.in:33
-#: ../../../www/admin/distributionlist/index.php.in:35
-#: ../../../www/admin/distributionlist/list.php.in:37
-#: ../../../www/admin/domainmaintainer/index.php.in:33
-#: ../../../www/admin/maintainer/index.php.in:33
-#: ../../../www/admin/settings/index.php.in:13
-#: ../../../www/admin/sharedfolder/index.php.in:22
-#: ../../../www/admin/sharedfolder/sf.php.in:25
-#: ../../../www/admin/user/index.php.in:34
-msgid "Error: You don't have Permissions to access this Menu"
-msgstr "Fout: je hebt geen toegangsrechten voor dit menu "
+#: ../../www/admin/user/vacation.php:62 ../../www/admin/user/deliver.php:65
+#: ../../www/admin/user/forward.php:67
+#, php-format
+msgid ""
+"Warning: You currently have a sieve script named %s active for your account."
+msgstr ""
 
-#: ../../../www/admin/addressbook/addr.php.in:65
-#: ../../../www/admin/user/user.php.in:114
+#: ../../www/admin/user/vacation.php:63 ../../www/admin/user/deliver.php:66
+#: ../../www/admin/user/forward.php:68
+msgid ""
+"Warning: This script will be overwritten without further warnings if you "
+"press \"Update\"!"
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:43
+msgid "zPush in not enabled in your system."
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:468
+msgid ""
+"There are currently no devices known for your user.<br/><br/>In order to "
+"register a device, please connect it to the server first, using <a "
+"href='http://wiki.kolab.org/Z_push#Clients'>the instructions in the Wiki</"
+"a>. Afterwards the device should become available for configuration in this "
+"dialogue."
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:496
+#, fuzzy
+msgid "Address Books"
+msgstr "Adresboek"
+
+#: ../../www/admin/user/activesync.php:496
+msgid "Calendars"
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:496
+#: ../../www/admin/sharedfolder/index.php:65
+#: ../../lib/KolabAdmin/include/form.class.php:254
+msgid "Tasks"
+msgstr "Taken"
+
+#: ../../www/admin/user/activesync.php:496
+#: ../../www/admin/sharedfolder/index.php:69
+#: ../../lib/KolabAdmin/include/form.class.php:256
+msgid "Notes"
+msgstr "Aantekeningen"
+
+#: ../../www/admin/user/activesync.php:500
+msgid "Automatic"
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:501
+msgid "Flat Mode"
+msgstr ""
+
+#: ../../www/admin/user/activesync.php:502
+#, fuzzy
+msgid "Folder Mode"
+msgstr "Map naam"
+
+#: ../../www/admin/user/activesync.php:506
+#: ../../lib/KolabAdmin/include/form.class.php:204
+msgid "No"
+msgstr "Nee"
+
+#: ../../www/admin/user/activesync.php:507
+#: ../../lib/KolabAdmin/include/form.class.php:204
+msgid "Yes"
+msgstr "Ja"
+
+#: ../../www/admin/user/user.php:94
+msgid "Please enter an email address"
+msgstr "Gelieve een E-mailadres in te geven"
+
+#: ../../www/admin/user/user.php:111
+#, php-format
+msgid "Email address %1$s not in domains %2$s"
+msgstr "E-mail adres  %1$s niet in domeinen %2$s"
+
+#: ../../www/admin/user/user.php:114 ../../www/admin/addressbook/addr.php:65
 msgid "User, vCard or distribution list with this email address already exists"
 msgstr "Gebruiker, vCard of distributielijst met dit E-mailadres bestaat al"
 
-#: ../../../www/admin/addressbook/addr.php.in:78
-#: ../../../www/admin/administrator/admin.php.in:121
-#: ../../../www/admin/distributionlist/list.php.in:106
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:96
-#: ../../../www/admin/maintainer/maintainer.php.in:118
-#: ../../../www/admin/sharedfolder/sf.php.in:112
-#: ../../../www/admin/user/user.php.in:349
+#: ../../www/admin/user/user.php:130
+msgid "UID "
+msgstr "UID"
+
+#: ../../www/admin/user/user.php:130
+#: ../../lib/KolabAdmin/include/form.class.php:34
+msgid ""
+" collides with an address already used for another user, a vCard or a "
+"distribution list.<br />"
+msgstr ""
+
+#: ../../www/admin/user/user.php:145
+#, php-format
+msgid "Email-Delegate %s does not exist"
+msgstr "Delegate %s bestaat niet"
+
+#: ../../www/admin/user/user.php:165
+#, php-format
+msgid "Syntax for Recipient %s is invalid"
+msgstr ""
+
+#: ../../www/admin/user/user.php:211
+#, php-format
+msgid "Illegal user or group %s"
+msgstr "Illegale gebruiker of groep %s"
+
+#: ../../www/admin/user/user.php:220
+#, fuzzy
+msgid "Free/Busy interval can not be negative"
+msgstr "Quota kan niet negatief zijn"
+
+#: ../../www/admin/user/user.php:221
+#, fuzzy
+msgid "Free/Busy interval must be a number"
+msgstr "Quota moet kleiner zijn dan 4096"
+
+#: ../../www/admin/user/user.php:222
+#, fuzzy
+msgid "Free/Busy interval must be an integer"
+msgstr "Quota moet kleiner zijn dan 4096"
+
+#: ../../www/admin/user/user.php:414
+#: ../../www/admin/administrator/admin.php:121
+#: ../../www/admin/addressbook/addr.php:78
+#: ../../www/admin/maintainer/maintainer.php:118
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:96
+#: ../../www/admin/sharedfolder/sf.php:114
+#: ../../www/admin/distributionlist/list.php:109
 msgid "Error: need valid action to proceed"
 msgstr "Fout: heeft een geldige actie nodig om door te gaan"
 
-#: ../../../www/admin/addressbook/addr.php.in:81
-#: ../../../www/admin/administrator/admin.php.in:127
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:102
-#: ../../../www/admin/maintainer/maintainer.php.in:124
-#: ../../../www/admin/user/user.php.in:361
-#: ../../../www/admin/user/user.php.in:364
-#: ../../../www/admin/user/user.php.in:370
-#: ../../../www/admin/user/user.php.in:772
+#: ../../www/admin/user/user.php:426 ../../www/admin/user/user.php:429
+#: ../../www/admin/user/user.php:435 ../../www/admin/user/user.php:870
+#: ../../www/admin/administrator/admin.php:127
+#: ../../www/admin/addressbook/addr.php:81
+#: ../../www/admin/maintainer/maintainer.php:124
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:102
 msgid "Error: You don't have the required Permissions"
 msgstr "Fout: je hebt de nodige toegangsrechten niet"
 
-#: ../../../www/admin/addressbook/addr.php.in:95
-msgid "Primary E-Mail Address"
-msgstr "Hoofd E-mailadres"
+#: ../../www/admin/user/user.php:444 ../../www/admin/user/user.php:446
+#: ../../www/admin/sharedfolder/sf.php:128
+msgid "Non volatile"
+msgstr "Permanent"
 
-#: ../../../www/admin/addressbook/addr.php.in:97
-msgid "E-Mail Aliases"
-msgstr "E-Mail Aliassen"
+#: ../../www/admin/user/user.php:445
+#: ../../www/admin/administrator/admin.php:136
+#: ../../www/admin/maintainer/maintainer.php:133
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:111
+msgid "Leave blank to keep password unchanged"
+msgstr "Laat leeg om wachtwoord niet te wijzigen"
+
+#: ../../www/admin/user/user.php:469
+msgid "Unique Identity (UID)"
+msgstr "Unieke identiteit (UID)"
+
+#: ../../www/admin/user/user.php:471
+msgid "Optional - Defaults to Primary Email Address"
+msgstr "Optioneel - standaard voor hoofd E-mailadres"
+
+#: ../../www/admin/user/user.php:472
+msgid "Mailbox Home Server"
+msgstr "Postvak Home Server"
+
+#: ../../www/admin/user/user.php:476
+msgid "Account Type"
+msgstr "Account Type"
+
+#: ../../www/admin/user/user.php:478
+msgid "User Account"
+msgstr "Gebruikersaccount"
+
+#: ../../www/admin/user/user.php:478
+msgid "Internal User Account"
+msgstr "Interne gebruikersaccount"
+
+#: ../../www/admin/user/user.php:478
+msgid "Group Account"
+msgstr "Group account"
+
+#: ../../www/admin/user/user.php:478
+msgid "Resource Account"
+msgstr "Hulpbron account"
+
+#: ../../www/admin/user/user.php:480
+msgid ""
+"NOTE: An internal user is a user that will not be visible in the address book"
+msgstr "Opmerking: een interne gebruiker is niet zichtbaar in het adresboek"
+
+#: ../../www/admin/user/user.php:481
+msgid "Invitation Policy"
+msgstr "Uitnodigingsbeleid"
+
+#: ../../www/admin/user/user.php:485
+msgid "For automatic invitation handling"
+msgstr "Voor automatische uitnodigingsafhandeling"
+
+#: ../../www/admin/user/user.php:486
+msgid ""
+"NOTE: For regular accounts to use this feature, give the 'calendar' user "
+"access to the Calendar folder"
+msgstr ""
+"Opmerking: reguliere accounts die deze functie willen gebruiken, moeten "
+"toegang hebben tot de kalendermap"
 
-#: ../../../www/admin/addressbook/addr.php.in:100
-#: ../../../www/admin/user/user.php.in:425
+#: ../../www/admin/user/user.php:488
+msgid "Email Aliases"
+msgstr "E-mail Aliases"
+
+#: ../../www/admin/user/user.php:491 ../../www/admin/addressbook/addr.php:100
 msgid "One address per line"
 msgstr "EÃ©n adres per lijn"
 
-#: ../../../www/admin/addressbook/addr.php.in:105
-msgid "Post Box"
-msgstr "Postbus"
+#: ../../www/admin/user/user.php:493
+msgid "Email-Delegates"
+msgstr "Gemachtigde"
 
-#: ../../../www/admin/addressbook/addr.php.in:121
-#: ../../../www/admin/distributionlist/list.php.in:135
-#: ../../../www/admin/sharedfolder/sf.php.in:148
-#, php-format
-msgid "Error: DN required for %s operation"
-msgstr "Fout: dn nodig voor %s handeling"
+#: ../../www/admin/user/user.php:496
+msgid "Others allowed to send emails with a \"from\" address of this account."
+msgstr ""
+"Anderen toestaan om email te sturen met een \"from\" adres van dit account."
 
-#: ../../../www/admin/addressbook/addr.php.in:131
-msgid "Add External Address"
-msgstr "Extern adres toevoegen"
+#: ../../www/admin/user/user.php:497
+msgid "One email address per line."
+msgstr "EÃ©n E-mailadres per lijn"
 
-#: ../../../www/admin/addressbook/addr.php.in:178
-#, php-format
+#: ../../www/admin/user/user.php:499
+msgid "Allowed Recipients"
+msgstr ""
+
+#: ../../www/admin/user/user.php:502
+msgid "Restrict allowed recipients of SMTP messages"
+msgstr ""
+
+#: ../../www/admin/user/user.php:503
+#, fuzzy
+msgid "One entry per line."
+msgstr "EÃ©n adres per lijn"
+
+#: ../../www/admin/user/user.php:514
 msgid ""
-"Addressbook entry DN could not be modified, distribution list <a "
-"href='@kolab_wui@/distributionlist/list.php?action=modify&dn=%s'>'%s'</a> "
-"depends on it. To modify this entry, first remove it from the distribution "
-"list."
-msgstr ""
-"DN account kon niet gewijzigd worden, distributielijst <a href='/admin/"
-"distributionlist/list.php?action=modify&dn=%s'>'%s'</a> is hiervan "
-"afhankelijk.  Om deze account te wijzigen moet het worden verwijderd van de "
-"distributielijst."
+"2 letter code from <a href=\"http://www.iso.org/iso/"
+"english_country_names_and_code_elements\" target=\"_blank\">ISO 3166</a>"
+msgstr ""
+
+#: ../../www/admin/user/user.php:520
+msgid "User Quota in MBytes"
+msgstr "Beschikbare schijfruimte in MBytes per gebruiker "
+
+#: ../../www/admin/user/user.php:536
+msgid "Free/Busy interval in days"
+msgstr "Vrij/bezet interval in dagen"
+
+#: ../../www/admin/user/user.php:537
+msgid "Leave blank for default (60 days)"
+msgstr "Laat leeg voor standaard (60 dagen)"
 
-#: ../../../www/admin/addressbook/addr.php.in:189
-#: ../../../www/admin/administrator/admin.php.in:216
-#: ../../../www/admin/distributionlist/list.php.in:196
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:200
-#: ../../../www/admin/maintainer/maintainer.php.in:213
-#: ../../../www/admin/sharedfolder/sf.php.in:227
-#: ../../../www/admin/user/user.php.in:617
+#: ../../www/admin/user/user.php:547
+#: ../../www/admin/administrator/admin.php:165
+#: ../../www/admin/maintainer/maintainer.php:162
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:149
+#, php-format
+msgid "LDAP Error: No such dn: %s: %s"
+msgstr "LDAP fout: er is geen dn %s: %s"
+
+#: ../../www/admin/user/user.php:711
+#: ../../www/admin/administrator/admin.php:217
+#: ../../www/admin/addressbook/addr.php:189
+#: ../../www/admin/maintainer/maintainer.php:215
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:202
+#: ../../www/admin/sharedfolder/sf.php:231
+#: ../../www/admin/distributionlist/list.php:200
 #, php-format
 msgid "LDAP Error: could not rename %s to %s: %s"
 msgstr "LDAP fout: kon naam niet wijzigen van %s naar %s: %s"
 
-#: ../../../www/admin/addressbook/addr.php.in:197
-#: ../../../www/admin/administrator/admin.php.in:224
-#: ../../../www/admin/distributionlist/list.php.in:204
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:208
-#: ../../../www/admin/maintainer/maintainer.php.in:221
-#: ../../../www/admin/sharedfolder/sf.php.in:235
-#: ../../../www/admin/user/user.php.in:625
+#: ../../www/admin/user/user.php:719
 #, fuzzy, php-format
-msgid "LDAP Error: could not modify %s to %s: %s"
+msgid "LDAP Error: could not modify %s: %s"
 msgstr "LDAP fout: kon het object %s: %s niet aanpassen"
 
-#: ../../../www/admin/addressbook/addr.php.in:203
-#: ../../../www/admin/addressbook/addr.php.in:218
-#: ../../../www/admin/administrator/admin.php.in:230
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:214
-#: ../../../www/admin/maintainer/maintainer.php.in:227
-#: ../../../www/admin/user/user.php.in:631
+#: ../../www/admin/user/user.php:725
+#: ../../www/admin/administrator/admin.php:231
+#: ../../www/admin/addressbook/addr.php:203
+#: ../../www/admin/addressbook/addr.php:218
+#: ../../www/admin/maintainer/maintainer.php:229
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:216
 #, php-format
 msgid "%s successfully updated"
 msgstr "%s succesvol bijgewerkt"
 
-#: ../../../www/admin/addressbook/addr.php.in:209
-#: ../../../www/admin/administrator/admin.php.in:234
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:226
-#: ../../../www/admin/maintainer/maintainer.php.in:231
-#: ../../../www/admin/sharedfolder/sf.php.in:247
+#: ../../www/admin/user/user.php:731
+#: ../../www/admin/distributionlist/list.php:220
 #, php-format
-msgid "LDAP Error: could not read %s: %s"
-msgstr "LDAP fout: kon %s: %s niet lezen"
+msgid "LDAP Error: Could not read %s: %s"
+msgstr "LDAP fout: leesfout %s: %s"
 
-#: ../../../www/admin/addressbook/addr.php.in:215
-#: ../../../www/admin/administrator/admin.php.in:238
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:230
-#: ../../../www/admin/maintainer/maintainer.php.in:235
-#: ../../../www/admin/sharedfolder/sf.php.in:251
+#: ../../www/admin/user/user.php:745 ../../www/admin/user/user.php:758
+#: ../../www/admin/user/user.php:797 ../../www/admin/user/user.php:812
+#: ../../www/admin/distributionlist/list.php:224
+#: ../../www/admin/distributionlist/list.php:253
 #, php-format
-msgid "LDAP Error: could not modify object %s: %s"
-msgstr "LDAP fout: kon het object %s: %s niet aanpassen"
+msgid "LDAP Error: Could not modify object %s: %s"
+msgstr "LDAP fout: kon het object niet aanpassen %s: %s"
 
-#: ../../../www/admin/addressbook/addr.php.in:227
-#: ../../../www/admin/administrator/admin.php.in:256
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:261
-#: ../../../www/admin/maintainer/maintainer.php.in:257
-#: ../../../www/admin/sharedfolder/sf.php.in:261
-#: ../../../www/admin/user/user.php.in:689
+#: ../../www/admin/user/user.php:761 ../../www/admin/user/user.php:815
+#, php-format
+msgid "Mid-air collision detected, alias %1$s renamed to %2$s"
+msgstr "Opmerking; alias %1$s hernoemd naar %2$s"
+
+#: ../../www/admin/user/user.php:766 ../../www/admin/user/user.php:848
+msgid "Modify User"
+msgstr "Gebruiker wijzigen"
+
+#: ../../www/admin/user/user.php:767
+#, php-format
+msgid "User '%s' successfully modified"
+msgstr "Gebruiker '%s' succesvol gewijzigd"
+
+#: ../../www/admin/user/user.php:787
+#: ../../www/admin/administrator/admin.php:260
+#: ../../www/admin/addressbook/addr.php:227
+#: ../../www/admin/maintainer/maintainer.php:261
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:265
+#: ../../www/admin/sharedfolder/sf.php:265
 #, php-format
 msgid "LDAP Error: could not add object %s: %s"
 msgstr "LDAP fout: kon object %s: %s niet toevoegen"
 
-#: ../../../www/admin/addressbook/addr.php.in:230
+#: ../../www/admin/user/user.php:800
+#: ../../www/admin/distributionlist/list.php:256
 #, php-format
-msgid "%s successfully added"
-msgstr "%s succesvol aangemaakt"
+msgid "Mid-air collision detected, email address %1$s renamed to %2$s"
+msgstr "Opmerking; E-mail adres %1$s hernoemd naar %2$s"
 
-#: ../../../www/admin/addressbook/addr.php.in:240
-#: ../../../www/admin/addressbook/addr.php.in:258
-msgid "Modify External Address"
-msgstr "Pas extern adres aan"
+#: ../../www/admin/user/user.php:821
+msgid "User "
+msgstr "Gebruiker"
 
-#: ../../../www/admin/addressbook/addr.php.in:261
-#: ../../../www/admin/addressbook/addr.php.in:281
-#, php-format
-msgid "Error: No entry with DN %s found"
-msgstr "Fout: geen ingang met DN %s gevonden"
+#: ../../www/admin/user/user.php:821
+#: ../../www/admin/administrator/admin.php:270
+#: ../../www/admin/maintainer/maintainer.php:269
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:276
+msgid " successfully created"
+msgstr " aanmaken gelukt"
 
-#: ../../../www/admin/addressbook/addr.php.in:278
-msgid "Delete External Address"
-msgstr "Verwijder extern adres "
+#: ../../www/admin/user/user.php:822 ../../www/admin/user/user.php:828
+#: ../../www/admin/user/user.php:839 ../../lib/KolabAdmin/include/menu.php:30
+msgid "Create New User"
+msgstr "CreÃ«er nieuwe gebruiker"
+
+#: ../../www/admin/user/user.php:854 ../../www/admin/user/user.php:912
+msgid "Delete User"
+msgstr "Gebruiker verwijderen"
 
-#: ../../../www/admin/addressbook/addr.php.in:295
-#: ../../../www/admin/user/user.php.in:788
+#: ../../www/admin/user/user.php:867
+#: ../../www/admin/administrator/admin.php:315
+#: ../../www/admin/maintainer/maintainer.php:314
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:318
+msgid "Error: need DN for delete operation"
+msgstr "Fout: DN is nodig voor het verwijderen"
+
+#: ../../www/admin/user/user.php:873
+#: ../../www/admin/maintainer/maintainer.php:316
+msgid "Error: you need administrative permissions to delete users"
+msgstr ""
+"Fout: er zijn administratieve rechten nodig om gebruikers te verwijderen"
+
+#: ../../www/admin/user/user.php:886 ../../www/admin/addressbook/addr.php:295
 #, php-format
 msgid "Account could not be deleted, distribution list '%s' depends on it."
 msgstr ""
 "Account kan niet worden verwijderd, distributielijst %s is er van "
 "afhankelijk."
 
-#: ../../../www/admin/addressbook/addr.php.in:302
+#: ../../www/admin/user/user.php:893
 #, php-format
-msgid "Addressbook entry removed from distribution list '%s'."
+msgid "Account removed from distribution list '%s'."
 msgstr "Account is verwijderd van distributielijst '%s'."
 
-#: ../../../www/admin/addressbook/addr.php.in:304
+#: ../../www/admin/user/user.php:895
 #, php-format
 msgid ""
-"Failure to remove addressbook entry from distribution list '%s', entry will "
-"not be deleted."
+"Failure to remove account from distribution list '%s', account will not be "
+"deleted."
 msgstr ""
 "De account kon niet van de distributielijst worden verwijderd.  De account "
 "is niet verwijderd."
 
-#: ../../../www/admin/addressbook/addr.php.in:312
+#: ../../www/admin/user/user.php:903
 #, php-format
-msgid "LDAP Error: could not delete %s: %s"
-msgstr "LDAP fout: kon %s: %s niet verwijderen"
+msgid "LDAP Error: could not mark '%s' for deletion: %s"
+msgstr "LDAP fout: kon '%s' niet voor verwijdering markeren: %s"
 
-#: ../../../www/admin/addressbook/addr.php.in:315
-#: ../../../www/admin/distributionlist/list.php.in:312
-#: ../../../www/admin/sharedfolder/sf.php.in:321
-msgid "Entry Deleted"
-msgstr "Entry verwijderd"
+#: ../../www/admin/user/user.php:906
+msgid "User Deleted"
+msgstr "Gebruiker verwijderd"
 
-#: ../../../www/admin/addressbook/addr.php.in:316
+#: ../../www/admin/user/deliver.php:58
 #, php-format
-msgid "Address book entry with DN %s was deleted"
-msgstr "Adresboek entry met DN %s is verwijderd"
+msgid "Delivery to '%s' successfully activated"
+msgstr "Afleveren aan '%s' succesvol geactiveerd"
 
-#: ../../../www/admin/addressbook/index.php.in:122
-#: ../../../www/admin/user/index.php.in:184
-msgid "Email"
-msgstr "E-mail"
+#: ../../www/admin/user/deliver.php:60
+#, php-format
+msgid "Delivery to '%s' successfully deactivated"
+msgstr "Afleveren aan '%s' succesvol uitgeschakeld"
 
-#: ../../../www/admin/addressbook/index.php.in:123
-#: ../../../www/admin/user/index.php.in:186
-msgid "contains"
-msgstr "bevat"
+#: ../../www/admin/user/forward.php:60
+#, php-format
+msgid "Forwarding to '%s' successfully activated"
+msgstr "Doorsturen naar '%s' succesvol geactiveerd"
 
-#: ../../../www/admin/addressbook/index.php.in:124
-#: ../../../www/admin/user/index.php.in:187
-msgid "is"
-msgstr "is"
+#: ../../www/admin/user/forward.php:62
+#, php-format
+msgid "Forwarding to '%s' successfully deactivated"
+msgstr "Doorsturen naar '%s' succesvol uitgeschakeld"
 
-#: ../../../www/admin/addressbook/index.php.in:125
-#: ../../../www/admin/user/index.php.in:188
-msgid "begins with"
-msgstr "begint met"
+#: ../../www/admin/administrator/index.php:62
+msgid "Manage Administrators ("
+msgstr "Beheer administrators ("
 
-#: ../../../www/admin/addressbook/index.php.in:126
-#: ../../../www/admin/user/index.php.in:189
-msgid "ends with"
-msgstr "Eindigt met"
+#: ../../www/admin/administrator/index.php:62
+msgid " Administrators)"
+msgstr "Administrators)"
 
-#: ../../../www/admin/administrator/admin.php.in:52
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:53
-#: ../../../www/admin/maintainer/maintainer.php.in:52
+#: ../../www/admin/administrator/admin.php:52
+#: ../../www/admin/maintainer/maintainer.php:52
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:53
 msgid "Account with this UID already exists"
 msgstr "Account met deze UID bestaat reeds"
 
-#: ../../../www/admin/administrator/admin.php.in:75
+#: ../../www/admin/administrator/admin.php:75
 msgid "Manager's password can't be changed from the webgui"
 msgstr "Managers wachtwoord kan niet gewijzigd worden via de webgui"
 
-#: ../../../www/admin/administrator/admin.php.in:135
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:110
-#: ../../../www/admin/maintainer/maintainer.php.in:132
+#: ../../www/admin/administrator/admin.php:135
+#: ../../www/admin/maintainer/maintainer.php:132
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:110
 msgid "non volatile"
 msgstr "permanent"
 
-#: ../../../www/admin/administrator/admin.php.in:136
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:111
-#: ../../../www/admin/maintainer/maintainer.php.in:133
-#: ../../../www/admin/user/user.php.in:380
-msgid "Leave blank to keep password unchanged"
-msgstr "Laat leeg om wachtwoord niet te wijzigen"
-
-#: ../../../www/admin/administrator/admin.php.in:153
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:128
-#: ../../../www/admin/maintainer/maintainer.php.in:150
+#: ../../www/admin/administrator/admin.php:153
+#: ../../www/admin/maintainer/maintainer.php:150
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:128
 msgid "Unique User ID"
 msgstr "Unieke gebruikers ID"
 
-#: ../../../www/admin/administrator/admin.php.in:165
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:149
-#: ../../../www/admin/maintainer/maintainer.php.in:162
-#: ../../../www/admin/user/user.php.in:471
+#: ../../www/admin/administrator/admin.php:225
+#: ../../www/admin/addressbook/addr.php:197
+#: ../../www/admin/maintainer/maintainer.php:223
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:210
+#: ../../www/admin/sharedfolder/sf.php:239
+#: ../../www/admin/distributionlist/list.php:208
+#, fuzzy, php-format
+msgid "LDAP Error: could not modify %s to %s: %s"
+msgstr "LDAP fout: kon het object %s: %s niet aanpassen"
+
+#: ../../www/admin/administrator/admin.php:235
+#: ../../www/admin/addressbook/addr.php:209
+#: ../../www/admin/maintainer/maintainer.php:233
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:228
+#: ../../www/admin/sharedfolder/sf.php:251
 #, php-format
-msgid "LDAP Error: No such dn: %s: %s"
-msgstr "LDAP fout: er is geen dn %s: %s"
+msgid "LDAP Error: could not read %s: %s"
+msgstr "LDAP fout: kon %s: %s niet lezen"
 
-#: ../../../www/admin/administrator/admin.php.in:243
-#: ../../../www/admin/administrator/admin.php.in:293
+#: ../../www/admin/administrator/admin.php:239
+#: ../../www/admin/addressbook/addr.php:215
+#: ../../www/admin/maintainer/maintainer.php:237
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:232
+#: ../../www/admin/sharedfolder/sf.php:255
+#, php-format
+msgid "LDAP Error: could not modify object %s: %s"
+msgstr "LDAP fout: kon het object %s: %s niet aanpassen"
+
+#: ../../www/admin/administrator/admin.php:244
+#: ../../www/admin/administrator/admin.php:297
 msgid "Modify Administrator"
 msgstr "Wijzig administrator"
 
-#: ../../../www/admin/administrator/admin.php.in:244
-#: ../../../www/admin/administrator/admin.php.in:266
+#: ../../www/admin/administrator/admin.php:245
+#: ../../www/admin/administrator/admin.php:270
 msgid "Administrator "
 msgstr "Administrator "
 
-#: ../../../www/admin/administrator/admin.php.in:244
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:244
-#: ../../../www/admin/maintainer/maintainer.php.in:241
+#: ../../www/admin/administrator/admin.php:245
+#: ../../www/admin/maintainer/maintainer.php:243
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:246
 msgid " successfully modified"
 msgstr "Wijziging succesvol"
 
-#: ../../../www/admin/administrator/admin.php.in:262
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:265
-#: ../../../www/admin/maintainer/maintainer.php.in:261
+#: ../../www/admin/administrator/admin.php:266
+#: ../../www/admin/maintainer/maintainer.php:265
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:269
 #, php-format
 msgid "LDAP Error: could not add object %s to maintainer group: %s"
 msgstr "LDAP fout: kon object %s niet aan e beheerders groep %s toevoegen"
 
-#: ../../../www/admin/administrator/admin.php.in:266
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:272
-#: ../../../www/admin/maintainer/maintainer.php.in:265
-#: ../../../www/admin/user/user.php.in:723
-msgid " successfully created"
-msgstr " aanmaken gelukt"
-
-#: ../../../www/admin/administrator/admin.php.in:267
-#: ../../../www/admin/administrator/admin.php.in:273
-#: ../../../www/admin/administrator/admin.php.in:284 ../include/menu.php:74
+#: ../../www/admin/administrator/admin.php:271
+#: ../../www/admin/administrator/admin.php:277
+#: ../../www/admin/administrator/admin.php:288
+#: ../../lib/KolabAdmin/include/menu.php:81
 msgid "Create New Administrator"
 msgstr "Nieuwe administrator aanmaken"
 
-#: ../../../www/admin/administrator/admin.php.in:299
+#: ../../www/admin/administrator/admin.php:303
 msgid "Delete Administrator"
 msgstr "Verwijder administrator"
 
-#: ../../../www/admin/administrator/admin.php.in:311
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:314
-#: ../../../www/admin/maintainer/maintainer.php.in:310
-#: ../../../www/admin/user/user.php.in:769
-msgid "Error: need DN for delete operation"
-msgstr "Fout: DN is nodig voor het verwijderen"
-
-#: ../../../www/admin/administrator/admin.php.in:313
+#: ../../www/admin/administrator/admin.php:317
 msgid "Error: you need administrative permissions to delete administrators"
 msgstr ""
 "Fout: je hebt administratieve toegangsrechten nodig om administrators te "
 "verwijderen"
 
-#: ../../../www/admin/administrator/admin.php.in:317
+#: ../../www/admin/administrator/admin.php:321
 #, php-format
 msgid "LDAP Error: Could not remove %s from admin group: %s"
 msgstr "LDAP fout: kan %s van admin groep %s niet verwijderen"
 
-#: ../../../www/admin/administrator/admin.php.in:322
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:326
-#: ../../../www/admin/maintainer/maintainer.php.in:322
+#: ../../www/admin/administrator/admin.php:326
+#: ../../www/admin/maintainer/maintainer.php:326
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:330
 #, php-format
 msgid "LDAP Error: could not mark %s for deletion: %s"
 msgstr "LDAP fout: kon %s niet voor verwijdering markeren: %s"
 
-#: ../../../www/admin/administrator/admin.php.in:328
+#: ../../www/admin/administrator/admin.php:332
 msgid "Administrator Deleted"
 msgstr "Administrator verwijderd"
 
-#: ../../../www/admin/administrator/index.php.in:62
-msgid "Manage Administrators ("
-msgstr "Beheer administrators ("
-
-#: ../../../www/admin/administrator/index.php.in:62
-msgid " Administrators)"
-msgstr "Administrators)"
-
-#: ../../../www/admin/distributionlist/index.php.in:63
-#, php-format
-msgid "Manage Distribution Lists (%d Lists)"
-msgstr "Beheer distributielijsten (%d lijsten)"
+#: ../../www/admin/addressbook/addr.php:95
+msgid "Primary E-Mail Address"
+msgstr "Hoofd E-mailadres"
 
-#: ../../../www/admin/distributionlist/index.php.in:74
-msgid "not yet implemented"
-msgstr "nog niet geÃ¯mplementeerd"
+#: ../../www/admin/addressbook/addr.php:97
+msgid "E-Mail Aliases"
+msgstr "E-Mail Aliassen"
 
-#: ../../../www/admin/distributionlist/list.php.in:46
-msgid "Please add at least one member"
-msgstr "Gelieve tenminste Ã©Ã©n lid toe te voegen"
+#: ../../www/admin/addressbook/addr.php:105
+msgid "Post Box"
+msgstr "Postbus"
 
-#: ../../../www/admin/distributionlist/list.php.in:50
+#: ../../www/admin/addressbook/addr.php:121
+#: ../../www/admin/sharedfolder/sf.php:150
+#: ../../www/admin/distributionlist/list.php:138
 #, php-format
-msgid "No user with email address, UID or alias %s"
-msgstr "Er is geen gebruiker met E-mailadres, UID of alias %s"
-
-#: ../../../www/admin/distributionlist/list.php.in:62
-msgid "User or distribution list with this email address already exists"
-msgstr "Gebruiker of distributielijst met dit E-mailadres bestaat al"
-
-#: ../../../www/admin/distributionlist/list.php.in:111
-msgid "List Name"
-msgstr "Lijstnaam"
-
-#: ../../../www/admin/distributionlist/list.php.in:118
-msgid "Members"
-msgstr "Leden"
+msgid "Error: DN required for %s operation"
+msgstr "Fout: dn nodig voor %s handeling"
 
-#: ../../../www/admin/distributionlist/list.php.in:120
-msgid "One email address per line"
-msgstr "EÃ©n E-mailadres per lijn"
+#: ../../www/admin/addressbook/addr.php:131
+msgid "Add External Address"
+msgstr "Extern adres toevoegen"
 
-#: ../../../www/admin/distributionlist/list.php.in:123
-msgid "Hidden"
-msgstr "Verborgen"
+#: ../../www/admin/addressbook/addr.php:178
+#, fuzzy, php-format
+msgid "Addressbook entry DN could not be modified, distribution list <a href='"
+msgstr "Account is verwijderd van distributielijst '%s'."
 
-#: ../../../www/admin/distributionlist/list.php.in:126
-msgid ""
-"Check here to make this distribution list available only to authenticated "
-"users"
-msgstr ""
-"Kruis hier aan om de distribitielijst alleen beschikbaar te maken voor ge-"
-"authoriseerde gebruikers"
+#: ../../www/admin/addressbook/addr.php:230
+#, php-format
+msgid "%s successfully added"
+msgstr "%s succesvol aangemaakt"
 
-#: ../../../www/admin/distributionlist/list.php.in:145
-msgid "Add Distribution List"
-msgstr "Voeg distributielijst toe"
+#: ../../www/admin/addressbook/addr.php:240
+#: ../../www/admin/addressbook/addr.php:258
+msgid "Modify External Address"
+msgstr "Pas extern adres aan"
 
-#: ../../../www/admin/distributionlist/list.php.in:179
+#: ../../www/admin/addressbook/addr.php:261
+#: ../../www/admin/addressbook/addr.php:281
 #, php-format
-msgid "No user with address %s"
-msgstr "Geen gebruiker met adres %s"
+msgid "Error: No entry with DN %s found"
+msgstr "Fout: geen ingang met DN %s gevonden"
 
-#: ../../../www/admin/distributionlist/list.php.in:210
-#: ../../../www/admin/distributionlist/list.php.in:222
-msgid "Distribution List updated"
-msgstr "Distributielijst bijgewerkt"
+#: ../../www/admin/addressbook/addr.php:278
+msgid "Delete External Address"
+msgstr "Verwijder extern adres "
 
-#: ../../../www/admin/distributionlist/list.php.in:216
-#: ../../../www/admin/user/user.php.in:637
+#: ../../www/admin/addressbook/addr.php:302
 #, php-format
-msgid "LDAP Error: Could not read %s: %s"
-msgstr "LDAP fout: leesfout %s: %s"
+msgid "Addressbook entry removed from distribution list '%s'."
+msgstr "Account is verwijderd van distributielijst '%s'."
 
-#: ../../../www/admin/distributionlist/list.php.in:220
-#: ../../../www/admin/distributionlist/list.php.in:249
-#: ../../../www/admin/user/user.php.in:649
-#: ../../../www/admin/user/user.php.in:662
-#: ../../../www/admin/user/user.php.in:699
-#: ../../../www/admin/user/user.php.in:714
+#: ../../www/admin/addressbook/addr.php:304
 #, php-format
-msgid "LDAP Error: Could not modify object %s: %s"
-msgstr "LDAP fout: kon het object niet aanpassen %s: %s"
+msgid ""
+"Failure to remove addressbook entry from distribution list '%s', entry will "
+"not be deleted."
+msgstr ""
+"De account kon niet van de distributielijst worden verwijderd.  De account "
+"is niet verwijderd."
 
-#: ../../../www/admin/distributionlist/list.php.in:231
+#: ../../www/admin/addressbook/addr.php:312
 #, php-format
-msgid "LDAP Error: Could not add object %s: %s"
-msgstr "LDAP fout: kon object %s: %s niet toevoegen"
+msgid "LDAP Error: could not delete %s: %s"
+msgstr "LDAP fout: kon %s: %s niet verwijderen"
 
-#: ../../../www/admin/distributionlist/list.php.in:252
-#: ../../../www/admin/user/user.php.in:702
-#, php-format
-msgid "Mid-air collision detected, email address %1$s renamed to %2$s"
-msgstr "Opmerking; E-mail adres %1$s hernoemd naar %2$s"
+#: ../../www/admin/addressbook/addr.php:315
+#: ../../www/admin/sharedfolder/sf.php:325
+#: ../../www/admin/distributionlist/list.php:316
+msgid "Entry Deleted"
+msgstr "Entry verwijderd"
 
-#: ../../../www/admin/distributionlist/list.php.in:260
+#: ../../www/admin/addressbook/addr.php:316
 #, php-format
-msgid "Distribution List '%s' added"
-msgstr "Distributielijst %s toegevoegd"
+msgid "Address book entry with DN %s was deleted"
+msgstr "Adresboek entry met DN %s is verwijderd"
 
-#: ../../../www/admin/distributionlist/list.php.in:272
-#: ../../../www/admin/distributionlist/list.php.in:286
-msgid "Modify Distribution List"
-msgstr "Distributielijst wijzigen"
+#: ../../www/admin/maintainer/index.php:62
+#: ../../www/admin/domainmaintainer/index.php:62
+msgid "Manage Maintainers ("
+msgstr "Beheer van de Maintainers("
 
-#: ../../../www/admin/distributionlist/list.php.in:289
-#: ../../../www/admin/distributionlist/list.php.in:304
-#: ../../../www/admin/sharedfolder/sf.php.in:298
-#: ../../../www/admin/sharedfolder/sf.php.in:314
-#, php-format
-msgid "Error: No results returned for DN '%s'"
-msgstr "Fout: geen resultaten voor DN %s"
+#: ../../www/admin/maintainer/index.php:62
+#: ../../www/admin/domainmaintainer/index.php:62
+msgid " Maintainers)"
+msgstr "Maintainers)"
 
-#: ../../../www/admin/distributionlist/list.php.in:301
-msgid "Delete Distribution List"
-msgstr "Distributielijst verwijderen"
+#: ../../www/admin/maintainer/maintainer.php:242
+#: ../../www/admin/maintainer/maintainer.php:296
+msgid "Modify Maintainer"
+msgstr "Maintainers wijzigen"
 
-#: ../../../www/admin/distributionlist/list.php.in:311
-msgid "Distribution List "
-msgstr "Distributielijst "
+#: ../../www/admin/maintainer/maintainer.php:243
+#: ../../www/admin/maintainer/maintainer.php:269
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:246
+msgid "Maintainer "
+msgstr "Maintainer "
 
-#: ../../../www/admin/distributionlist/list.php.in:311
-msgid " deleted"
-msgstr " verwijderd"
+#: ../../www/admin/maintainer/maintainer.php:270
+#: ../../www/admin/maintainer/maintainer.php:276
+#: ../../www/admin/maintainer/maintainer.php:287
+#: ../../lib/KolabAdmin/include/menu.php:93
+msgid "Create New Maintainer"
+msgstr "Nieuwe beheerder aanmaken"
+
+#: ../../www/admin/maintainer/maintainer.php:302
+msgid "Delete Maintainer"
+msgstr "Beheerder verwijderen"
 
-#: ../../../www/admin/distributionlist/list.php.in:315
+#: ../../www/admin/maintainer/maintainer.php:320
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:324
 #, php-format
-msgid "LDAP Error: Could not delete %s: %s"
-msgstr "LDAP fout: kon %s: %s niet verwijderen"
+msgid "LDAP Error: Could not remove %s from maintainer group: %s"
+msgstr "LDAP fout: kan %s niet van beheerders groep: %s verwijderen"
+
+#: ../../www/admin/maintainer/maintainer.php:332
+msgid "Maintainer Deleted"
+msgstr "Beheerder verwijderd"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:49
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:49
 #, fuzzy
 msgid "Please enter a uid value"
 msgstr "Gelieve een E-mailadres in te geven"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:137
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:137
 msgid "Check domains this domain maintainer should be able to maintain"
 msgstr ""
 "Controleer domein, deze domein beheerder moet in staat zijn om te onderhouden"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:243
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:296
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:245
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:300
 msgid "Modify Domain Maintainer"
 msgstr "Domein beheerders wijzigen"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:244
-#: ../../../www/admin/maintainer/maintainer.php.in:241
-#: ../../../www/admin/maintainer/maintainer.php.in:265
-msgid "Maintainer "
-msgstr "Maintainer "
-
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:272
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:276
 msgid "Domain maintainer "
 msgstr "Domein beheerder"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:273
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:277
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:287
-#: ../include/menu.php:80 ../include/menu.php:97
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:277
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:281
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:291
+#: ../../lib/KolabAdmin/include/menu.php:87
+#: ../../lib/KolabAdmin/include/menu.php:104
 msgid "Create New Domain Maintainer"
 msgstr "Nieuwe domein beheerder aanmaken"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:302
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:306
 msgid "Delete Domain Maintainer"
 msgstr "Domein beheerder verwijderen"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:316
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:320
 msgid "Error: you need administrative permissions to delete domain maintainers"
 msgstr ""
 "Fout :  je hebt administratieve toegangsrechten nodig om administrators te "
 "verwijderen"
 
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:320
-#: ../../../www/admin/maintainer/maintainer.php.in:316
-#, php-format
-msgid "LDAP Error: Could not remove %s from maintainer group: %s"
-msgstr "LDAP fout: kan %s niet van beheerders groep: %s verwijderen"
-
-#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:332
+#: ../../www/admin/domainmaintainer/domainmaintainer.php:336
 msgid "Domain Maintainer Deleted"
 msgstr "Domein beheerder verwijderd"
 
-#: ../../../www/admin/domainmaintainer/index.php.in:62
-#: ../../../www/admin/maintainer/index.php.in:62
-msgid "Manage Maintainers ("
-msgstr "Beheer van de Maintainers("
-
-#: ../../../www/admin/domainmaintainer/index.php.in:62
-#: ../../../www/admin/maintainer/index.php.in:62
-msgid " Maintainers)"
-msgstr "Maintainers)"
-
-#: ../../../www/admin/maintainer/maintainer.php.in:240
-#: ../../../www/admin/maintainer/maintainer.php.in:292
-msgid "Modify Maintainer"
-msgstr "Maintainers wijzigen"
-
-#: ../../../www/admin/maintainer/maintainer.php.in:266
-#: ../../../www/admin/maintainer/maintainer.php.in:272
-#: ../../../www/admin/maintainer/maintainer.php.in:283 ../include/menu.php:86
-msgid "Create New Maintainer"
-msgstr "Nieuwe beheerder aanmaken"
-
-#: ../../../www/admin/maintainer/maintainer.php.in:298
-msgid "Delete Maintainer"
-msgstr "Beheerder verwijderen"
-
-#: ../../../www/admin/maintainer/maintainer.php.in:312
-#: ../../../www/admin/user/user.php.in:775
-msgid "Error: you need administrative permissions to delete users"
-msgstr ""
-"Fout: er zijn administratieve rechten nodig om gebruikers te verwijderen"
-
-#: ../../../www/admin/maintainer/maintainer.php.in:328
-msgid "Maintainer Deleted"
-msgstr "Beheerder verwijderd"
-
-#: ../../../www/admin/settings/index.php.in:98
-#, php-format
-msgid "No account found for email address %s"
-msgstr "Er is geen account voor E-mailadres %s"
-
-#: ../../../www/admin/settings/index.php.in:107
-#, php-format
-msgid "LDAP Error: Failed to add distribution list %s: %s"
-msgstr "LDAP fout: het toevoegen van de distributielijst %s: %s is gefaald"
-
-#: ../../../www/admin/settings/index.php.in:109
-#, php-format
-msgid "Successfully created distribution list %s"
-msgstr "Het aanmaken van de distributielijst %s is geslaagd"
-
-#: ../../../www/admin/settings/index.php.in:128
-#: ../../../www/admin/settings/index.php.in:137
-#: ../../../www/admin/settings/index.php.in:146
-#: ../../../www/admin/settings/index.php.in:155
-#: ../../../www/admin/settings/index.php.in:165
-#: ../../../www/admin/settings/index.php.in:174
-#: ../../../www/admin/settings/index.php.in:185
-#: ../../../www/admin/settings/index.php.in:199
-#: ../../../www/admin/settings/index.php.in:217
-#: ../../../www/admin/settings/index.php.in:235
-#: ../../../www/admin/settings/index.php.in:252
-#: ../../../www/admin/settings/index.php.in:265
-#, php-format
-msgid "LDAP Error: failed to modify kolab configuration object: %s"
-msgstr "LDAP fout: het bijwerken van Kolab configuratie object %s is gefaald"
-
-#: ../../../www/admin/settings/index.php.in:223
-#, php-format
-msgid "LDAP Error: Failed to delete domain object %s: %s"
-msgstr "LDAP fout: het verwijderen van domein object %s: %s is gefaald"
-
-#: ../../../www/admin/settings/index.php.in:273
-msgid "POP3 Service"
-msgstr "POP3 Service"
-
-#: ../../../www/admin/settings/index.php.in:274
-msgid "POP3/SSL service (TCP port 995)"
-msgstr "POP3/SSL service (TCP poort 995)"
-
-#: ../../../www/admin/settings/index.php.in:275
-msgid "IMAP Service"
-msgstr "IMAP Service"
-
-#: ../../../www/admin/settings/index.php.in:276
-msgid "IMAP/SSL Service (TCP port 993)"
-msgstr "IMAP/SSL Service (TCP poort 993)"
-
-#: ../../../www/admin/settings/index.php.in:277
-msgid "Sieve service (TCP port %s)"
-msgstr "Sieve service (TCP poort %s)"
-
-#: ../../../www/admin/settings/index.php.in:278
-msgid "FreeBusy Service via HTTP (in addition to HTTPS)"
-msgstr ""
-
-#: ../../../www/admin/settings/index.php.in:279
-msgid "Amavis Email Scanning (Virus/Spam)"
-msgstr "Amavis E-mail scannen (virus/anti-spam)"
-
-#: ../../../www/admin/sharedfolder/index.php.in:53
+#: ../../www/admin/sharedfolder/index.php:53
 #, php-format
 msgid "Manage Shared Folders (%d Folders)"
 msgstr "Beheer gedeelde mappen (%d mappen)"
 
-#: ../../../www/admin/sharedfolder/index.php.in:63
-#: ../include/form.class.php:255
+#: ../../www/admin/sharedfolder/index.php:63
+#: ../../lib/KolabAdmin/include/form.class.php:254
 msgid "Unspecified"
 msgstr "Niet gespecificeerd"
 
-#: ../../../www/admin/sharedfolder/index.php.in:64
-#: ../include/form.class.php:255
+#: ../../www/admin/sharedfolder/index.php:64
+#: ../../lib/KolabAdmin/include/form.class.php:254
 msgid "Mails"
 msgstr "E-mails"
 
-#: ../../../www/admin/sharedfolder/index.php.in:65
-#: ../include/form.class.php:255
-msgid "Tasks"
-msgstr "Taken"
-
-#: ../../../www/admin/sharedfolder/index.php.in:66
-#: ../include/form.class.php:256
+#: ../../www/admin/sharedfolder/index.php:66
+#: ../../lib/KolabAdmin/include/form.class.php:255
 msgid "Journals"
 msgstr "Journalen"
 
-#: ../../../www/admin/sharedfolder/index.php.in:67
-#: ../include/form.class.php:256
+#: ../../www/admin/sharedfolder/index.php:67
+#: ../../lib/KolabAdmin/include/form.class.php:255
 msgid "Events"
 msgstr "Gebeurtenissen"
 
-#: ../../../www/admin/sharedfolder/index.php.in:68
-#: ../include/form.class.php:257
+#: ../../www/admin/sharedfolder/index.php:68
+#: ../../lib/KolabAdmin/include/form.class.php:256
 msgid "Contacts"
 msgstr "Contacten"
 
-#: ../../../www/admin/sharedfolder/index.php.in:69
-#: ../include/form.class.php:257
-msgid "Notes"
-msgstr "Aantekeningen"
-
-#: ../../../www/admin/sharedfolder/sf.php.in:60
-#: ../../../www/admin/sharedfolder/sf.php.in:67
+#: ../../www/admin/sharedfolder/sf.php:62
+#: ../../www/admin/sharedfolder/sf.php:69
 msgid "Permission for UID/email/GID"
 msgstr "Toestemming voor UID/E-mail/GID"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:101
+#: ../../www/admin/sharedfolder/sf.php:103
 #, php-format
 msgid "No UID or GID %s"
 msgstr "Geen UID of GID %s"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:117
+#: ../../www/admin/sharedfolder/sf.php:119
 msgid "Folder Name"
 msgstr "Map naam"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:124
+#: ../../www/admin/sharedfolder/sf.php:126
 msgid "Folder Location"
 msgstr "Map locatie"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:126
-#: ../../../www/admin/user/user.php.in:379
-#: ../../../www/admin/user/user.php.in:381
-msgid "Non volatile"
-msgstr "Permanent"
-
-#: ../../../www/admin/sharedfolder/sf.php.in:128
+#: ../../www/admin/sharedfolder/sf.php:130
 msgid "Folder Type"
 msgstr "Map naam "
 
-#: ../../../www/admin/sharedfolder/sf.php.in:132
+#: ../../www/admin/sharedfolder/sf.php:134
 msgid "Quota Limit"
 msgstr "Quota limiet"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:133
+#: ../../www/admin/sharedfolder/sf.php:135
 msgid "MBytes (empty for unlimited)"
 msgstr "MBytes (leeg voor onbeperkt)"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:135
+#: ../../www/admin/sharedfolder/sf.php:137
 msgid "Permission for UID/GID"
 msgstr "Toestemming voor UID/GID"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:158 ../include/menu.php:58
+#: ../../www/admin/sharedfolder/sf.php:160
+#: ../../lib/KolabAdmin/include/menu.php:65
 msgid "Add Shared Folder"
 msgstr "Voeg gedeelde map toe"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:241
-#: ../../../www/admin/sharedfolder/sf.php.in:253
+#: ../../www/admin/sharedfolder/sf.php:245
+#: ../../www/admin/sharedfolder/sf.php:257
 msgid "Shared folder updated"
 msgstr "Gedeelde map bijgewerkt"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:263
+#: ../../www/admin/sharedfolder/sf.php:267
 #, php-format
 msgid "Shared folder '%s' added"
 msgstr "Gedeelde map %s toegevoegd"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:275
-#: ../../../www/admin/sharedfolder/sf.php.in:295
+#: ../../www/admin/sharedfolder/sf.php:279
+#: ../../www/admin/sharedfolder/sf.php:299
 msgid "Modify Shared Folder"
 msgstr "Gedeelde map wijzigen"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:311
+#: ../../www/admin/sharedfolder/sf.php:302
+#: ../../www/admin/sharedfolder/sf.php:318
+#: ../../www/admin/distributionlist/list.php:293
+#: ../../www/admin/distributionlist/list.php:308
+#, php-format
+msgid "Error: No results returned for DN '%s'"
+msgstr "Fout: geen resultaten voor DN %s"
+
+#: ../../www/admin/sharedfolder/sf.php:315
 msgid "Delete Shared Folder"
 msgstr "Gedeelde map verwijderen"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:320
+#: ../../www/admin/sharedfolder/sf.php:324
 msgid "Shared folder "
 msgstr "Gedeelde map "
 
-#: ../../../www/admin/sharedfolder/sf.php.in:320
+#: ../../www/admin/sharedfolder/sf.php:324
 msgid " marked for deletion"
 msgstr " aangemerkt voor verwijdering"
 
-#: ../../../www/admin/sharedfolder/sf.php.in:324
+#: ../../www/admin/sharedfolder/sf.php:328
 #, php-format
 msgid "LDAP Error: Could not mark %s for deletion: %s"
 msgstr "LDAP fout: kon %s niet voor verwijdereing markeren: %s"
 
-#: ../../../www/admin/user/deliver.php.in:37
-msgid ""
-"Net/Sieve.php is missing. Without that, filter settings are not available"
-msgstr ""
-"Net/Sieve.php ontbreekt. Zonder daardoor <ijn de filter instellingen niet "
-"beschikbaar"
-
-#: ../../../www/admin/user/deliver.php.in:38
-#: ../../../www/admin/user/forward.php.in:39
-#: ../../../www/admin/user/vacation.php.in:18
-#, fuzzy
-msgid ""
-"Suggest your system administrator to run \"pear install http://pear.php.net/"
-"get/Net_Sieve\" on the server"
-msgstr ""
-"Stel Uw systeem administrator voor om \"@bindir@/pear install http://pear."
-"php.net/get/Net_Sieve\" uit te voeren op de server"
-
-#: ../../../www/admin/user/deliver.php.in:66
-#: ../../../www/admin/user/forward.php.in:70
-msgid "Script was:"
-msgstr "Script was:"
-
-#: ../../../www/admin/user/deliver.php.in:74
+#: ../../www/admin/distributionlist/index.php:63
 #, php-format
-msgid "Delivery to '%s' successfully activated"
-msgstr "Afleveren aan '%s' succesvol geactiveerd"
-
-#: ../../../www/admin/user/deliver.php.in:75
-#, php-format
-msgid "Delivery to '%s' successfully deactivated"
-msgstr "Afleveren aan '%s' succesvol uitgeschakeld"
-
-#: ../../../www/admin/user/forward.php.in:38
-#: ../../../www/admin/user/vacation.php.in:17
-msgid ""
-"Net/Sieve.php is missing. Without that, vacation settings are not available"
-msgstr ""
-"Net/Sieve.php ontbreekt. Vakantie instellingen zijn daardoor niet beschikbaar"
-
-#: ../../../www/admin/user/forward.php.in:64
-#: ../../../www/admin/user/user.php.in:94
-msgid "Please enter an email address"
-msgstr "Gelieve een E-mailadres in te geven"
-
-#: ../../../www/admin/user/forward.php.in:78
-#, php-format
-msgid "Forwarding to '%s' successfully activated"
-msgstr "Doorsturen naar '%s' succesvol geactiveerd"
-
-#: ../../../www/admin/user/forward.php.in:79
-#, php-format
-msgid "Forwarding to '%s' successfully deactivated"
-msgstr "Doorsturen naar '%s' succesvol uitgeschakeld"
-
-#: ../../../www/admin/user/index.php.in:122
-#, php-format
-msgid "Manage Email User (%d Users)"
-msgstr "Beheer gebruikers E-mails (%d gebruikers)"
-
-#: ../../../www/admin/user/user.php.in:111
-#, php-format
-msgid "Email address %1$s not in domains %2$s"
-msgstr "E-mail adres  %1$s niet in domeinen %2$s"
-
-#: ../../../www/admin/user/user.php.in:130
-msgid "UID "
-msgstr "UID"
+msgid "Manage Distribution Lists (%d Lists)"
+msgstr "Beheer distributielijsten (%d lijsten)"
 
-#: ../../../www/admin/user/user.php.in:130 ../include/form.class.php:34
-msgid ""
-" collides with an address already used for another user, a vCard or a "
-"distribution list.<br />"
-msgstr ""
+#: ../../www/admin/distributionlist/index.php:74
+msgid "not yet implemented"
+msgstr "nog niet geÃ¯mplementeerd"
 
-#: ../../../www/admin/user/user.php.in:145
-#, php-format
-msgid "Email-Delegate %s does not exist"
-msgstr "Delegate %s bestaat niet"
+#: ../../www/admin/distributionlist/list.php:46
+msgid "Please add at least one member"
+msgstr "Gelieve tenminste Ã©Ã©n lid toe te voegen"
 
-#: ../../../www/admin/user/user.php.in:158
+#: ../../www/admin/distributionlist/list.php:50
 #, php-format
-msgid "Illegal user or group %s"
-msgstr "Illegale gebruiker of groep %s"
-
-#: ../../../www/admin/user/user.php.in:167
-#, fuzzy
-msgid "Free/Busy interval can not be negative"
-msgstr "Quota kan niet negatief zijn"
-
-#: ../../../www/admin/user/user.php.in:168
-#, fuzzy
-msgid "Free/Busy interval must be a number"
-msgstr "Quota moet kleiner zijn dan 4096"
-
-#: ../../../www/admin/user/user.php.in:169
-#, fuzzy
-msgid "Free/Busy interval must be an integer"
-msgstr "Quota moet kleiner zijn dan 4096"
-
-#: ../../../www/admin/user/user.php.in:403
-msgid "Unique Identity (UID)"
-msgstr "Unieke identiteit (UID)"
-
-#: ../../../www/admin/user/user.php.in:405
-msgid "Optional - Defaults to Primary Email Address"
-msgstr "Optioneel - standaard voor hoofd E-mailadres"
-
-#: ../../../www/admin/user/user.php.in:406
-msgid "Mailbox Home Server"
-msgstr "Postvak Home Server"
-
-#: ../../../www/admin/user/user.php.in:410
-msgid "Account Type"
-msgstr "Account Type"
-
-#: ../../../www/admin/user/user.php.in:412
-msgid "User Account"
-msgstr "Gebruikersaccount"
-
-#: ../../../www/admin/user/user.php.in:412
-msgid "Internal User Account"
-msgstr "Interne gebruikersaccount"
+msgid "No user with email address, UID or alias %s"
+msgstr "Er is geen gebruiker met E-mailadres, UID of alias %s"
 
-#: ../../../www/admin/user/user.php.in:412
-msgid "Group Account"
-msgstr "Group account"
+#: ../../www/admin/distributionlist/list.php:62
+msgid "User or distribution list with this email address already exists"
+msgstr "Gebruiker of distributielijst met dit E-mailadres bestaat al"
 
-#: ../../../www/admin/user/user.php.in:412
-msgid "Resource Account"
-msgstr "Hulpbron account"
+#: ../../www/admin/distributionlist/list.php:114
+msgid "List Name"
+msgstr "Lijstnaam"
 
-#: ../../../www/admin/user/user.php.in:414
-msgid ""
-"NOTE: An internal user is a user that will not be visible in the address book"
-msgstr "Opmerking: een interne gebruiker is niet zichtbaar in het adresboek"
+#: ../../www/admin/distributionlist/list.php:121
+msgid "Members"
+msgstr "Leden"
 
-#: ../../../www/admin/user/user.php.in:415
-msgid "Invitation Policy"
-msgstr "Uitnodigingsbeleid"
+#: ../../www/admin/distributionlist/list.php:123
+msgid "One email address per line"
+msgstr "EÃ©n E-mailadres per lijn"
 
-#: ../../../www/admin/user/user.php.in:419
-msgid "For automatic invitation handling"
-msgstr "Voor automatische uitnodigingsafhandeling"
+#: ../../www/admin/distributionlist/list.php:126
+msgid "Hidden"
+msgstr "Verborgen"
 
-#: ../../../www/admin/user/user.php.in:420
+#: ../../www/admin/distributionlist/list.php:129
 msgid ""
-"NOTE: For regular accounts to use this feature, give the 'calendar' user "
-"access to the Calendar folder"
-msgstr ""
-"Opmerking: reguliere accounts die deze functie willen gebruiken, moeten "
-"toegang hebben tot de kalendermap"
-
-#: ../../../www/admin/user/user.php.in:422
-msgid "Email Aliases"
-msgstr "E-mail Aliases"
-
-#: ../../../www/admin/user/user.php.in:427
-msgid "Email-Delegates"
-msgstr "Gemachtigde"
-
-#: ../../../www/admin/user/user.php.in:430
-msgid "Others allowed to send emails with a \"from\" address of this account."
+"Check here to make this distribution list available only to authenticated "
+"users"
 msgstr ""
-"Anderen toestaan om email te sturen met een \"from\" adres van dit account."
-
-#: ../../../www/admin/user/user.php.in:431
-msgid "One email address per line."
-msgstr "EÃ©n E-mailadres per lijn"
-
-#: ../../../www/admin/user/user.php.in:447
-msgid "User Quota in MBytes"
-msgstr "Beschikbare schijfruimte in MBytes per gebruiker "
-
-#: ../../../www/admin/user/user.php.in:460
-msgid "Free/Busy interval in days"
-msgstr "Vrij/bezet interval in dagen"
-
-#: ../../../www/admin/user/user.php.in:461
-msgid "Leave blank for default (60 days)"
-msgstr "Laat leeg voor standaard (60 dagen)"
-
-#: ../../../www/admin/user/user.php.in:665
-#: ../../../www/admin/user/user.php.in:717
-#, php-format
-msgid "Mid-air collision detected, alias %1$s renamed to %2$s"
-msgstr "Opmerking; alias %1$s hernoemd naar %2$s"
+"Kruis hier aan om de distribitielijst alleen beschikbaar te maken voor ge-"
+"authoriseerde gebruikers"
 
-#: ../../../www/admin/user/user.php.in:670
-#: ../../../www/admin/user/user.php.in:750
-msgid "Modify User"
-msgstr "Gebruiker wijzigen"
+#: ../../www/admin/distributionlist/list.php:148
+msgid "Add Distribution List"
+msgstr "Voeg distributielijst toe"
 
-#: ../../../www/admin/user/user.php.in:671
+#: ../../www/admin/distributionlist/list.php:183
 #, php-format
-msgid "User '%s' successfully modified"
-msgstr "Gebruiker '%s' succesvol gewijzigd"
-
-#: ../../../www/admin/user/user.php.in:723
-msgid "User "
-msgstr "Gebruiker"
-
-#: ../../../www/admin/user/user.php.in:724
-#: ../../../www/admin/user/user.php.in:730
-#: ../../../www/admin/user/user.php.in:741 ../include/menu.php:30
-msgid "Create New User"
-msgstr "CreÃ«er nieuwe gebruiker"
-
-#: ../../../www/admin/user/user.php.in:756
-#: ../../../www/admin/user/user.php.in:814
-msgid "Delete User"
-msgstr "Gebruiker verwijderen"
+msgid "No user with address %s"
+msgstr "Geen gebruiker met adres %s"
 
-#: ../../../www/admin/user/user.php.in:795
-#, php-format
-msgid "Account removed from distribution list '%s'."
-msgstr "Account is verwijderd van distributielijst '%s'."
+#: ../../www/admin/distributionlist/list.php:214
+#: ../../www/admin/distributionlist/list.php:226
+msgid "Distribution List updated"
+msgstr "Distributielijst bijgewerkt"
 
-#: ../../../www/admin/user/user.php.in:797
+#: ../../www/admin/distributionlist/list.php:235
 #, php-format
-msgid ""
-"Failure to remove account from distribution list '%s', account will not be "
-"deleted."
-msgstr ""
-"De account kon niet van de distributielijst worden verwijderd.  De account "
-"is niet verwijderd."
+msgid "LDAP Error: Could not add object %s: %s"
+msgstr "LDAP fout: kon object %s: %s niet toevoegen"
 
-#: ../../../www/admin/user/user.php.in:805
+#: ../../www/admin/distributionlist/list.php:264
 #, php-format
-msgid "LDAP Error: could not mark '%s' for deletion: %s"
-msgstr "LDAP fout: kon '%s' niet voor verwijdering markeren: %s"
+msgid "Distribution List '%s' added"
+msgstr "Distributielijst %s toegevoegd"
 
-#: ../../../www/admin/user/user.php.in:808
-msgid "User Deleted"
-msgstr "Gebruiker verwijderd"
+#: ../../www/admin/distributionlist/list.php:276
+#: ../../www/admin/distributionlist/list.php:290
+msgid "Modify Distribution List"
+msgstr "Distributielijst wijzigen"
 
-#: ../../../www/admin/user/vacation.php.in:43
-msgid "Days must be at least one"
-msgstr "Tenminste 1 dag"
+#: ../../www/admin/distributionlist/list.php:305
+msgid "Delete Distribution List"
+msgstr "Distributielijst verwijderen"
 
-#: ../../../www/admin/user/vacation.php.in:65
-msgid "Vacation message successfully activated"
-msgstr "Vakantiemededeling succesvol geactiveerd"
+#: ../../www/admin/distributionlist/list.php:315
+msgid "Distribution List "
+msgstr "Distributielijst "
 
-#: ../../../www/admin/user/vacation.php.in:66
-msgid "Vacation message successfully deactivated"
-msgstr "Vakantiemededeling succesvol uitgeschakeld"
+#: ../../www/admin/distributionlist/list.php:315
+msgid " deleted"
+msgstr " verwijderd"
 
-#: ../../../www/admin/user/vacation.php.in:87
+#: ../../www/admin/distributionlist/list.php:319
 #, php-format
-msgid "%x"
-msgstr "%x"
+msgid "LDAP Error: Could not delete %s: %s"
+msgstr "LDAP fout: kon %s: %s niet verwijderen"
 
-#: ../../../www/admin/user/vacation.php.in:89
+#: ../../www/admin/settings/index.php:99
 #, php-format
-msgid "I am out of office until %s.\r\n"
-msgstr "Ik heb het kantoor verlaten tot %s.\r\n"
+msgid "No account found for email address %s"
+msgstr "Er is geen account voor E-mailadres %s"
 
-#: ../../../www/admin/user/vacation.php.in:90
+#: ../../www/admin/settings/index.php:108
 #, php-format
-msgid ""
-"In urgent cases, please contact Mrs. <vacation replacement>\r\n"
-"\r\n"
-msgstr ""
-"In dringende gevallen, gelieve Mrs.te contacteren <vacation replacement>\r\n"
-"\r\n"
+msgid "LDAP Error: Failed to add distribution list %s: %s"
+msgstr "LDAP fout: het toevoegen van de distributielijst %s: %s is gefaald"
 
-#: ../../../www/admin/user/vacation.php.in:91
+#: ../../www/admin/settings/index.php:110
 #, php-format
-msgid "email: <email address of vacation replacement>\r\n"
-msgstr "E-mail: <E-mailadres voor afwezigheidsberichten>\r\n"
+msgid "Successfully created distribution list %s"
+msgstr "Het aanmaken van de distributielijst %s is geslaagd"
 
-#: ../../../www/admin/user/vacation.php.in:92
+#: ../../www/admin/settings/index.php:129
+#: ../../www/admin/settings/index.php:138
+#: ../../www/admin/settings/index.php:147
+#: ../../www/admin/settings/index.php:158
+#: ../../www/admin/settings/index.php:168
+#: ../../www/admin/settings/index.php:177
+#: ../../www/admin/settings/index.php:188
+#: ../../www/admin/settings/index.php:202
+#: ../../www/admin/settings/index.php:220
+#: ../../www/admin/settings/index.php:238
+#: ../../www/admin/settings/index.php:255
+#: ../../www/admin/settings/index.php:268
 #, php-format
-msgid "phone: +49 711 1111 11\r\n"
-msgstr "telefoon: +49 711 1111 11\r\n"
+msgid "LDAP Error: failed to modify kolab configuration object: %s"
+msgstr "LDAP fout: het bijwerken van Kolab configuratie object %s is gefaald"
 
-#: ../../../www/admin/user/vacation.php.in:93
+#: ../../www/admin/settings/index.php:226
 #, php-format
-msgid ""
-"fax.:  +49 711 1111 12\r\n"
-"\r\n"
-msgstr ""
-"fax.:  +49 711 1111 12\r\n"
-"\r\n"
+msgid "LDAP Error: Failed to delete domain object %s: %s"
+msgstr "LDAP fout: het verwijderen van domein object %s: %s is gefaald"
 
-#: ../../../www/admin/user/vacation.php.in:94
-#, php-format
-msgid "Yours sincerely,\r\n"
-msgstr "Met vriendelijk groeten,\r\n"
+#: ../../www/admin/settings/index.php:276
+msgid "POP3 Service"
+msgstr "POP3 Service"
 
-#: ../../../www/admin/user/vacation.php.in:95
-#, php-format
-msgid "-- \r\n"
-msgstr "-- \r\n"
+#: ../../www/admin/settings/index.php:277
+msgid "POP3/SSL service (TCP port 995)"
+msgstr "POP3/SSL service (TCP poort 995)"
 
-#: ../../../www/admin/user/vacation.php.in:96
-#, php-format
-msgid "<enter your name and email address here>"
-msgstr "<vul hier uw naam en E-mailadres in>"
+#: ../../www/admin/settings/index.php:278
+msgid "IMAP Service"
+msgstr "IMAP Service"
 
-#: ../include/auth.class.php.in:40
-msgid "Server error, no ldap object!"
-msgstr "Serverfout, geen LDAP object"
+#: ../../www/admin/settings/index.php:279
+msgid "IMAP/SSL Service (TCP port 993)"
+msgstr "IMAP/SSL Service (TCP poort 993)"
 
-#: ../include/auth.class.php.in:45
-msgid "Could not bind to LDAP server: "
-msgstr "Kon geen verbinding maken met LDAP server: "
+#: ../../www/admin/settings/index.php:280
+#, php-format
+msgid "Sieve service (TCP port %s)"
+msgstr "Sieve service (TCP poort %s)"
 
-#: ../include/auth.class.php.in:56
-msgid "Could not bind to LDAP server"
-msgstr "Kon geen verbinding maken met LDAP server"
+#: ../../www/admin/settings/index.php:281
+msgid "FreeBusy Service via HTTP (in addition to HTTPS)"
+msgstr ""
 
-#: ../include/auth.class.php.in:83 ../include/auth.class.php.in:87
-msgid "Wrong username or password"
-msgstr "Verkeerde gebruikersnaam of wachtwoord"
+#: ../../www/admin/settings/index.php:282
+msgid "Amavis Email Scanning (Virus/Spam)"
+msgstr "Amavis E-mail scannen (virus/anti-spam)"
 
-#: ../include/form.class.php:34
+#: ../../lib/KolabAdmin/include/form.class.php:34
 msgid "Email address "
 msgstr "E-mailadres"
 
-#: ../include/form.class.php:45
-msgid "Quota must be smaller than 4096"
-msgstr "Quota moet kleiner zijn dan 4096"
-
-#: ../include/form.class.php:46
+#: ../../lib/KolabAdmin/include/form.class.php:45
 msgid "Quota can not be negative"
 msgstr "Quota kan niet negatief zijn"
 
-#: ../include/form.class.php:47
+#: ../../lib/KolabAdmin/include/form.class.php:46
 #, fuzzy
 msgid "Quota must be a number"
 msgstr "Quota moet kleiner zijn dan 4096"
 
-#: ../include/form.class.php:48
+#: ../../lib/KolabAdmin/include/form.class.php:47
 #, fuzzy
 msgid "Quota must be an integer"
 msgstr "Quota moet kleiner zijn dan 4096"
 
-#: ../include/form.class.php:55
+#: ../../lib/KolabAdmin/include/form.class.php:54
 msgid ""
 "Phone entries may only contain a-z, numbers, spaces and the characters ()-+/."
 "=?:"
 msgstr ""
 
-#: ../include/form.class.php:118
+#: ../../lib/KolabAdmin/include/form.class.php:117
 msgid "<tr><th>Attribute</th><th>Value</th><th>Comment</th></tr>"
 msgstr "<tr><th>Attribuut</th><th>Waarde</th><th>Commentaar</th></tr>"
 
-#: ../include/form.class.php:205
-msgid "Yes"
-msgstr "Ja"
-
-#: ../include/form.class.php:205
-msgid "No"
-msgstr "Nee"
-
-#: ../include/form.class.php:323
+#: ../../lib/KolabAdmin/include/form.class.php:322
 msgid "Always accept"
 msgstr "Altijd accepteren"
 
-#: ../include/form.class.php:324
+#: ../../lib/KolabAdmin/include/form.class.php:323
 msgid "Always reject"
 msgstr "Altijd afwijzen"
 
-#: ../include/form.class.php:325
+#: ../../lib/KolabAdmin/include/form.class.php:324
 msgid "Reject if conflicts"
 msgstr "Afwijzen bij conflicten"
 
-#: ../include/form.class.php:326
+#: ../../lib/KolabAdmin/include/form.class.php:325
 msgid "Manual if conflicts"
 msgstr "Handmatig bij conflicten"
 
-#: ../include/form.class.php:327
+#: ../../lib/KolabAdmin/include/form.class.php:326
 msgid "Manual"
 msgstr "Handmatig"
 
-#: ../include/form.class.php:333 ../include/form.class.php:339
+#: ../../lib/KolabAdmin/include/form.class.php:332
+#: ../../lib/KolabAdmin/include/form.class.php:338
 msgid "Anyone"
 msgstr "Iemand"
 
-#: ../include/form.class.php:375
+#: ../../lib/KolabAdmin/include/form.class.php:374
 msgid "* Required field."
 msgstr "Vereist veld"
 
-#: ../include/form.class.php:396 ../include/form.class.php:399
+#: ../../lib/KolabAdmin/include/form.class.php:395
+#: ../../lib/KolabAdmin/include/form.class.php:398
 msgid "Required field "
 msgstr "Vereiste veld"
 
-#: ../include/form.class.php:396 ../include/form.class.php:399
+#: ../../lib/KolabAdmin/include/form.class.php:395
+#: ../../lib/KolabAdmin/include/form.class.php:398
 msgid " is empty"
 msgstr " is leeg"
 
-#: ../include/ldap.class.php.in:54
-msgid ""
-"Error setting LDAP protocol to v3. Please contact your system administrator"
-msgstr ""
-"Fout met instelling LDAP protocol to v3. Gelieve contact op te nemen met uw "
-"systeembeheerder "
-
-#: ../include/ldap.class.php.in:184 ../include/ldap.class.php.in:214
-#: ../include/ldap.class.php.in:244
-#, php-format
-msgid "No such object %s"
-msgstr "Object %s bestaat niet"
-
-#: ../include/ldap.class.php.in:187 ../include/ldap.class.php.in:217
-#: ../include/ldap.class.php.in:247
-#, php-format
-msgid "LDAP Error searching for DN %s: %s"
-msgstr "LDAP fout, kan DN %s: %s niet vinden"
-
-#: ../include/ldap.class.php.in:200
-#, php-format
-msgid "Error searching for DN for UID=%s"
-msgstr "Fout kan DN voor UID=%s niet vinden"
-
-#: ../include/ldap.class.php.in:230
-#, php-format
-msgid "Error searching for DN for Mail=%s"
-msgstr "Fout kan DN voor mail=%s niet vinden"
-
-#: ../include/ldap.class.php.in:260
-#, php-format
-msgid "Error searching for DN for alias=%s: %s"
-msgstr "Fout kan DN voor alias=%s:%s niet vinden"
-
-#: ../include/ldap.class.php.in:273
-#, php-format
-msgid "Error searching for DN for mail or alias %s: %s"
-msgstr "Fout kan DN voor mail or alias %s: %s niet vinden"
-
-#: ../include/ldap.class.php.in:336
-msgid "LDAP Error: Can't read maintainers group: "
-msgstr "LDAP fout: Can't read maintainers group"
-
-#: ../include/menu.php:26
+#: ../../lib/KolabAdmin/include/menu.php:26
 msgid "Users"
 msgstr "Gebruikers"
 
-#: ../include/menu.php:28
+#: ../../lib/KolabAdmin/include/menu.php:28
 msgid "Manage Email Users"
 msgstr "Beheer email gebruikers"
 
-#: ../include/menu.php:33 ../include/menu.php:35
+#: ../../lib/KolabAdmin/include/menu.php:33
+#: ../../lib/KolabAdmin/include/menu.php:35
 msgid "My User Settings"
 msgstr "Mijn gebruiker instellingen"
 
-#: ../include/menu.php:37
+#: ../../lib/KolabAdmin/include/menu.php:37
 msgid "Mail Delivery"
 msgstr "E-mail aflevering"
 
-#: ../include/menu.php:39
+#: ../../lib/KolabAdmin/include/menu.php:39
 msgid "Forward Email"
 msgstr "E-mail doorsturen"
 
-#: ../include/menu.php:41
+#: ../../lib/KolabAdmin/include/menu.php:41
 msgid "Vacation"
 msgstr "Vakantie"
 
-#: ../include/menu.php:47
+#: ../../lib/KolabAdmin/include/menu.php:54
 msgid "Manage Address Book"
 msgstr "Beheer adresboek"
 
-#: ../include/menu.php:49
+#: ../../lib/KolabAdmin/include/menu.php:56
 msgid "Create New vCard"
 msgstr "Maak een nieuwe vCard"
 
-#: ../include/menu.php:54
+#: ../../lib/KolabAdmin/include/menu.php:61
 msgid "Shared Folder"
 msgstr "Gedeelde map"
 
-#: ../include/menu.php:56
+#: ../../lib/KolabAdmin/include/menu.php:63
 msgid "Manage Shared Folders"
 msgstr "Beheer gedeelde mappen"
 
-#: ../include/menu.php:64
+#: ../../lib/KolabAdmin/include/menu.php:71
 msgid "Manage Distribution Lists"
 msgstr "Beheer distributielijsten"
 
-#: ../include/menu.php:66
+#: ../../lib/KolabAdmin/include/menu.php:73
 msgid "Create New List"
 msgstr "Maak een nieuwe lijst"
 
-#: ../include/menu.php:72
+#: ../../lib/KolabAdmin/include/menu.php:79
 msgid "Manage Administrators"
 msgstr "Beheer administrators"
 
-#: ../include/menu.php:78 ../include/menu.php:95
+#: ../../lib/KolabAdmin/include/menu.php:85
+#: ../../lib/KolabAdmin/include/menu.php:102
 msgid "Manage Domain Maintainers"
 msgstr "Beheer domein beheerders"
 
-#: ../include/menu.php:84
+#: ../../lib/KolabAdmin/include/menu.php:91
 msgid "Manage Maintainers"
 msgstr "Beheer maintainers"
 
-#: ../include/menu.php:92
+#: ../../lib/KolabAdmin/include/menu.php:99
 msgid "Manage Maintainer"
 msgstr "Beheer maintainer"
 
-#: ../include/menu.php:103
+#: ../../lib/KolabAdmin/include/menu.php:110
 msgid "Manage Domain Maintainer"
 msgstr "Beheer maintainers"
 
-#: ../include/menu.php:106
-msgid "Settings"
-msgstr "Instellingen"
-
-#: ../include/menu.php:108
+#: ../../lib/KolabAdmin/include/menu.php:115
 msgid "System Settings"
 msgstr "Systeem Instellingen"
 
-#: ../include/menu.php:111 ../include/menu.php:113
+#: ../../lib/KolabAdmin/include/menu.php:118
+#: ../../lib/KolabAdmin/include/menu.php:120
 msgid "About Kolab"
 msgstr "Info over Kolab"
 
-#: ../include/menu.php:115
-msgid "Erfrakon"
-msgstr "Erfrakon"
+#: ../../lib/KolabAdmin/include/menu.php:122
+msgid "Kolab Systems"
+msgstr ""
 
-#: ../include/menu.php:117
-msgid "Intevation"
-msgstr "Intevation"
+#: ../../lib/KolabAdmin/include/menu.php:124
+msgid "Technology"
+msgstr ""
 
-#: ../include/menu.php:119
-msgid "Klarälvdalens Datakonsult"
-msgstr "Klarälvdalens Datakonsu"
+#: ../../lib/KolabAdmin/include/menu.php:128
+msgid "Versions"
+msgstr "Versies"
 
-#: ../include/menu.php:121
-msgid "Code Fusion"
-msgstr "Code Fusion"
+#: ../../lib/KolabAdmin/include/auth.class.php:40
+msgid "Server error, no ldap object!"
+msgstr "Serverfout, geen LDAP object"
 
-#: ../include/menu.php:123
-msgid "KDE"
-msgstr "KDE"
+#: ../../lib/KolabAdmin/include/auth.class.php:45
+msgid "Could not bind to LDAP server: "
+msgstr "Kon geen verbinding maken met LDAP server: "
 
-#: ../include/menu.php:127
-msgid "Versions"
-msgstr "Versies"
+#: ../../lib/KolabAdmin/include/auth.class.php:56
+msgid "Could not bind to LDAP server"
+msgstr "Kon geen verbinding maken met LDAP server"
 
-#: ../include/passwd.php:33
+#: ../../lib/KolabAdmin/include/auth.class.php:83
+#: ../../lib/KolabAdmin/include/auth.class.php:87
+msgid "Wrong username or password"
+msgstr "Verkeerde gebruikersnaam of wachtwoord"
+
+#: ../../lib/KolabAdmin/include/auth.class.php:124
+msgid "Kolab Groupware login"
+msgstr "Kolab Groupware login"
+
+#: ../../lib/KolabAdmin/include/passwd.php:33
 msgid "Password is empty"
 msgstr "Wachtwoord is leeg"
 
-#: ../include/passwd.php:36 ../include/passwd.php:41
+#: ../../lib/KolabAdmin/include/passwd.php:36
+#: ../../lib/KolabAdmin/include/passwd.php:41
 msgid "Passwords dont match"
 msgstr "Wachtwoorden stemmen niet overeen"
 
 #~ msgid ""
+#~ "Activate delivery to folder (only one of vacation, forward and delivery "
+#~ "to folder can be active at any time)"
+#~ msgstr ""
+#~ "Aflevering naar een map activeren (er kan maar Ã©Ã©n van E-mail aflevering, "
+#~ "E-mail doorsturen of Vakantie aktief zijn)"
+
+#~ msgid ""
+#~ "Activate email forwarding (only one of vacation, forward and delivery to "
+#~ "folder can be active at any time)"
+#~ msgstr ""
+#~ "Activeer doorsturen E-mail (er kan maar Ã©Ã©n van E-mail aflevering, E-mail "
+#~ "doorsturen of Vakantie aktief zijn)"
+
+#~ msgid ""
+#~ "This is the Kolab2 Server. It is Free Software developed by the <a href="
+#~ "\"http://www.kolab.org/\">Kolab Project</a>, with the intention of "
+#~ "bringing groupware functionality to Unix/KDE users as well as Windows "
+#~ "desktops."
+#~ msgstr ""
+#~ "Dit is de Kolab2 Server. Het is Free Software ontworpen door het  <a href="
+#~ "\"http://www.kolab.org/\">Kolab Project</a>, met de bedoeling groupware "
+#~ "functionaliteit te bieden voor Unix/KDE gebruikers evenals voor Microsoft "
+#~ "Windows desktops."
+
+#~ msgid "Kolab builds upon many other Free Software projects, namely:"
+#~ msgstr ""
+#~ "Kolab is gebaseerd op verschillende Free Software projecten, namelijk:"
+
+#~ msgid ""
+#~ "The following projects are used in binding the above together, in order "
+#~ "to create the Kolab Server:"
+#~ msgstr ""
+#~ "De volgende projecten worden gebruikt om in combinatie met de "
+#~ "bovenstaanden projecten de Kolab server te creÃ«ren:"
+
+#~ msgid "The following projects are used as a base for the Kolab Clients:"
+#~ msgstr ""
+#~ "De volgende projecten worden gebruikt als basis voor de Kolab Clients:"
+
+#~ msgid "User:"
+#~ msgstr "Gebruiker:"
+
+#~ msgid "Role:"
+#~ msgstr "Rol:"
+
+#~ msgid "Logout"
+#~ msgstr "Logout"
+
+#~ msgid "Not logged in"
+#~ msgstr "niet ingelogd"
+
+#~ msgid ""
+#~ "Activate vacation notification (only one of vacation, forward and "
+#~ "delivery to folder can be active at any time)"
+#~ msgstr ""
+#~ "Activeer afwezigheidsbericht (er kan maar Ã©Ã©n van E-mail aflevering, E-"
+#~ "mail doorsturen of Vakantie aktief zijn)"
+
+#~ msgid ""
+#~ "Addressbook entry DN could not be modified, distribution list <a "
+#~ "href='@kolab_wui@/distributionlist/list.php?action=modify&dn=%s'>'%s'</a> "
+#~ "depends on it. To modify this entry, first remove it from the "
+#~ "distribution list."
+#~ msgstr ""
+#~ "DN account kon niet gewijzigd worden, distributielijst <a href='/admin/"
+#~ "distributionlist/list.php?action=modify&dn=%s'>'%s'</a> is hiervan "
+#~ "afhankelijk.  Om deze account te wijzigen moet het worden verwijderd van "
+#~ "de distributielijst."
+
+#~ msgid ""
+#~ "Net/Sieve.php is missing. Without that, filter settings are not available"
+#~ msgstr ""
+#~ "Net/Sieve.php ontbreekt. Zonder daardoor <ijn de filter instellingen niet "
+#~ "beschikbaar"
+
+#, fuzzy
+#~ msgid ""
+#~ "Suggest your system administrator to run \"pear install http://pear.php."
+#~ "net/get/Net_Sieve\" on the server"
+#~ msgstr ""
+#~ "Stel Uw systeem administrator voor om \"@bindir@/pear install http://pear."
+#~ "php.net/get/Net_Sieve\" uit te voeren op de server"
+
+#~ msgid "Script was:"
+#~ msgstr "Script was:"
+
+#~ msgid ""
+#~ "Net/Sieve.php is missing. Without that, vacation settings are not "
+#~ "available"
+#~ msgstr ""
+#~ "Net/Sieve.php ontbreekt. Vakantie instellingen zijn daardoor niet "
+#~ "beschikbaar"
+
+#~ msgid "Days must be at least one"
+#~ msgstr "Tenminste 1 dag"
+
+#~ msgid "%x"
+#~ msgstr "%x"
+
+#~ msgid "I am out of office until %s.\r\n"
+#~ msgstr "Ik heb het kantoor verlaten tot %s.\r\n"
+
+#~ msgid ""
+#~ "In urgent cases, please contact Mrs. <vacation replacement>\r\n"
+#~ "\r\n"
+#~ msgstr ""
+#~ "In dringende gevallen, gelieve Mrs.te contacteren <vacation replacement>"
+#~ "\r\n"
+#~ "\r\n"
+
+#~ msgid "email: <email address of vacation replacement>\r\n"
+#~ msgstr "E-mail: <E-mailadres voor afwezigheidsberichten>\r\n"
+
+#~ msgid "phone: +49 711 1111 11\r\n"
+#~ msgstr "telefoon: +49 711 1111 11\r\n"
+
+#~ msgid ""
+#~ "fax.:  +49 711 1111 12\r\n"
+#~ "\r\n"
+#~ msgstr ""
+#~ "fax.:  +49 711 1111 12\r\n"
+#~ "\r\n"
+
+#~ msgid "Yours sincerely,\r\n"
+#~ msgstr "Met vriendelijk groeten,\r\n"
+
+#~ msgid "-- \r\n"
+#~ msgstr "-- \r\n"
+
+#~ msgid "<enter your name and email address here>"
+#~ msgstr "<vul hier uw naam en E-mailadres in>"
+
+#~ msgid "Quota must be smaller than 4096"
+#~ msgstr "Quota moet kleiner zijn dan 4096"
+
+#~ msgid ""
+#~ "Error setting LDAP protocol to v3. Please contact your system "
+#~ "administrator"
+#~ msgstr ""
+#~ "Fout met instelling LDAP protocol to v3. Gelieve contact op te nemen met "
+#~ "uw systeembeheerder "
+
+#~ msgid "No such object %s"
+#~ msgstr "Object %s bestaat niet"
+
+#~ msgid "LDAP Error searching for DN %s: %s"
+#~ msgstr "LDAP fout, kan DN %s: %s niet vinden"
+
+#~ msgid "Error searching for DN for UID=%s"
+#~ msgstr "Fout kan DN voor UID=%s niet vinden"
+
+#~ msgid "Error searching for DN for Mail=%s"
+#~ msgstr "Fout kan DN voor mail=%s niet vinden"
+
+#~ msgid "Error searching for DN for alias=%s: %s"
+#~ msgstr "Fout kan DN voor alias=%s:%s niet vinden"
+
+#~ msgid "Error searching for DN for mail or alias %s: %s"
+#~ msgstr "Fout kan DN voor mail or alias %s: %s niet vinden"
+
+#~ msgid "LDAP Error: Can't read maintainers group: "
+#~ msgstr "LDAP fout: Can't read maintainers group"
+
+#~ msgid "Erfrakon"
+#~ msgstr "Erfrakon"
+
+#~ msgid "Intevation"
+#~ msgstr "Intevation"
+
+#~ msgid "Klarälvdalens Datakonsult"
+#~ msgstr "Klarälvdalens Datakonsu"
+
+#~ msgid "Code Fusion"
+#~ msgstr "Code Fusion"
+
+#~ msgid "KDE"
+#~ msgstr "KDE"
+
+#~ msgid ""
 #~ "Using legacy services poses a security thread due to leakage of cleartext "
 #~ "passwords, lack of authenticity and privacy."
 #~ msgstr ""


commit 8f333ffca0913f264f5d0997b99454785e486d45
Author: Bogomil Shopov <bogomil at efb.bg>
Date:   Thu Jun 16 14:04:46 2011 +0300

    Fixing bug https://bugzilla.kolabsys.com/show_bug.cgi?id=98#c15.

diff --git a/www/admin/user/activesync.php b/www/admin/user/activesync.php
index d13aa24..0b211cb 100755
--- a/www/admin/user/activesync.php
+++ b/www/admin/user/activesync.php
@@ -294,7 +294,10 @@ function getFolderType($folder)
 	     {
 	     
 	      return "NOTES";
-	     }
+	     }else
+		 	{
+		 		return "MAIL";
+		 	}
 	    }else{
 	    
 	    return "MAIL";


commit 89f6617a68fcdd417791731f463a1b1d62b24bfb
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Mon Jun 13 19:13:08 2011 +0200

    Remove link to Code Fusion, their company no longer exists

diff --git a/data/templates/technology.tpl b/data/templates/technology.tpl
index 68308ca..656c120 100644
--- a/data/templates/technology.tpl
+++ b/data/templates/technology.tpl
@@ -69,7 +69,7 @@
 </p>
 
 <p>
-{tr msg="<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> joined the project soon after the original Kolab1 server was released. Its developers are primarily responsible for an updated engine (which forms the base of the Kolab2 server), the web client, as well as contributing to development of the Kolab2 storage format."}
+{tr msg="Code Fusion cc joined the project soon after the original Kolab1 server was released. Its developers are primarily responsible for an updated engine (which forms the base of the Kolab2 server), the web client, as well as contributing to development of the Kolab2 storage format."}
 </p>
 
 <div>


commit 8bc64d8788f4f9321eaee7d92dae72a9ae437aff
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Mon Jun 13 19:15:07 2011 +0200

    Replace server-team with kolab-devel list in the 'About' section

diff --git a/data/templates/technology.tpl b/data/templates/technology.tpl
index 4c2b600..68308ca 100644
--- a/data/templates/technology.tpl
+++ b/data/templates/technology.tpl
@@ -112,7 +112,7 @@
  <li>Christoph Wickert</li>
  <li>Karl-Heinz Zimmer</li>
  <li>Romain Pokrzywka</li>
- <li>{tr msg="...and anyone we forgot. Please let us know at <a href=\"mail:server-team at lists.kolabsys.com\">server-team at lists.kolabsys.com</a> so we can add you to this list."}
+ <li>{tr msg="...and anyone we forgot. Please let us know at <a href=\"mail:kolab-devel at kolab.org\">kolab-devel at kolab.org</a> so we can add you to this list."}
 </ul>
 </div>
 


commit f19c3977807bd331771f38f9835006d7f3c65e9f
Author: Bogomil Shopov <bogomil at efb.bg>
Date:   Thu Jun 2 14:23:28 2011 +0300

    Fixing bug: https://bugzilla.kolabsys.com/show_bug.cgi?id=98

diff --git a/www/admin/user/activesync.php b/www/admin/user/activesync.php
index 24aea3e..d13aa24 100755
--- a/www/admin/user/activesync.php
+++ b/www/admin/user/activesync.php
@@ -225,7 +225,7 @@ function __construct()
 		     }if($folder_chunk[2]!="" and count($folder_chunk)==3 and $folder_chunk[0]=="user")
 		     {
 		      //user folder
-		      $folder="(".$folder_chunk[1].") ".$folder_chunk[2];
+		      $folder= preg_replace(array('/INBOX\//'),array(''),$folder);
 		     }else
 			 	{
 			 		$folder= preg_replace(array('/INBOX\//'),array(''),$folder);


commit 307322725a31dc0ef38a3e020e4dbe08110159c4
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Wed Jun 1 13:30:26 2011 +0200

    Fix changelog

diff --git a/package.xml b/package.xml
index a0b8753..572b22c 100644
--- a/package.xml
+++ b/package.xml
@@ -500,7 +500,7 @@
    <date>2011-04-20</date>
    <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
    <notes>
-* Fix new welcome pages
+* Fix new welcome pages (bugzilla.kolabsys.com #87)
    </notes>
   </release>
   <release>


commit 5f18b3e5e13ce3ea1566c23e692827d5b75a2813
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Wed Jun 1 12:42:23 2011 +0200

    Update package.xml for 2.3.2 release

diff --git a/package.xml b/package.xml
index 030dbf4..a0b8753 100644
--- a/package.xml
+++ b/package.xml
@@ -26,8 +26,8 @@
  <date>2011-04-20</date>
  <time>00:44:50</time>
  <version>
-  <release>2.3.1</release>
-  <api>2.3.1</api>
+  <release>2.3.2</release>
+  <api>2.3.0</api>
  </version>
  <stability>
   <release>alpha</release>
@@ -518,5 +518,20 @@
 * Move all graphics from www/admin/pics to www/admin/images
    </notes>
   </release>
+  <release>
+   <version>
+    <release>2.3.2</release>
+    <api>2.3.0</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2011-05-06</date>
+   <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
+   <notes>
+* Fix subfolders issue (bugzilla.kolabsys.com #98)
+   </notes>
+  </release>
  </changelog>
 </package>


commit 1a581744905422b7abe87338e9a1e6a329709647
Merge: f107996... c4ee8ec...
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Wed Jun 1 12:33:25 2011 +0200

    Merge with master for release

diff --cc data/templates/welcome-admin.tpl
index 7a88759,99af818..bcb7856
--- a/data/templates/welcome-admin.tpl
+++ b/data/templates/welcome-admin.tpl
@@@ -7,25 -7,34 +7,34 @@@
  <div class="contenttext">
  <h1>{tr msg="Welcome to the Kolab Groupware Server Administration"}</h1>
  
- <table cellspacing="10" cellpadding="10">
+ <table cellspacing="10" cellpadding="10" style="background:#d0e2e6">
  <tr>
  <td>
- <a href="/admin/user/" class="welcomelinks"><img src="/admin/pics/system-users.png" border="0" alt="Manage Users" /><br /><b>{tr msg="Manage Users"}</b></a>
+ <a href="/admin/user/" class="welcomelinks"><img src="/admin/images/system-users.png" border="0" alt="Manage Users" /><br /><b>{tr msg="Manage Users"}</b></a>
  </td>
  <td>
- <a href="/admin/addressbook/" class="welcomelinks"><img src="/admin/pics/office-address-book.png" border="0" alt="Addressbook" /><br /><b>{tr msg="Addressbook"}</b></a>
+ <a href="/admin/addressbook/" class="welcomelinks"><img src="/admin/images/office-address-book.png" border="0" alt="Addressbook" /><br /><b>{tr msg="Addressbook"}</b></a>
  </td>
  <td>
- <a href="/admin/sharedfolder/" class="welcomelinks"><img src="/admin/pics/preferences-system-network-sharing.png" border="0" alt="Shared Folders" /><br /><b>{tr msg="Shared Folders"}</b></a>
+ <a href="/admin/sharedfolder/" class="welcomelinks"><img src="/admin/images/preferences-system-network-sharing.png" border="0" alt="Shared Folders" /><br /><b>{tr msg="Shared Folders"}</b></a>
  </td>
  <td>
- <a href="/admin/administrator/" class="welcomelinks"><img src="/admin/pics/resource-group.png" border="0" alt="Administrator" /><br /><b>{tr msg="Administrator"}</b></a>
+ <a href="/admin/distributionlist/" class="welcomelinks"><img src="/admin/images/list.png" border="0" alt="Distribution Lists" /><br /><b>{tr msg="Distribution Lists"}</b></a>
  </td>
  <td>
- <a href="/admin/settings/" class="welcomelinks"><img src="/admin/pics/preferences-system.png" border="0" alt="Settings" /><br /><b>{tr msg="Settings"}</b></a>
+ <a href="/admin/administrator/" class="welcomelinks"><img src="/admin/images/resource-group.png" border="0" alt="Administrator" /><br /><b>{tr msg="Administrator"}</b></a>
  </td>
  <td>
- <a href="/admin/kolab/" class="welcomelinks"><img src="/admin/pics/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
+ <a href="/admin/maintainer/" class="welcomelinks"><img src="/admin/images/book.png" border="0" alt="Manage Maintainers" /><br /><b>{tr msg="Maintainers"}</b></a>
+ </td>
+ <td>
+ <a href="/admin/domainmaintainer/" class="welcomelinks"><img src="/admin/images/book2.png" border="0" alt="Domain Maintainers" /><br /><b>{tr msg="Domain Maintainers"}</b></a>
+ </td>
+ <td>
+ <a href="/admin/settings/" class="welcomelinks"><img src="/admin/images/preferences-system.png" border="0" alt="Settings" /><br /><b>{tr msg="Settings"}</b></a>
+ </td>
+ <td>
+ <a href="/admin/kolab/" class="welcomelinks"><img src="/admin/images/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
  </td>
  </tr></table>
--</div>
++</div>
diff --cc data/templates/welcome-domain-maintainer.tpl
index 9de2f87,282e7ec..1dc4550
--- a/data/templates/welcome-domain-maintainer.tpl
+++ b/data/templates/welcome-domain-maintainer.tpl
@@@ -7,16 -7,22 +7,32 @@@
  <div class="contenttext">
  <h1>{tr msg="Welcome to the Kolab Groupware Server Maintenance"}</h1>
  
 +<table cellspacing="10" cellpadding="10">
 +<tr>
 +<td>
 +<a href="/admin/user/" class="welcomelinks"><img src="/admin/pics/system-users.png" border="0" alt="Manage Users" /><br /><b>{tr msg="Manage Users"}</b></a>
 +</td>
 +<td>
 +<a href="/admin/sharedfolder/" class="welcomelinks"><img src="/admin/pics/preferences-system-network-sharing.png" border="0" alt="Shared Folders" /><br /><b>{tr msg="Shared Folders"}</b></a>
 +</td>
 +<td>
 +<a href="/admin/kolab/" class="welcomelinks"><img src="/admin/pics/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
+ <table cellspacing="10" cellpadding="10" style="background:#d0e2e6">
+ <tr>
+ <td>
+ <a href="/admin/user/" class="welcomelinks"><img src="/admin/images/system-users.png" border="0" alt="Manage Users" /><br /><b>{tr msg="Manage Users"}</b></a>
+ </td>
+ <td>
+ <a href="/admin/sharedfolder/" class="welcomelinks"><img src="/admin/images/preferences-system-network-sharing.png" border="0" alt="Shared Folders" /><br /><b>{tr msg="Shared Folders"}</b></a>
+ </td>
+ <td>
+ <a href="/admin/distributionlist/" class="welcomelinks"><img src="/admin/images/list.png" border="0" alt="Distribution Lists" /><br /><b>{tr msg="Distribution Lists"}</b></a>
+ </td>
+ <td>
+ <a href="{$dmurl}" class="welcomelinks"><img src="/admin/images/book2.png" border="0" alt="Domain Maintainers" /><br /><b>{tr msg="Domain Maintainers"}</b></a>
+ </td>
+ <td>
+ <a href="/admin/kolab/" class="welcomelinks"><img src="/admin/images/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
  </td>
  </tr></table>
--</div>
++</div>
diff --cc data/templates/welcome-maintainer.tpl
index ecffab7,c920efb..36e27ac
--- a/data/templates/welcome-maintainer.tpl
+++ b/data/templates/welcome-maintainer.tpl
@@@ -7,25 -7,28 +7,28 @@@
  <div class="contenttext">
  <h1>{tr msg="Welcome to the Kolab Groupware Server Maintenance"}</h1>
  
- <table cellspacing="10" cellpadding="10">
+ <table cellspacing="10" cellpadding="10" style="background:#d0e2e6">
  <tr>
  <td>
- <a href="/admin/user/" class="welcomelinks"><img src="/admin/pics/system-users.png" border="0" alt="Manage Users" /><br /><b>{tr msg="Manage Users"}</b></a>
+ <a href="/admin/user/" class="welcomelinks"><img src="/admin/images/system-users.png" border="0" alt="Manage Users" /><br /><b>{tr msg="Manage Users"}</b></a>
  </td>
  <td>
- <a href="/admin/addressbook/" class="welcomelinks"><img src="/admin/pics/office-address-book.png" border="0" alt="Addressbook" /><br /><b>{tr msg="Addressbook"}</b></a>
+ <a href="/admin/addressbook/" class="welcomelinks"><img src="/admin/images/office-address-book.png" border="0" alt="Addressbook" /><br /><b>{tr msg="Addressbook"}</b></a>
  </td>
  <td>
- <a href="/admin/sharedfolder/" class="welcomelinks"><img src="/admin/pics/preferences-system-network-sharing.png" border="0" alt="Shared Folders" /><br /><b>{tr msg="Shared Folders"}</b></a>
+ <a href="/admin/sharedfolder/" class="welcomelinks"><img src="/admin/images/preferences-system-network-sharing.png" border="0" alt="Shared Folders" /><br /><b>{tr msg="Shared Folders"}</b></a>
  </td>
  <td>
- <a href="/admin/administrator/" class="welcomelinks"><img src="/admin/pics/resource-group.png" border="0" alt="Administrator" /><br /><b>{tr msg="Administrator"}</b></a>
+ <a href="/admin/distributionlist/" class="welcomelinks"><img src="/admin/images/list.png" border="0" alt="Distribution Lists" /><br /><b>{tr msg="Distribution Lists"}</b></a>
  </td>
  <td>
- <a href="/admin/settings/" class="welcomelinks"><img src="/admin/pics/preferences-system.png" border="0" alt="Settings" /><br /><b>{tr msg="Settings"}</b></a>
+ <a href="{$murl}" class="welcomelinks"><img src="/admin/images/book.png" border="0" alt="Manage Maintainers" /><br /><b>{tr msg="Maintainers"}</b></a>
  </td>
  <td>
- <a href="/admin/kolab/" class="welcomelinks"><img src="/admin/pics/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
+ <a href="/admin/domainmaintainer/" class="welcomelinks"><img src="/admin/images/book2.png" border="0" alt="Domain Maintainers" /><br /><b>{tr msg="Domain Maintainers"}</b></a>
+ </td>
+ <td>
+ <a href="/admin/kolab/" class="welcomelinks"><img src="/admin/images/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
  </td>
  </tr></table>
--</div>
++</div>
diff --cc data/templates/welcome-user.tpl
index 6bd553d,7f09576..a57f91b
--- a/data/templates/welcome-user.tpl
+++ b/data/templates/welcome-user.tpl
@@@ -7,13 -7,16 +7,16 @@@
  <div class="contenttext">
  <h1>{tr msg="Welcome to the Kolab Groupware Server"}</h1>
  
- <table cellspacing="10" cellpadding="10">
+ <table cellspacing="10" cellpadding="10" style="background:#d0e2e6">
  <tr>
  <td>
- <a href="/admin/user/user.php?action=modify" class="welcomelinks"><img src="/admin/pics/preferences-system.png" border="0" alt="My settings" /><br /><b>{tr msg="My settings"}</b></a>
+ <a href="/admin/user/user.php?action=modify" class="welcomelinks"><img src="/admin/images/preferences-system.png" border="0" alt="My settings" /><br /><b>{tr msg="My settings"}</b></a>
  </td>
  <td>
- <a href="/admin/kolab/" class="welcomelinks"><img src="/admin/pics/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
+ <a href="/admin/user/activesync.php" class="welcomelinks"><img src="/admin/images/phone.png" border="0" alt="ActiveSync" /><br /><b>{tr msg="ActiveSync"}</b></a>
+ </td>
+ <td>
+ <a href="/admin/kolab/" class="welcomelinks"><img src="/admin/images/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
  </td>
  </tr></table>
--</div>
++</div>


commit f1079963b6b1bd71eda4e21f88c41419c1f619ca
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Wed Apr 20 14:53:00 2011 +0200

    Include welcome-domain-maintainer.tpl in package.xml

diff --git a/package.xml b/package.xml
index f1a991f..13e7375 100644
--- a/package.xml
+++ b/package.xml
@@ -26,7 +26,7 @@
  <date>2011-04-20</date>
  <time>00:44:50</time>
  <version>
-  <release>2.3.0.1</release>
+  <release>2.3.0.2</release>
   <api>2.3.0</api>
  </version>
  <stability>
@@ -104,6 +104,7 @@
      <file name="versions.tpl" role="data" />
      <file name="welcome.tpl" role="data" />
      <file name="welcome-admin.tpl" role="data" />
+     <file name="welcome-domain-maintainer.tpl" role="data" />
      <file name="welcome-maintainer.tpl" role="data" />
      <file name="welcome-user.tpl" role="data" />
     </dir> <!-- /data/templates -->
@@ -309,6 +310,7 @@
    <install as="templates/versions.tpl" name="data/templates/versions.tpl" />
    <install as="templates/welcome.tpl" name="data/templates/welcome.tpl" />
    <install as="templates/welcome-admin.tpl" name="data/templates/welcome-admin.tpl" />
+   <install as="templates/welcome-domain-maintainer.tpl" name="data/templates/welcome-domain-maintainer.tpl" />
    <install as="templates/welcome-maintainer.tpl" name="data/templates/welcome-maintainer.tpl" />
    <install as="templates/welcome-user.tpl" name="data/templates/welcome-user.tpl" />
    <install as="KolabAdmin/Ldap.php" name="lib/KolabAdmin/Ldap.php" />
@@ -451,5 +453,20 @@
 * Include ActiveSync configuration
    </notes>
   </release>
+  <release>
+   <version>
+    <release>2.3.0.2</release>
+    <api>2.3.0</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2011-04-20</date>
+   <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
+   <notes>
+* Fix new welcome pages
+   </notes>
+  </release>
  </changelog>
 </package>


commit d849f1b3fff9dbe4e7217cb928483dc3aa5532fd
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Wed Apr 20 14:43:48 2011 +0200

    Fix permissions

diff --git a/data/templates/welcome-user.tpl b/data/templates/welcome-user.tpl
old mode 100755
new mode 100644
diff --git a/www/admin/custom.css b/www/admin/custom.css
old mode 100755
new mode 100644
diff --git a/www/admin/index.php b/www/admin/index.php
old mode 100755
new mode 100644


commit 2124f52d0de5d9596c7efdc45732c1ff8cc96138
Author: Bogomil Shopov <shopov at kolabsys.com>
Date:   Wed Apr 20 14:57:54 2011 +0300

    New welcome screen fixes. https://bugzilla.kolabsys.com/show_bug.cgi?id=87

diff --git a/data/templates/welcome-admin.tpl b/data/templates/welcome-admin.tpl
old mode 100644
new mode 100755
index fd8e441..7a88759
--- a/data/templates/welcome-admin.tpl
+++ b/data/templates/welcome-admin.tpl
@@ -10,22 +10,22 @@
 <table cellspacing="10" cellpadding="10">
 <tr>
 <td>
-<a href="/admin/user/"><img src="/admin/pics/system-users.png" border="0" alt="Manage Users" /><br /><b>{tr msg="Manage Users"}</b></a>
+<a href="/admin/user/" class="welcomelinks"><img src="/admin/pics/system-users.png" border="0" alt="Manage Users" /><br /><b>{tr msg="Manage Users"}</b></a>
 </td>
 <td>
-<a href="/admin/addressbook/"><img src="/admin/pics/office-address-book.png" border="0" alt="Addressbook" /><br /><b>{tr msg="Addressbook"}</b></a>
+<a href="/admin/addressbook/" class="welcomelinks"><img src="/admin/pics/office-address-book.png" border="0" alt="Addressbook" /><br /><b>{tr msg="Addressbook"}</b></a>
 </td>
 <td>
-<a href="/admin/sharedfolder/"><img src="/admin/pics/preferences-system-network-sharing.png" border="0" alt="Shared Folders" /><br /><b>{tr msg="Shared Folders"}</b></a>
+<a href="/admin/sharedfolder/" class="welcomelinks"><img src="/admin/pics/preferences-system-network-sharing.png" border="0" alt="Shared Folders" /><br /><b>{tr msg="Shared Folders"}</b></a>
 </td>
 <td>
-<a href="/admin/administrator/"><img src="/admin/pics/resource-group.png" border="0" alt="Administrator" /><br /><b>{tr msg="Administrator"}</b></a>
+<a href="/admin/administrator/" class="welcomelinks"><img src="/admin/pics/resource-group.png" border="0" alt="Administrator" /><br /><b>{tr msg="Administrator"}</b></a>
 </td>
 <td>
-<a href="/admin/settings/"><img src="/admin/pics/preferences-system.png" border="0" alt="Settings" /><br /><b>{tr msg="Settings"}</b></a>
+<a href="/admin/settings/" class="welcomelinks"><img src="/admin/pics/preferences-system.png" border="0" alt="Settings" /><br /><b>{tr msg="Settings"}</b></a>
 </td>
 <td>
-<a href="/admin/kolab/"><img src="/admin/pics/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
+<a href="/admin/kolab/" class="welcomelinks"><img src="/admin/pics/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
 </td>
-
+</tr></table>
 </div>
\ No newline at end of file
diff --git a/data/templates/welcome-domain-maintainer.tpl b/data/templates/welcome-domain-maintainer.tpl
new file mode 100644
index 0000000..9de2f87
--- /dev/null
+++ b/data/templates/welcome-domain-maintainer.tpl
@@ -0,0 +1,22 @@
+{* Smarty Template *}
+{*
+  Local variables:
+  buffer-file-coding-system: utf-8
+  End:
+*}
+<div class="contenttext">
+<h1>{tr msg="Welcome to the Kolab Groupware Server Maintenance"}</h1>
+
+<table cellspacing="10" cellpadding="10">
+<tr>
+<td>
+<a href="/admin/user/" class="welcomelinks"><img src="/admin/pics/system-users.png" border="0" alt="Manage Users" /><br /><b>{tr msg="Manage Users"}</b></a>
+</td>
+<td>
+<a href="/admin/sharedfolder/" class="welcomelinks"><img src="/admin/pics/preferences-system-network-sharing.png" border="0" alt="Shared Folders" /><br /><b>{tr msg="Shared Folders"}</b></a>
+</td>
+<td>
+<a href="/admin/kolab/" class="welcomelinks"><img src="/admin/pics/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
+</td>
+</tr></table>
+</div>
\ No newline at end of file
diff --git a/data/templates/welcome-maintainer.tpl b/data/templates/welcome-maintainer.tpl
old mode 100644
new mode 100755
index ef5f190..ecffab7
--- a/data/templates/welcome-maintainer.tpl
+++ b/data/templates/welcome-maintainer.tpl
@@ -10,22 +10,22 @@
 <table cellspacing="10" cellpadding="10">
 <tr>
 <td>
-<a href="/admin/user/"><img src="/admin/pics/system-users.png" border="0" alt="Manage Users" /><br /><b>{tr msg="Manage Users"}</b></a>
+<a href="/admin/user/" class="welcomelinks"><img src="/admin/pics/system-users.png" border="0" alt="Manage Users" /><br /><b>{tr msg="Manage Users"}</b></a>
 </td>
 <td>
-<a href="/admin/addressbook/"><img src="/admin/pics/office-address-book.png" border="0" alt="Addressbook" /><br /><b>{tr msg="Addressbook"}</b></a>
+<a href="/admin/addressbook/" class="welcomelinks"><img src="/admin/pics/office-address-book.png" border="0" alt="Addressbook" /><br /><b>{tr msg="Addressbook"}</b></a>
 </td>
 <td>
-<a href="/admin/sharedfolder/"><img src="/admin/pics/preferences-system-network-sharing.png" border="0" alt="Shared Folders" /><br /><b>{tr msg="Shared Folders"}</b></a>
+<a href="/admin/sharedfolder/" class="welcomelinks"><img src="/admin/pics/preferences-system-network-sharing.png" border="0" alt="Shared Folders" /><br /><b>{tr msg="Shared Folders"}</b></a>
 </td>
 <td>
-<a href="/admin/administrator/"><img src="/admin/pics/resource-group.png" border="0" alt="Administrator" /><br /><b>{tr msg="Administrator"}</b></a>
+<a href="/admin/administrator/" class="welcomelinks"><img src="/admin/pics/resource-group.png" border="0" alt="Administrator" /><br /><b>{tr msg="Administrator"}</b></a>
 </td>
 <td>
-<a href="/admin/settings/"><img src="/admin/pics/preferences-system.png" border="0" alt="Settings" /><br /><b>{tr msg="Settings"}</b></a>
+<a href="/admin/settings/" class="welcomelinks"><img src="/admin/pics/preferences-system.png" border="0" alt="Settings" /><br /><b>{tr msg="Settings"}</b></a>
 </td>
 <td>
-<a href="/admin/kolab/"><img src="/admin/pics/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
+<a href="/admin/kolab/" class="welcomelinks"><img src="/admin/pics/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
 </td>
-
+</tr></table>
 </div>
\ No newline at end of file
diff --git a/data/templates/welcome-user.tpl b/data/templates/welcome-user.tpl
old mode 100644
new mode 100755
index 968f378..6bd553d
--- a/data/templates/welcome-user.tpl
+++ b/data/templates/welcome-user.tpl
@@ -10,10 +10,10 @@
 <table cellspacing="10" cellpadding="10">
 <tr>
 <td>
-<a href="/admin/user/user.php?action=modify"><img src="/admin/pics/preferences-system.png" border="0" alt="My settings" /><br /><b>{tr msg="My settings"}</b></a>
+<a href="/admin/user/user.php?action=modify" class="welcomelinks"><img src="/admin/pics/preferences-system.png" border="0" alt="My settings" /><br /><b>{tr msg="My settings"}</b></a>
 </td>
 <td>
-<a href="/admin/kolab/"><img src="/admin/pics/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
+<a href="/admin/kolab/" class="welcomelinks"><img src="/admin/pics/dialog-information.png" border="0" alt="About Kolab" /><br /><b>{tr msg="About"}</b></a>
 </td>
-
+</tr></table>
 </div>
\ No newline at end of file
diff --git a/www/admin/custom.css b/www/admin/custom.css
old mode 100644
new mode 100755
index c529cca..1fdc164
--- a/www/admin/custom.css
+++ b/www/admin/custom.css
@@ -181,3 +181,10 @@ border: 1px dashed;
 background-color: #c6ced8;
 
 }
+
+.welcomelinks{
+	color: #5d5656;
+	text-decoration: none;
+	font-size:12px;
+	text-align: center;
+}
diff --git a/www/admin/index.php b/www/admin/index.php
old mode 100644
new mode 100755
index 265a221..d4e5d9a
--- a/www/admin/index.php
+++ b/www/admin/index.php
@@ -57,6 +57,9 @@ if ($auth->group() == 'user') {
 if ($auth->group() == 'maintainer') {
   $maincontent = 'welcome-maintainer.tpl';
 }
+if ($auth->group() == 'domain-maintainer') {
+  $maincontent = 'welcome-domain-maintainer.tpl';
+}
 
 
 /**** Insert into template and output ***/


commit 4acbda2fb20feced57d780d4479313508ee99340
Author: Bogomil Shopov <shopov at kolabsys.com>
Date:   Wed Apr 20 11:51:53 2011 +0300

    Fixing the UID problem in user.php.

diff --git a/www/admin/user/user.php b/www/admin/user/user.php
index 7d757f2..215e792 100644
--- a/www/admin/user/user.php
+++ b/www/admin/user/user.php
@@ -706,7 +706,7 @@ switch( $action ) {
 
 			   if ( !$errors ) {
 				 // Try to rename the object
-				 if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap->dn_escape($ldap_object['cn']), $domain_dn, true)) {
+				 if (!ldap_rename($ldap->connection, $dn, $new_uid, $domain_dn, true)) {
 				   array_push($errors, sprintf(_("LDAP Error: could not rename %s to %s: %s"), $dn,
 											   $newdn, ldap_error($ldap->connection)));
 				 }
@@ -715,7 +715,7 @@ switch( $action ) {
 				   if (!ldap_modify($ldap->connection, $newdn, $ldap_object)) {
 					 // While this should not happen, in case it does, we need to revert the
 					 // renaming
-					 array_push($errors, sprintf(_("LDAP Error: could not modify %s to %s: %s"), $newdn,
+					 array_push($errors, sprintf(_("LDAP Error: could not modify %s: %s"), $newdn,
 												 ldap_error($ldap->connection)));
 					 $old_dn = substr($dn, 0, strlen($dn) - strlen($domain_dn) - 1);
 					 ldap_rename($ldap->connection, $newdn, $old_dn, $domain_dn, true);


commit c53b93336d45d07f88f1a84ad62f0cf81706d604
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Wed Apr 20 02:56:51 2011 +0200

    Fix paths of includes in the new About section

diff --git a/www/admin/kolab/kolabsystems.php b/www/admin/kolab/kolabsystems.php
index 8451066..b2af70f 100644
--- a/www/admin/kolab/kolabsystems.php
+++ b/www/admin/kolab/kolabsystems.php
@@ -8,15 +8,15 @@
  Read the file COPYING that comes with this packages for details.
 */
 
-require_once('admin/include/mysmarty.php');
-require_once('admin/include/headers.php');
-require_once('admin/include/locale.php');
-require_once('admin/include/authenticate.php');
+require_once('KolabAdmin/include/mysmarty.php');
+require_once('KolabAdmin/include/headers.php');
+require_once('KolabAdmin/include/locale.php');
+require_once('KolabAdmin/include/authenticate.php');
 
 /**** Authentication etc. ***/
 $sidx = 'about';
 
-require_once('admin/include/menu.php');
+require_once('KolabAdmin/include/menu.php');
 
 
 /**** Submenu for current page ***/
diff --git a/www/admin/kolab/technology.php b/www/admin/kolab/technology.php
index f5d8a3b..1217933 100644
--- a/www/admin/kolab/technology.php
+++ b/www/admin/kolab/technology.php
@@ -7,15 +7,15 @@
  Read the file COPYING that comes with this packages for details.
 */
 
-require_once('admin/include/mysmarty.php');
-require_once('admin/include/headers.php');
-require_once('admin/include/locale.php');
-require_once('admin/include/authenticate.php');
+require_once('KolabAdmin/include/mysmarty.php');
+require_once('KolabAdmin/include/headers.php');
+require_once('KolabAdmin/include/locale.php');
+require_once('KolabAdmin/include/authenticate.php');
 
 /**** Authentication etc. ***/
 $sidx = 'about';
 
-require_once('admin/include/menu.php');
+require_once('KolabAdmin/include/menu.php');
 
 
 /**** Submenu for current page ***/


commit 6f6a29b33e5a68e3faaf9c32bf93805d255231c9
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Wed Apr 20 00:51:46 2011 +0200

    Bump version to 2.3.0.1, include all developers and update changelog

diff --git a/package.xml b/package.xml
index dcde2a7..f1a991f 100644
--- a/package.xml
+++ b/package.xml
@@ -11,10 +11,22 @@
   <email>p at rdus.de</email>
   <active>yes</active>
  </lead>
- <date>2010-09-14</date>
- <time>16:02:38</time>
+ <developer>
+  <name>Bogomil Shopov</name>
+  <user>shopov</user>
+  <email>shopov at kolabsys.com</email>
+  <active>yes</active>
+ </developer>
+ <contributor>
+  <name>Christoph Wickert</name>
+  <user>wickert</user>
+  <email>wickert at kolabsys.com</email>
+  <active>yes</active>
+ </contributor>
+ <date>2011-04-20</date>
+ <time>00:44:50</time>
  <version>
-  <release>2.3.0</release>
+  <release>2.3.0.1</release>
   <api>2.3.0</api>
  </version>
  <stability>
@@ -409,5 +421,35 @@
 * Initial PEAR packaging.
    </notes>
   </release>
+  <release>
+   <version>
+    <release>2.3.0</release>
+    <api>2.3.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2011-04-15</date>
+   <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
+   <notes>
+* Package for Kolab Server 2.3.0 release
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>2.3.0.1</release>
+    <api>2.3.0</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2011-04-20</date>
+   <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
+   <notes>
+* Include ActiveSync configuration
+   </notes>
+  </release>
  </changelog>
 </package>


commit eb180b7052b324431d8b745d18fdbc66beefb3a9
Author: Bogomil Shopov <shopov at kolabsys.com>
Date:   Tue Apr 19 17:46:32 2011 +0100

    Fix #75: Problems with new UID based dn

diff --git a/www/admin/user/user.php b/www/admin/user/user.php
index 7ba9d27..7d757f2 100644
--- a/www/admin/user/user.php
+++ b/www/admin/user/user.php
@@ -662,6 +662,9 @@ switch( $action ) {
 	   
        if ($action == "save") {
 		 if (!$errors) {
+           // We need the unmodified uid rdn for renaming
+           $new_uid = "uid=" . $ldap->dn_escape($ldap_object['uid']);
+
 		   if (!empty($ldap_object['uid'])) $newdn = "uid=".$ldap->dn_escape($ldap_object['uid']).",".$domain_dn;
 		   else $newdn = $dn;
 		   if (strcmp($dn,$newdn) != 0) {
@@ -674,7 +677,10 @@ switch( $action ) {
 			 if (($result=ldap_read($ldap->connection,$dn,"(objectclass=*)")) &&
 				 ($entry=ldap_first_entry($ldap->connection,$result)) &&
 				 ($oldattrs=ldap_get_attributes($ldap->connection,$entry))) {
-			   $ldap_object['uid'] = $oldattrs['uid'][0];
+
+               // This is no longer necessary.
+			   //$ldap_object['uid'] = $oldattrs['uid'][0];
+
 			   $ldap_object['mail'] = $oldattrs['mail'][0];
 			   unset( $oldattrs['count'] );
 			   foreach( $oldattrs as $k => $v ) {



