From 1c26603f4fd393156a29ab1415e604c4965a907b Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Wed, 4 Jul 2012 15:18:43 +0200
Subject: [PATCH] Translation files update.

---
 modoboa/locale/de/LC_MESSAGES/django.po   | 1308 ++++++++++++---------
 modoboa/locale/de/LC_MESSAGES/djangojs.po |   48 +-
 modoboa/locale/en/LC_MESSAGES/django.po   | 1060 +++++++++--------
 modoboa/locale/en/LC_MESSAGES/djangojs.po |   46 +-
 modoboa/locale/es/LC_MESSAGES/django.po   | 1224 +++++++++++--------
 modoboa/locale/es/LC_MESSAGES/djangojs.po |   52 +-
 modoboa/locale/fr/LC_MESSAGES/django.po   | 1095 +++++++++--------
 modoboa/locale/fr/LC_MESSAGES/djangojs.po |   48 +-
 8 files changed, 2783 insertions(+), 2098 deletions(-)

diff --git a/modoboa/locale/de/LC_MESSAGES/django.po b/modoboa/locale/de/LC_MESSAGES/django.po
index 27021e11a..fad8bec8c 100644
--- a/modoboa/locale/de/LC_MESSAGES/django.po
+++ b/modoboa/locale/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Modoboa-0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-03 10:59+0200\n"
+"POT-Creation-Date: 2012-07-04 15:16+0200\n"
 "PO-Revision-Date: 2012-05-10 17:06+0100\n"
 "Last-Translator: Patrick Ben Koetter <p@state-of-mind.de>\n"
 "Language-Team: DE <p@state-of-mind.de>\n"
@@ -34,36 +34,46 @@ msgid "Path to the root directory where messages are stored"
 msgstr "Pfad zum root-Verzeichnis unterhalb dessen E-Mails abgelegt werden"
 
 #: admin/__init__.py:17
-msgid "UID of the virtual user which owns domains/mailboxes/messages on the filesystem"
-msgstr "UID des virtuellen Benutzers, der Besitzer der Domains, Mailboxen und Nachrichten im Dateisystem ist."
+msgid ""
+"UID of the virtual user which owns domains/mailboxes/messages on the "
+"filesystem"
+msgstr ""
+"UID des virtuellen Benutzers, der Besitzer der Domains, Mailboxen und "
+"Nachrichten im Dateisystem ist."
 
 #: admin/__init__.py:19
-msgid "GID of the virtual user which owns domains/mailboxes/messages on the filesystem"
-msgstr "GID des virtuellen Benutzers, der Besitzer der Domains, Mailboxen und Nachrichten im Dateisystem ist."
+msgid ""
+"GID of the virtual user which owns domains/mailboxes/messages on the "
+"filesystem"
+msgstr ""
+"GID des virtuellen Benutzers, der Besitzer der Domains, Mailboxen und "
+"Nachrichten im Dateisystem ist."
 
 #: admin/__init__.py:22
 msgid "Mailboxes storage format"
 msgstr "Mailbox erstellt."
 
 #: admin/__init__.py:24
-msgid "Sub-directory (inside the mailbox) where messages are stored when using the maildir format"
-msgstr "Unterverzeichnis (innerhalb der Mailbox) in dem Nachrichten abgelegt werden wenn Maildir-Format eingesetzt wird."
+msgid ""
+"Sub-directory (inside the mailbox) where messages are stored when using the "
+"maildir format"
+msgstr ""
+"Unterverzeichnis (innerhalb der Mailbox) in dem Nachrichten abgelegt werden "
+"wenn Maildir-Format eingesetzt wird."
 
-#: admin/__init__.py:28
+#: admin/__init__.py:32
 msgid "Scheme used to crypt mailbox passwords"
 msgstr "Verschlüsselungsschema der Mailbox-Passworte"
 
-#: admin/__init__.py:31
+#: admin/__init__.py:35
 msgid "Number of displayed items per page"
 msgstr "Anzahl dargestellter Einträge pro Seite"
 
-#: admin/__init__.py:54
+#: admin/__init__.py:57
 msgid "The default redirection used when no application is specified"
 msgstr "Die Standardumleitung wenn kein Programm angegeben wurde"
 
-#: admin/forms.py:15
-#: admin/forms.py:396
-#: admin/tables.py:17
+#: admin/forms.py:15 admin/forms.py:445 admin/tables.py:17
 msgid "Alias(es)"
 msgstr "Aliase"
 
@@ -71,185 +81,180 @@ msgstr "Aliase"
 msgid "Alias(es) of this domain"
 msgstr "Aliase dieser Domain"
 
-#: admin/forms.py:51
-#: admin/views.py:60
+#: admin/forms.py:54
 msgid "An alias with this name already exists"
 msgstr "Ein Alias mit diesem Namen existiert bereits"
 
-#: admin/forms.py:66
+#: admin/forms.py:69
 msgid "A domain with this name already exists"
 msgstr "Eine Domäne mit diesem Namen existiert bereits"
 
-#: admin/forms.py:76
+#: admin/forms.py:79
 msgid "Failed to rename domain, check permissions"
 msgstr "Domäne konnte nicht umbenannt werden. Prüfen Sie die Berechtigungen."
 
-#: admin/forms.py:103
+#: admin/forms.py:110 admin/forms.py:598 admin/views.py:363
+msgid "General"
+msgstr "Grundsätzlich"
+
+#: admin/forms.py:132
 msgid "Email address"
 msgstr "E-Mail Adresse"
 
-#: admin/forms.py:104
+#: admin/forms.py:133
 msgid "The distribution list address"
 msgstr "Adresse der Verteilerliste"
 
-#: admin/forms.py:107
+#: admin/forms.py:136
 msgid "Recipients"
 msgstr "Empfänger"
 
-#: admin/forms.py:108
-msgid "Mailbox(es) this alias will point to"
-msgstr "Mailbox(en) auf den der Alias verweisen wird"
+#: admin/forms.py:137
+msgid ""
+"Mailbox(es) this alias will point to. Indicate only one address per input, "
+"press ENTER to add a new input."
+msgstr ""
 
-#: admin/forms.py:142
-#: admin/forms.py:221
-#: admin/forms.py:429
-#: admin/models.py:779
+#: admin/forms.py:171 admin/forms.py:250 admin/forms.py:478
+#: admin/models.py:809
 msgid "Domain does not exist"
 msgstr "Domain existiert nicht"
 
-#: admin/forms.py:144
-#: admin/forms.py:223
+#: admin/forms.py:173 admin/forms.py:252
 msgid "You don't have access to this domain"
 msgstr "Der Zugriff auf diese Domain ist ihnen nicht gestattet"
 
-#: admin/forms.py:164
+#: admin/forms.py:193
 msgid "Invalid mailbox"
 msgstr "Ungültige Mailbox"
 
-#: admin/forms.py:175
-#: admin/models.py:799
+#: admin/forms.py:204 admin/models.py:829
 #, python-format
 msgid "Mailbox %s does not exist"
 msgstr "Mailbox %s existiert nicht"
 
-#: admin/forms.py:184
+#: admin/forms.py:213
 msgid "No recipient defined"
 msgstr "Keine Empfänger angegeben"
 
-#: admin/forms.py:187
+#: admin/forms.py:216
 msgid "A distribution list must contain at least two recipients"
 msgstr "Eine Verteilerliste muss mindestens zwei Empfänger haben"
 
-#: admin/forms.py:201
+#: admin/forms.py:230
 msgid "Address"
 msgstr "Adresse"
 
-#: admin/forms.py:202
+#: admin/forms.py:231
 msgid "A valid e-mail address"
 msgstr "Eine gültige E-Mail-Adresse"
 
-#: admin/forms.py:238
-#: admin/forms.py:267
-#: extensions/sievefilters/forms.py:70
+#: admin/forms.py:267 admin/forms.py:296 extensions/sievefilters/forms.py:70
 msgid "Recipient"
 msgstr "Empfänger"
 
-#: admin/forms.py:239
+#: admin/forms.py:268
 msgid "A local recipient address"
 msgstr "Eine lokale Empfänger-Adresse"
 
-#: admin/forms.py:254
+#: admin/forms.py:283
 msgid "Mailbox does not exist"
 msgstr "Mailbox existiert nicht"
 
-#: admin/forms.py:256
+#: admin/forms.py:285
 msgid "You can't access this mailbox"
 msgstr "Sie können auf diese Mailbox nicht zugreifen"
 
-#: admin/forms.py:268
+#: admin/forms.py:297
 msgid "An external recipient address"
 msgstr "Adresse eines externen Empfängers"
 
-#: admin/forms.py:285
+#: admin/forms.py:314
 msgid "Local recipients are forbidden"
 msgstr "Lokale Empfänger sind nicht gestattet"
 
-#: admin/forms.py:295
-#: extensions/webmail/forms.py:18
+#: admin/forms.py:324 extensions/webmail/forms.py:18
 msgid "Select a file"
 msgstr "Wählen Sie eine Datei"
 
-#: admin/forms.py:296
+#: admin/forms.py:325
 msgid "Separator"
 msgstr "Separator"
 
-#: admin/forms.py:308
+#: admin/forms.py:337 admin/templates/admin/editdomainform.html:9
 #: auth/forms.py:6
-#: templates/admin/editdomainform.html:20
 msgid "Username"
 msgstr "Benutzername"
 
-#: admin/forms.py:310
+#: admin/forms.py:339
 msgid "Role"
 msgstr "Rolle"
 
-#: admin/forms.py:311
-#: admin/forms.py:335
+#: admin/forms.py:340 admin/forms.py:364
 msgid "Choose"
 msgstr "Auswählen"
 
-#: admin/forms.py:312
+#: admin/forms.py:341
 msgid "What level of permission this user will have"
 msgstr "Rechte, die der Benutzer haben wird"
 
-#: admin/forms.py:314
-#: auth/forms.py:10
+#: admin/forms.py:343 auth/forms.py:10
 msgid "Password"
 msgstr "Passwort"
 
-#: admin/forms.py:316
-#: userprefs/forms.py:15
+#: admin/forms.py:345 userprefs/forms.py:15
 msgid "Confirmation"
 msgstr "Bestätigung"
 
-#: admin/forms.py:318
+#: admin/forms.py:347
 msgid "Enter the same password as above, for verification."
 msgstr "Kennwort bestätigen"
 
-#: admin/forms.py:329
+#: admin/forms.py:358
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: admin/forms.py:367
+#: admin/forms.py:396
 msgid "The two password fields didn't match."
 msgstr "Die angegebenen Kennworte stimmen nicht überein"
 
-#: admin/forms.py:393
+#: admin/forms.py:437
 msgid "E-mail"
 msgstr "E-Mail"
 
-#: admin/forms.py:394
+#: admin/forms.py:439
 msgid "Quota"
 msgstr "Quota"
 
-#: admin/forms.py:398
-msgid "Alias(es) of this mailbox"
-msgstr "Aliase dieser Mailbox"
+#: admin/forms.py:441
+msgid ""
+"Quota in MB for this mailbox. Leave empty to use the value defined at domain "
+"level."
+msgstr ""
 
-#: admin/forms.py:454
+#: admin/forms.py:447
+msgid ""
+"Alias(es) of this mailbox. Indicate only one address per input, press ENTER "
+"to add a new input."
+msgstr ""
+
+#: admin/forms.py:505
 msgid "Failed to rename mailbox, check permissions"
 msgstr "Mailbox konnte nicht umbenannt werden. Prüfen Sie die Berechtigungen."
 
-#: admin/forms.py:495
+#: admin/forms.py:547
 msgid "Domain(s)"
 msgstr "Domain(s)"
 
-#: admin/forms.py:497
+#: admin/forms.py:549
 msgid "Domain(s) that user administrates"
 msgstr "Domänen, die dieser Anwender administriert"
 
-#: admin/forms.py:546
-#: admin/views.py:356
-#: templates/admin/editdomainform.html:4
-msgid "General"
-msgstr "Grundsätzlich"
-
-#: admin/forms.py:548
-#: admin/views.py:359
+#: admin/forms.py:600 admin/views.py:366
 msgid "Mail"
 msgstr "E-Mail"
 
-#: admin/forms.py:550
+#: admin/forms.py:602
 msgid "Permissions"
 msgstr "Berechtigungen"
 
@@ -261,121 +266,118 @@ msgstr "Unbekannter Objekt-Typ"
 msgid "You can't delete your own account"
 msgstr "Sie können Ihr eigenes Konto nicht entfernen"
 
-#: admin/models.py:137
+#: admin/models.py:151
 msgid "Failed to update password: LDAP module not installed"
 msgstr "Konnte Kennwort nicht aktualisieren: LDAP-Modul nicht installiert"
 
-#: admin/models.py:143
+#: admin/models.py:157
 #, python-format
 msgid "Failed to update password: %s"
 msgstr "Konnte Kennwort nicht aktualisieren: %s"
 
-#: admin/models.py:375
-#: admin/models.py:461
+#: admin/models.py:393 admin/models.py:479
 msgid "name"
 msgstr "Name"
 
-#: admin/models.py:376
+#: admin/models.py:394
 msgid "The domain name"
 msgstr "Name der Domäne"
 
-#: admin/models.py:377
+#: admin/models.py:395
 msgid "Default quota in MB applied to mailboxes"
 msgstr "Standard-Quota für Mailboxen (in MB)"
 
-#: admin/models.py:378
-#: admin/models.py:466
-#: admin/models.py:708
-#: admin/models.py:805
-#: extensions/postfix_autoreply/models.py:19
+#: admin/models.py:396 admin/models.py:484 admin/models.py:738
+#: admin/models.py:835 extensions/postfix_autoreply/models.py:19
 msgid "enabled"
 msgstr "aktiviert"
 
-#: admin/models.py:379
+#: admin/models.py:397
 msgid "Check to activate this domain"
 msgstr "Auswählen, um diese Domäne zu aktivieren"
 
-#: admin/models.py:446
+#: admin/models.py:464
 msgid "Failed to initialise domain, check permissions"
-msgstr "Domäne konnte nicht initialisiert werden. Prüfen Sie die Berechtigungen."
+msgstr ""
+"Domäne konnte nicht initialisiert werden. Prüfen Sie die Berechtigungen."
 
-#: admin/models.py:454
-#: admin/models.py:669
-#: admin/models.py:774
+#: admin/models.py:472 admin/models.py:699 admin/models.py:804
 msgid "Invalid line"
 msgstr "Ungültige Zeile"
 
-#: admin/models.py:462
+#: admin/models.py:480
 msgid "The alias name"
 msgstr "Der Alias-Name"
 
-#: admin/models.py:463
+#: admin/models.py:481
 msgid "target"
 msgstr "Ziel"
 
-#: admin/models.py:464
+#: admin/models.py:482
 msgid "The domain this alias points to"
 msgstr "Domäne auf die dieser Alias verweist"
 
-#: admin/models.py:467
-#: admin/models.py:709
+#: admin/models.py:485 admin/models.py:739
 msgid "Check to activate this alias"
 msgstr "Auswählen um den Alias zu aktivieren"
 
-#: admin/models.py:486
-#: admin/models.py:699
+#: admin/models.py:504 admin/models.py:729
 msgid "address"
 msgstr "Adresse"
 
-#: admin/models.py:487
+#: admin/models.py:505
 msgid "Mailbox address (without the @domain.tld part)"
 msgstr "Mailbox-Adresse (ohne den @domain.tld-Anteil)"
 
-#: admin/models.py:584
+#: admin/models.py:611
 #, python-format
 msgid "%s is not a valid uid/username"
 msgstr "%s ist kein gültiger uid/Benutzername"
 
-#: admin/models.py:593
+#: admin/models.py:620
 #, python-format
 msgid "%s is not a valid gid/groupname"
 msgstr "%s ist kein gültiger gid/Gruppenname"
 
-#: admin/models.py:597
-#: admin/models.py:654
+#: admin/models.py:630 admin/models.py:684
 msgid "Failed to initialise mailbox, check permissions"
-msgstr "Mailbox konnte nicht initialisiert werden. Prüfen Sie die Berechtigungen."
+msgstr ""
+"Mailbox konnte nicht initialisiert werden. Prüfen Sie die Berechtigungen."
 
-#: admin/models.py:622
+#: admin/models.py:655
 #, python-format
 msgid "Account '%s' already exists"
 msgstr "Das Konto '%s' existiert bereits"
 
-#: admin/models.py:675
+#: admin/models.py:705
 msgid "Cannot import this mailbox because the associated domain does not exist"
-msgstr "Kann Mailbox nicht importieren, weil die dazugehörende Domain nicht existiert"
+msgstr ""
+"Kann Mailbox nicht importieren, weil die dazugehörende Domain nicht existiert"
 
-#: admin/models.py:700
-msgid "The alias address (without the domain part). For a 'catch-all' address, just enter an * character."
-msgstr "Die Alias-Adresse (ohne den Domain-Anteil). Geben sie für eine Adresse an, die alles annimmt, * an."
+#: admin/models.py:730
+msgid ""
+"The alias address (without the domain part). For a 'catch-all' address, just "
+"enter an * character."
+msgstr ""
+"Die Alias-Adresse (ohne den Domain-Anteil). Geben sie für eine Adresse an, "
+"die alles annimmt, * an."
 
-#: admin/models.py:704
+#: admin/models.py:734
 msgid "mailboxes"
 msgstr "Mailboxen"
 
-#: admin/models.py:705
+#: admin/models.py:735
 msgid "The mailboxes this alias points to"
 msgstr "Mailbox auf den dieser Alias verweist"
 
-#: admin/models.py:806
+#: admin/models.py:836
 msgid "Check to enable this extension"
 msgstr "Auswählen, um diese Erweiterung zu aktivieren"
 
-#: admin/tables.py:12
-#: admin/tables.py:44
+#: admin/tables.py:12 admin/tables.py:44
+#: admin/templates/admin/editdomainform.html:9
 #: extensions/sievefilters/forms.py:53
 #: extensions/sievefilters/templates/sievefilters/guieditor.html:6
-#: templates/admin/editdomainform.html:20
 msgid "Name"
 msgstr "Name"
 
@@ -383,9 +385,7 @@ msgstr "Name"
 msgid "Edit domain"
 msgstr "Domäne bearbeiten"
 
-#: admin/tables.py:18
-#: admin/tables.py:61
-#: extensions/sievefilters/views.py:79
+#: admin/tables.py:18 admin/tables.py:61 extensions/sievefilters/views.py:79
 #: extensions/sievefilters/templates/sievefilters/filter.html:17
 #: extensions/sievefilters/templates/sievefilters/guieditor.html:5
 #: extensions/webmail/templatetags/webextras.py:93
@@ -412,12 +412,8 @@ msgstr "Name/Empfänger"
 msgid "New domain"
 msgstr "Neue Domäne"
 
-#: admin/views.py:81
-#: admin/views.py:174
-#: admin/views.py:353
-#: admin/views.py:360
-#: extensions/sievefilters/views.py:120
-#: extensions/sievefilters/views.py:187
+#: admin/views.py:81 admin/views.py:181 admin/views.py:360 admin/views.py:367
+#: extensions/sievefilters/views.py:120 extensions/sievefilters/views.py:187
 #: extensions/webmail/views.py:118
 msgid "Create"
 msgstr "Erstellen"
@@ -426,160 +422,145 @@ msgstr "Erstellen"
 msgid "Domain created"
 msgstr "Domäne erstellt."
 
-#: admin/views.py:108
-#: admin/views.py:223
-#: admin/views.py:403
-#: extensions/postfix_autoreply/views.py:22
-#: extensions/sievefilters/views.py:139
-#: extensions/webmail/views.py:149
-#: userprefs/views.py:34
-#: userprefs/views.py:66
+#: admin/views.py:111 admin/views.py:230 admin/views.py:411
+#: extensions/sievefilters/views.py:139 extensions/webmail/views.py:149
+#: userprefs/templates/userprefs/form.html:4
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: admin/views.py:115
+#: admin/views.py:122
 msgid "Domain modified"
 msgstr "Domäne verändert"
 
-#: admin/views.py:138
+#: admin/views.py:145
 msgid "You can't delete your own domain"
 msgstr "Sie können Ihre eigene Domäne nicht löschen"
 
-#: admin/views.py:141
+#: admin/views.py:148
 msgid "Domain deleted"
 msgid_plural "Domains deleted"
 msgstr[0] "Domäne gelöscht"
 msgstr[1] "Domänen gelöscht"
 
-#: admin/views.py:156
+#: admin/views.py:163
 msgid "Alias with this name already exists"
 msgstr "Ein Alias mit diesem Namen existiert bereits"
 
-#: admin/views.py:194
+#: admin/views.py:201
 msgid "New distribution list"
 msgstr "Neue Verteilerliste"
 
-#: admin/views.py:198
+#: admin/views.py:205
 msgid "Distribution list created"
 msgstr "Verteilerliste erstellt"
 
-#: admin/views.py:204
+#: admin/views.py:211
 msgid "New alias"
 msgstr "Neuer Alias"
 
-#: admin/views.py:208
+#: admin/views.py:215
 msgid "Alias created"
 msgstr "Alias erstellt"
 
-#: admin/views.py:214
+#: admin/views.py:221
 msgid "New forward"
 msgstr "Neue Weiterleitung"
 
-#: admin/views.py:218
+#: admin/views.py:225
 msgid "Forward created"
 msgstr "Weiterleitung erstellt"
 
-#: admin/views.py:235
+#: admin/views.py:242
 msgid "Alias modified"
 msgstr "Alias verändert"
 
-#: admin/views.py:239
+#: admin/views.py:246
 msgid "Distribution list modified"
 msgstr "Verteilerliste verändert"
 
-#: admin/views.py:243
+#: admin/views.py:250
 msgid "Forward modified"
 msgstr "Weiterleitung verändert"
 
-#: admin/views.py:350
+#: admin/views.py:357
 msgid "New account"
 msgstr "Neues Konto"
 
-#: admin/views.py:357
+#: admin/views.py:364
 msgid "Next"
 msgstr "Nächstes"
 
-#: admin/views.py:361
+#: admin/views.py:368
 msgid "Previous"
 msgstr "Vorheriges"
 
-#: admin/views.py:372
+#: admin/views.py:380
 msgid "Account created"
 msgstr "Konto erstellt"
 
-#: admin/views.py:417
+#: admin/views.py:425
 msgid "Account updated"
 msgstr "Konto aktualisiert"
 
-#: admin/views.py:437
+#: admin/views.py:445
 msgid "Account deleted"
 msgid_plural "Accounts deleted"
 msgstr[0] "Konto gelöscht"
 msgstr[1] "Konten gelöscht"
 
-#: admin/views.py:447
-#: admin/views.py:452
-#: extensions/amavis_quarantine/views.py:196
-#: extensions/amavis_quarantine/views.py:202
-#: extensions/amavis_quarantine/views.py:229
-#: extensions/amavis_quarantine/views.py:233
-#: extensions/amavis_quarantine/views.py:235
-#: extensions/stats/views.py:46
-#: extensions/webmail/views.py:32
-#: extensions/webmail/views.py:55
-#: extensions/webmail/views.py:68
-#: extensions/webmail/views.py:80
-#: extensions/webmail/views.py:96
-#: extensions/webmail/views.py:180
-#: extensions/webmail/views.py:405
-#: extensions/webmail/views.py:416
-#: extensions/webmail/views.py:443
-#: lib/formutils.py:29
-#: lib/formutils.py:34
+#: admin/views.py:455 admin/views.py:460 extensions/amavis/views.py:199
+#: extensions/amavis/views.py:205 extensions/amavis/views.py:232
+#: extensions/amavis/views.py:236 extensions/amavis/views.py:238
+#: extensions/stats/views.py:46 extensions/webmail/views.py:32
+#: extensions/webmail/views.py:55 extensions/webmail/views.py:68
+#: extensions/webmail/views.py:80 extensions/webmail/views.py:96
+#: extensions/webmail/views.py:180 extensions/webmail/views.py:407
+#: extensions/webmail/views.py:418 extensions/webmail/views.py:445
+#: lib/formutils.py:33 lib/formutils.py:38
 msgid "Invalid request"
 msgstr "Ungültige Anfrage"
 
-#: admin/views.py:492
+#: admin/views.py:500
 msgid "Parameters saved"
 msgstr "Parameter gespeichert"
 
-#: admin/views.py:538
+#: admin/views.py:546
 msgid "Modifications applied."
 msgstr "Änderungen übernommen."
 
-#: admin/views.py:595
+#: admin/views.py:603
 #, python-format
 msgid "%d objects imported successfully"
 msgstr "%d Objekte erfolgreich importiert"
 
-#: admin/views.py:614
+#: admin/views.py:621
 msgid ""
 "Provide a CSV file where lines respect one of the following format:\n"
 "<ul>\n"
-"<li><em>account; loginname; password; first name; last name; address</em></li>\n"
+"<li><em>account; loginname; password; first name; last name; address</em></"
+"li>\n"
 "<li><em>dlist; address; recipient; recipient; ...</em></li>\n"
 "</ul>\n"
 "You can use a different character as separator.\n"
 msgstr ""
 "CSV-Datei in einem der folgenden Formate hinzufügen:\n"
 "<ul>\n"
-"<li><em>account; loginname; password; first name; last name; address</em></li>\n"
+"<li><em>account; loginname; password; first name; last name; address</em></"
+"li>\n"
 "<li><em>dlist; address; recipient; recipient; ...</em></li>\n"
 "</ul>\n"
 "Ein anderes Zeichen als Trenner ist gestattet.\n"
 
-#: admin/views.py:622
+#: admin/views.py:629
 msgid "Import identities"
 msgstr "Identitäten importieren"
 
-#: admin/views.py:623
-#: admin/views.py:649
-#: admin/templatetags/admin_extras.py:73
-#: admin/templatetags/admin_extras.py:114
+#: admin/views.py:630 admin/views.py:656 admin/templatetags/admin_extras.py:76
+#: admin/templatetags/admin_extras.py:118
 msgid "Import"
 msgstr "Importiere"
 
-#: admin/views.py:641
+#: admin/views.py:648
 msgid ""
 "Provide a CSV file where lines respect the following format:<br/>\n"
 "<em>domain; name; quota</em><br/>\n"
@@ -591,10 +572,100 @@ msgstr ""
 "\n"
 "Ein anderes Zeichen als Trenner ist gestattet.\n"
 
-#: admin/views.py:648
+#: admin/views.py:655
 msgid "Import domains"
 msgstr "Domains importieren"
 
+#: admin/templates/admin/domain_general_form.html:3
+#: admin/templates/admin/mailform.html:3
+#: admin/templates/admin/newdomainform.html:3
+msgid "MB"
+msgstr ""
+
+#: admin/templates/admin/domains.html:2 admin/templatetags/admin_extras.py:22
+#: extensions/limits/forms.py:14 extensions/limits/models.py:10
+msgid "Domains"
+msgstr "Domänen"
+
+#: admin/templates/admin/editdomainform.html:3
+msgid "Administrators"
+msgstr "Administratoren"
+
+#: admin/templates/admin/editdomainform.html:4
+msgid "Miscellaneous"
+msgstr "Verschiedenes"
+
+#: admin/templates/admin/editdomainform.html:13
+msgid "No domain administrator defined"
+msgstr "Domänen-Administrator fehlt"
+
+#: admin/templates/admin/editdomainform.html:16
+msgid "Creation date"
+msgstr "Erstellungsdatum"
+
+#: admin/templates/admin/editdomainform.html:17
+msgid "Last modification date"
+msgstr "Datum der letzten Änderung"
+
+#: admin/templates/admin/editdomainform.html:18 extensions/limits/forms.py:16
+#: extensions/limits/models.py:11
+msgid "Domain aliases"
+msgstr "Domänen-Aliase"
+
+#: admin/templates/admin/editdomainform.html:19 extensions/limits/forms.py:18
+#: extensions/limits/models.py:12
+#: extensions/webmail/templates/webmail/folders.html:4
+msgid "Mailboxes"
+msgstr "Mailboxen"
+
+#: admin/templates/admin/editdomainform.html:20 extensions/limits/forms.py:20
+#: extensions/limits/models.py:13
+msgid "Mailbox aliases"
+msgstr "Mailboxen-Aliase"
+
+#: admin/templates/admin/extensions.html:2
+#: admin/templatetags/admin_extras.py:49
+msgid "Extensions"
+msgstr "Erweiterungen"
+
+#: admin/templates/admin/extensions.html:7
+#: admin/templates/admin/parameters.html:9
+#: userprefs/templates/userprefs/preferences.html:28
+msgid "Save"
+msgstr "Speichern"
+
+#: admin/templates/admin/identities.html:2
+#: admin/templatetags/admin_extras.py:30
+msgid "Identities"
+msgstr "Identitäten"
+
+#: admin/templates/admin/importform.html:5
+msgid "Help"
+msgstr "Hilfe"
+
+#: admin/templates/admin/importform.html:12
+msgid "Importing..."
+msgstr "Importiere …"
+
+#: admin/templates/admin/listing.html:12
+#: admin/templates/admin/searchform.html:4
+msgid "Search"
+msgstr "Suchen"
+
+#: admin/templates/admin/mailboxes_raw.html:3
+msgid "Choose a value"
+msgstr "Wert auswählen"
+
+#: admin/templates/admin/newaccount.html:31
+#: templates/common/generic_modal.html:11
+msgid "Close"
+msgstr "Schliessen"
+
+#: admin/templates/admin/parameters.html:2
+#: admin/templatetags/admin_extras.py:54
+msgid "Parameters"
+msgstr "Parameter"
+
 #: admin/templatetags/admin_extras.py:12
 msgid "enabled_m"
 msgstr "aktiviert_m"
@@ -603,77 +674,55 @@ msgstr "aktiviert_m"
 msgid "enabled_f"
 msgstr "aktiviert_f"
 
-#: admin/templatetags/admin_extras.py:22
-#: extensions/limits/forms.py:14
-#: extensions/limits/models.py:10
-#: templates/admin/domains.html:2
-msgid "Domains"
-msgstr "Domänen"
-
-#: admin/templatetags/admin_extras.py:30
-#: templates/admin/identities.html:2
-msgid "Identities"
-msgstr "Identitäten"
-
 #: admin/templatetags/admin_extras.py:35
 msgid "Modoboa"
 msgstr "Modoboa"
 
-#: admin/templatetags/admin_extras.py:49
-#: templates/admin/extensions.html:2
-msgid "Extensions"
-msgstr "Erweiterungen"
-
-#: admin/templatetags/admin_extras.py:54
-#: templates/admin/parameters.html:2
-msgid "Parameters"
-msgstr "Parameter"
-
-#: admin/templatetags/admin_extras.py:67
+#: admin/templatetags/admin_extras.py:70
 msgid "Add domain"
 msgstr "Domain hinzufügen"
 
-#: admin/templatetags/admin_extras.py:90
+#: admin/templatetags/admin_extras.py:94
 msgid "Add account"
 msgstr "Konto hinzufügen"
 
-#: admin/templatetags/admin_extras.py:96
+#: admin/templatetags/admin_extras.py:100
 msgid "Add alias"
 msgstr "Alias hinzufügen"
 
-#: admin/templatetags/admin_extras.py:102
+#: admin/templatetags/admin_extras.py:106
 msgid "Add forward"
 msgstr "Weiterleitung hinzufügen"
 
-#: admin/templatetags/admin_extras.py:108
+#: admin/templatetags/admin_extras.py:112
 msgid "Add distribution list"
 msgstr "Verteilerliste hinzufügen"
 
-#: admin/templatetags/admin_extras.py:145
+#: admin/templatetags/admin_extras.py:150
 msgid "Delete this account"
 msgstr "Dieses Konto löschen"
 
-#: admin/templatetags/admin_extras.py:155
+#: admin/templatetags/admin_extras.py:160
 msgid "Delete this distribution list"
 msgstr "Diese Verteilerliste löschen"
 
-#: admin/templatetags/admin_extras.py:162
+#: admin/templatetags/admin_extras.py:167
 msgid "Delete this forward"
 msgstr "Weiterleitung entfernen"
 
-#: admin/templatetags/admin_extras.py:169
+#: admin/templatetags/admin_extras.py:174
 msgid "Delete this alias"
 msgstr " Alias entfernen"
 
-#: admin/templatetags/admin_extras.py:179
+#: admin/templatetags/admin_extras.py:184
 msgid "Remove this permission"
 msgstr "Berechtigung entfernen"
 
-#: admin/templatetags/admin_extras.py:213
+#: admin/templatetags/admin_extras.py:214
 msgid "Yes"
 msgstr "Ja"
 
-#: admin/templatetags/admin_extras.py:213
+#: admin/templatetags/admin_extras.py:214
 msgid "No"
 msgstr "Nein"
 
@@ -681,28 +730,29 @@ msgstr "Nein"
 msgid "Key used to encrypt/decrypt passwords"
 msgstr "Verwendeter Schlüssel, um Passworte zu ver-/entschlüsseln"
 
-#: auth/views.py:38
+#: auth/views.py:40
 msgid "Account is disabled."
 msgstr "Konto ist deaktiviert"
 
-#: auth/views.py:39
+#: auth/views.py:41
 msgid "Your username and password didn't match. Please try again."
-msgstr "Ihr Benutzername und Passwort stimmen nicht überein. Bitte versuchen Sie es noch einmal."
+msgstr ""
+"Ihr Benutzername und Passwort stimmen nicht überein. Bitte versuchen Sie es "
+"noch einmal."
 
-#: demo/__init__.py:19
+#: demo/__init__.py:17
 msgid "Test messages"
 msgstr "Test-Nachrichten"
 
-#: demo/__init__.py:24
+#: demo/__init__.py:22
 msgid "Send virus"
 msgstr "Virus senden"
 
-#: demo/__init__.py:28
+#: demo/__init__.py:25
 msgid "Send spam"
 msgstr "Spam senden"
 
-#: demo/views.py:17
-#: demo/views.py:41
+#: demo/views.py:17 demo/views.py:41
 msgid "Message sent"
 msgstr "Nachricht gesendet"
 
@@ -711,208 +761,337 @@ msgid ""
 "\n"
 "<h3>Welcome to the online demo!</h3>\n"
 "<p><b>Warning:</b> the demo's concent is resetted every two hours.</p>\n"
-"<p>To try the demo, the following users are available (<i>username/password</i>): </p>\n"
+"<p>To try the demo, the following users are available (<i>username/password</"
+"i>): </p>\n"
 "<ul>\n"
 "  <li>A super administrator : <b>admin/password</b></li>\n"
 "  <li>A domain administrator : <b>admin@demo.local/admin</b></li>\n"
 "  <li>A simple user : <b>user@demo.local/user</b></li>\n"
 "</ul>\n"
 "<p>Please report any issue or give any suggestion to \n"
-"  <a href=\"https://groups.google.com/forum/#!forum/modoboa-users\">the mailing list</a>.</p>\n"
+"  <a href=\"https://groups.google.com/forum/#!forum/modoboa-users\">the "
+"mailing list</a>.</p>\n"
 msgstr ""
 "\n"
 "<h1>Willkommen zur Online Demo!</h1>\n"
-"<p><b>Warnung:</b> die Inhalte dieser Demo werden alle zwei Stunden gelöscht.</p>\n"
-"<p>Folgende User (<i>Benutzername/Kennwort</i>) stehen zum Testen zur Verfügung:</p>\n"
+"<p><b>Warnung:</b> die Inhalte dieser Demo werden alle zwei Stunden gelöscht."
+"</p>\n"
+"<p>Folgende User (<i>Benutzername/Kennwort</i>) stehen zum Testen zur "
+"Verfügung:</p>\n"
 "<ul>\n"
 "  <li>Super-Administrator : <b>admin/password</b></li>\n"
 "  <li>Domänen-Administrator : <b>admin@demo.local/admin</b></li>\n"
 "  <li>Normaler Benutzer: <b>user@demo.local/user</b></li>\n"
 "</ul>\n"
 "<p>Probleme und Anregungen bitte an die\n"
-"  <a href=\"https://groups.google.com/forum/#!forum/modoboa-users\">Mailingliste</a> berichten.</p>\n"
+"  <a href=\"https://groups.google.com/forum/#!forum/modoboa-users"
+"\">Mailingliste</a> berichten.</p>\n"
 
-#: extensions/amavis_quarantine/__init__.py:17
-msgid "Simple amavis quarantine management tool"
+#: extensions/amavis/__init__.py:21
+#, fuzzy
+msgid "Simple amavis management frontend"
 msgstr "Einfaches amavis Quarantäne-Management Werkzeug"
 
-#: extensions/amavis_quarantine/__init__.py:46
+#: extensions/amavis/__init__.py:45
 msgid "Quarantine messages maximum age (in days) before deletion"
-msgstr "Maximales Alter (in Tagen) von Nachrichten in der Quarantäne bevor sie gelöscht werden"
+msgstr ""
+"Maximales Alter (in Tagen) von Nachrichten in der Quarantäne bevor sie "
+"gelöscht werden"
 
-#: extensions/amavis_quarantine/__init__.py:50
+#: extensions/amavis/__init__.py:49
 msgid "Remove messages marked as released while cleaning up the database"
 msgstr "Freigegebene Nachrichten löschen wenn Datenbank bereinigt wird"
 
-#: extensions/amavis_quarantine/__init__.py:55
+#: extensions/amavis/__init__.py:54
 msgid "Mode used to access the PDP server"
 msgstr "Modus für Zugriff auf den PDP-Server"
 
-#: extensions/amavis_quarantine/__init__.py:58
+#: extensions/amavis/__init__.py:57
 msgid "PDP server address (if inet mode)"
 msgstr "PDP-Server addresse (im inet-Modus)"
 
-#: extensions/amavis_quarantine/__init__.py:61
+#: extensions/amavis/__init__.py:60
 msgid "PDP server port (if inet mode)"
 msgstr "PDP-Server port (im inet-Modus)"
 
-#: extensions/amavis_quarantine/__init__.py:64
+#: extensions/amavis/__init__.py:63
 msgid "Path to the PDP server socket (if unix mode)"
 msgstr "Pfad zum PDP-Server Socket (im UNIX-Modus)"
 
-#: extensions/amavis_quarantine/__init__.py:67
+#: extensions/amavis/__init__.py:66
 msgid "Interval between two release requests checks"
 msgstr "Prüf-Intervall nach neuen Quarantäne-Release-Anfragen"
 
-#: extensions/amavis_quarantine/__init__.py:69
+#: extensions/amavis/__init__.py:68
 msgid "Allow users to directly release their messages"
 msgstr "Anwender dürfen Nachrichten in Quarantäne selber freigeben"
 
-#: extensions/amavis_quarantine/__init__.py:71
+#: extensions/amavis/__init__.py:70
 msgid "Activate the 'self-service' mode"
 msgstr "'Self-Service'-Modus aktivieren"
 
-#: extensions/amavis_quarantine/__init__.py:76
-#: extensions/webmail/__init__.py:37
-msgid "Sets the maximum number of messages displayed in a page"
-msgstr "Legt die maximale Anzahl von Nachrichten fest, die in einer Seite dargestellt werden"
+#: extensions/amavis/__init__.py:72
+#, fuzzy
+msgid "The e-mail address used to send notitications"
+msgstr "Das backend, das zur Authentifizierung genutzt wird"
 
-#: extensions/amavis_quarantine/__init__.py:90
+#: extensions/amavis/__init__.py:77 extensions/webmail/__init__.py:45
+msgid "Sets the maximum number of messages displayed in a page"
+msgstr ""
+"Legt die maximale Anzahl von Nachrichten fest, die in einer Seite "
+"dargestellt werden"
+
+#: extensions/amavis/__init__.py:93
 msgid "Quarantine"
 msgstr "Quarantäne"
 
-#: extensions/amavis_quarantine/__init__.py:152
+#: extensions/amavis/__init__.py:151
 msgid "pending requests"
 msgstr "Offene Anfragen"
 
-#: extensions/amavis_quarantine/__init__.py:168
+#: extensions/amavis/__init__.py:167
 #, python-format
 msgid "%d pending requests"
 msgstr "%d offene Anfragen"
 
-#: extensions/amavis_quarantine/sql_listing.py:23
-#: extensions/webmail/forms.py:5
+#: extensions/amavis/__init__.py:178
+#, fuzzy
+msgid "Content filter"
+msgstr "Inhaltsklasse"
+
+#: extensions/amavis/models.py:78
+#, fuzzy
+msgid "Virus filter"
+msgstr "Filter bearbeiten"
+
+#: extensions/amavis/models.py:79 extensions/amavis/models.py:87
+#: extensions/amavis/models.py:95 extensions/amavis/models.py:104
+#: extensions/sievefilters/views.py:265
+msgid "yes"
+msgstr "Ja"
+
+#: extensions/amavis/models.py:80 extensions/amavis/models.py:88
+#: extensions/amavis/models.py:96 extensions/amavis/models.py:105
+#: extensions/sievefilters/views.py:269
+msgid "no"
+msgstr "Nein"
+
+#: extensions/amavis/models.py:81 extensions/amavis/models.py:89
+#: extensions/amavis/models.py:97 extensions/amavis/models.py:106
+msgid "default"
+msgstr ""
+
+#: extensions/amavis/models.py:83
+msgid "Bypass virus checks or not. Choose 'default' to use global settings."
+msgstr ""
+
+#: extensions/amavis/models.py:86
+#, fuzzy
+msgid "Spam filter"
+msgstr "Neuer Filter"
+
+#: extensions/amavis/models.py:91
+msgid "Bypass spam checks or not. Choose 'default' to use global settings."
+msgstr ""
+
+#: extensions/amavis/models.py:94
+#, fuzzy
+msgid "Banned filter"
+msgstr "Neuer Filter"
+
+#: extensions/amavis/models.py:99
+msgid "Bypass banned checks or not. Choose 'default' to use global settings."
+msgstr ""
+
+#: extensions/amavis/models.py:103
+msgid "Spam marker"
+msgstr ""
+
+#: extensions/amavis/models.py:108
+msgid "Modify spam subject or not. Choose 'default' to use global settings."
+msgstr ""
+
+#: extensions/amavis/sql_listing.py:23 extensions/webmail/forms.py:5
 #: extensions/webmail/lib.py:34
 msgid "From"
 msgstr "Von"
 
-#: extensions/amavis_quarantine/sql_listing.py:24
-#: extensions/sievefilters/forms.py:68
-#: extensions/webmail/forms.py:9
-#: extensions/webmail/lib.py:33
-#: extensions/webmail/lib.py:363
-#: templates/common/email_searchbar.html:6
+#: extensions/amavis/sql_listing.py:24 extensions/sievefilters/forms.py:68
+#: extensions/webmail/forms.py:9 extensions/webmail/lib.py:33
+#: extensions/webmail/lib.py:363 templates/common/email_searchbar.html:6
 msgid "Subject"
 msgstr "Betreff"
 
-#: extensions/amavis_quarantine/sql_listing.py:25
-#: extensions/webmail/lib.py:35
+#: extensions/amavis/sql_listing.py:25 extensions/webmail/lib.py:35
 #: extensions/webmail/lib.py:365
 msgid "Date"
 msgstr "Datum"
 
-#: extensions/amavis_quarantine/sql_listing.py:26
-#: extensions/amavis_quarantine/templatetags/amextras.py:102
+#: extensions/amavis/sql_listing.py:26
+#: extensions/amavis/templatetags/amextras.py:102
 #: extensions/webmail/forms.py:6
 msgid "To"
 msgstr "An"
 
-#: extensions/amavis_quarantine/views.py:32
+#: extensions/amavis/views.py:32
 msgid "Empty quarantine"
 msgstr "Quarantäne leeren"
 
-#: extensions/amavis_quarantine/views.py:203
+#: extensions/amavis/views.py:206
 msgid "Message deleted"
 msgstr "Nachricht gelöscht"
 
-#: extensions/amavis_quarantine/views.py:219
+#: extensions/amavis/views.py:222
 #, python-format
 msgid "%(count)d message deleted successfully"
 msgid_plural "%(count)d messages deleted successfully"
 msgstr[0] "%(count)d Nachricht erfolgreich gelöscht"
 msgstr[1] "%(count)d Nachrichten erfolgreich gelöscht"
 
-#: extensions/amavis_quarantine/views.py:238
+#: extensions/amavis/views.py:241
 msgid "Request sent"
 msgstr "Anfrage gesendet"
 
-#: extensions/amavis_quarantine/views.py:244
+#: extensions/amavis/views.py:247
 msgid "Message released"
 msgstr "Nachricht freigegeben"
 
-#: extensions/amavis_quarantine/views.py:258
+#: extensions/amavis/views.py:261
 #, python-format
 msgid "%(count)d request sent"
 msgid_plural "%(count)d requests sent"
 msgstr[0] "%(count)d Anfrage gesendet"
 msgstr[1] "%(count)d Anfragen gesendet"
 
-#: extensions/amavis_quarantine/views.py:281
+#: extensions/amavis/views.py:284
 #, python-format
 msgid "%(count)d message released successfully"
 msgid_plural "%(count)d messages released successfully"
 msgstr[0] "%(count)d Nachicht erfolgreich freigegeben"
 msgstr[1] "%(count)d Nachichten erfolgreich freigegeben"
 
-#: extensions/amavis_quarantine/templates/amavis_quarantine/index.html:2
+#: extensions/amavis/management/commands/amnotify.py:45
+#, fuzzy
+msgid "[modoboa] Pending release requests"
+msgstr "%d offene Anfragen"
+
+#: extensions/amavis/templates/amavis/domain_content_filter.html:5
+msgid "Thresholds"
+msgstr ""
+
+#: extensions/amavis/templates/amavis/domain_content_filter.html:7
+msgid "or more is spam"
+msgstr ""
+
+#: extensions/amavis/templates/amavis/domain_content_filter.html:8
+msgid "or more throw spam message away"
+msgstr ""
+
+#: extensions/amavis/templates/amavis/index.html:2
 msgid "Quarantine management"
 msgstr "Quarantäne-Management"
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:20
-#: extensions/amavis_quarantine/templatetags/amextras.py:52
-#: extensions/amavis_quarantine/templatetags/amextras.py:72
+#: extensions/amavis/templates/amavis/notifications/pending_requests.html:1
+#, python-format
+msgid ""
+"\n"
+"%(counter)s release request is pending for action.\n"
+msgid_plural ""
+"\n"
+"%(counter)s release requests are pending for action.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: extensions/amavis/templates/amavis/notifications/pending_requests.html:6
+msgid "Sketch:"
+msgstr ""
+
+#: extensions/amavis/templates/amavis/notifications/pending_requests.html:8
+#, fuzzy
+msgid "From:"
+msgstr "Von"
+
+#: extensions/amavis/templates/amavis/notifications/pending_requests.html:9
+#, fuzzy
+msgid "To:"
+msgstr "An"
+
+#: extensions/amavis/templates/amavis/notifications/pending_requests.html:10
+#, fuzzy
+msgid "Date:"
+msgstr "Datum"
+
+#: extensions/amavis/templates/amavis/notifications/pending_requests.html:11
+#, fuzzy
+msgid "Subject:"
+msgstr "Betreff"
+
+#: extensions/amavis/templates/amavis/notifications/pending_requests.html:12
+#, fuzzy
+msgid "Act on this message:"
+msgstr "Nachricht schliessen"
+
+#: extensions/amavis/templates/amavis/notifications/pending_requests.html:14
+#, python-format
+msgid "Please visit %(listingurl)s for a full listing."
+msgstr ""
+
+#: extensions/amavis/templatetags/amextras.py:20
+#: extensions/amavis/templatetags/amextras.py:52
+#: extensions/amavis/templatetags/amextras.py:72
 msgid "Release"
 msgstr "Freigeben"
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:26
-#: extensions/amavis_quarantine/templatetags/amextras.py:59
-#: extensions/amavis_quarantine/templatetags/amextras.py:77
+#: extensions/amavis/templatetags/amextras.py:26
+#: extensions/amavis/templatetags/amextras.py:59
+#: extensions/amavis/templatetags/amextras.py:77
 #: extensions/webmail/templatetags/webextras.py:33
 msgid "Delete"
 msgstr "Löschen"
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:29
+#: extensions/amavis/templatetags/amextras.py:29
 msgid "View full headers"
 msgstr "Alle Mail-Header ansehen"
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:80
+#: extensions/amavis/templatetags/amextras.py:80
 msgid "Content Class"
 msgstr "Inhaltsklasse"
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:84
+#: extensions/amavis/templatetags/amextras.py:84
 msgid "Nothing"
 msgstr "Nichts"
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:87
+#: extensions/amavis/templatetags/amextras.py:87
 msgid "Spam"
 msgstr "Spam"
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:90
+#: extensions/amavis/templatetags/amextras.py:90
 msgid "Virus"
 msgstr "Virus"
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:93
+#: extensions/amavis/templatetags/amextras.py:93
 msgid "Bad header"
 msgstr "Schlechte Header"
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:96
+#: extensions/amavis/templatetags/amextras.py:96
 msgid "Bad MIME"
 msgstr "Schlechtes MIME"
 
-#: extensions/limits/__init__.py:55
-msgid "Per administrator resources to limit the number of objects they can create"
-msgstr "Administrator-Ressourcen, um die Anzahl erstellbarer Objekte einzuschränken"
+#: extensions/limits/__init__.py:23
+msgid ""
+"Per administrator resources to limit the number of objects they can create"
+msgstr ""
+"Administrator-Ressourcen, um die Anzahl erstellbarer Objekte einzuschränken"
 
-#: extensions/limits/__init__.py:62
+#: extensions/limits/__init__.py:60
 msgid "Reseller"
 msgstr "Reseller"
 
-#: extensions/limits/__init__.py:93
+#: extensions/limits/__init__.py:91
 msgid "Resources"
 msgstr "Ressourcen"
 
-#: extensions/limits/forms.py:11
-#: extensions/limits/models.py:9
+#: extensions/limits/forms.py:11 extensions/limits/models.py:9
 msgid "Domain admins"
 msgstr "Domänen-Administratoren"
 
@@ -924,33 +1103,14 @@ msgstr "Maximale Anzahl Domains, die ein Administrator erstellen darf"
 msgid "Maximum number of domains this user can create"
 msgstr "Maximale Anzahl Domains, die dieser Anwender erstellen darf"
 
-#: extensions/limits/forms.py:16
-#: extensions/limits/models.py:11
-#: templates/admin/editdomainform.html:29
-msgid "Domain aliases"
-msgstr "Domänen-Aliase"
-
 #: extensions/limits/forms.py:17
 msgid "Maximum number of domain aliases this user can create"
 msgstr "Maximale Anzahl Domain Aliase, die dieser Anwender erstellen darf"
 
-#: extensions/limits/forms.py:18
-#: extensions/limits/models.py:12
-#: extensions/webmail/templates/webmail/folders.html:4
-#: templates/admin/editdomainform.html:30
-msgid "Mailboxes"
-msgstr "Mailboxen"
-
 #: extensions/limits/forms.py:19
 msgid "Maximum number of mailboxes this user can create"
 msgstr "Maximale Anzahl Mailboxen, die dieser Anwender erstellen darf"
 
-#: extensions/limits/forms.py:20
-#: extensions/limits/models.py:13
-#: templates/admin/editdomainform.html:31
-msgid "Mailbox aliases"
-msgstr "Mailboxen-Aliase"
-
 #: extensions/limits/forms.py:21
 msgid "Maximum number of mailbox aliases this user can create"
 msgstr "Maximale Anzahl Mailbox-Aliase, die dieser Anwender erstellen darf"
@@ -965,7 +1125,8 @@ msgstr "Ihre Ressourcen wurde noch nicht initialisiert"
 
 #: extensions/limits/forms.py:64
 msgid "You're not allowed to define unlimited values"
-msgstr "Sie verfügen nicht über ausreichend Rechte, um unbegrenzte Werte anzugeben"
+msgstr ""
+"Sie verfügen nicht über ausreichend Rechte, um unbegrenzte Werte anzugeben"
 
 #: extensions/limits/lib.py:16
 #, python-format
@@ -990,14 +1151,17 @@ msgstr "Ressourcen-Verbrauch"
 
 #: extensions/postfix_autoreply/__init__.py:20
 msgid "Auto-reply (vacation) functionality using Postfix"
-msgstr "Automatische Antwort (Abwesenheitsbenachrichtigung) über Postfix-Programm"
+msgstr ""
+"Automatische Antwort (Abwesenheitsbenachrichtigung) über Postfix-Programm"
 
-#: extensions/postfix_autoreply/__init__.py:45
+#: extensions/postfix_autoreply/__init__.py:43
 msgid "Timeout in seconds between two auto-replies to the same recipient"
-msgstr "Zeit in Sekunden zwischen zwei automatisierten Antworten an denselben Empfänger"
+msgstr ""
+"Zeit in Sekunden zwischen zwei automatisierten Antworten an denselben "
+"Empfänger"
 
 #: extensions/postfix_autoreply/__init__.py:68
-#: extensions/postfix_autoreply/views.py:19
+#: extensions/postfix_autoreply/views.py:42
 msgid "Auto-reply message"
 msgstr "Automatische Antwort"
 
@@ -1018,7 +1182,8 @@ msgid "subject"
 msgstr "Betreff"
 
 #: extensions/postfix_autoreply/models.py:16
-msgid "The subject that will appear in sended emails"
+#, fuzzy
+msgid "The subject that will appear in sent emails"
 msgstr "Der Betreff, der in den versendeten Nachrichten verwendet wird"
 
 #: extensions/postfix_autoreply/models.py:17
@@ -1026,46 +1191,51 @@ msgid "content"
 msgstr "Inhalt"
 
 #: extensions/postfix_autoreply/models.py:18
-msgid "The content that will appear in sended emails"
+#, fuzzy
+msgid "The content that will appear in sent emails"
 msgstr "Der Inhalt, der in den versendeten Nachrichten verwendet wird"
 
 #: extensions/postfix_autoreply/models.py:20
 msgid "Activate/Deactivate your auto reply"
 msgstr "Aktivieren/Deaktivieren Sie die automatisierte Antwort"
 
-#: extensions/postfix_autoreply/views.py:43
+#: extensions/postfix_autoreply/views.py:36
 msgid "Auto reply message updated successfully."
 msgstr "Automatische Antwort erfolgreich aktualisiert."
 
-#: extensions/sievefilters/__init__.py:15
-msgid "Address of your MANAGESIEVE server"
-msgstr "Adresse Ihres MANAGESIEVE-Servers"
+#: extensions/postfix_autoreply/views.py:43
+msgid "Define a message to automatically send when you are off"
+msgstr ""
 
-#: extensions/sievefilters/__init__.py:17
-msgid "Listening port of your MANAGESIEVE server"
-msgstr "TCP-Port auf Ihr MANAGESIEVE-Server lauscht"
-
-#: extensions/sievefilters/__init__.py:19
-msgid "Use the STARTTLS extension"
-msgstr "STARTTLS benutzen"
-
-#: extensions/sievefilters/__init__.py:26
-msgid "Prefered authentication mechanism"
-msgstr "Bevorzugte Authentifizierungsmethode"
-
-#: extensions/sievefilters/__init__.py:30
-msgid "Editor mode"
-msgstr "Editor-Modus"
-
-#: extensions/sievefilters/__init__.py:32
-msgid "Select the mode you want the editor to work in"
-msgstr "Wählen Sie den Modus aus in dem der Editor arbeiten soll"
-
-#: extensions/sievefilters/__init__.py:42
+#: extensions/sievefilters/__init__.py:12
 msgid "Plugin to easily create server-side filters"
 msgstr "Plugin, um auf einfache Weise server-seitige Filter zu erstellen"
 
-#: extensions/sievefilters/__init__.py:56
+#: extensions/sievefilters/__init__.py:20
+msgid "Address of your MANAGESIEVE server"
+msgstr "Adresse Ihres MANAGESIEVE-Servers"
+
+#: extensions/sievefilters/__init__.py:22
+msgid "Listening port of your MANAGESIEVE server"
+msgstr "TCP-Port auf Ihr MANAGESIEVE-Server lauscht"
+
+#: extensions/sievefilters/__init__.py:24
+msgid "Use the STARTTLS extension"
+msgstr "STARTTLS benutzen"
+
+#: extensions/sievefilters/__init__.py:31
+msgid "Prefered authentication mechanism"
+msgstr "Bevorzugte Authentifizierungsmethode"
+
+#: extensions/sievefilters/__init__.py:35
+msgid "Editor mode"
+msgstr "Editor-Modus"
+
+#: extensions/sievefilters/__init__.py:37
+msgid "Select the mode you want the editor to work in"
+msgstr "Wählen Sie den Modus aus in dem der Editor arbeiten soll"
+
+#: extensions/sievefilters/__init__.py:55
 #: extensions/sievefilters/templates/sievefilters/index.html:2
 msgid "Message filters"
 msgstr "Nachrichten-Filter"
@@ -1106,8 +1276,7 @@ msgstr "ist nicht"
 msgid "Sender"
 msgstr "Sender"
 
-#: extensions/sievefilters/forms.py:71
-#: extensions/webmail/forms.py:7
+#: extensions/sievefilters/forms.py:71 extensions/webmail/forms.py:7
 msgid "Cc"
 msgstr "Cc"
 
@@ -1133,7 +1302,9 @@ msgstr "Leite Nachricht um zu"
 
 #: extensions/sievefilters/lib.py:37
 msgid "Connection to MANAGESIEVE server failed, check your configuration"
-msgstr "Verbindung zu MANAGESIEVE-Server fehlgeschlagen. Überprüfen Sie Ihre Konfiguration."
+msgstr ""
+"Verbindung zu MANAGESIEVE-Server fehlgeschlagen. Überprüfen Sie Ihre "
+"Konfiguration."
 
 #: extensions/sievefilters/lib.py:82
 msgid "Not enough space on server"
@@ -1189,14 +1360,6 @@ msgstr "Filter entfernt"
 msgid "Filters set activated"
 msgstr "Filter-Satz aktiviert"
 
-#: extensions/sievefilters/views.py:265
-msgid "yes"
-msgstr "Ja"
-
-#: extensions/sievefilters/views.py:269
-msgid "no"
-msgstr "Nein"
-
 #: extensions/sievefilters/templates/sievefilters/filter.html:6
 msgid "Conditions"
 msgstr "Bedingungen"
@@ -1218,8 +1381,11 @@ msgid "active"
 msgstr "aktiv"
 
 #: extensions/sievefilters/templates/sievefilters/index.html:73
-msgid "No filters set defined yet. You must create one in order to define filters."
-msgstr "Nich keine Filter-Sätze definiert. Sie müssen einen erstellen, damit sie Filter erstellen können."
+msgid ""
+"No filters set defined yet. You must create one in order to define filters."
+msgstr ""
+"Nich keine Filter-Sätze definiert. Sie müssen einen erstellen, damit sie "
+"Filter erstellen können."
 
 #: extensions/sievefilters/templatetags/sfilters_tags.py:16
 msgid "New filters set"
@@ -1257,23 +1423,19 @@ msgstr "Filter nach unten verschieben"
 msgid "Graphical statistics about emails traffic using RRDtool"
 msgstr "Grafische E-Mail-Statistik (setzt RRDtool ein)"
 
-#: extensions/stats/__init__.py:27
+#: extensions/stats/__init__.py:26
 msgid "Path to log file used to collect statistics"
 msgstr "Pfad zur Log-Datei, um Statistiken zu sammeln"
 
-#: extensions/stats/__init__.py:30
+#: extensions/stats/__init__.py:29
 msgid "Path to directory where RRD files are stored"
 msgstr "Pfad zum Verzeichnis in dem die RRD-Dateien abgelegt werden"
 
-#: extensions/stats/__init__.py:33
+#: extensions/stats/__init__.py:32
 msgid "Path to directory where PNG files are stored"
 msgstr "Pfad zu dem Verzeichnis in dem PNG-Dateien abgelegt werden"
 
-#: extensions/stats/__init__.py:36
-msgid "Graphics location (to build URLs)"
-msgstr "Grafik-Pfad (um URLs zu erstellen)"
-
-#: extensions/stats/__init__.py:47
+#: extensions/stats/__init__.py:45
 msgid "Statistics"
 msgstr "Statistiken"
 
@@ -1341,16 +1503,15 @@ msgstr "Jahr"
 msgid "Custom"
 msgstr "Individuell"
 
-#: extensions/stats/views.py:30
-#: extensions/stats/templates/stats/graphs.html:8
+#: extensions/stats/views.py:30 extensions/stats/templates/stats/graphs.html:8
 msgid "No statistics available"
 msgstr "Keine Statistik-Daten verfügbar"
 
-#: extensions/stats/views.py:58
+#: extensions/stats/views.py:57
 msgid "Domain not found. Please enter a full name"
 msgstr "Domain nicht gefunden. Bitte geben Sie eine vollständigen Namen an."
 
-#: extensions/stats/views.py:65
+#: extensions/stats/views.py:64
 msgid "Bad custom period"
 msgstr "Ungültiger individueller Zeitraum"
 
@@ -1375,114 +1536,114 @@ msgid "Apply"
 msgstr "Antworten"
 
 #: extensions/webmail/__init__.py:12
-msgid "Address of your IMAP server"
-msgstr "Addresse Ihres IMAP-Servers"
-
-#: extensions/webmail/__init__.py:15
-msgid "Use a secured connection to access IMAP server"
-msgstr "Gesicherte Verbindung für Zugriff auf IMAP-Server verwenden"
-
-#: extensions/webmail/__init__.py:17
-msgid "Listening port of your IMAP server"
-msgstr "Port auf dem der IMAP-Server lauscht"
-
-#: extensions/webmail/__init__.py:20
-msgid "Address of your SMTP server"
-msgstr "Addresse Ihres SMTP-Servers"
-
-#: extensions/webmail/__init__.py:22
-msgid "None"
-msgstr "Kein"
-
-#: extensions/webmail/__init__.py:26
-msgid "Use a secured connection to access SMTP server"
-msgstr "Gesicherte Verbindung für Zugriff auf SMTP-Server verwenden"
-
-#: extensions/webmail/__init__.py:28
-msgid "Listening port of your SMTP server"
-msgstr "Port auf dem der SMTP-Server lauscht"
-
-#: extensions/webmail/__init__.py:31
-msgid "Server needs authentication"
-msgstr "Server erfordert Authentifizierung"
-
-#: extensions/webmail/__init__.py:33
-msgid "Maximum attachment size in bytes (or KB, MB, GB if specified)"
-msgstr "Maximale Größe Anhang in Bytes (oder KB, MB, GB wenn angegeben)"
-
-#: extensions/webmail/__init__.py:36
-msgid "Number of displayed emails per page"
-msgstr "Anzahl dargestellter Nachrichten pro Seite"
-
-#: extensions/webmail/__init__.py:39
-msgid "Listing refresh rate"
-msgstr "Aktualisierungsintervall für Liste"
-
-#: extensions/webmail/__init__.py:40
-msgid "Automatic folder refresh rate (in seconds)"
-msgstr "Aktualisierungsintervall für Ordner (in Sekunden)"
-
-#: extensions/webmail/__init__.py:42
-msgid "Trash folder"
-msgstr "Papierkorb"
-
-#: extensions/webmail/__init__.py:43
-msgid "Folder where deleted messages go"
-msgstr "Ordner für gelöschte Nachrichten"
-
-#: extensions/webmail/__init__.py:45
-msgid "Sent folder"
-msgstr "Gesendete Nachrichten"
-
-#: extensions/webmail/__init__.py:46
-msgid "Folder where copies of sent messages go"
-msgstr "Ordner für Gesendete Nachrichten"
-
-#: extensions/webmail/__init__.py:48
-msgid "Drafts folder"
-msgstr "Entwürfe"
-
-#: extensions/webmail/__init__.py:49
-msgid "Folder where drafts go"
-msgstr "Ordner für Entwürfe"
-
-#: extensions/webmail/__init__.py:51
-msgid "Signature text"
-msgstr "Signatur"
-
-#: extensions/webmail/__init__.py:52
-msgid "User defined email signature"
-msgstr "Benutzerdefinierte E-Mail-Signatur"
-
-#: extensions/webmail/__init__.py:54
-msgid "Default editor"
-msgstr "Standard-Editor"
-
-#: extensions/webmail/__init__.py:56
-msgid "The default editor to use when composing a message"
-msgstr "Der Standard-Editor zum Erstellen einer Nachricht"
-
-#: extensions/webmail/__init__.py:58
-msgid "Default message display mode"
-msgstr "Standard Betrachtungsmodus für Nachrichten"
-
-#: extensions/webmail/__init__.py:60
-msgid "The default mode used when displaying a message"
-msgstr "Der Standard Modus zum Betrachten einer Nachricht"
-
-#: extensions/webmail/__init__.py:62
-msgid "Enable HTML links display"
-msgstr "Aktiviere Darstellung von HTML-Links"
-
-#: extensions/webmail/__init__.py:63
-msgid "Enable/Disable HTML links display"
-msgstr "Aktiviere/Deaktiviere Darstellung von HTML-Links"
-
-#: extensions/webmail/__init__.py:73
 msgid "Simple IMAP webmail"
 msgstr "Einfaches IMAP-Webmail"
 
-#: extensions/webmail/__init__.py:85
+#: extensions/webmail/__init__.py:20
+msgid "Address of your IMAP server"
+msgstr "Addresse Ihres IMAP-Servers"
+
+#: extensions/webmail/__init__.py:23
+msgid "Use a secured connection to access IMAP server"
+msgstr "Gesicherte Verbindung für Zugriff auf IMAP-Server verwenden"
+
+#: extensions/webmail/__init__.py:25
+msgid "Listening port of your IMAP server"
+msgstr "Port auf dem der IMAP-Server lauscht"
+
+#: extensions/webmail/__init__.py:28
+msgid "Address of your SMTP server"
+msgstr "Addresse Ihres SMTP-Servers"
+
+#: extensions/webmail/__init__.py:30
+msgid "None"
+msgstr "Kein"
+
+#: extensions/webmail/__init__.py:34
+msgid "Use a secured connection to access SMTP server"
+msgstr "Gesicherte Verbindung für Zugriff auf SMTP-Server verwenden"
+
+#: extensions/webmail/__init__.py:36
+msgid "Listening port of your SMTP server"
+msgstr "Port auf dem der SMTP-Server lauscht"
+
+#: extensions/webmail/__init__.py:39
+msgid "Server needs authentication"
+msgstr "Server erfordert Authentifizierung"
+
+#: extensions/webmail/__init__.py:41
+msgid "Maximum attachment size in bytes (or KB, MB, GB if specified)"
+msgstr "Maximale Größe Anhang in Bytes (oder KB, MB, GB wenn angegeben)"
+
+#: extensions/webmail/__init__.py:44
+msgid "Number of displayed emails per page"
+msgstr "Anzahl dargestellter Nachrichten pro Seite"
+
+#: extensions/webmail/__init__.py:47
+msgid "Listing refresh rate"
+msgstr "Aktualisierungsintervall für Liste"
+
+#: extensions/webmail/__init__.py:48
+msgid "Automatic folder refresh rate (in seconds)"
+msgstr "Aktualisierungsintervall für Ordner (in Sekunden)"
+
+#: extensions/webmail/__init__.py:50
+msgid "Trash folder"
+msgstr "Papierkorb"
+
+#: extensions/webmail/__init__.py:51
+msgid "Folder where deleted messages go"
+msgstr "Ordner für gelöschte Nachrichten"
+
+#: extensions/webmail/__init__.py:53
+msgid "Sent folder"
+msgstr "Gesendete Nachrichten"
+
+#: extensions/webmail/__init__.py:54
+msgid "Folder where copies of sent messages go"
+msgstr "Ordner für Gesendete Nachrichten"
+
+#: extensions/webmail/__init__.py:56
+msgid "Drafts folder"
+msgstr "Entwürfe"
+
+#: extensions/webmail/__init__.py:57
+msgid "Folder where drafts go"
+msgstr "Ordner für Entwürfe"
+
+#: extensions/webmail/__init__.py:59
+msgid "Signature text"
+msgstr "Signatur"
+
+#: extensions/webmail/__init__.py:60
+msgid "User defined email signature"
+msgstr "Benutzerdefinierte E-Mail-Signatur"
+
+#: extensions/webmail/__init__.py:62
+msgid "Default editor"
+msgstr "Standard-Editor"
+
+#: extensions/webmail/__init__.py:64
+msgid "The default editor to use when composing a message"
+msgstr "Der Standard-Editor zum Erstellen einer Nachricht"
+
+#: extensions/webmail/__init__.py:66
+msgid "Default message display mode"
+msgstr "Standard Betrachtungsmodus für Nachrichten"
+
+#: extensions/webmail/__init__.py:68
+msgid "The default mode used when displaying a message"
+msgstr "Der Standard Modus zum Betrachten einer Nachricht"
+
+#: extensions/webmail/__init__.py:70
+msgid "Enable HTML links display"
+msgstr "Aktiviere Darstellung von HTML-Links"
+
+#: extensions/webmail/__init__.py:71
+msgid "Enable/Disable HTML links display"
+msgstr "Aktiviere/Deaktiviere Darstellung von HTML-Links"
+
+#: extensions/webmail/__init__.py:87
 msgid "Webmail"
 msgstr "Webmail"
 
@@ -1503,12 +1664,11 @@ msgstr "Verbindung zu IMAP-Server fehlgeschlagen: %s"
 msgid "wrote:"
 msgstr "schrieb:"
 
-#: extensions/webmail/lib.py:377
-#: extensions/webmail/lib.py:381
+#: extensions/webmail/lib.py:377 extensions/webmail/lib.py:381
 msgid "Original message"
 msgstr "Gesendete Nachrichten"
 
-#: extensions/webmail/lib.py:681
+#: extensions/webmail/lib.py:678
 msgid "Red fields are mandatories"
 msgstr "Rote markierte Felder sind MUSS-Felder"
 
@@ -1516,13 +1676,12 @@ msgstr "Rote markierte Felder sind MUSS-Felder"
 msgid "Unknown action"
 msgstr "Unbekannte Aktion"
 
-#: extensions/webmail/views.py:98
-#: lib/email_listing.py:158
+#: extensions/webmail/views.py:98 lib/email_listing.py:158
 msgid "Empty mailbox"
 msgstr "Mailbox leer"
 
 #: extensions/webmail/views.py:115
-#: extensions/webmail/templatetags/webextras.py:166
+#: extensions/webmail/templatetags/webextras.py:165
 msgid "Create a new mailbox"
 msgstr "Neue Mailbox erstellen"
 
@@ -1538,9 +1697,8 @@ msgstr "Mailbox bearbeiten"
 msgid "Mailbox updated"
 msgstr "Mailbox aktualisiert"
 
-#: extensions/webmail/views.py:194
-#: extensions/webmail/views.py:374
-#: extensions/webmail/views.py:483
+#: extensions/webmail/views.py:194 extensions/webmail/views.py:376
+#: extensions/webmail/views.py:485
 msgid "Bad request"
 msgstr "Fehlerhafte Anfrage"
 
@@ -1571,7 +1729,7 @@ msgstr "Konnte Anhang nicht entfernen:"
 msgid "Unknown attachment"
 msgstr "Unbekannter Anhang"
 
-#: extensions/webmail/views.py:479
+#: extensions/webmail/views.py:481
 msgid "Undefined action"
 msgstr "Undefinierte Aktion"
 
@@ -1614,7 +1772,7 @@ msgstr "Antworten"
 msgid "Reply all"
 msgstr "Allen Antworten"
 
-#: extensions/webmail/templatetags/webextras.py:29
+#: extensions/webmail/templatetags/webextras.py:29 userprefs/views.py:27
 #: userprefs/templatetags/uprefs_extras.py:25
 msgid "Forward"
 msgstr "Weiterleiten"
@@ -1667,11 +1825,11 @@ msgstr "Ordner komprimieren"
 msgid "Empty folder"
 msgstr "Leerer Ordner"
 
-#: extensions/webmail/templatetags/webextras.py:174
+#: extensions/webmail/templatetags/webextras.py:173
 msgid "Edit the selected mailbox"
 msgstr "Ausgewählte Mailbox bearbeiten"
 
-#: extensions/webmail/templatetags/webextras.py:179
+#: extensions/webmail/templatetags/webextras.py:178
 msgid "Remove the selected mailbox"
 msgstr "Markierte Mailbox entfernen"
 
@@ -1684,8 +1842,7 @@ msgstr "Erlaubnis verweigert: %s"
 msgid "Permission denied"
 msgstr "Berechtigung verweigert"
 
-#: lib/formutils.py:154
-#: lib/formutils.py:161
+#: lib/formutils.py:158 lib/formutils.py:165
 msgid "Enter a valid domain name"
 msgstr "Geben Sie einen gültigen Domain-Namen an"
 
@@ -1701,63 +1858,15 @@ msgstr "Super-Administrator"
 msgid "Domain administrator"
 msgstr "Domänen-Administrator"
 
-#: lib/permissions.py:62
+#: lib/permissions.py:70
 #, python-format
 msgid "Failed to grant access (%s)"
 msgstr "Konnte Zugriff nicht gewähren: %s"
 
-#: lib/tables.py:233
+#: lib/tables.py:232
 msgid "No entries to display"
 msgstr "Keine Einträge darzustellen"
 
-#: templates/admin/editdomainform.html:5
-msgid "Administrators"
-msgstr "Administratoren"
-
-#: templates/admin/editdomainform.html:6
-msgid "Miscellaneous"
-msgstr "Verschiedenes"
-
-#: templates/admin/editdomainform.html:24
-msgid "No domain administrator defined"
-msgstr "Domänen-Administrator fehlt"
-
-#: templates/admin/editdomainform.html:27
-msgid "Creation date"
-msgstr "Erstellungsdatum"
-
-#: templates/admin/editdomainform.html:28
-msgid "Last modification date"
-msgstr "Datum der letzten Änderung"
-
-#: templates/admin/extensions.html:7
-#: templates/admin/parameters.html:9
-#: templates/userprefs/preferences.html:37
-msgid "Save"
-msgstr "Speichern"
-
-#: templates/admin/importform.html:5
-msgid "Help"
-msgstr "Hilfe"
-
-#: templates/admin/importform.html:12
-msgid "Importing..."
-msgstr "Importiere …"
-
-#: templates/admin/listing.html:12
-#: templates/admin/searchform.html:4
-msgid "Search"
-msgstr "Suchen"
-
-#: templates/admin/mailboxes_raw.html:3
-msgid "Choose a value"
-msgstr "Wert auswählen"
-
-#: templates/admin/newaccount.html:31
-#: templates/common/generic_modal.html:11
-msgid "Close"
-msgstr "Schliessen"
-
 #: templates/common/email_searchbar.html:5
 msgid "From address"
 msgstr "From:-Adresse"
@@ -1774,7 +1883,8 @@ msgstr "Suchen..."
 msgid "Error:"
 msgstr "Fehler:"
 
-#: templates/common/generic_field.html:4
+#: templates/common/generic_field.html:3
+#: templates/common/generic_fields_group.html:3
 msgid "Help:"
 msgstr "Hilfe:"
 
@@ -1786,19 +1896,14 @@ msgstr "Keine Parameter verfügbar"
 msgid "Welcome to Modoboa"
 msgstr "Willkommen zu Modoboa"
 
-#: templates/registration/login.html:35
+#: templates/registration/login.html:36
 msgid "Remember me"
 msgstr "Erinnere mich"
 
-#: templates/registration/login.html:37
+#: templates/registration/login.html:38
 msgid "Log in"
 msgstr "Anmelden"
 
-#: templates/userprefs/preferences.html:2
-#: userprefs/templatetags/uprefs_extras.py:53
-msgid "Settings"
-msgstr "Einstellungen"
-
 #: userprefs/__init__.py:7
 msgid "Prefered language"
 msgstr "Bevorzugte Sprache"
@@ -1815,56 +1920,107 @@ msgstr "Altes Passwort"
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: userprefs/forms.py:27
+#: userprefs/forms.py:37
 msgid "Old password mismatchs"
 msgstr "Altes Passwort stimmt nicht überein"
 
-#: userprefs/forms.py:32
+#: userprefs/forms.py:42
 msgid "Passwords mismatch"
 msgstr "Passwörter stimmen nicht überein"
 
-#: userprefs/forms.py:36
-msgid "Destination(s)"
-msgstr "Ziel(e)"
+#: userprefs/forms.py:56
+#, fuzzy
+msgid "Recipient(s)"
+msgstr "Empfänger"
 
-#: userprefs/forms.py:37
+#: userprefs/forms.py:59
+msgid "Indicate one or more recipients separated by a ','"
+msgstr ""
+
+#: userprefs/forms.py:62
 msgid "Keep local copies"
 msgstr "Lokale Kopien behalten"
 
-#: userprefs/forms.py:50
-msgid "You can't define a forward to a local destination. Please ask your administrator to create an alias instead."
-msgstr "Sie können keine Weiterleitung auf ein lokales Ziel anlegen. Bitten Sie Ihren Administrator stattdessen einen Alias anzulegen."
+#: userprefs/forms.py:64
+msgid "Forward messages and store copies into your local mailbox"
+msgstr ""
 
-#: userprefs/views.py:26
-msgid "Password change is disabled for this user"
-msgstr "Passwort-Änderung ist für diesen Anwender deaktiviert"
+#: userprefs/forms.py:81
+msgid ""
+"You can't define a forward to a local destination. Please ask your "
+"administrator to create an alias instead."
+msgstr ""
+"Sie können keine Weiterleitung auf ein lokales Ziel anlegen. Bitten Sie "
+"Ihren Administrator stattdessen einen Alias anzulegen."
 
-#: userprefs/views.py:31
-#: userprefs/templatetags/uprefs_extras.py:48
-msgid "Change password"
-msgstr "Passwort ändern"
+#: userprefs/views.py:28
+msgid "Automatically forward emails to another address"
+msgstr ""
 
-#: userprefs/views.py:51
-msgid "Password changed"
-msgstr "Passwort geändert"
-
-#: userprefs/views.py:63
-msgid "Define a forward"
-msgstr "Weiterleitung definieren"
-
-#: userprefs/views.py:89
+#: userprefs/views.py:52
 msgid "Forward updated"
 msgstr "Weiterleitung aktualisiert"
 
-#: userprefs/views.py:142
+#: userprefs/views.py:88
+#, fuzzy
+msgid "Profile updated"
+msgstr "Mailbox aktualisiert"
+
+#: userprefs/views.py:97 userprefs/templatetags/uprefs_extras.py:16
+msgid "Profile"
+msgstr ""
+
+#: userprefs/views.py:98
+msgid "Update your personal information"
+msgstr ""
+
+#: userprefs/views.py:114
 msgid "Preferences saved"
 msgstr "Einstellungen gespeichert"
 
-#: userprefs/templatetags/uprefs_extras.py:17
+#: userprefs/templates/userprefs/preferences.html:2
+#: userprefs/templatetags/uprefs_extras.py:46
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: userprefs/templates/userprefs/preferences.html:21
+#: userprefs/templatetags/uprefs_extras.py:19
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: userprefs/templatetags/uprefs_extras.py:61
+#: userprefs/templates/userprefs/preferences.html:21
+#, fuzzy
+msgid "Customize Modoboa"
+msgstr "Willkommen zu Modoboa"
+
+#: userprefs/templatetags/uprefs_extras.py:55
 msgid "Logout"
 msgstr "Logout"
 
+#, fuzzy
+#~ msgid "tag subject"
+#~ msgstr "Betreff"
+
+#~ msgid "Mailbox(es) this alias will point to"
+#~ msgstr "Mailbox(en) auf den der Alias verweisen wird"
+
+#~ msgid "Alias(es) of this mailbox"
+#~ msgstr "Aliase dieser Mailbox"
+
+#~ msgid "Graphics location (to build URLs)"
+#~ msgstr "Grafik-Pfad (um URLs zu erstellen)"
+
+#~ msgid "Destination(s)"
+#~ msgstr "Ziel(e)"
+
+#~ msgid "Password change is disabled for this user"
+#~ msgstr "Passwort-Änderung ist für diesen Anwender deaktiviert"
+
+#~ msgid "Change password"
+#~ msgstr "Passwort ändern"
+
+#~ msgid "Password changed"
+#~ msgstr "Passwort geändert"
+
+#~ msgid "Define a forward"
+#~ msgstr "Weiterleitung definieren"
diff --git a/modoboa/locale/de/LC_MESSAGES/djangojs.po b/modoboa/locale/de/LC_MESSAGES/djangojs.po
index 5a25ed863..98c06c3c2 100644
--- a/modoboa/locale/de/LC_MESSAGES/djangojs.po
+++ b/modoboa/locale/de/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Modoboa-0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-03 11:05+0200\n"
+"POT-Creation-Date: 2012-07-03 09:12+0200\n"
 "PO-Revision-Date: 2012-05-10 17:08+0100\n"
 "Last-Translator: Patrick Ben Koetter <p@state-of-mind.de>\n"
 "Language-Team: DE <p@state-of-mind.fr>\n"
@@ -17,75 +17,74 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: extensions/amavis_quarantine/static/js/quarantine.js:126
+#: admin/static/admin/js/admin.js:17
+msgid "No domain administrator defined"
+msgstr "Domain-Administrator fehlt"
+
+#: extensions/amavis/static/amavis/js/quarantine.js:126
 msgid "Release this selection?"
 msgstr "Diese Auswahl freilassen?"
 
-#: extensions/amavis_quarantine/static/js/quarantine.js:130
+#: extensions/amavis/static/amavis/js/quarantine.js:130
 msgid "Delete this selection?"
 msgstr "Diese Auswahl löschen?"
 
-#: extensions/amavis_quarantine/static/js/quarantine.js:148
-#: extensions/amavis_quarantine/static/js/selfservice.js:22
+#: extensions/amavis/static/amavis/js/quarantine.js:148
+#: extensions/amavis/static/amavis/js/selfservice.js:22
 msgid "Release this message?"
 msgstr "Diese Nachricht freilassen?"
 
-#: extensions/amavis_quarantine/static/js/quarantine.js:152
-#: extensions/amavis_quarantine/static/js/selfservice.js:26
+#: extensions/amavis/static/amavis/js/quarantine.js:152
+#: extensions/amavis/static/amavis/js/selfservice.js:26
 msgid "Delete this message?"
 msgstr "Diese Nachricht löschen?"
 
-#: extensions/amavis_quarantine/static/js/quarantine.js:169
+#: extensions/amavis/static/amavis/js/quarantine.js:169
 msgid "View full headers"
 msgstr "Vollansicht Header anzeigen"
 
-#: extensions/amavis_quarantine/static/js/quarantine.js:174
+#: extensions/amavis/static/amavis/js/quarantine.js:174
 msgid "Hide full headers"
 msgstr "Vollansicht Header ausblenden"
 
-#: extensions/sievefilters/static/js/lib.js:14
+#: extensions/sievefilters/static/sievefilters/js/lib.js:14
 msgid "Remove this filter?"
 msgstr "Diesen Filter entfernen?"
 
-#: extensions/sievefilters/static/js/lib.js:117
+#: extensions/sievefilters/static/sievefilters/js/lib.js:117
 msgid "Save changes?"
 msgstr "Änderungen speichern?"
 
-#: extensions/sievefilters/static/js/lib.js:144
+#: extensions/sievefilters/static/sievefilters/js/lib.js:144
 msgid "Remove filters set?"
 msgstr "Diesen Filter entfernen?"
 
-#: extensions/sievefilters/static/js/lib.js:161
+#: extensions/sievefilters/static/sievefilters/js/lib.js:161
 msgid "Activate this filters set?"
 msgstr "Diesen Filter aktivieren?"
 
-#: extensions/sievefilters/static/js/lib.js:169
-#: extensions/sievefilters/static/js/lib.js:224
+#: extensions/sievefilters/static/sievefilters/js/lib.js:169
+#: extensions/sievefilters/static/sievefilters/js/lib.js:224
 msgid "active"
 msgstr "aktiv"
 
-#: extensions/stats/static/js/stats.js:28
+#: extensions/stats/static/stats/js/stats.js:28
 msgid "Search a domain"
 msgstr "Domain suchen"
 
-#: extensions/webmail/static/js/webmail.js:499
+#: extensions/webmail/static/webmail/js/webmail.js:511
 msgid "Remove the selected mailbox?"
 msgstr "Ausgewählte Mailbox entfernen?"
 
-#: extensions/webmail/static/js/webmail.js:513
+#: extensions/webmail/static/webmail/js/webmail.js:525
 msgid "Mailbox removed"
 msgstr "Mailbox entfernt"
 
-#: static/js/admin.js:17
-msgid "No domain administrator defined"
-msgstr "Domain-Administrator fehlt"
-
 #: static/js/confirmation.js:45
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: static/js/confirmation.js:84
-#: static/js/history.js:230
+#: static/js/confirmation.js:84 static/js/history.js:231
 msgid "Internal Error"
 msgstr "Interner Fehler"
 
@@ -96,4 +95,3 @@ msgstr "Lade..."
 #: static/js/searchbar.js:20
 msgid "Search..."
 msgstr "Suchen..."
-
diff --git a/modoboa/locale/en/LC_MESSAGES/django.po b/modoboa/locale/en/LC_MESSAGES/django.po
index ea8416d69..978b28949 100644
--- a/modoboa/locale/en/LC_MESSAGES/django.po
+++ b/modoboa/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-03 10:59+0200\n"
+"POT-Creation-Date: 2012-07-04 15:16+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -55,19 +55,19 @@ msgid ""
 "maildir format"
 msgstr ""
 
-#: admin/__init__.py:28
+#: admin/__init__.py:32
 msgid "Scheme used to crypt mailbox passwords"
 msgstr ""
 
-#: admin/__init__.py:31
+#: admin/__init__.py:35
 msgid "Number of displayed items per page"
 msgstr ""
 
-#: admin/__init__.py:54
+#: admin/__init__.py:57
 msgid "The default redirection used when no application is specified"
 msgstr ""
 
-#: admin/forms.py:15 admin/forms.py:396 admin/tables.py:17
+#: admin/forms.py:15 admin/forms.py:445 admin/tables.py:17
 msgid "Alias(es)"
 msgstr ""
 
@@ -75,169 +75,180 @@ msgstr ""
 msgid "Alias(es) of this domain"
 msgstr ""
 
-#: admin/forms.py:51 admin/views.py:60
+#: admin/forms.py:54
 msgid "An alias with this name already exists"
 msgstr ""
 
-#: admin/forms.py:66
+#: admin/forms.py:69
 msgid "A domain with this name already exists"
 msgstr ""
 
-#: admin/forms.py:76
+#: admin/forms.py:79
 msgid "Failed to rename domain, check permissions"
 msgstr ""
 
-#: admin/forms.py:103
+#: admin/forms.py:110 admin/forms.py:598 admin/views.py:363
+msgid "General"
+msgstr ""
+
+#: admin/forms.py:132
 msgid "Email address"
 msgstr ""
 
-#: admin/forms.py:104
+#: admin/forms.py:133
 msgid "The distribution list address"
 msgstr ""
 
-#: admin/forms.py:107
+#: admin/forms.py:136
 msgid "Recipients"
 msgstr ""
 
-#: admin/forms.py:108
-msgid "Mailbox(es) this alias will point to"
+#: admin/forms.py:137
+msgid ""
+"Mailbox(es) this alias will point to. Indicate only one address per input, "
+"press ENTER to add a new input."
 msgstr ""
 
-#: admin/forms.py:142 admin/forms.py:221 admin/forms.py:429
-#: admin/models.py:779
+#: admin/forms.py:171 admin/forms.py:250 admin/forms.py:478
+#: admin/models.py:809
 msgid "Domain does not exist"
 msgstr ""
 
-#: admin/forms.py:144 admin/forms.py:223
+#: admin/forms.py:173 admin/forms.py:252
 msgid "You don't have access to this domain"
 msgstr ""
 
-#: admin/forms.py:164
+#: admin/forms.py:193
 msgid "Invalid mailbox"
 msgstr ""
 
-#: admin/forms.py:175 admin/models.py:799
+#: admin/forms.py:204 admin/models.py:829
 #, python-format
 msgid "Mailbox %s does not exist"
 msgstr ""
 
-#: admin/forms.py:184
+#: admin/forms.py:213
 msgid "No recipient defined"
 msgstr ""
 
-#: admin/forms.py:187
+#: admin/forms.py:216
 msgid "A distribution list must contain at least two recipients"
 msgstr ""
 
-#: admin/forms.py:201
+#: admin/forms.py:230
 msgid "Address"
 msgstr ""
 
-#: admin/forms.py:202
+#: admin/forms.py:231
 msgid "A valid e-mail address"
 msgstr ""
 
-#: admin/forms.py:238 admin/forms.py:267 extensions/sievefilters/forms.py:70
+#: admin/forms.py:267 admin/forms.py:296 extensions/sievefilters/forms.py:70
 msgid "Recipient"
 msgstr ""
 
-#: admin/forms.py:239
+#: admin/forms.py:268
 msgid "A local recipient address"
 msgstr ""
 
-#: admin/forms.py:254
+#: admin/forms.py:283
 msgid "Mailbox does not exist"
 msgstr ""
 
-#: admin/forms.py:256
+#: admin/forms.py:285
 msgid "You can't access this mailbox"
 msgstr ""
 
-#: admin/forms.py:268
+#: admin/forms.py:297
 msgid "An external recipient address"
 msgstr ""
 
-#: admin/forms.py:285
+#: admin/forms.py:314
 msgid "Local recipients are forbidden"
 msgstr ""
 
-#: admin/forms.py:295 extensions/webmail/forms.py:18
+#: admin/forms.py:324 extensions/webmail/forms.py:18
 msgid "Select a file"
 msgstr ""
 
-#: admin/forms.py:296
+#: admin/forms.py:325
 msgid "Separator"
 msgstr ""
 
-#: admin/forms.py:308 auth/forms.py:6 templates/admin/editdomainform.html:20
+#: admin/forms.py:337 admin/templates/admin/editdomainform.html:9
+#: auth/forms.py:6
 msgid "Username"
 msgstr ""
 
-#: admin/forms.py:310
+#: admin/forms.py:339
 msgid "Role"
 msgstr ""
 
-#: admin/forms.py:311 admin/forms.py:335
+#: admin/forms.py:340 admin/forms.py:364
 msgid "Choose"
 msgstr ""
 
-#: admin/forms.py:312
+#: admin/forms.py:341
 msgid "What level of permission this user will have"
 msgstr ""
 
-#: admin/forms.py:314 auth/forms.py:10
+#: admin/forms.py:343 auth/forms.py:10
 msgid "Password"
 msgstr ""
 
-#: admin/forms.py:316 userprefs/forms.py:15
+#: admin/forms.py:345 userprefs/forms.py:15
 msgid "Confirmation"
 msgstr ""
 
-#: admin/forms.py:318
+#: admin/forms.py:347
 msgid "Enter the same password as above, for verification."
 msgstr ""
 
-#: admin/forms.py:329
+#: admin/forms.py:358
 msgid "Enabled"
 msgstr ""
 
-#: admin/forms.py:367
+#: admin/forms.py:396
 msgid "The two password fields didn't match."
 msgstr ""
 
-#: admin/forms.py:393
+#: admin/forms.py:437
 msgid "E-mail"
 msgstr ""
 
-#: admin/forms.py:394
+#: admin/forms.py:439
 msgid "Quota"
 msgstr ""
 
-#: admin/forms.py:398
-msgid "Alias(es) of this mailbox"
+#: admin/forms.py:441
+msgid ""
+"Quota in MB for this mailbox. Leave empty to use the value defined at domain "
+"level."
 msgstr ""
 
-#: admin/forms.py:454
+#: admin/forms.py:447
+msgid ""
+"Alias(es) of this mailbox. Indicate only one address per input, press ENTER "
+"to add a new input."
+msgstr ""
+
+#: admin/forms.py:505
 msgid "Failed to rename mailbox, check permissions"
 msgstr ""
 
-#: admin/forms.py:495
+#: admin/forms.py:547
 msgid "Domain(s)"
 msgstr ""
 
-#: admin/forms.py:497
+#: admin/forms.py:549
 msgid "Domain(s) that user administrates"
 msgstr ""
 
-#: admin/forms.py:546 admin/views.py:356 templates/admin/editdomainform.html:4
-msgid "General"
-msgstr ""
-
-#: admin/forms.py:548 admin/views.py:359
+#: admin/forms.py:600 admin/views.py:366
 msgid "Mail"
 msgstr ""
 
-#: admin/forms.py:550
+#: admin/forms.py:602
 msgid "Permissions"
 msgstr ""
 
@@ -249,112 +260,113 @@ msgstr ""
 msgid "You can't delete your own account"
 msgstr ""
 
-#: admin/models.py:137
+#: admin/models.py:151
 msgid "Failed to update password: LDAP module not installed"
 msgstr ""
 
-#: admin/models.py:143
+#: admin/models.py:157
 #, python-format
 msgid "Failed to update password: %s"
 msgstr ""
 
-#: admin/models.py:375 admin/models.py:461
+#: admin/models.py:393 admin/models.py:479
 msgid "name"
 msgstr ""
 
-#: admin/models.py:376
+#: admin/models.py:394
 msgid "The domain name"
 msgstr ""
 
-#: admin/models.py:377
+#: admin/models.py:395
 msgid "Default quota in MB applied to mailboxes"
 msgstr ""
 
-#: admin/models.py:378 admin/models.py:466 admin/models.py:708
-#: admin/models.py:805 extensions/postfix_autoreply/models.py:19
+#: admin/models.py:396 admin/models.py:484 admin/models.py:738
+#: admin/models.py:835 extensions/postfix_autoreply/models.py:19
 msgid "enabled"
 msgstr ""
 
-#: admin/models.py:379
+#: admin/models.py:397
 msgid "Check to activate this domain"
 msgstr ""
 
-#: admin/models.py:446
+#: admin/models.py:464
 msgid "Failed to initialise domain, check permissions"
 msgstr ""
 
-#: admin/models.py:454 admin/models.py:669 admin/models.py:774
+#: admin/models.py:472 admin/models.py:699 admin/models.py:804
 msgid "Invalid line"
 msgstr ""
 
-#: admin/models.py:462
+#: admin/models.py:480
 msgid "The alias name"
 msgstr ""
 
-#: admin/models.py:463
+#: admin/models.py:481
 msgid "target"
 msgstr ""
 
-#: admin/models.py:464
+#: admin/models.py:482
 msgid "The domain this alias points to"
 msgstr ""
 
-#: admin/models.py:467 admin/models.py:709
+#: admin/models.py:485 admin/models.py:739
 msgid "Check to activate this alias"
 msgstr ""
 
-#: admin/models.py:486 admin/models.py:699
+#: admin/models.py:504 admin/models.py:729
 msgid "address"
 msgstr ""
 
-#: admin/models.py:487
+#: admin/models.py:505
 msgid "Mailbox address (without the @domain.tld part)"
 msgstr ""
 
-#: admin/models.py:584
+#: admin/models.py:611
 #, python-format
 msgid "%s is not a valid uid/username"
 msgstr ""
 
-#: admin/models.py:593
+#: admin/models.py:620
 #, python-format
 msgid "%s is not a valid gid/groupname"
 msgstr ""
 
-#: admin/models.py:597 admin/models.py:654
+#: admin/models.py:630 admin/models.py:684
 msgid "Failed to initialise mailbox, check permissions"
 msgstr ""
 
-#: admin/models.py:622
+#: admin/models.py:655
 #, python-format
 msgid "Account '%s' already exists"
 msgstr ""
 
-#: admin/models.py:675
+#: admin/models.py:705
 msgid "Cannot import this mailbox because the associated domain does not exist"
 msgstr ""
 
-#: admin/models.py:700
+#: admin/models.py:730
 msgid ""
 "The alias address (without the domain part). For a 'catch-all' address, just "
 "enter an * character."
 msgstr ""
 
-#: admin/models.py:704
+#: admin/models.py:734
 msgid "mailboxes"
 msgstr ""
 
-#: admin/models.py:705
+#: admin/models.py:735
 msgid "The mailboxes this alias points to"
 msgstr ""
 
-#: admin/models.py:806
+#: admin/models.py:836
 msgid "Check to enable this extension"
 msgstr ""
 
-#: admin/tables.py:12 admin/tables.py:44 extensions/sievefilters/forms.py:53
+#: admin/tables.py:12 admin/tables.py:44
+#: admin/templates/admin/editdomainform.html:9
+#: extensions/sievefilters/forms.py:53
 #: extensions/sievefilters/templates/sievefilters/guieditor.html:6
-#: templates/admin/editdomainform.html:20
 msgid "Name"
 msgstr ""
 
@@ -389,7 +401,7 @@ msgstr ""
 msgid "New domain"
 msgstr ""
 
-#: admin/views.py:81 admin/views.py:174 admin/views.py:353 admin/views.py:360
+#: admin/views.py:81 admin/views.py:181 admin/views.py:360 admin/views.py:367
 #: extensions/sievefilters/views.py:120 extensions/sievefilters/views.py:187
 #: extensions/webmail/views.py:118
 msgid "Create"
@@ -399,121 +411,118 @@ msgstr ""
 msgid "Domain created"
 msgstr ""
 
-#: admin/views.py:108 admin/views.py:223 admin/views.py:403
-#: extensions/postfix_autoreply/views.py:22
+#: admin/views.py:111 admin/views.py:230 admin/views.py:411
 #: extensions/sievefilters/views.py:139 extensions/webmail/views.py:149
-#: userprefs/views.py:34 userprefs/views.py:66
+#: userprefs/templates/userprefs/form.html:4
 msgid "Update"
 msgstr ""
 
-#: admin/views.py:115
+#: admin/views.py:122
 msgid "Domain modified"
 msgstr ""
 
-#: admin/views.py:138
+#: admin/views.py:145
 msgid "You can't delete your own domain"
 msgstr ""
 
-#: admin/views.py:141
+#: admin/views.py:148
 msgid "Domain deleted"
 msgid_plural "Domains deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin/views.py:156
+#: admin/views.py:163
 msgid "Alias with this name already exists"
 msgstr ""
 
-#: admin/views.py:194
+#: admin/views.py:201
 msgid "New distribution list"
 msgstr ""
 
-#: admin/views.py:198
+#: admin/views.py:205
 msgid "Distribution list created"
 msgstr ""
 
-#: admin/views.py:204
+#: admin/views.py:211
 msgid "New alias"
 msgstr ""
 
-#: admin/views.py:208
+#: admin/views.py:215
 msgid "Alias created"
 msgstr ""
 
-#: admin/views.py:214
+#: admin/views.py:221
 msgid "New forward"
 msgstr ""
 
-#: admin/views.py:218
+#: admin/views.py:225
 msgid "Forward created"
 msgstr ""
 
-#: admin/views.py:235
+#: admin/views.py:242
 msgid "Alias modified"
 msgstr ""
 
-#: admin/views.py:239
+#: admin/views.py:246
 msgid "Distribution list modified"
 msgstr ""
 
-#: admin/views.py:243
+#: admin/views.py:250
 msgid "Forward modified"
 msgstr ""
 
-#: admin/views.py:350
+#: admin/views.py:357
 msgid "New account"
 msgstr ""
 
-#: admin/views.py:357
+#: admin/views.py:364
 msgid "Next"
 msgstr ""
 
-#: admin/views.py:361
+#: admin/views.py:368
 msgid "Previous"
 msgstr ""
 
-#: admin/views.py:372
+#: admin/views.py:380
 msgid "Account created"
 msgstr ""
 
-#: admin/views.py:417
+#: admin/views.py:425
 msgid "Account updated"
 msgstr ""
 
-#: admin/views.py:437
+#: admin/views.py:445
 msgid "Account deleted"
 msgid_plural "Accounts deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin/views.py:447 admin/views.py:452
-#: extensions/amavis_quarantine/views.py:196
-#: extensions/amavis_quarantine/views.py:202
-#: extensions/amavis_quarantine/views.py:229
-#: extensions/amavis_quarantine/views.py:233
-#: extensions/amavis_quarantine/views.py:235 extensions/stats/views.py:46
-#: extensions/webmail/views.py:32 extensions/webmail/views.py:55
-#: extensions/webmail/views.py:68 extensions/webmail/views.py:80
-#: extensions/webmail/views.py:96 extensions/webmail/views.py:180
-#: extensions/webmail/views.py:405 extensions/webmail/views.py:416
-#: extensions/webmail/views.py:443 lib/formutils.py:29 lib/formutils.py:34
+#: admin/views.py:455 admin/views.py:460 extensions/amavis/views.py:199
+#: extensions/amavis/views.py:205 extensions/amavis/views.py:232
+#: extensions/amavis/views.py:236 extensions/amavis/views.py:238
+#: extensions/stats/views.py:46 extensions/webmail/views.py:32
+#: extensions/webmail/views.py:55 extensions/webmail/views.py:68
+#: extensions/webmail/views.py:80 extensions/webmail/views.py:96
+#: extensions/webmail/views.py:180 extensions/webmail/views.py:407
+#: extensions/webmail/views.py:418 extensions/webmail/views.py:445
+#: lib/formutils.py:33 lib/formutils.py:38
 msgid "Invalid request"
 msgstr ""
 
-#: admin/views.py:492
+#: admin/views.py:500
 msgid "Parameters saved"
 msgstr ""
 
-#: admin/views.py:538
+#: admin/views.py:546
 msgid "Modifications applied."
 msgstr ""
 
-#: admin/views.py:595
+#: admin/views.py:603
 #, python-format
 msgid "%d objects imported successfully"
 msgstr ""
 
-#: admin/views.py:614
+#: admin/views.py:621
 msgid ""
 "Provide a CSV file where lines respect one of the following format:\n"
 "<ul>\n"
@@ -524,16 +533,16 @@ msgid ""
 "You can use a different character as separator.\n"
 msgstr ""
 
-#: admin/views.py:622
+#: admin/views.py:629
 msgid "Import identities"
 msgstr ""
 
-#: admin/views.py:623 admin/views.py:649 admin/templatetags/admin_extras.py:73
-#: admin/templatetags/admin_extras.py:114
+#: admin/views.py:630 admin/views.py:656 admin/templatetags/admin_extras.py:76
+#: admin/templatetags/admin_extras.py:118
 msgid "Import"
 msgstr ""
 
-#: admin/views.py:641
+#: admin/views.py:648
 msgid ""
 "Provide a CSV file where lines respect the following format:<br/>\n"
 "<em>domain; name; quota</em><br/>\n"
@@ -541,10 +550,100 @@ msgid ""
 "You can use a different character as separator.\n"
 msgstr ""
 
-#: admin/views.py:648
+#: admin/views.py:655
 msgid "Import domains"
 msgstr ""
 
+#: admin/templates/admin/domain_general_form.html:3
+#: admin/templates/admin/mailform.html:3
+#: admin/templates/admin/newdomainform.html:3
+msgid "MB"
+msgstr ""
+
+#: admin/templates/admin/domains.html:2 admin/templatetags/admin_extras.py:22
+#: extensions/limits/forms.py:14 extensions/limits/models.py:10
+msgid "Domains"
+msgstr ""
+
+#: admin/templates/admin/editdomainform.html:3
+msgid "Administrators"
+msgstr ""
+
+#: admin/templates/admin/editdomainform.html:4
+msgid "Miscellaneous"
+msgstr ""
+
+#: admin/templates/admin/editdomainform.html:13
+msgid "No domain administrator defined"
+msgstr ""
+
+#: admin/templates/admin/editdomainform.html:16
+msgid "Creation date"
+msgstr ""
+
+#: admin/templates/admin/editdomainform.html:17
+msgid "Last modification date"
+msgstr ""
+
+#: admin/templates/admin/editdomainform.html:18 extensions/limits/forms.py:16
+#: extensions/limits/models.py:11
+msgid "Domain aliases"
+msgstr ""
+
+#: admin/templates/admin/editdomainform.html:19 extensions/limits/forms.py:18
+#: extensions/limits/models.py:12
+#: extensions/webmail/templates/webmail/folders.html:4
+msgid "Mailboxes"
+msgstr ""
+
+#: admin/templates/admin/editdomainform.html:20 extensions/limits/forms.py:20
+#: extensions/limits/models.py:13
+msgid "Mailbox aliases"
+msgstr ""
+
+#: admin/templates/admin/extensions.html:2
+#: admin/templatetags/admin_extras.py:49
+msgid "Extensions"
+msgstr ""
+
+#: admin/templates/admin/extensions.html:7
+#: admin/templates/admin/parameters.html:9
+#: userprefs/templates/userprefs/preferences.html:28
+msgid "Save"
+msgstr ""
+
+#: admin/templates/admin/identities.html:2
+#: admin/templatetags/admin_extras.py:30
+msgid "Identities"
+msgstr ""
+
+#: admin/templates/admin/importform.html:5
+msgid "Help"
+msgstr ""
+
+#: admin/templates/admin/importform.html:12
+msgid "Importing..."
+msgstr ""
+
+#: admin/templates/admin/listing.html:12
+#: admin/templates/admin/searchform.html:4
+msgid "Search"
+msgstr ""
+
+#: admin/templates/admin/mailboxes_raw.html:3
+msgid "Choose a value"
+msgstr ""
+
+#: admin/templates/admin/newaccount.html:31
+#: templates/common/generic_modal.html:11
+msgid "Close"
+msgstr ""
+
+#: admin/templates/admin/parameters.html:2
+#: admin/templatetags/admin_extras.py:54
+msgid "Parameters"
+msgstr ""
+
 #: admin/templatetags/admin_extras.py:12
 msgid "enabled_m"
 msgstr ""
@@ -553,72 +652,55 @@ msgstr ""
 msgid "enabled_f"
 msgstr ""
 
-#: admin/templatetags/admin_extras.py:22 extensions/limits/forms.py:14
-#: extensions/limits/models.py:10 templates/admin/domains.html:2
-msgid "Domains"
-msgstr ""
-
-#: admin/templatetags/admin_extras.py:30 templates/admin/identities.html:2
-msgid "Identities"
-msgstr ""
-
 #: admin/templatetags/admin_extras.py:35
 msgid "Modoboa"
 msgstr ""
 
-#: admin/templatetags/admin_extras.py:49 templates/admin/extensions.html:2
-msgid "Extensions"
-msgstr ""
-
-#: admin/templatetags/admin_extras.py:54 templates/admin/parameters.html:2
-msgid "Parameters"
-msgstr ""
-
-#: admin/templatetags/admin_extras.py:67
+#: admin/templatetags/admin_extras.py:70
 msgid "Add domain"
 msgstr ""
 
-#: admin/templatetags/admin_extras.py:90
+#: admin/templatetags/admin_extras.py:94
 msgid "Add account"
 msgstr ""
 
-#: admin/templatetags/admin_extras.py:96
+#: admin/templatetags/admin_extras.py:100
 msgid "Add alias"
 msgstr ""
 
-#: admin/templatetags/admin_extras.py:102
+#: admin/templatetags/admin_extras.py:106
 msgid "Add forward"
 msgstr ""
 
-#: admin/templatetags/admin_extras.py:108
+#: admin/templatetags/admin_extras.py:112
 msgid "Add distribution list"
 msgstr ""
 
-#: admin/templatetags/admin_extras.py:145
+#: admin/templatetags/admin_extras.py:150
 msgid "Delete this account"
 msgstr ""
 
-#: admin/templatetags/admin_extras.py:155
+#: admin/templatetags/admin_extras.py:160
 msgid "Delete this distribution list"
 msgstr ""
 
-#: admin/templatetags/admin_extras.py:162
+#: admin/templatetags/admin_extras.py:167
 msgid "Delete this forward"
 msgstr ""
 
-#: admin/templatetags/admin_extras.py:169
+#: admin/templatetags/admin_extras.py:174
 msgid "Delete this alias"
 msgstr ""
 
-#: admin/templatetags/admin_extras.py:179
+#: admin/templatetags/admin_extras.py:184
 msgid "Remove this permission"
 msgstr ""
 
-#: admin/templatetags/admin_extras.py:213
+#: admin/templatetags/admin_extras.py:214
 msgid "Yes"
 msgstr ""
 
-#: admin/templatetags/admin_extras.py:213
+#: admin/templatetags/admin_extras.py:214
 msgid "No"
 msgstr ""
 
@@ -626,23 +708,23 @@ msgstr ""
 msgid "Key used to encrypt/decrypt passwords"
 msgstr ""
 
-#: auth/views.py:38
+#: auth/views.py:40
 msgid "Account is disabled."
 msgstr ""
 
-#: auth/views.py:39
+#: auth/views.py:41
 msgid "Your username and password didn't match. Please try again."
 msgstr ""
 
-#: demo/__init__.py:19
+#: demo/__init__.py:17
 msgid "Test messages"
 msgstr ""
 
-#: demo/__init__.py:24
+#: demo/__init__.py:22
 msgid "Send virus"
 msgstr ""
 
-#: demo/__init__.py:28
+#: demo/__init__.py:25
 msgid "Send spam"
 msgstr ""
 
@@ -667,179 +749,290 @@ msgid ""
 "mailing list</a>.</p>\n"
 msgstr ""
 
-#: extensions/amavis_quarantine/__init__.py:17
-msgid "Simple amavis quarantine management tool"
+#: extensions/amavis/__init__.py:21
+msgid "Simple amavis management frontend"
 msgstr ""
 
-#: extensions/amavis_quarantine/__init__.py:46
+#: extensions/amavis/__init__.py:45
 msgid "Quarantine messages maximum age (in days) before deletion"
 msgstr ""
 
-#: extensions/amavis_quarantine/__init__.py:50
+#: extensions/amavis/__init__.py:49
 msgid "Remove messages marked as released while cleaning up the database"
 msgstr ""
 
-#: extensions/amavis_quarantine/__init__.py:55
+#: extensions/amavis/__init__.py:54
 msgid "Mode used to access the PDP server"
 msgstr ""
 
-#: extensions/amavis_quarantine/__init__.py:58
+#: extensions/amavis/__init__.py:57
 msgid "PDP server address (if inet mode)"
 msgstr ""
 
-#: extensions/amavis_quarantine/__init__.py:61
+#: extensions/amavis/__init__.py:60
 msgid "PDP server port (if inet mode)"
 msgstr ""
 
-#: extensions/amavis_quarantine/__init__.py:64
+#: extensions/amavis/__init__.py:63
 msgid "Path to the PDP server socket (if unix mode)"
 msgstr ""
 
-#: extensions/amavis_quarantine/__init__.py:67
+#: extensions/amavis/__init__.py:66
 msgid "Interval between two release requests checks"
 msgstr ""
 
-#: extensions/amavis_quarantine/__init__.py:69
+#: extensions/amavis/__init__.py:68
 msgid "Allow users to directly release their messages"
 msgstr ""
 
-#: extensions/amavis_quarantine/__init__.py:71
+#: extensions/amavis/__init__.py:70
 msgid "Activate the 'self-service' mode"
 msgstr ""
 
-#: extensions/amavis_quarantine/__init__.py:76
-#: extensions/webmail/__init__.py:37
+#: extensions/amavis/__init__.py:72
+msgid "The e-mail address used to send notitications"
+msgstr ""
+
+#: extensions/amavis/__init__.py:77 extensions/webmail/__init__.py:45
 msgid "Sets the maximum number of messages displayed in a page"
 msgstr ""
 
-#: extensions/amavis_quarantine/__init__.py:90
+#: extensions/amavis/__init__.py:93
 msgid "Quarantine"
 msgstr ""
 
-#: extensions/amavis_quarantine/__init__.py:152
+#: extensions/amavis/__init__.py:151
 msgid "pending requests"
 msgstr ""
 
-#: extensions/amavis_quarantine/__init__.py:168
+#: extensions/amavis/__init__.py:167
 #, python-format
 msgid "%d pending requests"
 msgstr ""
 
-#: extensions/amavis_quarantine/sql_listing.py:23
-#: extensions/webmail/forms.py:5 extensions/webmail/lib.py:34
+#: extensions/amavis/__init__.py:178
+msgid "Content filter"
+msgstr ""
+
+#: extensions/amavis/models.py:78
+msgid "Virus filter"
+msgstr ""
+
+#: extensions/amavis/models.py:79 extensions/amavis/models.py:87
+#: extensions/amavis/models.py:95 extensions/amavis/models.py:104
+#: extensions/sievefilters/views.py:265
+msgid "yes"
+msgstr ""
+
+#: extensions/amavis/models.py:80 extensions/amavis/models.py:88
+#: extensions/amavis/models.py:96 extensions/amavis/models.py:105
+#: extensions/sievefilters/views.py:269
+msgid "no"
+msgstr ""
+
+#: extensions/amavis/models.py:81 extensions/amavis/models.py:89
+#: extensions/amavis/models.py:97 extensions/amavis/models.py:106
+msgid "default"
+msgstr ""
+
+#: extensions/amavis/models.py:83
+msgid "Bypass virus checks or not. Choose 'default' to use global settings."
+msgstr ""
+
+#: extensions/amavis/models.py:86
+msgid "Spam filter"
+msgstr ""
+
+#: extensions/amavis/models.py:91
+msgid "Bypass spam checks or not. Choose 'default' to use global settings."
+msgstr ""
+
+#: extensions/amavis/models.py:94
+msgid "Banned filter"
+msgstr ""
+
+#: extensions/amavis/models.py:99
+msgid "Bypass banned checks or not. Choose 'default' to use global settings."
+msgstr ""
+
+#: extensions/amavis/models.py:103
+msgid "Spam marker"
+msgstr ""
+
+#: extensions/amavis/models.py:108
+msgid "Modify spam subject or not. Choose 'default' to use global settings."
+msgstr ""
+
+#: extensions/amavis/sql_listing.py:23 extensions/webmail/forms.py:5
+#: extensions/webmail/lib.py:34
 msgid "From"
 msgstr ""
 
-#: extensions/amavis_quarantine/sql_listing.py:24
-#: extensions/sievefilters/forms.py:68 extensions/webmail/forms.py:9
-#: extensions/webmail/lib.py:33 extensions/webmail/lib.py:363
-#: templates/common/email_searchbar.html:6
+#: extensions/amavis/sql_listing.py:24 extensions/sievefilters/forms.py:68
+#: extensions/webmail/forms.py:9 extensions/webmail/lib.py:33
+#: extensions/webmail/lib.py:363 templates/common/email_searchbar.html:6
 msgid "Subject"
 msgstr ""
 
-#: extensions/amavis_quarantine/sql_listing.py:25 extensions/webmail/lib.py:35
+#: extensions/amavis/sql_listing.py:25 extensions/webmail/lib.py:35
 #: extensions/webmail/lib.py:365
 msgid "Date"
 msgstr ""
 
-#: extensions/amavis_quarantine/sql_listing.py:26
-#: extensions/amavis_quarantine/templatetags/amextras.py:102
+#: extensions/amavis/sql_listing.py:26
+#: extensions/amavis/templatetags/amextras.py:102
 #: extensions/webmail/forms.py:6
 msgid "To"
 msgstr ""
 
-#: extensions/amavis_quarantine/views.py:32
+#: extensions/amavis/views.py:32
 msgid "Empty quarantine"
 msgstr ""
 
-#: extensions/amavis_quarantine/views.py:203
+#: extensions/amavis/views.py:206
 msgid "Message deleted"
 msgstr ""
 
-#: extensions/amavis_quarantine/views.py:219
+#: extensions/amavis/views.py:222
 #, python-format
 msgid "%(count)d message deleted successfully"
 msgid_plural "%(count)d messages deleted successfully"
 msgstr[0] ""
 msgstr[1] ""
 
-#: extensions/amavis_quarantine/views.py:238
+#: extensions/amavis/views.py:241
 msgid "Request sent"
 msgstr ""
 
-#: extensions/amavis_quarantine/views.py:244
+#: extensions/amavis/views.py:247
 msgid "Message released"
 msgstr ""
 
-#: extensions/amavis_quarantine/views.py:258
+#: extensions/amavis/views.py:261
 #, python-format
 msgid "%(count)d request sent"
 msgid_plural "%(count)d requests sent"
 msgstr[0] ""
 msgstr[1] ""
 
-#: extensions/amavis_quarantine/views.py:281
+#: extensions/amavis/views.py:284
 #, python-format
 msgid "%(count)d message released successfully"
 msgid_plural "%(count)d messages released successfully"
 msgstr[0] ""
 msgstr[1] ""
 
-#: extensions/amavis_quarantine/templates/amavis_quarantine/index.html:2
+#: extensions/amavis/management/commands/amnotify.py:45
+msgid "[modoboa] Pending release requests"
+msgstr ""
+
+#: extensions/amavis/templates/amavis/domain_content_filter.html:5
+msgid "Thresholds"
+msgstr ""
+
+#: extensions/amavis/templates/amavis/domain_content_filter.html:7
+msgid "or more is spam"
+msgstr ""
+
+#: extensions/amavis/templates/amavis/domain_content_filter.html:8
+msgid "or more throw spam message away"
+msgstr ""
+
+#: extensions/amavis/templates/amavis/index.html:2
 msgid "Quarantine management"
 msgstr ""
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:20
-#: extensions/amavis_quarantine/templatetags/amextras.py:52
-#: extensions/amavis_quarantine/templatetags/amextras.py:72
+#: extensions/amavis/templates/amavis/notifications/pending_requests.html:1
+#, python-format
+msgid ""
+"\n"
+"%(counter)s release request is pending for action.\n"
+msgid_plural ""
+"\n"
+"%(counter)s release requests are pending for action.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: extensions/amavis/templates/amavis/notifications/pending_requests.html:6
+msgid "Sketch:"
+msgstr ""
+
+#: extensions/amavis/templates/amavis/notifications/pending_requests.html:8
+msgid "From:"
+msgstr ""
+
+#: extensions/amavis/templates/amavis/notifications/pending_requests.html:9
+msgid "To:"
+msgstr ""
+
+#: extensions/amavis/templates/amavis/notifications/pending_requests.html:10
+msgid "Date:"
+msgstr ""
+
+#: extensions/amavis/templates/amavis/notifications/pending_requests.html:11
+msgid "Subject:"
+msgstr ""
+
+#: extensions/amavis/templates/amavis/notifications/pending_requests.html:12
+msgid "Act on this message:"
+msgstr ""
+
+#: extensions/amavis/templates/amavis/notifications/pending_requests.html:14
+#, python-format
+msgid "Please visit %(listingurl)s for a full listing."
+msgstr ""
+
+#: extensions/amavis/templatetags/amextras.py:20
+#: extensions/amavis/templatetags/amextras.py:52
+#: extensions/amavis/templatetags/amextras.py:72
 msgid "Release"
 msgstr ""
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:26
-#: extensions/amavis_quarantine/templatetags/amextras.py:59
-#: extensions/amavis_quarantine/templatetags/amextras.py:77
+#: extensions/amavis/templatetags/amextras.py:26
+#: extensions/amavis/templatetags/amextras.py:59
+#: extensions/amavis/templatetags/amextras.py:77
 #: extensions/webmail/templatetags/webextras.py:33
 msgid "Delete"
 msgstr ""
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:29
+#: extensions/amavis/templatetags/amextras.py:29
 msgid "View full headers"
 msgstr ""
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:80
+#: extensions/amavis/templatetags/amextras.py:80
 msgid "Content Class"
 msgstr ""
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:84
+#: extensions/amavis/templatetags/amextras.py:84
 msgid "Nothing"
 msgstr ""
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:87
+#: extensions/amavis/templatetags/amextras.py:87
 msgid "Spam"
 msgstr ""
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:90
+#: extensions/amavis/templatetags/amextras.py:90
 msgid "Virus"
 msgstr ""
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:93
+#: extensions/amavis/templatetags/amextras.py:93
 msgid "Bad header"
 msgstr ""
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:96
+#: extensions/amavis/templatetags/amextras.py:96
 msgid "Bad MIME"
 msgstr ""
 
-#: extensions/limits/__init__.py:55
+#: extensions/limits/__init__.py:23
 msgid ""
 "Per administrator resources to limit the number of objects they can create"
 msgstr ""
 
-#: extensions/limits/__init__.py:62
+#: extensions/limits/__init__.py:60
 msgid "Reseller"
 msgstr ""
 
-#: extensions/limits/__init__.py:93
+#: extensions/limits/__init__.py:91
 msgid "Resources"
 msgstr ""
 
@@ -855,30 +1048,14 @@ msgstr ""
 msgid "Maximum number of domains this user can create"
 msgstr ""
 
-#: extensions/limits/forms.py:16 extensions/limits/models.py:11
-#: templates/admin/editdomainform.html:29
-msgid "Domain aliases"
-msgstr ""
-
 #: extensions/limits/forms.py:17
 msgid "Maximum number of domain aliases this user can create"
 msgstr ""
 
-#: extensions/limits/forms.py:18 extensions/limits/models.py:12
-#: extensions/webmail/templates/webmail/folders.html:4
-#: templates/admin/editdomainform.html:30
-msgid "Mailboxes"
-msgstr ""
-
 #: extensions/limits/forms.py:19
 msgid "Maximum number of mailboxes this user can create"
 msgstr ""
 
-#: extensions/limits/forms.py:20 extensions/limits/models.py:13
-#: templates/admin/editdomainform.html:31
-msgid "Mailbox aliases"
-msgstr ""
-
 #: extensions/limits/forms.py:21
 msgid "Maximum number of mailbox aliases this user can create"
 msgstr ""
@@ -920,12 +1097,12 @@ msgstr ""
 msgid "Auto-reply (vacation) functionality using Postfix"
 msgstr ""
 
-#: extensions/postfix_autoreply/__init__.py:45
+#: extensions/postfix_autoreply/__init__.py:43
 msgid "Timeout in seconds between two auto-replies to the same recipient"
 msgstr ""
 
 #: extensions/postfix_autoreply/__init__.py:68
-#: extensions/postfix_autoreply/views.py:19
+#: extensions/postfix_autoreply/views.py:42
 msgid "Auto-reply message"
 msgstr ""
 
@@ -946,7 +1123,7 @@ msgid "subject"
 msgstr ""
 
 #: extensions/postfix_autoreply/models.py:16
-msgid "The subject that will appear in sended emails"
+msgid "The subject that will appear in sent emails"
 msgstr ""
 
 #: extensions/postfix_autoreply/models.py:17
@@ -954,46 +1131,50 @@ msgid "content"
 msgstr ""
 
 #: extensions/postfix_autoreply/models.py:18
-msgid "The content that will appear in sended emails"
+msgid "The content that will appear in sent emails"
 msgstr ""
 
 #: extensions/postfix_autoreply/models.py:20
 msgid "Activate/Deactivate your auto reply"
 msgstr ""
 
-#: extensions/postfix_autoreply/views.py:43
+#: extensions/postfix_autoreply/views.py:36
 msgid "Auto reply message updated successfully."
 msgstr ""
 
-#: extensions/sievefilters/__init__.py:15
-msgid "Address of your MANAGESIEVE server"
+#: extensions/postfix_autoreply/views.py:43
+msgid "Define a message to automatically send when you are off"
 msgstr ""
 
-#: extensions/sievefilters/__init__.py:17
-msgid "Listening port of your MANAGESIEVE server"
-msgstr ""
-
-#: extensions/sievefilters/__init__.py:19
-msgid "Use the STARTTLS extension"
-msgstr ""
-
-#: extensions/sievefilters/__init__.py:26
-msgid "Prefered authentication mechanism"
-msgstr ""
-
-#: extensions/sievefilters/__init__.py:30
-msgid "Editor mode"
-msgstr ""
-
-#: extensions/sievefilters/__init__.py:32
-msgid "Select the mode you want the editor to work in"
-msgstr ""
-
-#: extensions/sievefilters/__init__.py:42
+#: extensions/sievefilters/__init__.py:12
 msgid "Plugin to easily create server-side filters"
 msgstr ""
 
-#: extensions/sievefilters/__init__.py:56
+#: extensions/sievefilters/__init__.py:20
+msgid "Address of your MANAGESIEVE server"
+msgstr ""
+
+#: extensions/sievefilters/__init__.py:22
+msgid "Listening port of your MANAGESIEVE server"
+msgstr ""
+
+#: extensions/sievefilters/__init__.py:24
+msgid "Use the STARTTLS extension"
+msgstr ""
+
+#: extensions/sievefilters/__init__.py:31
+msgid "Prefered authentication mechanism"
+msgstr ""
+
+#: extensions/sievefilters/__init__.py:35
+msgid "Editor mode"
+msgstr ""
+
+#: extensions/sievefilters/__init__.py:37
+msgid "Select the mode you want the editor to work in"
+msgstr ""
+
+#: extensions/sievefilters/__init__.py:55
 #: extensions/sievefilters/templates/sievefilters/index.html:2
 msgid "Message filters"
 msgstr ""
@@ -1116,14 +1297,6 @@ msgstr ""
 msgid "Filters set activated"
 msgstr ""
 
-#: extensions/sievefilters/views.py:265
-msgid "yes"
-msgstr ""
-
-#: extensions/sievefilters/views.py:269
-msgid "no"
-msgstr ""
-
 #: extensions/sievefilters/templates/sievefilters/filter.html:6
 msgid "Conditions"
 msgstr ""
@@ -1185,23 +1358,19 @@ msgstr ""
 msgid "Graphical statistics about emails traffic using RRDtool"
 msgstr ""
 
-#: extensions/stats/__init__.py:27
+#: extensions/stats/__init__.py:26
 msgid "Path to log file used to collect statistics"
 msgstr ""
 
-#: extensions/stats/__init__.py:30
+#: extensions/stats/__init__.py:29
 msgid "Path to directory where RRD files are stored"
 msgstr ""
 
-#: extensions/stats/__init__.py:33
+#: extensions/stats/__init__.py:32
 msgid "Path to directory where PNG files are stored"
 msgstr ""
 
-#: extensions/stats/__init__.py:36
-msgid "Graphics location (to build URLs)"
-msgstr ""
-
-#: extensions/stats/__init__.py:47
+#: extensions/stats/__init__.py:45
 msgid "Statistics"
 msgstr ""
 
@@ -1273,11 +1442,11 @@ msgstr ""
 msgid "No statistics available"
 msgstr ""
 
-#: extensions/stats/views.py:58
+#: extensions/stats/views.py:57
 msgid "Domain not found. Please enter a full name"
 msgstr ""
 
-#: extensions/stats/views.py:65
+#: extensions/stats/views.py:64
 msgid "Bad custom period"
 msgstr ""
 
@@ -1302,114 +1471,114 @@ msgid "Apply"
 msgstr ""
 
 #: extensions/webmail/__init__.py:12
-msgid "Address of your IMAP server"
-msgstr ""
-
-#: extensions/webmail/__init__.py:15
-msgid "Use a secured connection to access IMAP server"
-msgstr ""
-
-#: extensions/webmail/__init__.py:17
-msgid "Listening port of your IMAP server"
-msgstr ""
-
-#: extensions/webmail/__init__.py:20
-msgid "Address of your SMTP server"
-msgstr ""
-
-#: extensions/webmail/__init__.py:22
-msgid "None"
-msgstr ""
-
-#: extensions/webmail/__init__.py:26
-msgid "Use a secured connection to access SMTP server"
-msgstr ""
-
-#: extensions/webmail/__init__.py:28
-msgid "Listening port of your SMTP server"
-msgstr ""
-
-#: extensions/webmail/__init__.py:31
-msgid "Server needs authentication"
-msgstr ""
-
-#: extensions/webmail/__init__.py:33
-msgid "Maximum attachment size in bytes (or KB, MB, GB if specified)"
-msgstr ""
-
-#: extensions/webmail/__init__.py:36
-msgid "Number of displayed emails per page"
-msgstr ""
-
-#: extensions/webmail/__init__.py:39
-msgid "Listing refresh rate"
-msgstr ""
-
-#: extensions/webmail/__init__.py:40
-msgid "Automatic folder refresh rate (in seconds)"
-msgstr ""
-
-#: extensions/webmail/__init__.py:42
-msgid "Trash folder"
-msgstr ""
-
-#: extensions/webmail/__init__.py:43
-msgid "Folder where deleted messages go"
-msgstr ""
-
-#: extensions/webmail/__init__.py:45
-msgid "Sent folder"
-msgstr ""
-
-#: extensions/webmail/__init__.py:46
-msgid "Folder where copies of sent messages go"
-msgstr ""
-
-#: extensions/webmail/__init__.py:48
-msgid "Drafts folder"
-msgstr ""
-
-#: extensions/webmail/__init__.py:49
-msgid "Folder where drafts go"
-msgstr ""
-
-#: extensions/webmail/__init__.py:51
-msgid "Signature text"
-msgstr ""
-
-#: extensions/webmail/__init__.py:52
-msgid "User defined email signature"
-msgstr ""
-
-#: extensions/webmail/__init__.py:54
-msgid "Default editor"
-msgstr ""
-
-#: extensions/webmail/__init__.py:56
-msgid "The default editor to use when composing a message"
-msgstr ""
-
-#: extensions/webmail/__init__.py:58
-msgid "Default message display mode"
-msgstr ""
-
-#: extensions/webmail/__init__.py:60
-msgid "The default mode used when displaying a message"
-msgstr ""
-
-#: extensions/webmail/__init__.py:62
-msgid "Enable HTML links display"
-msgstr ""
-
-#: extensions/webmail/__init__.py:63
-msgid "Enable/Disable HTML links display"
-msgstr ""
-
-#: extensions/webmail/__init__.py:73
 msgid "Simple IMAP webmail"
 msgstr ""
 
-#: extensions/webmail/__init__.py:85
+#: extensions/webmail/__init__.py:20
+msgid "Address of your IMAP server"
+msgstr ""
+
+#: extensions/webmail/__init__.py:23
+msgid "Use a secured connection to access IMAP server"
+msgstr ""
+
+#: extensions/webmail/__init__.py:25
+msgid "Listening port of your IMAP server"
+msgstr ""
+
+#: extensions/webmail/__init__.py:28
+msgid "Address of your SMTP server"
+msgstr ""
+
+#: extensions/webmail/__init__.py:30
+msgid "None"
+msgstr ""
+
+#: extensions/webmail/__init__.py:34
+msgid "Use a secured connection to access SMTP server"
+msgstr ""
+
+#: extensions/webmail/__init__.py:36
+msgid "Listening port of your SMTP server"
+msgstr ""
+
+#: extensions/webmail/__init__.py:39
+msgid "Server needs authentication"
+msgstr ""
+
+#: extensions/webmail/__init__.py:41
+msgid "Maximum attachment size in bytes (or KB, MB, GB if specified)"
+msgstr ""
+
+#: extensions/webmail/__init__.py:44
+msgid "Number of displayed emails per page"
+msgstr ""
+
+#: extensions/webmail/__init__.py:47
+msgid "Listing refresh rate"
+msgstr ""
+
+#: extensions/webmail/__init__.py:48
+msgid "Automatic folder refresh rate (in seconds)"
+msgstr ""
+
+#: extensions/webmail/__init__.py:50
+msgid "Trash folder"
+msgstr ""
+
+#: extensions/webmail/__init__.py:51
+msgid "Folder where deleted messages go"
+msgstr ""
+
+#: extensions/webmail/__init__.py:53
+msgid "Sent folder"
+msgstr ""
+
+#: extensions/webmail/__init__.py:54
+msgid "Folder where copies of sent messages go"
+msgstr ""
+
+#: extensions/webmail/__init__.py:56
+msgid "Drafts folder"
+msgstr ""
+
+#: extensions/webmail/__init__.py:57
+msgid "Folder where drafts go"
+msgstr ""
+
+#: extensions/webmail/__init__.py:59
+msgid "Signature text"
+msgstr ""
+
+#: extensions/webmail/__init__.py:60
+msgid "User defined email signature"
+msgstr ""
+
+#: extensions/webmail/__init__.py:62
+msgid "Default editor"
+msgstr ""
+
+#: extensions/webmail/__init__.py:64
+msgid "The default editor to use when composing a message"
+msgstr ""
+
+#: extensions/webmail/__init__.py:66
+msgid "Default message display mode"
+msgstr ""
+
+#: extensions/webmail/__init__.py:68
+msgid "The default mode used when displaying a message"
+msgstr ""
+
+#: extensions/webmail/__init__.py:70
+msgid "Enable HTML links display"
+msgstr ""
+
+#: extensions/webmail/__init__.py:71
+msgid "Enable/Disable HTML links display"
+msgstr ""
+
+#: extensions/webmail/__init__.py:87
 msgid "Webmail"
 msgstr ""
 
@@ -1434,7 +1603,7 @@ msgstr ""
 msgid "Original message"
 msgstr ""
 
-#: extensions/webmail/lib.py:681
+#: extensions/webmail/lib.py:678
 msgid "Red fields are mandatories"
 msgstr ""
 
@@ -1447,7 +1616,7 @@ msgid "Empty mailbox"
 msgstr ""
 
 #: extensions/webmail/views.py:115
-#: extensions/webmail/templatetags/webextras.py:166
+#: extensions/webmail/templatetags/webextras.py:165
 msgid "Create a new mailbox"
 msgstr ""
 
@@ -1463,8 +1632,8 @@ msgstr ""
 msgid "Mailbox updated"
 msgstr ""
 
-#: extensions/webmail/views.py:194 extensions/webmail/views.py:374
-#: extensions/webmail/views.py:483
+#: extensions/webmail/views.py:194 extensions/webmail/views.py:376
+#: extensions/webmail/views.py:485
 msgid "Bad request"
 msgstr ""
 
@@ -1495,7 +1664,7 @@ msgstr ""
 msgid "Unknown attachment"
 msgstr ""
 
-#: extensions/webmail/views.py:479
+#: extensions/webmail/views.py:481
 msgid "Undefined action"
 msgstr ""
 
@@ -1538,7 +1707,7 @@ msgstr ""
 msgid "Reply all"
 msgstr ""
 
-#: extensions/webmail/templatetags/webextras.py:29
+#: extensions/webmail/templatetags/webextras.py:29 userprefs/views.py:27
 #: userprefs/templatetags/uprefs_extras.py:25
 msgid "Forward"
 msgstr ""
@@ -1591,11 +1760,11 @@ msgstr ""
 msgid "Empty folder"
 msgstr ""
 
-#: extensions/webmail/templatetags/webextras.py:174
+#: extensions/webmail/templatetags/webextras.py:173
 msgid "Edit the selected mailbox"
 msgstr ""
 
-#: extensions/webmail/templatetags/webextras.py:179
+#: extensions/webmail/templatetags/webextras.py:178
 msgid "Remove the selected mailbox"
 msgstr ""
 
@@ -1608,7 +1777,7 @@ msgstr ""
 msgid "Permission denied"
 msgstr ""
 
-#: lib/formutils.py:154 lib/formutils.py:161
+#: lib/formutils.py:158 lib/formutils.py:165
 msgid "Enter a valid domain name"
 msgstr ""
 
@@ -1624,60 +1793,15 @@ msgstr ""
 msgid "Domain administrator"
 msgstr ""
 
-#: lib/permissions.py:62
+#: lib/permissions.py:70
 #, python-format
 msgid "Failed to grant access (%s)"
 msgstr ""
 
-#: lib/tables.py:233
+#: lib/tables.py:232
 msgid "No entries to display"
 msgstr ""
 
-#: templates/admin/editdomainform.html:5
-msgid "Administrators"
-msgstr ""
-
-#: templates/admin/editdomainform.html:6
-msgid "Miscellaneous"
-msgstr ""
-
-#: templates/admin/editdomainform.html:24
-msgid "No domain administrator defined"
-msgstr ""
-
-#: templates/admin/editdomainform.html:27
-msgid "Creation date"
-msgstr ""
-
-#: templates/admin/editdomainform.html:28
-msgid "Last modification date"
-msgstr ""
-
-#: templates/admin/extensions.html:7 templates/admin/parameters.html:9
-#: templates/userprefs/preferences.html:37
-msgid "Save"
-msgstr ""
-
-#: templates/admin/importform.html:5
-msgid "Help"
-msgstr ""
-
-#: templates/admin/importform.html:12
-msgid "Importing..."
-msgstr ""
-
-#: templates/admin/listing.html:12 templates/admin/searchform.html:4
-msgid "Search"
-msgstr ""
-
-#: templates/admin/mailboxes_raw.html:3
-msgid "Choose a value"
-msgstr ""
-
-#: templates/admin/newaccount.html:31 templates/common/generic_modal.html:11
-msgid "Close"
-msgstr ""
-
 #: templates/common/email_searchbar.html:5
 msgid "From address"
 msgstr ""
@@ -1694,7 +1818,8 @@ msgstr ""
 msgid "Error:"
 msgstr ""
 
-#: templates/common/generic_field.html:4
+#: templates/common/generic_field.html:3
+#: templates/common/generic_fields_group.html:3
 msgid "Help:"
 msgstr ""
 
@@ -1706,19 +1831,14 @@ msgstr ""
 msgid "Welcome to Modoboa"
 msgstr ""
 
-#: templates/registration/login.html:35
+#: templates/registration/login.html:36
 msgid "Remember me"
 msgstr ""
 
-#: templates/registration/login.html:37
+#: templates/registration/login.html:38
 msgid "Log in"
 msgstr ""
 
-#: templates/userprefs/preferences.html:2
-#: userprefs/templatetags/uprefs_extras.py:53
-msgid "Settings"
-msgstr ""
-
 #: userprefs/__init__.py:7
 msgid "Prefered language"
 msgstr ""
@@ -1735,56 +1855,74 @@ msgstr ""
 msgid "New password"
 msgstr ""
 
-#: userprefs/forms.py:27
+#: userprefs/forms.py:37
 msgid "Old password mismatchs"
 msgstr ""
 
-#: userprefs/forms.py:32
+#: userprefs/forms.py:42
 msgid "Passwords mismatch"
 msgstr ""
 
-#: userprefs/forms.py:36
-msgid "Destination(s)"
+#: userprefs/forms.py:56
+msgid "Recipient(s)"
 msgstr ""
 
-#: userprefs/forms.py:37
+#: userprefs/forms.py:59
+msgid "Indicate one or more recipients separated by a ','"
+msgstr ""
+
+#: userprefs/forms.py:62
 msgid "Keep local copies"
 msgstr ""
 
-#: userprefs/forms.py:50
+#: userprefs/forms.py:64
+msgid "Forward messages and store copies into your local mailbox"
+msgstr ""
+
+#: userprefs/forms.py:81
 msgid ""
 "You can't define a forward to a local destination. Please ask your "
 "administrator to create an alias instead."
 msgstr ""
 
-#: userprefs/views.py:26
-msgid "Password change is disabled for this user"
+#: userprefs/views.py:28
+msgid "Automatically forward emails to another address"
 msgstr ""
 
-#: userprefs/views.py:31 userprefs/templatetags/uprefs_extras.py:48
-msgid "Change password"
-msgstr ""
-
-#: userprefs/views.py:51
-msgid "Password changed"
-msgstr ""
-
-#: userprefs/views.py:63
-msgid "Define a forward"
-msgstr ""
-
-#: userprefs/views.py:89
+#: userprefs/views.py:52
 msgid "Forward updated"
 msgstr ""
 
-#: userprefs/views.py:142
+#: userprefs/views.py:88
+msgid "Profile updated"
+msgstr ""
+
+#: userprefs/views.py:97 userprefs/templatetags/uprefs_extras.py:16
+msgid "Profile"
+msgstr ""
+
+#: userprefs/views.py:98
+msgid "Update your personal information"
+msgstr ""
+
+#: userprefs/views.py:114
 msgid "Preferences saved"
 msgstr ""
 
-#: userprefs/templatetags/uprefs_extras.py:17
+#: userprefs/templates/userprefs/preferences.html:2
+#: userprefs/templatetags/uprefs_extras.py:46
+msgid "Settings"
+msgstr ""
+
+#: userprefs/templates/userprefs/preferences.html:21
+#: userprefs/templatetags/uprefs_extras.py:19
 msgid "Preferences"
 msgstr ""
 
-#: userprefs/templatetags/uprefs_extras.py:61
+#: userprefs/templates/userprefs/preferences.html:21
+msgid "Customize Modoboa"
+msgstr ""
+
+#: userprefs/templatetags/uprefs_extras.py:55
 msgid "Logout"
 msgstr ""
diff --git a/modoboa/locale/en/LC_MESSAGES/djangojs.po b/modoboa/locale/en/LC_MESSAGES/djangojs.po
index 6e714568e..0fd48c85f 100644
--- a/modoboa/locale/en/LC_MESSAGES/djangojs.po
+++ b/modoboa/locale/en/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-03 11:05+0200\n"
+"POT-Creation-Date: 2012-07-03 09:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,74 +17,74 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: extensions/amavis_quarantine/static/js/quarantine.js:126
+#: admin/static/admin/js/admin.js:17
+msgid "No domain administrator defined"
+msgstr ""
+
+#: extensions/amavis/static/amavis/js/quarantine.js:126
 msgid "Release this selection?"
 msgstr ""
 
-#: extensions/amavis_quarantine/static/js/quarantine.js:130
+#: extensions/amavis/static/amavis/js/quarantine.js:130
 msgid "Delete this selection?"
 msgstr ""
 
-#: extensions/amavis_quarantine/static/js/quarantine.js:148
-#: extensions/amavis_quarantine/static/js/selfservice.js:22
+#: extensions/amavis/static/amavis/js/quarantine.js:148
+#: extensions/amavis/static/amavis/js/selfservice.js:22
 msgid "Release this message?"
 msgstr ""
 
-#: extensions/amavis_quarantine/static/js/quarantine.js:152
-#: extensions/amavis_quarantine/static/js/selfservice.js:26
+#: extensions/amavis/static/amavis/js/quarantine.js:152
+#: extensions/amavis/static/amavis/js/selfservice.js:26
 msgid "Delete this message?"
 msgstr ""
 
-#: extensions/amavis_quarantine/static/js/quarantine.js:169
+#: extensions/amavis/static/amavis/js/quarantine.js:169
 msgid "View full headers"
 msgstr ""
 
-#: extensions/amavis_quarantine/static/js/quarantine.js:174
+#: extensions/amavis/static/amavis/js/quarantine.js:174
 msgid "Hide full headers"
 msgstr ""
 
-#: extensions/sievefilters/static/js/lib.js:14
+#: extensions/sievefilters/static/sievefilters/js/lib.js:14
 msgid "Remove this filter?"
 msgstr ""
 
-#: extensions/sievefilters/static/js/lib.js:117
+#: extensions/sievefilters/static/sievefilters/js/lib.js:117
 msgid "Save changes?"
 msgstr ""
 
-#: extensions/sievefilters/static/js/lib.js:144
+#: extensions/sievefilters/static/sievefilters/js/lib.js:144
 msgid "Remove filters set?"
 msgstr ""
 
-#: extensions/sievefilters/static/js/lib.js:161
+#: extensions/sievefilters/static/sievefilters/js/lib.js:161
 msgid "Activate this filters set?"
 msgstr ""
 
-#: extensions/sievefilters/static/js/lib.js:169
-#: extensions/sievefilters/static/js/lib.js:224
+#: extensions/sievefilters/static/sievefilters/js/lib.js:169
+#: extensions/sievefilters/static/sievefilters/js/lib.js:224
 msgid "active"
 msgstr ""
 
-#: extensions/stats/static/js/stats.js:28
+#: extensions/stats/static/stats/js/stats.js:28
 msgid "Search a domain"
 msgstr ""
 
-#: extensions/webmail/static/js/webmail.js:499
+#: extensions/webmail/static/webmail/js/webmail.js:511
 msgid "Remove the selected mailbox?"
 msgstr ""
 
-#: extensions/webmail/static/js/webmail.js:513
+#: extensions/webmail/static/webmail/js/webmail.js:525
 msgid "Mailbox removed"
 msgstr ""
 
-#: static/js/admin.js:17
-msgid "No domain administrator defined"
-msgstr ""
-
 #: static/js/confirmation.js:45
 msgid "Cancel"
 msgstr ""
 
-#: static/js/confirmation.js:84 static/js/history.js:230
+#: static/js/confirmation.js:84 static/js/history.js:231
 msgid "Internal Error"
 msgstr ""
 
diff --git a/modoboa/locale/es/LC_MESSAGES/django.po b/modoboa/locale/es/LC_MESSAGES/django.po
index 91e7151ce..99a59d90c 100644
--- a/modoboa/locale/es/LC_MESSAGES/django.po
+++ b/modoboa/locale/es/LC_MESSAGES/django.po
@@ -1,20 +1,20 @@
 # Modoboa spanish translation.
 # Copyright (C) 2010-2012
 # This file is distributed under the same license as the Modoboa package.
-# 
+#
 # Pedro Gracia <pedro.gracia@impulzia.com>, 2010-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Modoboa-0.9\n"
-"Report-Msgid-Bugs-To: http://dev.modoboa.org/\n"
-"POT-Creation-Date: 2012-05-03 10:59+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-07-04 15:16+0200\n"
 "PO-Revision-Date: 2012-05-19 08:42+0000\n"
 "Last-Translator: Pedro Gracia <pedro.gracia@impulzia.com>\n"
 "Language-Team: ES <LL@li.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: admin/__init__.py:9
@@ -27,7 +27,8 @@ msgstr "El sistema usado para autenticación"
 
 #: admin/__init__.py:13
 msgid "Modoboa will handle mailbox creation on filesystem"
-msgstr "Modoboa se ocupará de la creación del mailbox en el sistema de ficheros."
+msgstr ""
+"Modoboa se ocupará de la creación del mailbox en el sistema de ficheros."
 
 #: admin/__init__.py:15
 msgid "Path to the root directory where messages are stored"
@@ -37,13 +38,17 @@ msgstr "Directorio raiz dónde están almacenados los mensajes"
 msgid ""
 "UID of the virtual user which owns domains/mailboxes/messages on the "
 "filesystem"
-msgstr "UID del usuario virtual que es el propietario de los dominios/mailboxes/mensajes en el sistema"
+msgstr ""
+"UID del usuario virtual que es el propietario de los dominios/mailboxes/"
+"mensajes en el sistema"
 
 #: admin/__init__.py:19
 msgid ""
 "GID of the virtual user which owns domains/mailboxes/messages on the "
 "filesystem"
-msgstr "GID del usuario virtual que es el propietario de los dominios/mailboxes/mensajes en el sistema"
+msgstr ""
+"GID del usuario virtual que es el propietario de los dominios/mailboxes/"
+"mensajes en el sistema"
 
 #: admin/__init__.py:22
 msgid "Mailboxes storage format"
@@ -53,21 +58,24 @@ msgstr "Formato de almacenamiento de los Mailboxes"
 msgid ""
 "Sub-directory (inside the mailbox) where messages are stored when using the "
 "maildir format"
-msgstr "Subdirectorio (dentro del mailbox) dónde los mensajes son almacenados cuando se usa el formato maildir"
+msgstr ""
+"Subdirectorio (dentro del mailbox) dónde los mensajes son almacenados cuando "
+"se usa el formato maildir"
 
-#: admin/__init__.py:28
+#: admin/__init__.py:32
 msgid "Scheme used to crypt mailbox passwords"
 msgstr "Esquema usado para cifrar las contraseñas del mailbox"
 
-#: admin/__init__.py:31
+#: admin/__init__.py:35
 msgid "Number of displayed items per page"
 msgstr "Número de elementos mostrado por página"
 
-#: admin/__init__.py:54
+#: admin/__init__.py:57
 msgid "The default redirection used when no application is specified"
-msgstr "La redirección que será usada cuando ninguna aplicación sea especificada."
+msgstr ""
+"La redirección que será usada cuando ninguna aplicación sea especificada."
 
-#: admin/forms.py:15 admin/forms.py:396 admin/tables.py:17
+#: admin/forms.py:15 admin/forms.py:445 admin/tables.py:17
 msgid "Alias(es)"
 msgstr "Alias"
 
@@ -75,169 +83,180 @@ msgstr "Alias"
 msgid "Alias(es) of this domain"
 msgstr "Alias para este dominio"
 
-#: admin/forms.py:51 admin/views.py:60
+#: admin/forms.py:54
 msgid "An alias with this name already exists"
 msgstr "Ya existe un alias con este nombre"
 
-#: admin/forms.py:66
+#: admin/forms.py:69
 msgid "A domain with this name already exists"
 msgstr "Ya existe un dominio con este nombre"
 
-#: admin/forms.py:76
+#: admin/forms.py:79
 msgid "Failed to rename domain, check permissions"
 msgstr "Ha fallado el cambio de nombre de este dominio, compruebe permisos"
 
-#: admin/forms.py:103
+#: admin/forms.py:110 admin/forms.py:598 admin/views.py:363
+msgid "General"
+msgstr "General"
+
+#: admin/forms.py:132
 msgid "Email address"
 msgstr "Dirección de email"
 
-#: admin/forms.py:104
+#: admin/forms.py:133
 msgid "The distribution list address"
 msgstr "Dirección de la lista de distribución"
 
-#: admin/forms.py:107
+#: admin/forms.py:136
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: admin/forms.py:108
-msgid "Mailbox(es) this alias will point to"
-msgstr "Los mailbox(es) a los que el alias apunta"
+#: admin/forms.py:137
+msgid ""
+"Mailbox(es) this alias will point to. Indicate only one address per input, "
+"press ENTER to add a new input."
+msgstr ""
 
-#: admin/forms.py:142 admin/forms.py:221 admin/forms.py:429
-#: admin/models.py:779
+#: admin/forms.py:171 admin/forms.py:250 admin/forms.py:478
+#: admin/models.py:809
 msgid "Domain does not exist"
 msgstr "El dominio no existe"
 
-#: admin/forms.py:144 admin/forms.py:223
+#: admin/forms.py:173 admin/forms.py:252
 msgid "You don't have access to this domain"
 msgstr "No tienes acceso a este dominio"
 
-#: admin/forms.py:164
+#: admin/forms.py:193
 msgid "Invalid mailbox"
 msgstr "mailbox inválido"
 
-#: admin/forms.py:175 admin/models.py:799
+#: admin/forms.py:204 admin/models.py:829
 #, python-format
 msgid "Mailbox %s does not exist"
 msgstr "El mailbox %s no existe"
 
-#: admin/forms.py:184
+#: admin/forms.py:213
 msgid "No recipient defined"
 msgstr "No ha puesto destinatario"
 
-#: admin/forms.py:187
+#: admin/forms.py:216
 msgid "A distribution list must contain at least two recipients"
 msgstr "Una lista de distribución debe contener al menos dos destinatarios"
 
-#: admin/forms.py:201
+#: admin/forms.py:230
 msgid "Address"
 msgstr "Dirección"
 
-#: admin/forms.py:202
+#: admin/forms.py:231
 msgid "A valid e-mail address"
 msgstr "Una dirección válida de email"
 
-#: admin/forms.py:238 admin/forms.py:267 extensions/sievefilters/forms.py:70
+#: admin/forms.py:267 admin/forms.py:296 extensions/sievefilters/forms.py:70
 msgid "Recipient"
 msgstr "Destinatario"
 
-#: admin/forms.py:239
+#: admin/forms.py:268
 msgid "A local recipient address"
 msgstr "Una dirección de destinatario local"
 
-#: admin/forms.py:254
+#: admin/forms.py:283
 msgid "Mailbox does not exist"
 msgstr "El mailbox no existe"
 
-#: admin/forms.py:256
+#: admin/forms.py:285
 msgid "You can't access this mailbox"
 msgstr "No puede acceder a este mailbox"
 
-#: admin/forms.py:268
+#: admin/forms.py:297
 msgid "An external recipient address"
 msgstr "Una dirección de destinatario externa"
 
-#: admin/forms.py:285
+#: admin/forms.py:314
 msgid "Local recipients are forbidden"
 msgstr "Destinatarios locales no están permitidos"
 
-#: admin/forms.py:295 extensions/webmail/forms.py:18
+#: admin/forms.py:324 extensions/webmail/forms.py:18
 msgid "Select a file"
 msgstr "Seleccione un fichero"
 
-#: admin/forms.py:296
+#: admin/forms.py:325
 msgid "Separator"
 msgstr "Separador"
 
-#: admin/forms.py:308 auth/forms.py:6 templates/admin/editdomainform.html:20
+#: admin/forms.py:337 admin/templates/admin/editdomainform.html:9
+#: auth/forms.py:6
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: admin/forms.py:310
+#: admin/forms.py:339
 msgid "Role"
 msgstr "Rol"
 
-#: admin/forms.py:311 admin/forms.py:335
+#: admin/forms.py:340 admin/forms.py:364
 msgid "Choose"
 msgstr "Elija"
 
-#: admin/forms.py:312
+#: admin/forms.py:341
 msgid "What level of permission this user will have"
 msgstr "Qué nivel de permiso tendrá este usuario"
 
-#: admin/forms.py:314 auth/forms.py:10
+#: admin/forms.py:343 auth/forms.py:10
 msgid "Password"
 msgstr "Contraseña"
 
-#: admin/forms.py:316 userprefs/forms.py:15
+#: admin/forms.py:345 userprefs/forms.py:15
 msgid "Confirmation"
 msgstr "Confirmación"
 
-#: admin/forms.py:318
+#: admin/forms.py:347
 msgid "Enter the same password as above, for verification."
 msgstr "Introduzca la misma contraseña que arriba, para verificación."
 
-#: admin/forms.py:329
+#: admin/forms.py:358
 msgid "Enabled"
 msgstr "Activado"
 
-#: admin/forms.py:367
+#: admin/forms.py:396
 msgid "The two password fields didn't match."
 msgstr "Las contraseñas no concuerdan"
 
-#: admin/forms.py:393
+#: admin/forms.py:437
 msgid "E-mail"
 msgstr "Email"
 
-#: admin/forms.py:394
+#: admin/forms.py:439
 msgid "Quota"
 msgstr "Cuota"
 
-#: admin/forms.py:398
-msgid "Alias(es) of this mailbox"
-msgstr "Alias para este mailbox"
+#: admin/forms.py:441
+msgid ""
+"Quota in MB for this mailbox. Leave empty to use the value defined at domain "
+"level."
+msgstr ""
 
-#: admin/forms.py:454
+#: admin/forms.py:447
+msgid ""
+"Alias(es) of this mailbox. Indicate only one address per input, press ENTER "
+"to add a new input."
+msgstr ""
+
+#: admin/forms.py:505
 msgid "Failed to rename mailbox, check permissions"
 msgstr "Ha fallado el cambio de nombre del mailbox, compruebe permisos"
 
-#: admin/forms.py:495
+#: admin/forms.py:547
 msgid "Domain(s)"
 msgstr "Dominio(s)"
 
-#: admin/forms.py:497
+#: admin/forms.py:549
 msgid "Domain(s) that user administrates"
 msgstr "Dominio(s) que el usuario administra"
 
-#: admin/forms.py:546 admin/views.py:356 templates/admin/editdomainform.html:4
-msgid "General"
-msgstr "General"
-
-#: admin/forms.py:548 admin/views.py:359
+#: admin/forms.py:600 admin/views.py:366
 msgid "Mail"
 msgstr "Correo"
 
-#: admin/forms.py:550
+#: admin/forms.py:602
 msgid "Permissions"
 msgstr "Permisos"
 
@@ -249,113 +268,116 @@ msgstr "Tipo de objeto desconocido"
 msgid "You can't delete your own account"
 msgstr "No puede eliminar su propia cuenta"
 
-#: admin/models.py:137
+#: admin/models.py:151
 msgid "Failed to update password: LDAP module not installed"
 msgstr "Falló al actualizar la contraseña: módulo LDAP no instalado"
 
-#: admin/models.py:143
+#: admin/models.py:157
 #, python-format
 msgid "Failed to update password: %s"
 msgstr "Falló la actualización de la contraseña: %s"
 
-#: admin/models.py:375 admin/models.py:461
+#: admin/models.py:393 admin/models.py:479
 msgid "name"
 msgstr "nombre"
 
-#: admin/models.py:376
+#: admin/models.py:394
 msgid "The domain name"
 msgstr "Nombre del dominio"
 
-#: admin/models.py:377
+#: admin/models.py:395
 msgid "Default quota in MB applied to mailboxes"
 msgstr "Cuota por defecto en MB que se aplicará a los mailboxes"
 
-#: admin/models.py:378 admin/models.py:466 admin/models.py:708
-#: admin/models.py:805 extensions/postfix_autoreply/models.py:19
+#: admin/models.py:396 admin/models.py:484 admin/models.py:738
+#: admin/models.py:835 extensions/postfix_autoreply/models.py:19
 msgid "enabled"
 msgstr "activado"
 
-#: admin/models.py:379
+#: admin/models.py:397
 msgid "Check to activate this domain"
 msgstr "Marcar para activar este dominio"
 
-#: admin/models.py:446
+#: admin/models.py:464
 msgid "Failed to initialise domain, check permissions"
 msgstr "Ha fallado la inicialización del dominio, compruebe permisos"
 
-#: admin/models.py:454 admin/models.py:669 admin/models.py:774
+#: admin/models.py:472 admin/models.py:699 admin/models.py:804
 msgid "Invalid line"
 msgstr "Línea inválida"
 
-#: admin/models.py:462
+#: admin/models.py:480
 msgid "The alias name"
 msgstr "Nombre del alias"
 
-#: admin/models.py:463
+#: admin/models.py:481
 msgid "target"
 msgstr "objetivo"
 
-#: admin/models.py:464
+#: admin/models.py:482
 msgid "The domain this alias points to"
 msgstr "El dominio al que este alias apunta"
 
-#: admin/models.py:467 admin/models.py:709
+#: admin/models.py:485 admin/models.py:739
 msgid "Check to activate this alias"
 msgstr "Marcar para activar este alias"
 
-#: admin/models.py:486 admin/models.py:699
+#: admin/models.py:504 admin/models.py:729
 msgid "address"
 msgstr "dirección"
 
-#: admin/models.py:487
+#: admin/models.py:505
 msgid "Mailbox address (without the @domain.tld part)"
 msgstr "Dirección del mailbox (sin la parte @dominio.tld)"
 
-#: admin/models.py:584
+#: admin/models.py:611
 #, python-format
 msgid "%s is not a valid uid/username"
 msgstr "%s no es un uid/nombre de usuario válido"
 
-#: admin/models.py:593
+#: admin/models.py:620
 #, python-format
 msgid "%s is not a valid gid/groupname"
 msgstr "%s no es un gid/nombre de grupo válido"
 
-#: admin/models.py:597 admin/models.py:654
+#: admin/models.py:630 admin/models.py:684
 msgid "Failed to initialise mailbox, check permissions"
 msgstr "Ha fallado la inicialización del mailbox, compruebe permisos"
 
-#: admin/models.py:622
+#: admin/models.py:655
 #, python-format
 msgid "Account '%s' already exists"
 msgstr "La cuenta '%s' ya existe"
 
-#: admin/models.py:675
-msgid ""
-"Cannot import this mailbox because the associated domain does not exist"
-msgstr "No ha sido posible importar este mailbox ya que el dominio asociado no existe"
+#: admin/models.py:705
+msgid "Cannot import this mailbox because the associated domain does not exist"
+msgstr ""
+"No ha sido posible importar este mailbox ya que el dominio asociado no existe"
 
-#: admin/models.py:700
+#: admin/models.py:730
 msgid ""
-"The alias address (without the domain part). For a 'catch-all' address, just"
-" enter an * character."
-msgstr "La dirección del alias (sin la parte del dominio). Para una dirección que lo recoja todo, ponga un asterisco (*)."
+"The alias address (without the domain part). For a 'catch-all' address, just "
+"enter an * character."
+msgstr ""
+"La dirección del alias (sin la parte del dominio). Para una dirección que lo "
+"recoja todo, ponga un asterisco (*)."
 
-#: admin/models.py:704
+#: admin/models.py:734
 msgid "mailboxes"
 msgstr "mailboxes"
 
-#: admin/models.py:705
+#: admin/models.py:735
 msgid "The mailboxes this alias points to"
 msgstr "Los 'mailboxes' de este alias apuntan a"
 
-#: admin/models.py:806
+#: admin/models.py:836
 msgid "Check to enable this extension"
 msgstr "Marcar para activar esta extensión"
 
-#: admin/tables.py:12 admin/tables.py:44 extensions/sievefilters/forms.py:53
+#: admin/tables.py:12 admin/tables.py:44
+#: admin/templates/admin/editdomainform.html:9
+#: extensions/sievefilters/forms.py:53
 #: extensions/sievefilters/templates/sievefilters/guieditor.html:6
-#: templates/admin/editdomainform.html:20
 msgid "Name"
 msgstr "Nombre"
 
@@ -390,7 +412,7 @@ msgstr "Nombre completo/Destinatario"
 msgid "New domain"
 msgstr "Nuevo dominio"
 
-#: admin/views.py:81 admin/views.py:174 admin/views.py:353 admin/views.py:360
+#: admin/views.py:81 admin/views.py:181 admin/views.py:360 admin/views.py:367
 #: extensions/sievefilters/views.py:120 extensions/sievefilters/views.py:187
 #: extensions/webmail/views.py:118
 msgid "Create"
@@ -400,151 +422,251 @@ msgstr "Crear"
 msgid "Domain created"
 msgstr "Dominio creado"
 
-#: admin/views.py:108 admin/views.py:223 admin/views.py:403
-#: extensions/postfix_autoreply/views.py:22
+#: admin/views.py:111 admin/views.py:230 admin/views.py:411
 #: extensions/sievefilters/views.py:139 extensions/webmail/views.py:149
-#: userprefs/views.py:34 userprefs/views.py:66
+#: userprefs/templates/userprefs/form.html:4
 msgid "Update"
 msgstr "Actualizar"
 
-#: admin/views.py:115
+#: admin/views.py:122
 msgid "Domain modified"
 msgstr "Dominio modificado"
 
-#: admin/views.py:138
+#: admin/views.py:145
 msgid "You can't delete your own domain"
 msgstr "No puedo eliminar su propio dominio"
 
-#: admin/views.py:141
+#: admin/views.py:148
 msgid "Domain deleted"
 msgid_plural "Domains deleted"
 msgstr[0] "Dominio eliminado"
 msgstr[1] "Dominios eliminados"
 
-#: admin/views.py:156
+#: admin/views.py:163
 msgid "Alias with this name already exists"
 msgstr "Ya existe un alias con este nombre"
 
-#: admin/views.py:194
+#: admin/views.py:201
 msgid "New distribution list"
 msgstr "Nueva lista de distribución"
 
-#: admin/views.py:198
+#: admin/views.py:205
 msgid "Distribution list created"
 msgstr "Lista de distribución creada"
 
-#: admin/views.py:204
+#: admin/views.py:211
 msgid "New alias"
 msgstr "Nuevo alias"
 
-#: admin/views.py:208
+#: admin/views.py:215
 msgid "Alias created"
 msgstr "Alias creado"
 
-#: admin/views.py:214
+#: admin/views.py:221
 msgid "New forward"
 msgstr "Nuevo reenvío"
 
-#: admin/views.py:218
+#: admin/views.py:225
 msgid "Forward created"
 msgstr "Reenvío creado"
 
-#: admin/views.py:235
+#: admin/views.py:242
 msgid "Alias modified"
 msgstr "Alias modificado"
 
-#: admin/views.py:239
+#: admin/views.py:246
 msgid "Distribution list modified"
 msgstr "Lista de distribución modificada"
 
-#: admin/views.py:243
+#: admin/views.py:250
 msgid "Forward modified"
 msgstr "Reenvío modificado"
 
-#: admin/views.py:350
+#: admin/views.py:357
 msgid "New account"
 msgstr "Nueva cuenta"
 
-#: admin/views.py:357
+#: admin/views.py:364
 msgid "Next"
 msgstr "Siguiente"
 
-#: admin/views.py:361
+#: admin/views.py:368
 msgid "Previous"
 msgstr "Anterior"
 
-#: admin/views.py:372
+#: admin/views.py:380
 msgid "Account created"
 msgstr "Cuenta creada"
 
-#: admin/views.py:417
+#: admin/views.py:425
 msgid "Account updated"
 msgstr "Cuenta actualizada"
 
-#: admin/views.py:437
+#: admin/views.py:445
 msgid "Account deleted"
 msgid_plural "Accounts deleted"
 msgstr[0] "Cuenta eliminada"
 msgstr[1] "Cuentas eliminadas"
 
-#: admin/views.py:447 admin/views.py:452
-#: extensions/amavis_quarantine/views.py:196
-#: extensions/amavis_quarantine/views.py:202
-#: extensions/amavis_quarantine/views.py:229
-#: extensions/amavis_quarantine/views.py:233
-#: extensions/amavis_quarantine/views.py:235 extensions/stats/views.py:46
-#: extensions/webmail/views.py:32 extensions/webmail/views.py:55
-#: extensions/webmail/views.py:68 extensions/webmail/views.py:80
-#: extensions/webmail/views.py:96 extensions/webmail/views.py:180
-#: extensions/webmail/views.py:405 extensions/webmail/views.py:416
-#: extensions/webmail/views.py:443 lib/formutils.py:29 lib/formutils.py:34
+#: admin/views.py:455 admin/views.py:460 extensions/amavis/views.py:199
+#: extensions/amavis/views.py:205 extensions/amavis/views.py:232
+#: extensions/amavis/views.py:236 extensions/amavis/views.py:238
+#: extensions/stats/views.py:46 extensions/webmail/views.py:32
+#: extensions/webmail/views.py:55 extensions/webmail/views.py:68
+#: extensions/webmail/views.py:80 extensions/webmail/views.py:96
+#: extensions/webmail/views.py:180 extensions/webmail/views.py:407
+#: extensions/webmail/views.py:418 extensions/webmail/views.py:445
+#: lib/formutils.py:33 lib/formutils.py:38
 msgid "Invalid request"
 msgstr "Petición inválida"
 
-#: admin/views.py:492
+#: admin/views.py:500
 msgid "Parameters saved"
 msgstr "Parámetros guardados"
 
-#: admin/views.py:538
+#: admin/views.py:546
 msgid "Modifications applied."
 msgstr "Modificaciones aplicadas."
 
-#: admin/views.py:595
+#: admin/views.py:603
 #, python-format
 msgid "%d objects imported successfully"
 msgstr "%d objetos importados con éxito"
 
-#: admin/views.py:614
+#: admin/views.py:621
 msgid ""
 "Provide a CSV file where lines respect one of the following format:\n"
 "<ul>\n"
-"<li><em>account; loginname; password; first name; last name; address</em></li>\n"
+"<li><em>account; loginname; password; first name; last name; address</em></"
+"li>\n"
 "<li><em>dlist; address; recipient; recipient; ...</em></li>\n"
 "</ul>\n"
 "You can use a different character as separator.\n"
-msgstr "Suministre un fichero CSV dónde las líneas respetan uno de los siguientes formatos:\n<ul>\n<li><em>cuenta; nombredeusuario; nombre; apellido; dirección</em></li>\n<li><em>listadistribución; dirección; destinatario; destinatario; ...</em></li>\n</ul>nPuede usar un carácter diferente como separador.\n"
+msgstr ""
+"Suministre un fichero CSV dónde las líneas respetan uno de los siguientes "
+"formatos:\n"
+"<ul>\n"
+"<li><em>cuenta; nombredeusuario; nombre; apellido; dirección</em></li>\n"
+"<li><em>listadistribución; dirección; destinatario; destinatario; ...</em></"
+"li>\n"
+"</ul>nPuede usar un carácter diferente como separador.\n"
 
-#: admin/views.py:622
+#: admin/views.py:629
 msgid "Import identities"
 msgstr "Importar identidades"
 
-#: admin/views.py:623 admin/views.py:649 admin/templatetags/admin_extras.py:73
-#: admin/templatetags/admin_extras.py:114
+#: admin/views.py:630 admin/views.py:656 admin/templatetags/admin_extras.py:76
+#: admin/templatetags/admin_extras.py:118
 msgid "Import"
 msgstr "Importar"
 
-#: admin/views.py:641
+#: admin/views.py:648
 msgid ""
 "Provide a CSV file where lines respect the following format:<br/>\n"
 "<em>domain; name; quota</em><br/>\n"
 "\n"
 "You can use a different character as separator.\n"
-msgstr "Suministre un fichero CSV dónde las líneas respatan el siguiente formato:<br/>\n<em>dominio; nombre; cuota</em><br/>\n\nPuede usar un carácter diferente como separador.\n"
+msgstr ""
+"Suministre un fichero CSV dónde las líneas respatan el siguiente formato:<br/"
+">\n"
+"<em>dominio; nombre; cuota</em><br/>\n"
+"\n"
+"Puede usar un carácter diferente como separador.\n"
 
-#: admin/views.py:648
+#: admin/views.py:655
 msgid "Import domains"
 msgstr "Importar dominios"
 
+#: admin/templates/admin/domain_general_form.html:3
+#: admin/templates/admin/mailform.html:3
+#: admin/templates/admin/newdomainform.html:3
+msgid "MB"
+msgstr ""
+
+#: admin/templates/admin/domains.html:2 admin/templatetags/admin_extras.py:22
+#: extensions/limits/forms.py:14 extensions/limits/models.py:10
+msgid "Domains"
+msgstr "Dominios"
+
+#: admin/templates/admin/editdomainform.html:3
+msgid "Administrators"
+msgstr "Administradores"
+
+#: admin/templates/admin/editdomainform.html:4
+msgid "Miscellaneous"
+msgstr "Otros"
+
+#: admin/templates/admin/editdomainform.html:13
+msgid "No domain administrator defined"
+msgstr "No hay un dominio de administrador definido "
+
+#: admin/templates/admin/editdomainform.html:16
+msgid "Creation date"
+msgstr "Fecha de creación"
+
+#: admin/templates/admin/editdomainform.html:17
+msgid "Last modification date"
+msgstr "Última fecha de modificación"
+
+#: admin/templates/admin/editdomainform.html:18 extensions/limits/forms.py:16
+#: extensions/limits/models.py:11
+msgid "Domain aliases"
+msgstr "Alias del dominio"
+
+#: admin/templates/admin/editdomainform.html:19 extensions/limits/forms.py:18
+#: extensions/limits/models.py:12
+#: extensions/webmail/templates/webmail/folders.html:4
+msgid "Mailboxes"
+msgstr "Mailboxes"
+
+#: admin/templates/admin/editdomainform.html:20 extensions/limits/forms.py:20
+#: extensions/limits/models.py:13
+msgid "Mailbox aliases"
+msgstr "Alias del mailbox"
+
+#: admin/templates/admin/extensions.html:2
+#: admin/templatetags/admin_extras.py:49
+msgid "Extensions"
+msgstr "Extensiones"
+
+#: admin/templates/admin/extensions.html:7
+#: admin/templates/admin/parameters.html:9
+#: userprefs/templates/userprefs/preferences.html:28
+msgid "Save"
+msgstr "Guardar"
+
+#: admin/templates/admin/identities.html:2
+#: admin/templatetags/admin_extras.py:30
+msgid "Identities"
+msgstr "Identidades"
+
+#: admin/templates/admin/importform.html:5
+msgid "Help"
+msgstr "Ayuda"
+
+#: admin/templates/admin/importform.html:12
+msgid "Importing..."
+msgstr "Importando..."
+
+#: admin/templates/admin/listing.html:12
+#: admin/templates/admin/searchform.html:4
+msgid "Search"
+msgstr "Buscar"
+
+#: admin/templates/admin/mailboxes_raw.html:3
+msgid "Choose a value"
+msgstr "Elija un valor"
+
+#: admin/templates/admin/newaccount.html:31
+#: templates/common/generic_modal.html:11
+msgid "Close"
+msgstr "Cerrar"
+
+#: admin/templates/admin/parameters.html:2
+#: admin/templatetags/admin_extras.py:54
+msgid "Parameters"
+msgstr "Parámetros"
+
 #: admin/templatetags/admin_extras.py:12
 msgid "enabled_m"
 msgstr "Activado"
@@ -553,72 +675,55 @@ msgstr "Activado"
 msgid "enabled_f"
 msgstr "Activado"
 
-#: admin/templatetags/admin_extras.py:22 extensions/limits/forms.py:14
-#: extensions/limits/models.py:10 templates/admin/domains.html:2
-msgid "Domains"
-msgstr "Dominios"
-
-#: admin/templatetags/admin_extras.py:30 templates/admin/identities.html:2
-msgid "Identities"
-msgstr "Identidades"
-
 #: admin/templatetags/admin_extras.py:35
 msgid "Modoboa"
 msgstr "Modoboa"
 
-#: admin/templatetags/admin_extras.py:49 templates/admin/extensions.html:2
-msgid "Extensions"
-msgstr "Extensiones"
-
-#: admin/templatetags/admin_extras.py:54 templates/admin/parameters.html:2
-msgid "Parameters"
-msgstr "Parámetros"
-
-#: admin/templatetags/admin_extras.py:67
+#: admin/templatetags/admin_extras.py:70
 msgid "Add domain"
 msgstr "Añadir dominio"
 
-#: admin/templatetags/admin_extras.py:90
+#: admin/templatetags/admin_extras.py:94
 msgid "Add account"
 msgstr "Añadir cuenta"
 
-#: admin/templatetags/admin_extras.py:96
+#: admin/templatetags/admin_extras.py:100
 msgid "Add alias"
 msgstr "Añadir alias"
 
-#: admin/templatetags/admin_extras.py:102
+#: admin/templatetags/admin_extras.py:106
 msgid "Add forward"
 msgstr "Añadir reenvío"
 
-#: admin/templatetags/admin_extras.py:108
+#: admin/templatetags/admin_extras.py:112
 msgid "Add distribution list"
 msgstr "Añadir lista de distribución"
 
-#: admin/templatetags/admin_extras.py:145
+#: admin/templatetags/admin_extras.py:150
 msgid "Delete this account"
 msgstr "Eliminar esta cuenta"
 
-#: admin/templatetags/admin_extras.py:155
+#: admin/templatetags/admin_extras.py:160
 msgid "Delete this distribution list"
 msgstr "Eliminar esta lista de distribución"
 
-#: admin/templatetags/admin_extras.py:162
+#: admin/templatetags/admin_extras.py:167
 msgid "Delete this forward"
 msgstr "Eliminar este reenvío"
 
-#: admin/templatetags/admin_extras.py:169
+#: admin/templatetags/admin_extras.py:174
 msgid "Delete this alias"
 msgstr "Eliminar este alias"
 
-#: admin/templatetags/admin_extras.py:179
+#: admin/templatetags/admin_extras.py:184
 msgid "Remove this permission"
 msgstr "Eliminar este permiso"
 
-#: admin/templatetags/admin_extras.py:213
+#: admin/templatetags/admin_extras.py:214
 msgid "Yes"
 msgstr "Sí"
 
-#: admin/templatetags/admin_extras.py:213
+#: admin/templatetags/admin_extras.py:214
 msgid "No"
 msgstr "No "
 
@@ -626,23 +731,25 @@ msgstr "No "
 msgid "Key used to encrypt/decrypt passwords"
 msgstr "Clave usada para cifrar/descifrar contraseñas"
 
-#: auth/views.py:38
+#: auth/views.py:40
 msgid "Account is disabled."
 msgstr "La cuenta está desactivada."
 
-#: auth/views.py:39
+#: auth/views.py:41
 msgid "Your username and password didn't match. Please try again."
-msgstr "Su nombre de usuario y contraseña no concuerdan. Por favor, inténtelo de nuevo."
+msgstr ""
+"Su nombre de usuario y contraseña no concuerdan. Por favor, inténtelo de "
+"nuevo."
 
-#: demo/__init__.py:19
+#: demo/__init__.py:17
 msgid "Test messages"
 msgstr "Mensajes de test"
 
-#: demo/__init__.py:24
+#: demo/__init__.py:22
 msgid "Send virus"
 msgstr "Enviar virus"
 
-#: demo/__init__.py:28
+#: demo/__init__.py:25
 msgid "Send spam"
 msgstr "Enviar correo basura"
 
@@ -655,189 +762,335 @@ msgid ""
 "\n"
 "<h3>Welcome to the online demo!</h3>\n"
 "<p><b>Warning:</b> the demo's concent is resetted every two hours.</p>\n"
-"<p>To try the demo, the following users are available (<i>username/password</i>): </p>\n"
+"<p>To try the demo, the following users are available (<i>username/password</"
+"i>): </p>\n"
 "<ul>\n"
 "  <li>A super administrator : <b>admin/password</b></li>\n"
 "  <li>A domain administrator : <b>admin@demo.local/admin</b></li>\n"
 "  <li>A simple user : <b>user@demo.local/user</b></li>\n"
 "</ul>\n"
 "<p>Please report any issue or give any suggestion to \n"
-"  <a href=\"https://groups.google.com/forum/#!forum/modoboa-users\">the mailing list</a>.</p>\n"
-msgstr "\n<h3>¡Bienvendio a la demo!</h3>\n<p><b>Aviso:</b> el contenido de la demo será inicializado cada dos horas.</p>\n<p>Para probar la demo están disponibles los siguientes usuarios (<i>usuario/contraseña</i>): </p>\n<ul>\n  <li>Un super administrador : <b>admin/password</b></li>\n  <li>Un administrador de dominio : <b>admin@demo.local/admin</b></li>\n  <li>Un usuario normal : <b>user@demo.local/user</b></li>\n</ul>\n<p>Por favor, informe de cualquier incidencia o denos cualquier sugerencia a \n  <a href=\"https://groups.google.com/forum/#!forum/modoboa-users\">la lista de correo</a>.</p>\n"
+"  <a href=\"https://groups.google.com/forum/#!forum/modoboa-users\">the "
+"mailing list</a>.</p>\n"
+msgstr ""
+"\n"
+"<h3>¡Bienvendio a la demo!</h3>\n"
+"<p><b>Aviso:</b> el contenido de la demo será inicializado cada dos horas.</"
+"p>\n"
+"<p>Para probar la demo están disponibles los siguientes usuarios (<i>usuario/"
+"contraseña</i>): </p>\n"
+"<ul>\n"
+"  <li>Un super administrador : <b>admin/password</b></li>\n"
+"  <li>Un administrador de dominio : <b>admin@demo.local/admin</b></li>\n"
+"  <li>Un usuario normal : <b>user@demo.local/user</b></li>\n"
+"</ul>\n"
+"<p>Por favor, informe de cualquier incidencia o denos cualquier sugerencia "
+"a \n"
+"  <a href=\"https://groups.google.com/forum/#!forum/modoboa-users\">la lista "
+"de correo</a>.</p>\n"
 
-#: extensions/amavis_quarantine/__init__.py:17
-msgid "Simple amavis quarantine management tool"
-msgstr "Herramienta sencilla para la administración de la cuarentena de amavis "
+#: extensions/amavis/__init__.py:21
+#, fuzzy
+msgid "Simple amavis management frontend"
+msgstr ""
+"Herramienta sencilla para la administración de la cuarentena de amavis "
 
-#: extensions/amavis_quarantine/__init__.py:46
+#: extensions/amavis/__init__.py:45
 msgid "Quarantine messages maximum age (in days) before deletion"
-msgstr "Máxima edad (en días) de los mensajes de cuarentena antes de proceder a su eliminación"
+msgstr ""
+"Máxima edad (en días) de los mensajes de cuarentena antes de proceder a su "
+"eliminación"
 
-#: extensions/amavis_quarantine/__init__.py:50
+#: extensions/amavis/__init__.py:49
 msgid "Remove messages marked as released while cleaning up the database"
-msgstr "Eliminar los mensajes marcados como publicados cuando se haga limpieza de la base de datos"
+msgstr ""
+"Eliminar los mensajes marcados como publicados cuando se haga limpieza de la "
+"base de datos"
 
-#: extensions/amavis_quarantine/__init__.py:55
+#: extensions/amavis/__init__.py:54
 msgid "Mode used to access the PDP server"
 msgstr "Modo usado para acceder al servidor PDP"
 
-#: extensions/amavis_quarantine/__init__.py:58
+#: extensions/amavis/__init__.py:57
 msgid "PDP server address (if inet mode)"
 msgstr "Dirección del servidor de PDP (si está en modo inet)"
 
-#: extensions/amavis_quarantine/__init__.py:61
+#: extensions/amavis/__init__.py:60
 msgid "PDP server port (if inet mode)"
 msgstr "Puerto del servidor de PDP (si está en modo inet)"
 
-#: extensions/amavis_quarantine/__init__.py:64
+#: extensions/amavis/__init__.py:63
 msgid "Path to the PDP server socket (if unix mode)"
 msgstr "Dirección del socket del servidor de PDP (si están en modo unix)"
 
-#: extensions/amavis_quarantine/__init__.py:67
+#: extensions/amavis/__init__.py:66
 msgid "Interval between two release requests checks"
 msgstr "Intervalo entre dos peticiones de chequeo"
 
-#: extensions/amavis_quarantine/__init__.py:69
+#: extensions/amavis/__init__.py:68
 msgid "Allow users to directly release their messages"
 msgstr "Permitir a los usuarios enviar directamente sus mensajes"
 
-#: extensions/amavis_quarantine/__init__.py:71
+#: extensions/amavis/__init__.py:70
 msgid "Activate the 'self-service' mode"
 msgstr "Activar el modo 'auto-servicio'"
 
-#: extensions/amavis_quarantine/__init__.py:76
-#: extensions/webmail/__init__.py:37
+#: extensions/amavis/__init__.py:72
+#, fuzzy
+msgid "The e-mail address used to send notitications"
+msgstr "El sistema usado para autenticación"
+
+#: extensions/amavis/__init__.py:77 extensions/webmail/__init__.py:45
 msgid "Sets the maximum number of messages displayed in a page"
 msgstr "Fija el número máximo de mensajes mostrados en una página"
 
-#: extensions/amavis_quarantine/__init__.py:90
+#: extensions/amavis/__init__.py:93
 msgid "Quarantine"
 msgstr "Cuarentena"
 
-#: extensions/amavis_quarantine/__init__.py:152
+#: extensions/amavis/__init__.py:151
 msgid "pending requests"
 msgstr "Peticiones pendientes"
 
-#: extensions/amavis_quarantine/__init__.py:168
+#: extensions/amavis/__init__.py:167
 #, python-format
 msgid "%d pending requests"
 msgstr "%d peticiones pendientes"
 
-#: extensions/amavis_quarantine/sql_listing.py:23
-#: extensions/webmail/forms.py:5 extensions/webmail/lib.py:34
+#: extensions/amavis/__init__.py:178
+#, fuzzy
+msgid "Content filter"
+msgstr "Clase de contenido"
+
+#: extensions/amavis/models.py:78
+#, fuzzy
+msgid "Virus filter"
+msgstr "Editar filtro"
+
+#: extensions/amavis/models.py:79 extensions/amavis/models.py:87
+#: extensions/amavis/models.py:95 extensions/amavis/models.py:104
+#: extensions/sievefilters/views.py:265
+msgid "yes"
+msgstr "sí"
+
+#: extensions/amavis/models.py:80 extensions/amavis/models.py:88
+#: extensions/amavis/models.py:96 extensions/amavis/models.py:105
+#: extensions/sievefilters/views.py:269
+msgid "no"
+msgstr "no"
+
+#: extensions/amavis/models.py:81 extensions/amavis/models.py:89
+#: extensions/amavis/models.py:97 extensions/amavis/models.py:106
+msgid "default"
+msgstr ""
+
+#: extensions/amavis/models.py:83
+msgid "Bypass virus checks or not. Choose 'default' to use global settings."
+msgstr ""
+
+#: extensions/amavis/models.py:86
+#, fuzzy
+msgid "Spam filter"
+msgstr "Nuevo filtro"
+
+#: extensions/amavis/models.py:91
+msgid "Bypass spam checks or not. Choose 'default' to use global settings."
+msgstr ""
+
+#: extensions/amavis/models.py:94
+#, fuzzy
+msgid "Banned filter"
+msgstr "Nuevo filtro"
+
+#: extensions/amavis/models.py:99
+msgid "Bypass banned checks or not. Choose 'default' to use global settings."
+msgstr ""
+
+#: extensions/amavis/models.py:103
+msgid "Spam marker"
+msgstr ""
+
+#: extensions/amavis/models.py:108
+msgid "Modify spam subject or not. Choose 'default' to use global settings."
+msgstr ""
+
+#: extensions/amavis/sql_listing.py:23 extensions/webmail/forms.py:5
+#: extensions/webmail/lib.py:34
 msgid "From"
 msgstr "Desde"
 
-#: extensions/amavis_quarantine/sql_listing.py:24
-#: extensions/sievefilters/forms.py:68 extensions/webmail/forms.py:9
-#: extensions/webmail/lib.py:33 extensions/webmail/lib.py:363
-#: templates/common/email_searchbar.html:6
+#: extensions/amavis/sql_listing.py:24 extensions/sievefilters/forms.py:68
+#: extensions/webmail/forms.py:9 extensions/webmail/lib.py:33
+#: extensions/webmail/lib.py:363 templates/common/email_searchbar.html:6
 msgid "Subject"
 msgstr "Tema"
 
-#: extensions/amavis_quarantine/sql_listing.py:25 extensions/webmail/lib.py:35
+#: extensions/amavis/sql_listing.py:25 extensions/webmail/lib.py:35
 #: extensions/webmail/lib.py:365
 msgid "Date"
 msgstr "Fecha"
 
-#: extensions/amavis_quarantine/sql_listing.py:26
-#: extensions/amavis_quarantine/templatetags/amextras.py:102
+#: extensions/amavis/sql_listing.py:26
+#: extensions/amavis/templatetags/amextras.py:102
 #: extensions/webmail/forms.py:6
 msgid "To"
 msgstr "A"
 
-#: extensions/amavis_quarantine/views.py:32
+#: extensions/amavis/views.py:32
 msgid "Empty quarantine"
 msgstr "Vaciar cuarentena"
 
-#: extensions/amavis_quarantine/views.py:203
+#: extensions/amavis/views.py:206
 msgid "Message deleted"
 msgstr "Mensaje eliminado"
 
-#: extensions/amavis_quarantine/views.py:219
+#: extensions/amavis/views.py:222
 #, python-format
 msgid "%(count)d message deleted successfully"
 msgid_plural "%(count)d messages deleted successfully"
 msgstr[0] "%(count)d mensaje eliminado correctamente"
 msgstr[1] "%(count)d mensajes eliminados correctamente"
 
-#: extensions/amavis_quarantine/views.py:238
+#: extensions/amavis/views.py:241
 msgid "Request sent"
 msgstr "Petición enviada"
 
-#: extensions/amavis_quarantine/views.py:244
+#: extensions/amavis/views.py:247
 msgid "Message released"
 msgstr "Mensaje publicado"
 
-#: extensions/amavis_quarantine/views.py:258
+#: extensions/amavis/views.py:261
 #, python-format
 msgid "%(count)d request sent"
 msgid_plural "%(count)d requests sent"
 msgstr[0] "%(count)d petición enviada"
 msgstr[1] "%(count)d peticiones enviadas"
 
-#: extensions/amavis_quarantine/views.py:281
+#: extensions/amavis/views.py:284
 #, python-format
 msgid "%(count)d message released successfully"
 msgid_plural "%(count)d messages released successfully"
 msgstr[0] "%(count)d mensaje publicado correctamente"
 msgstr[1] "%(count)d mensajes publicados correctamente"
 
-#: extensions/amavis_quarantine/templates/amavis_quarantine/index.html:2
+#: extensions/amavis/management/commands/amnotify.py:45
+#, fuzzy
+msgid "[modoboa] Pending release requests"
+msgstr "%d peticiones pendientes"
+
+#: extensions/amavis/templates/amavis/domain_content_filter.html:5
+msgid "Thresholds"
+msgstr ""
+
+#: extensions/amavis/templates/amavis/domain_content_filter.html:7
+msgid "or more is spam"
+msgstr ""
+
+#: extensions/amavis/templates/amavis/domain_content_filter.html:8
+msgid "or more throw spam message away"
+msgstr ""
+
+#: extensions/amavis/templates/amavis/index.html:2
 msgid "Quarantine management"
 msgstr "Mantenimiento de la cuarentena"
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:20
-#: extensions/amavis_quarantine/templatetags/amextras.py:52
-#: extensions/amavis_quarantine/templatetags/amextras.py:72
+#: extensions/amavis/templates/amavis/notifications/pending_requests.html:1
+#, python-format
+msgid ""
+"\n"
+"%(counter)s release request is pending for action.\n"
+msgid_plural ""
+"\n"
+"%(counter)s release requests are pending for action.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: extensions/amavis/templates/amavis/notifications/pending_requests.html:6
+msgid "Sketch:"
+msgstr ""
+
+#: extensions/amavis/templates/amavis/notifications/pending_requests.html:8
+#, fuzzy
+msgid "From:"
+msgstr "Desde"
+
+#: extensions/amavis/templates/amavis/notifications/pending_requests.html:9
+#, fuzzy
+msgid "To:"
+msgstr "A"
+
+#: extensions/amavis/templates/amavis/notifications/pending_requests.html:10
+#, fuzzy
+msgid "Date:"
+msgstr "Fecha"
+
+#: extensions/amavis/templates/amavis/notifications/pending_requests.html:11
+#, fuzzy
+msgid "Subject:"
+msgstr "Tema"
+
+#: extensions/amavis/templates/amavis/notifications/pending_requests.html:12
+#, fuzzy
+msgid "Act on this message:"
+msgstr "Cerrar este mensaje"
+
+#: extensions/amavis/templates/amavis/notifications/pending_requests.html:14
+#, python-format
+msgid "Please visit %(listingurl)s for a full listing."
+msgstr ""
+
+#: extensions/amavis/templatetags/amextras.py:20
+#: extensions/amavis/templatetags/amextras.py:52
+#: extensions/amavis/templatetags/amextras.py:72
 msgid "Release"
 msgstr "Publicar"
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:26
-#: extensions/amavis_quarantine/templatetags/amextras.py:59
-#: extensions/amavis_quarantine/templatetags/amextras.py:77
+#: extensions/amavis/templatetags/amextras.py:26
+#: extensions/amavis/templatetags/amextras.py:59
+#: extensions/amavis/templatetags/amextras.py:77
 #: extensions/webmail/templatetags/webextras.py:33
 msgid "Delete"
 msgstr "Eliminar"
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:29
+#: extensions/amavis/templatetags/amextras.py:29
 msgid "View full headers"
 msgstr "Ver todas las cabeceras"
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:80
+#: extensions/amavis/templatetags/amextras.py:80
 msgid "Content Class"
 msgstr "Clase de contenido"
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:84
+#: extensions/amavis/templatetags/amextras.py:84
 msgid "Nothing"
 msgstr "Nada"
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:87
+#: extensions/amavis/templatetags/amextras.py:87
 msgid "Spam"
 msgstr "Correo basura"
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:90
+#: extensions/amavis/templatetags/amextras.py:90
 msgid "Virus"
 msgstr "Virus"
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:93
+#: extensions/amavis/templatetags/amextras.py:93
 msgid "Bad header"
 msgstr "Mala cabecera"
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:96
+#: extensions/amavis/templatetags/amextras.py:96
 msgid "Bad MIME"
 msgstr "Mal MIME"
 
-#: extensions/limits/__init__.py:55
+#: extensions/limits/__init__.py:23
 msgid ""
 "Per administrator resources to limit the number of objects they can create"
-msgstr "Recursos por administrador para limitar el número de objetos que pueden crear"
+msgstr ""
+"Recursos por administrador para limitar el número de objetos que pueden crear"
 
-#: extensions/limits/__init__.py:62
+#: extensions/limits/__init__.py:60
 msgid "Reseller"
 msgstr "Revendedor"
 
-#: extensions/limits/__init__.py:93
+#: extensions/limits/__init__.py:91
 msgid "Resources"
 msgstr "Recursos"
 
@@ -847,36 +1100,21 @@ msgstr "Administradores del dominio"
 
 #: extensions/limits/forms.py:12
 msgid "Maximum number of domain administrators this user can create"
-msgstr "Número máximo de administradores de dominio que este usuario puede crear"
+msgstr ""
+"Número máximo de administradores de dominio que este usuario puede crear"
 
 #: extensions/limits/forms.py:15
 msgid "Maximum number of domains this user can create"
 msgstr "Número máxima de dominios que este usuario puede crear"
 
-#: extensions/limits/forms.py:16 extensions/limits/models.py:11
-#: templates/admin/editdomainform.html:29
-msgid "Domain aliases"
-msgstr "Alias del dominio"
-
 #: extensions/limits/forms.py:17
 msgid "Maximum number of domain aliases this user can create"
 msgstr "Número máximo de alias de dominio que este usuario puede crear"
 
-#: extensions/limits/forms.py:18 extensions/limits/models.py:12
-#: extensions/webmail/templates/webmail/folders.html:4
-#: templates/admin/editdomainform.html:30
-msgid "Mailboxes"
-msgstr "Mailboxes"
-
 #: extensions/limits/forms.py:19
 msgid "Maximum number of mailboxes this user can create"
 msgstr "Número máximo de mailboxes que este usuario puede crear"
 
-#: extensions/limits/forms.py:20 extensions/limits/models.py:13
-#: templates/admin/editdomainform.html:31
-msgid "Mailbox aliases"
-msgstr "Alias del mailbox"
-
 #: extensions/limits/forms.py:21
 msgid "Maximum number of mailbox aliases this user can create"
 msgstr "Número máximo de alias a mailboxes que este usuario puede crear"
@@ -918,12 +1156,12 @@ msgstr "Uso de recursos"
 msgid "Auto-reply (vacation) functionality using Postfix"
 msgstr "Funcionalidad de autorespuesta (vacaciones) usando Postfix"
 
-#: extensions/postfix_autoreply/__init__.py:45
+#: extensions/postfix_autoreply/__init__.py:43
 msgid "Timeout in seconds between two auto-replies to the same recipient"
 msgstr "Tiempo en segundos entre dos autorespuestas para el mismo emisor"
 
 #: extensions/postfix_autoreply/__init__.py:68
-#: extensions/postfix_autoreply/views.py:19
+#: extensions/postfix_autoreply/views.py:42
 msgid "Auto-reply message"
 msgstr "Mensaje de autorespuesta"
 
@@ -944,7 +1182,8 @@ msgid "subject"
 msgstr "asunto"
 
 #: extensions/postfix_autoreply/models.py:16
-msgid "The subject that will appear in sended emails"
+#, fuzzy
+msgid "The subject that will appear in sent emails"
 msgstr "El asunto que aparecerá en los correos enviados"
 
 #: extensions/postfix_autoreply/models.py:17
@@ -952,46 +1191,51 @@ msgid "content"
 msgstr "contenido"
 
 #: extensions/postfix_autoreply/models.py:18
-msgid "The content that will appear in sended emails"
+#, fuzzy
+msgid "The content that will appear in sent emails"
 msgstr "El contenido que aparecerá en los correos enviados"
 
 #: extensions/postfix_autoreply/models.py:20
 msgid "Activate/Deactivate your auto reply"
 msgstr "Activar/desactivar su autorespuesta"
 
-#: extensions/postfix_autoreply/views.py:43
+#: extensions/postfix_autoreply/views.py:36
 msgid "Auto reply message updated successfully."
 msgstr "El mensaje de autorespuesta se ha actualizado correctamente."
 
-#: extensions/sievefilters/__init__.py:15
-msgid "Address of your MANAGESIEVE server"
-msgstr "Dirección de su servidor MANAGESIEVE"
+#: extensions/postfix_autoreply/views.py:43
+msgid "Define a message to automatically send when you are off"
+msgstr ""
 
-#: extensions/sievefilters/__init__.py:17
-msgid "Listening port of your MANAGESIEVE server"
-msgstr "Puerto a la escucha de su servidor MANAGESIEVE"
-
-#: extensions/sievefilters/__init__.py:19
-msgid "Use the STARTTLS extension"
-msgstr "Usar la extensión STARTTLS"
-
-#: extensions/sievefilters/__init__.py:26
-msgid "Prefered authentication mechanism"
-msgstr "Mecanismo de autenticación preferido"
-
-#: extensions/sievefilters/__init__.py:30
-msgid "Editor mode"
-msgstr "Modo editor"
-
-#: extensions/sievefilters/__init__.py:32
-msgid "Select the mode you want the editor to work in"
-msgstr "Seleccione el modo en el que desea que el editor trabaje"
-
-#: extensions/sievefilters/__init__.py:42
+#: extensions/sievefilters/__init__.py:12
 msgid "Plugin to easily create server-side filters"
 msgstr "Extensión para crear filtros en el servidor de forma sencilla"
 
-#: extensions/sievefilters/__init__.py:56
+#: extensions/sievefilters/__init__.py:20
+msgid "Address of your MANAGESIEVE server"
+msgstr "Dirección de su servidor MANAGESIEVE"
+
+#: extensions/sievefilters/__init__.py:22
+msgid "Listening port of your MANAGESIEVE server"
+msgstr "Puerto a la escucha de su servidor MANAGESIEVE"
+
+#: extensions/sievefilters/__init__.py:24
+msgid "Use the STARTTLS extension"
+msgstr "Usar la extensión STARTTLS"
+
+#: extensions/sievefilters/__init__.py:31
+msgid "Prefered authentication mechanism"
+msgstr "Mecanismo de autenticación preferido"
+
+#: extensions/sievefilters/__init__.py:35
+msgid "Editor mode"
+msgstr "Modo editor"
+
+#: extensions/sievefilters/__init__.py:37
+msgid "Select the mode you want the editor to work in"
+msgstr "Seleccione el modo en el que desea que el editor trabaje"
+
+#: extensions/sievefilters/__init__.py:55
 #: extensions/sievefilters/templates/sievefilters/index.html:2
 msgid "Message filters"
 msgstr "Filtros de mensajes"
@@ -1114,14 +1358,6 @@ msgstr "Conjunto de filtros eliminado"
 msgid "Filters set activated"
 msgstr "Conjunto de filtros activado"
 
-#: extensions/sievefilters/views.py:265
-msgid "yes"
-msgstr "sí"
-
-#: extensions/sievefilters/views.py:269
-msgid "no"
-msgstr "no"
-
 #: extensions/sievefilters/templates/sievefilters/filter.html:6
 msgid "Conditions"
 msgstr "Condiciones"
@@ -1145,7 +1381,9 @@ msgstr "activo"
 #: extensions/sievefilters/templates/sievefilters/index.html:73
 msgid ""
 "No filters set defined yet. You must create one in order to define filters."
-msgstr "No hay un conjunto de filtros definido aún. Debe crear uno para poder definir filtros."
+msgstr ""
+"No hay un conjunto de filtros definido aún. Debe crear uno para poder "
+"definir filtros."
 
 #: extensions/sievefilters/templatetags/sfilters_tags.py:16
 msgid "New filters set"
@@ -1183,23 +1421,19 @@ msgstr "Bajar este filtro"
 msgid "Graphical statistics about emails traffic using RRDtool"
 msgstr "Estadísticas gráficas del tráfico de emails usando RRDtool"
 
-#: extensions/stats/__init__.py:27
+#: extensions/stats/__init__.py:26
 msgid "Path to log file used to collect statistics"
 msgstr "Ruta al fichero de log usado para recolectar estadísticas"
 
-#: extensions/stats/__init__.py:30
+#: extensions/stats/__init__.py:29
 msgid "Path to directory where RRD files are stored"
 msgstr "Ruta al directorio dónde están almacenados los ficheros RRD"
 
-#: extensions/stats/__init__.py:33
+#: extensions/stats/__init__.py:32
 msgid "Path to directory where PNG files are stored"
 msgstr "Ruta al directorio dónde están almacenados los ficheros PNG"
 
-#: extensions/stats/__init__.py:36
-msgid "Graphics location (to build URLs)"
-msgstr "Localización de gráficos (para construir URLs)"
-
-#: extensions/stats/__init__.py:47
+#: extensions/stats/__init__.py:45
 msgid "Statistics"
 msgstr "Estadísticas"
 
@@ -1271,11 +1505,11 @@ msgstr "A medida"
 msgid "No statistics available"
 msgstr "No hay estadísticas disponibles"
 
-#: extensions/stats/views.py:58
+#: extensions/stats/views.py:57
 msgid "Domain not found. Please enter a full name"
 msgstr "Dominio no encontrado. Por favor, introduzca un nombre completo"
 
-#: extensions/stats/views.py:65
+#: extensions/stats/views.py:64
 msgid "Bad custom period"
 msgstr "Período elegido erróneo"
 
@@ -1300,114 +1534,114 @@ msgid "Apply"
 msgstr "Aplicar"
 
 #: extensions/webmail/__init__.py:12
-msgid "Address of your IMAP server"
-msgstr "Dirección de su servidor IMAP"
-
-#: extensions/webmail/__init__.py:15
-msgid "Use a secured connection to access IMAP server"
-msgstr "Usar una conexión segura para acceder al servidor IMAP"
-
-#: extensions/webmail/__init__.py:17
-msgid "Listening port of your IMAP server"
-msgstr "Puerto de su servidor IMAP"
-
-#: extensions/webmail/__init__.py:20
-msgid "Address of your SMTP server"
-msgstr "Dirección de su servidor SMTP"
-
-#: extensions/webmail/__init__.py:22
-msgid "None"
-msgstr "Nada"
-
-#: extensions/webmail/__init__.py:26
-msgid "Use a secured connection to access SMTP server"
-msgstr "Usar una conexión segura para acceder al servidor SMTP"
-
-#: extensions/webmail/__init__.py:28
-msgid "Listening port of your SMTP server"
-msgstr "Puerto de su servidor SMTP"
-
-#: extensions/webmail/__init__.py:31
-msgid "Server needs authentication"
-msgstr "El servidor requiere autenticación"
-
-#: extensions/webmail/__init__.py:33
-msgid "Maximum attachment size in bytes (or KB, MB, GB if specified)"
-msgstr "Tamaño máximo del adjunto en bytes (or KB, MB, GB si se especifica)"
-
-#: extensions/webmail/__init__.py:36
-msgid "Number of displayed emails per page"
-msgstr "Número de emails mostrados por página"
-
-#: extensions/webmail/__init__.py:39
-msgid "Listing refresh rate"
-msgstr "Tasa de refresco"
-
-#: extensions/webmail/__init__.py:40
-msgid "Automatic folder refresh rate (in seconds)"
-msgstr "Tasa de refresco automática de la carpeta (en segundos)"
-
-#: extensions/webmail/__init__.py:42
-msgid "Trash folder"
-msgstr "Carpeta de basura"
-
-#: extensions/webmail/__init__.py:43
-msgid "Folder where deleted messages go"
-msgstr "Carpeta dónde van los mensajes eliminados"
-
-#: extensions/webmail/__init__.py:45
-msgid "Sent folder"
-msgstr "Carpeta de enviados"
-
-#: extensions/webmail/__init__.py:46
-msgid "Folder where copies of sent messages go"
-msgstr "Carpeta dónde van las copias de los correos enviados"
-
-#: extensions/webmail/__init__.py:48
-msgid "Drafts folder"
-msgstr "Carpeta de borradores"
-
-#: extensions/webmail/__init__.py:49
-msgid "Folder where drafts go"
-msgstr "Carpeta dónde van los borradores"
-
-#: extensions/webmail/__init__.py:51
-msgid "Signature text"
-msgstr "Texto de la firma"
-
-#: extensions/webmail/__init__.py:52
-msgid "User defined email signature"
-msgstr "Firma de correo definida por el usuario"
-
-#: extensions/webmail/__init__.py:54
-msgid "Default editor"
-msgstr "Editor por defecto"
-
-#: extensions/webmail/__init__.py:56
-msgid "The default editor to use when composing a message"
-msgstr "Editor por defecto para usar cuando redacta un mensaje"
-
-#: extensions/webmail/__init__.py:58
-msgid "Default message display mode"
-msgstr "Modo por defecto para mostrar un mensaje"
-
-#: extensions/webmail/__init__.py:60
-msgid "The default mode used when displaying a message"
-msgstr "Modo por defecto usado cuando se muestra un mensaje"
-
-#: extensions/webmail/__init__.py:62
-msgid "Enable HTML links display"
-msgstr "Activar el mostrar enlaces de HTML"
-
-#: extensions/webmail/__init__.py:63
-msgid "Enable/Disable HTML links display"
-msgstr "Activar/Desactivar el mostrar enlaces HTML"
-
-#: extensions/webmail/__init__.py:73
 msgid "Simple IMAP webmail"
 msgstr "Correo web sencillo para IMAP"
 
-#: extensions/webmail/__init__.py:85
+#: extensions/webmail/__init__.py:20
+msgid "Address of your IMAP server"
+msgstr "Dirección de su servidor IMAP"
+
+#: extensions/webmail/__init__.py:23
+msgid "Use a secured connection to access IMAP server"
+msgstr "Usar una conexión segura para acceder al servidor IMAP"
+
+#: extensions/webmail/__init__.py:25
+msgid "Listening port of your IMAP server"
+msgstr "Puerto de su servidor IMAP"
+
+#: extensions/webmail/__init__.py:28
+msgid "Address of your SMTP server"
+msgstr "Dirección de su servidor SMTP"
+
+#: extensions/webmail/__init__.py:30
+msgid "None"
+msgstr "Nada"
+
+#: extensions/webmail/__init__.py:34
+msgid "Use a secured connection to access SMTP server"
+msgstr "Usar una conexión segura para acceder al servidor SMTP"
+
+#: extensions/webmail/__init__.py:36
+msgid "Listening port of your SMTP server"
+msgstr "Puerto de su servidor SMTP"
+
+#: extensions/webmail/__init__.py:39
+msgid "Server needs authentication"
+msgstr "El servidor requiere autenticación"
+
+#: extensions/webmail/__init__.py:41
+msgid "Maximum attachment size in bytes (or KB, MB, GB if specified)"
+msgstr "Tamaño máximo del adjunto en bytes (or KB, MB, GB si se especifica)"
+
+#: extensions/webmail/__init__.py:44
+msgid "Number of displayed emails per page"
+msgstr "Número de emails mostrados por página"
+
+#: extensions/webmail/__init__.py:47
+msgid "Listing refresh rate"
+msgstr "Tasa de refresco"
+
+#: extensions/webmail/__init__.py:48
+msgid "Automatic folder refresh rate (in seconds)"
+msgstr "Tasa de refresco automática de la carpeta (en segundos)"
+
+#: extensions/webmail/__init__.py:50
+msgid "Trash folder"
+msgstr "Carpeta de basura"
+
+#: extensions/webmail/__init__.py:51
+msgid "Folder where deleted messages go"
+msgstr "Carpeta dónde van los mensajes eliminados"
+
+#: extensions/webmail/__init__.py:53
+msgid "Sent folder"
+msgstr "Carpeta de enviados"
+
+#: extensions/webmail/__init__.py:54
+msgid "Folder where copies of sent messages go"
+msgstr "Carpeta dónde van las copias de los correos enviados"
+
+#: extensions/webmail/__init__.py:56
+msgid "Drafts folder"
+msgstr "Carpeta de borradores"
+
+#: extensions/webmail/__init__.py:57
+msgid "Folder where drafts go"
+msgstr "Carpeta dónde van los borradores"
+
+#: extensions/webmail/__init__.py:59
+msgid "Signature text"
+msgstr "Texto de la firma"
+
+#: extensions/webmail/__init__.py:60
+msgid "User defined email signature"
+msgstr "Firma de correo definida por el usuario"
+
+#: extensions/webmail/__init__.py:62
+msgid "Default editor"
+msgstr "Editor por defecto"
+
+#: extensions/webmail/__init__.py:64
+msgid "The default editor to use when composing a message"
+msgstr "Editor por defecto para usar cuando redacta un mensaje"
+
+#: extensions/webmail/__init__.py:66
+msgid "Default message display mode"
+msgstr "Modo por defecto para mostrar un mensaje"
+
+#: extensions/webmail/__init__.py:68
+msgid "The default mode used when displaying a message"
+msgstr "Modo por defecto usado cuando se muestra un mensaje"
+
+#: extensions/webmail/__init__.py:70
+msgid "Enable HTML links display"
+msgstr "Activar el mostrar enlaces de HTML"
+
+#: extensions/webmail/__init__.py:71
+msgid "Enable/Disable HTML links display"
+msgstr "Activar/Desactivar el mostrar enlaces HTML"
+
+#: extensions/webmail/__init__.py:87
 msgid "Webmail"
 msgstr "Correo web"
 
@@ -1432,7 +1666,7 @@ msgstr "escribió:"
 msgid "Original message"
 msgstr "Mensaje original"
 
-#: extensions/webmail/lib.py:681
+#: extensions/webmail/lib.py:678
 msgid "Red fields are mandatories"
 msgstr "Los campos en rojo son obligatorios"
 
@@ -1445,7 +1679,7 @@ msgid "Empty mailbox"
 msgstr "Mailbox vacío"
 
 #: extensions/webmail/views.py:115
-#: extensions/webmail/templatetags/webextras.py:166
+#: extensions/webmail/templatetags/webextras.py:165
 msgid "Create a new mailbox"
 msgstr "Crear un nuevo mailbox"
 
@@ -1461,8 +1695,8 @@ msgstr "Editar el mailbox"
 msgid "Mailbox updated"
 msgstr "Mailbox actualizado"
 
-#: extensions/webmail/views.py:194 extensions/webmail/views.py:374
-#: extensions/webmail/views.py:483
+#: extensions/webmail/views.py:194 extensions/webmail/views.py:376
+#: extensions/webmail/views.py:485
 msgid "Bad request"
 msgstr "Petición incorrecta"
 
@@ -1493,7 +1727,7 @@ msgstr "Fallo al eliminar el adjunto:"
 msgid "Unknown attachment"
 msgstr "Adjunto desconocido"
 
-#: extensions/webmail/views.py:479
+#: extensions/webmail/views.py:481
 msgid "Undefined action"
 msgstr "Acción no definida"
 
@@ -1536,7 +1770,7 @@ msgstr "Responder"
 msgid "Reply all"
 msgstr "Responder a todos"
 
-#: extensions/webmail/templatetags/webextras.py:29
+#: extensions/webmail/templatetags/webextras.py:29 userprefs/views.py:27
 #: userprefs/templatetags/uprefs_extras.py:25
 msgid "Forward"
 msgstr "Siguiente"
@@ -1589,11 +1823,11 @@ msgstr "Comprimir la carpeta"
 msgid "Empty folder"
 msgstr "Vaciar la carpeta"
 
-#: extensions/webmail/templatetags/webextras.py:174
+#: extensions/webmail/templatetags/webextras.py:173
 msgid "Edit the selected mailbox"
 msgstr "Editar el mailbox seleccionado"
 
-#: extensions/webmail/templatetags/webextras.py:179
+#: extensions/webmail/templatetags/webextras.py:178
 msgid "Remove the selected mailbox"
 msgstr "Eliminar el mailbox seleccionado"
 
@@ -1606,7 +1840,7 @@ msgstr "Permiso denegado: %s"
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: lib/formutils.py:154 lib/formutils.py:161
+#: lib/formutils.py:158 lib/formutils.py:165
 msgid "Enter a valid domain name"
 msgstr "Introduzca un nombre dominio válido"
 
@@ -1622,60 +1856,15 @@ msgstr "Super administrador"
 msgid "Domain administrator"
 msgstr "Administrador de dominio"
 
-#: lib/permissions.py:62
+#: lib/permissions.py:70
 #, python-format
 msgid "Failed to grant access (%s)"
 msgstr "Fallo al dar acceso (%s)"
 
-#: lib/tables.py:233
+#: lib/tables.py:232
 msgid "No entries to display"
 msgstr "No hay entradas que mostrar"
 
-#: templates/admin/editdomainform.html:5
-msgid "Administrators"
-msgstr "Administradores"
-
-#: templates/admin/editdomainform.html:6
-msgid "Miscellaneous"
-msgstr "Otros"
-
-#: templates/admin/editdomainform.html:24
-msgid "No domain administrator defined"
-msgstr "No hay un dominio de administrador definido "
-
-#: templates/admin/editdomainform.html:27
-msgid "Creation date"
-msgstr "Fecha de creación"
-
-#: templates/admin/editdomainform.html:28
-msgid "Last modification date"
-msgstr "Última fecha de modificación"
-
-#: templates/admin/extensions.html:7 templates/admin/parameters.html:9
-#: templates/userprefs/preferences.html:37
-msgid "Save"
-msgstr "Guardar"
-
-#: templates/admin/importform.html:5
-msgid "Help"
-msgstr "Ayuda"
-
-#: templates/admin/importform.html:12
-msgid "Importing..."
-msgstr "Importando..."
-
-#: templates/admin/listing.html:12 templates/admin/searchform.html:4
-msgid "Search"
-msgstr "Buscar"
-
-#: templates/admin/mailboxes_raw.html:3
-msgid "Choose a value"
-msgstr "Elija un valor"
-
-#: templates/admin/newaccount.html:31 templates/common/generic_modal.html:11
-msgid "Close"
-msgstr "Cerrar"
-
 #: templates/common/email_searchbar.html:5
 msgid "From address"
 msgstr "De la dirección"
@@ -1692,7 +1881,8 @@ msgstr "Buscar..."
 msgid "Error:"
 msgstr "Error:"
 
-#: templates/common/generic_field.html:4
+#: templates/common/generic_field.html:3
+#: templates/common/generic_fields_group.html:3
 msgid "Help:"
 msgstr "Ayuda:"
 
@@ -1704,19 +1894,14 @@ msgstr "No hay parámetros disponibles"
 msgid "Welcome to Modoboa"
 msgstr "Bienvenido a Modoboa"
 
-#: templates/registration/login.html:35
+#: templates/registration/login.html:36
 msgid "Remember me"
 msgstr "Recuerdame"
 
-#: templates/registration/login.html:37
+#: templates/registration/login.html:38
 msgid "Log in"
 msgstr "Entrar"
 
-#: templates/userprefs/preferences.html:2
-#: userprefs/templatetags/uprefs_extras.py:53
-msgid "Settings"
-msgstr "Configuración"
-
 #: userprefs/__init__.py:7
 msgid "Prefered language"
 msgstr "Idioma preferido"
@@ -1733,56 +1918,107 @@ msgstr "Contraseña anterior"
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: userprefs/forms.py:27
+#: userprefs/forms.py:37
 msgid "Old password mismatchs"
 msgstr "La contraseña no concuerda con la anterior"
 
-#: userprefs/forms.py:32
+#: userprefs/forms.py:42
 msgid "Passwords mismatch"
 msgstr "Las contraseñas no coinciden"
 
-#: userprefs/forms.py:36
-msgid "Destination(s)"
-msgstr "Destino(s)"
+#: userprefs/forms.py:56
+#, fuzzy
+msgid "Recipient(s)"
+msgstr "Destinatarios"
 
-#: userprefs/forms.py:37
+#: userprefs/forms.py:59
+msgid "Indicate one or more recipients separated by a ','"
+msgstr ""
+
+#: userprefs/forms.py:62
 msgid "Keep local copies"
 msgstr "Mantener copias locales"
 
-#: userprefs/forms.py:50
+#: userprefs/forms.py:64
+msgid "Forward messages and store copies into your local mailbox"
+msgstr ""
+
+#: userprefs/forms.py:81
 msgid ""
 "You can't define a forward to a local destination. Please ask your "
 "administrator to create an alias instead."
-msgstr "No puede definir un reenvío a un destino local. Por favor, pregunte a su administrador para crear un alias en su lugar."
+msgstr ""
+"No puede definir un reenvío a un destino local. Por favor, pregunte a su "
+"administrador para crear un alias en su lugar."
 
-#: userprefs/views.py:26
-msgid "Password change is disabled for this user"
-msgstr "El cambio de contraseña está deshabilitado para este usuario"
+#: userprefs/views.py:28
+msgid "Automatically forward emails to another address"
+msgstr ""
 
-#: userprefs/views.py:31 userprefs/templatetags/uprefs_extras.py:48
-msgid "Change password"
-msgstr "Cambiar la contraseña"
-
-#: userprefs/views.py:51
-msgid "Password changed"
-msgstr "Contraseña cambiada"
-
-#: userprefs/views.py:63
-msgid "Define a forward"
-msgstr "Definir un reenvío"
-
-#: userprefs/views.py:89
+#: userprefs/views.py:52
 msgid "Forward updated"
 msgstr "Reenvío actualizado"
 
-#: userprefs/views.py:142
+#: userprefs/views.py:88
+#, fuzzy
+msgid "Profile updated"
+msgstr "Mailbox actualizado"
+
+#: userprefs/views.py:97 userprefs/templatetags/uprefs_extras.py:16
+msgid "Profile"
+msgstr ""
+
+#: userprefs/views.py:98
+msgid "Update your personal information"
+msgstr ""
+
+#: userprefs/views.py:114
 msgid "Preferences saved"
 msgstr "Preferencias guardadas"
 
-#: userprefs/templatetags/uprefs_extras.py:17
+#: userprefs/templates/userprefs/preferences.html:2
+#: userprefs/templatetags/uprefs_extras.py:46
+msgid "Settings"
+msgstr "Configuración"
+
+#: userprefs/templates/userprefs/preferences.html:21
+#: userprefs/templatetags/uprefs_extras.py:19
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: userprefs/templatetags/uprefs_extras.py:61
+#: userprefs/templates/userprefs/preferences.html:21
+#, fuzzy
+msgid "Customize Modoboa"
+msgstr "Bienvenido a Modoboa"
+
+#: userprefs/templatetags/uprefs_extras.py:55
 msgid "Logout"
 msgstr "Salir"
+
+#, fuzzy
+#~ msgid "tag subject"
+#~ msgstr "asunto"
+
+#~ msgid "Mailbox(es) this alias will point to"
+#~ msgstr "Los mailbox(es) a los que el alias apunta"
+
+#~ msgid "Alias(es) of this mailbox"
+#~ msgstr "Alias para este mailbox"
+
+#~ msgid "Graphics location (to build URLs)"
+#~ msgstr "Localización de gráficos (para construir URLs)"
+
+#~ msgid "Destination(s)"
+#~ msgstr "Destino(s)"
+
+#~ msgid "Password change is disabled for this user"
+#~ msgstr "El cambio de contraseña está deshabilitado para este usuario"
+
+#~ msgid "Change password"
+#~ msgstr "Cambiar la contraseña"
+
+#~ msgid "Password changed"
+#~ msgstr "Contraseña cambiada"
+
+#~ msgid "Define a forward"
+#~ msgstr "Definir un reenvío"
diff --git a/modoboa/locale/es/LC_MESSAGES/djangojs.po b/modoboa/locale/es/LC_MESSAGES/djangojs.po
index 1b1575588..675fbd0a5 100644
--- a/modoboa/locale/es/LC_MESSAGES/djangojs.po
+++ b/modoboa/locale/es/LC_MESSAGES/djangojs.po
@@ -1,90 +1,90 @@
 # Modoboa spanish translation.
 # Copyright (C) 2010-2012
 # This file is distributed under the same license as the Modoboa package.
-# 
+#
 # Pedro Gracia <pedro.gracia@impulzia.com>, 2010-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Modoboa-0.9\n"
-"Report-Msgid-Bugs-To: http://dev.modoboa.org/\n"
-"POT-Creation-Date: 2012-05-03 11:05+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-07-03 09:12+0200\n"
 "PO-Revision-Date: 2012-05-19 08:45+0000\n"
 "Last-Translator: Pedro Gracia <pedro.gracia@impulzia.com>\n"
 "Language-Team: ES <LL@li.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: extensions/amavis_quarantine/static/js/quarantine.js:126
+#: admin/static/admin/js/admin.js:17
+msgid "No domain administrator defined"
+msgstr "No hay un administrador de dominio definido"
+
+#: extensions/amavis/static/amavis/js/quarantine.js:126
 msgid "Release this selection?"
 msgstr "¿Publicar esta selección?"
 
-#: extensions/amavis_quarantine/static/js/quarantine.js:130
+#: extensions/amavis/static/amavis/js/quarantine.js:130
 msgid "Delete this selection?"
 msgstr "¿Eliminar esta selección?"
 
-#: extensions/amavis_quarantine/static/js/quarantine.js:148
-#: extensions/amavis_quarantine/static/js/selfservice.js:22
+#: extensions/amavis/static/amavis/js/quarantine.js:148
+#: extensions/amavis/static/amavis/js/selfservice.js:22
 msgid "Release this message?"
 msgstr "¿Publicar este mensaje?"
 
-#: extensions/amavis_quarantine/static/js/quarantine.js:152
-#: extensions/amavis_quarantine/static/js/selfservice.js:26
+#: extensions/amavis/static/amavis/js/quarantine.js:152
+#: extensions/amavis/static/amavis/js/selfservice.js:26
 msgid "Delete this message?"
 msgstr "¿Eliminar este mensaje?"
 
-#: extensions/amavis_quarantine/static/js/quarantine.js:169
+#: extensions/amavis/static/amavis/js/quarantine.js:169
 msgid "View full headers"
 msgstr "Ver todas las cabeceras"
 
-#: extensions/amavis_quarantine/static/js/quarantine.js:174
+#: extensions/amavis/static/amavis/js/quarantine.js:174
 msgid "Hide full headers"
 msgstr "Esconder todas las cabeceras"
 
-#: extensions/sievefilters/static/js/lib.js:14
+#: extensions/sievefilters/static/sievefilters/js/lib.js:14
 msgid "Remove this filter?"
 msgstr "¿Eliminar este filtro?"
 
-#: extensions/sievefilters/static/js/lib.js:117
+#: extensions/sievefilters/static/sievefilters/js/lib.js:117
 msgid "Save changes?"
 msgstr "¿Guardar cambios?"
 
-#: extensions/sievefilters/static/js/lib.js:144
+#: extensions/sievefilters/static/sievefilters/js/lib.js:144
 msgid "Remove filters set?"
 msgstr "¿Eliminar este conjunto de filtros?"
 
-#: extensions/sievefilters/static/js/lib.js:161
+#: extensions/sievefilters/static/sievefilters/js/lib.js:161
 msgid "Activate this filters set?"
 msgstr "¿Activar este conjunto de filtros?"
 
-#: extensions/sievefilters/static/js/lib.js:169
-#: extensions/sievefilters/static/js/lib.js:224
+#: extensions/sievefilters/static/sievefilters/js/lib.js:169
+#: extensions/sievefilters/static/sievefilters/js/lib.js:224
 msgid "active"
 msgstr "Activar"
 
-#: extensions/stats/static/js/stats.js:28
+#: extensions/stats/static/stats/js/stats.js:28
 msgid "Search a domain"
 msgstr "Buscar un dominio"
 
-#: extensions/webmail/static/js/webmail.js:499
+#: extensions/webmail/static/webmail/js/webmail.js:511
 msgid "Remove the selected mailbox?"
 msgstr "¿Eliminar el mailbox seleccionado?"
 
-#: extensions/webmail/static/js/webmail.js:513
+#: extensions/webmail/static/webmail/js/webmail.js:525
 msgid "Mailbox removed"
 msgstr "Mailbox eliminado"
 
-#: static/js/admin.js:17
-msgid "No domain administrator defined"
-msgstr "No hay un administrador de dominio definido"
-
 #: static/js/confirmation.js:45
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: static/js/confirmation.js:84 static/js/history.js:230
+#: static/js/confirmation.js:84 static/js/history.js:231
 msgid "Internal Error"
 msgstr "Error interno"
 
diff --git a/modoboa/locale/fr/LC_MESSAGES/django.po b/modoboa/locale/fr/LC_MESSAGES/django.po
index 07c4b9bf7..83cef7f18 100644
--- a/modoboa/locale/fr/LC_MESSAGES/django.po
+++ b/modoboa/locale/fr/LC_MESSAGES/django.po
@@ -5,9 +5,9 @@
 # Antoine Nguyen <tonio@ngyn.org>, 2009-2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: modoboa-0.9\n"
+"Project-Id-Version: modoboa-0.9.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-03 10:59+0200\n"
+"POT-Creation-Date: 2012-07-04 15:16+0200\n"
 "PO-Revision-Date: 2011-01-07 10:00+100\n"
 "Last-Translator: Antoine Nguyen <tonio@ngyn.org>\n"
 "Language-Team: FR <tonio@ngyn.org>\n"
@@ -62,21 +62,21 @@ msgstr ""
 "Sous répertoire (dans la boite aux lettres) ou les messages sont stockés en "
 "cas d'utilisation du format maildir"
 
-#: admin/__init__.py:28
+#: admin/__init__.py:32
 msgid "Scheme used to crypt mailbox passwords"
 msgstr ""
 "Méthode utilisée pour chiffrer les mots de passe des boites aux lettres"
 
-#: admin/__init__.py:31
+#: admin/__init__.py:35
 msgid "Number of displayed items per page"
 msgstr "Nombre d'éléments affichés par page"
 
-#: admin/__init__.py:54
+#: admin/__init__.py:57
 msgid "The default redirection used when no application is specified"
 msgstr ""
 "La redirection appliquée par défaut quand aucune application n'est spécifiée"
 
-#: admin/forms.py:15 admin/forms.py:396 admin/tables.py:17
+#: admin/forms.py:15 admin/forms.py:445 admin/tables.py:17
 msgid "Alias(es)"
 msgstr "Alias"
 
@@ -84,169 +84,186 @@ msgstr "Alias"
 msgid "Alias(es) of this domain"
 msgstr "Alias de ce domaine"
 
-#: admin/forms.py:51 admin/views.py:60
+#: admin/forms.py:54
 msgid "An alias with this name already exists"
 msgstr "Un alias de ce nom existe déjà"
 
-#: admin/forms.py:66
+#: admin/forms.py:69
 msgid "A domain with this name already exists"
 msgstr "Un domaine de ce nom existe déjà"
 
-#: admin/forms.py:76
+#: admin/forms.py:79
 msgid "Failed to rename domain, check permissions"
 msgstr "Impossible de renommer le domaine, vérifier les permissions"
 
-#: admin/forms.py:103
+#: admin/forms.py:110 admin/forms.py:598 admin/views.py:363
+msgid "General"
+msgstr "Général"
+
+#: admin/forms.py:132
 msgid "Email address"
 msgstr "Adresse email"
 
-#: admin/forms.py:104
+#: admin/forms.py:133
 msgid "The distribution list address"
 msgstr "L'adresse de liste de distribution"
 
-#: admin/forms.py:107
+#: admin/forms.py:136
 msgid "Recipients"
 msgstr "Destinataires"
 
-#: admin/forms.py:108
-msgid "Mailbox(es) this alias will point to"
-msgstr "Les boites aux lettres sur lesquelles cet alias pointera"
+#: admin/forms.py:137
+msgid ""
+"Mailbox(es) this alias will point to. Indicate only one address per input, "
+"press ENTER to add a new input."
+msgstr ""
+"Destinataire(s) de cet alias. Indiquer seulement une adresse par champ, "
+"appuyer sur ENTREE pour ajouter un nouveau champ."
 
-#: admin/forms.py:142 admin/forms.py:221 admin/forms.py:429
-#: admin/models.py:779
+#: admin/forms.py:171 admin/forms.py:250 admin/forms.py:478
+#: admin/models.py:809
 msgid "Domain does not exist"
 msgstr "Domain inexistant"
 
-#: admin/forms.py:144 admin/forms.py:223
+#: admin/forms.py:173 admin/forms.py:252
 msgid "You don't have access to this domain"
 msgstr "Vous n'avez pas accès à ce domaine"
 
-#: admin/forms.py:164
+#: admin/forms.py:193
 msgid "Invalid mailbox"
 msgstr "Boite aux lettres invalide"
 
-#: admin/forms.py:175 admin/models.py:799
+#: admin/forms.py:204 admin/models.py:829
 #, python-format
 msgid "Mailbox %s does not exist"
 msgstr "La boite %s n'existe pas"
 
-#: admin/forms.py:184
+#: admin/forms.py:213
 msgid "No recipient defined"
 msgstr "Aucune destinataire défini"
 
-#: admin/forms.py:187
+#: admin/forms.py:216
 msgid "A distribution list must contain at least two recipients"
 msgstr "Une liste de distribution doit contenir au moins deux destinataires"
 
-#: admin/forms.py:201
+#: admin/forms.py:230
 msgid "Address"
 msgstr "Adresse"
 
-#: admin/forms.py:202
+#: admin/forms.py:231
 msgid "A valid e-mail address"
 msgstr "Une adresse email valide"
 
-#: admin/forms.py:238 admin/forms.py:267 extensions/sievefilters/forms.py:70
+#: admin/forms.py:267 admin/forms.py:296 extensions/sievefilters/forms.py:70
 msgid "Recipient"
 msgstr "Destinataire"
 
-#: admin/forms.py:239
+#: admin/forms.py:268
 msgid "A local recipient address"
 msgstr "Une adresse de destination locale"
 
-#: admin/forms.py:254
+#: admin/forms.py:283
 msgid "Mailbox does not exist"
 msgstr "La boite n'existe pas"
 
-#: admin/forms.py:256
+#: admin/forms.py:285
 msgid "You can't access this mailbox"
 msgstr "Vous n'avez pas accès à cette boite"
 
-#: admin/forms.py:268
+#: admin/forms.py:297
 msgid "An external recipient address"
 msgstr "Une adresse de destination externe"
 
-#: admin/forms.py:285
+#: admin/forms.py:314
 msgid "Local recipients are forbidden"
 msgstr "Les destinataires locaux sont interdits"
 
-#: admin/forms.py:295 extensions/webmail/forms.py:18
+#: admin/forms.py:324 extensions/webmail/forms.py:18
 msgid "Select a file"
 msgstr "Sélectionner un fichier"
 
-#: admin/forms.py:296
+#: admin/forms.py:325
 msgid "Separator"
 msgstr "Séparateur"
 
-#: admin/forms.py:308 auth/forms.py:6 templates/admin/editdomainform.html:20
+#: admin/forms.py:337 admin/templates/admin/editdomainform.html:9
+#: auth/forms.py:6
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: admin/forms.py:310
+#: admin/forms.py:339
 msgid "Role"
 msgstr "Rôle"
 
-#: admin/forms.py:311 admin/forms.py:335
+#: admin/forms.py:340 admin/forms.py:364
 msgid "Choose"
 msgstr "Choisir"
 
-#: admin/forms.py:312
+#: admin/forms.py:341
 msgid "What level of permission this user will have"
 msgstr "Quel niveau de permission cet utilisateur aura"
 
-#: admin/forms.py:314 auth/forms.py:10
+#: admin/forms.py:343 auth/forms.py:10
 msgid "Password"
 msgstr "Mot de passe"
 
-#: admin/forms.py:316 userprefs/forms.py:15
+#: admin/forms.py:345 userprefs/forms.py:15
 msgid "Confirmation"
 msgstr "Confirmation"
 
-#: admin/forms.py:318
+#: admin/forms.py:347
 msgid "Enter the same password as above, for verification."
 msgstr "Entrer le même mot de passe, pour vérification."
 
-#: admin/forms.py:329
+#: admin/forms.py:358
 msgid "Enabled"
 msgstr "Activé"
 
-#: admin/forms.py:367
+#: admin/forms.py:396
 msgid "The two password fields didn't match."
 msgstr "Les deux mots de passe ne correspondent pas."
 
-#: admin/forms.py:393
+#: admin/forms.py:437
 msgid "E-mail"
 msgstr "E-mail"
 
-#: admin/forms.py:394
+#: admin/forms.py:439
 msgid "Quota"
 msgstr "Quota"
 
-#: admin/forms.py:398
-msgid "Alias(es) of this mailbox"
-msgstr "Alias de cette boite"
+#: admin/forms.py:441
+msgid ""
+"Quota in MB for this mailbox. Leave empty to use the value defined at domain "
+"level."
+msgstr ""
+"Quota en Mo pour cette boite. Laisser vide pour utiliser la valeur définie "
+"au niveau du domaine."
 
-#: admin/forms.py:454
+#: admin/forms.py:447
+msgid ""
+"Alias(es) of this mailbox. Indicate only one address per input, press ENTER "
+"to add a new input."
+msgstr ""
+"Alias de cette boite. Indiquer seulement une adresse par champ, appuyer sur "
+"ENTREE pour ajouter un nouveau champ."
+
+#: admin/forms.py:505
 msgid "Failed to rename mailbox, check permissions"
 msgstr "Impossible de renommer la boite aux lettres, vérifier les permissions."
 
-#: admin/forms.py:495
+#: admin/forms.py:547
 msgid "Domain(s)"
 msgstr "Domaine(s)"
 
-#: admin/forms.py:497
+#: admin/forms.py:549
 msgid "Domain(s) that user administrates"
 msgstr "Domaine(s) que cet utilisateur administre"
 
-#: admin/forms.py:546 admin/views.py:356 templates/admin/editdomainform.html:4
-msgid "General"
-msgstr "Général"
-
-#: admin/forms.py:548 admin/views.py:359
+#: admin/forms.py:600 admin/views.py:366
 msgid "Mail"
 msgstr "Courrier"
 
-#: admin/forms.py:550
+#: admin/forms.py:602
 msgid "Permissions"
 msgstr "Permissions"
 
@@ -258,94 +275,94 @@ msgstr "Type d'objet inconnu"
 msgid "You can't delete your own account"
 msgstr "Vous ne pouvez pas supprimer votre propre compte"
 
-#: admin/models.py:137
+#: admin/models.py:151
 msgid "Failed to update password: LDAP module not installed"
 msgstr ""
 "Echec de la mise à jour du mot de passe : le module LDAP n'est pas installé"
 
-#: admin/models.py:143
+#: admin/models.py:157
 #, python-format
 msgid "Failed to update password: %s"
 msgstr "Echec de la mise à jour du mot de passe : %s"
 
-#: admin/models.py:375 admin/models.py:461
+#: admin/models.py:393 admin/models.py:479
 msgid "name"
 msgstr "Nom"
 
-#: admin/models.py:376
+#: admin/models.py:394
 msgid "The domain name"
 msgstr "Le nom du domaine"
 
-#: admin/models.py:377
+#: admin/models.py:395
 msgid "Default quota in MB applied to mailboxes"
 msgstr "Quota par défaut en Mo appliqué aux boites aux lettres"
 
-#: admin/models.py:378 admin/models.py:466 admin/models.py:708
-#: admin/models.py:805 extensions/postfix_autoreply/models.py:19
+#: admin/models.py:396 admin/models.py:484 admin/models.py:738
+#: admin/models.py:835 extensions/postfix_autoreply/models.py:19
 msgid "enabled"
 msgstr "Activé"
 
-#: admin/models.py:379
+#: admin/models.py:397
 msgid "Check to activate this domain"
 msgstr "Cocher pour activer ce domaine"
 
-#: admin/models.py:446
+#: admin/models.py:464
 msgid "Failed to initialise domain, check permissions"
 msgstr "Impossible d'initialiser le domaine, vérifier les permissions"
 
-#: admin/models.py:454 admin/models.py:669 admin/models.py:774
+#: admin/models.py:472 admin/models.py:699 admin/models.py:804
 msgid "Invalid line"
 msgstr "Ligne invalide"
 
-#: admin/models.py:462
+#: admin/models.py:480
 msgid "The alias name"
 msgstr "Le nom de l'alias"
 
-#: admin/models.py:463
+#: admin/models.py:481
 msgid "target"
 msgstr "cible"
 
-#: admin/models.py:464
+#: admin/models.py:482
 msgid "The domain this alias points to"
 msgstr "Le domaine vers lequel cet alias pointe"
 
-#: admin/models.py:467 admin/models.py:709
+#: admin/models.py:485 admin/models.py:739
 msgid "Check to activate this alias"
 msgstr "Cocher pour activer cet alias"
 
-#: admin/models.py:486 admin/models.py:699
+#: admin/models.py:504 admin/models.py:729
 msgid "address"
 msgstr "Adresse"
 
-#: admin/models.py:487
+#: admin/models.py:505
 msgid "Mailbox address (without the @domain.tld part)"
 msgstr "Adresse de la boite aux lettres (sans la partie @domain.tld)"
 
-#: admin/models.py:584
+#: admin/models.py:611
 #, python-format
 msgid "%s is not a valid uid/username"
 msgstr "%s n'est pas un uid/nom d'utilisateur valide"
 
-#: admin/models.py:593
+#: admin/models.py:620
 #, python-format
 msgid "%s is not a valid gid/groupname"
 msgstr "%s n'est pas un gid/nom de groupe valide"
 
-#: admin/models.py:597 admin/models.py:654
+#: admin/models.py:630 admin/models.py:684
 msgid "Failed to initialise mailbox, check permissions"
 msgstr ""
 "Impossible d'initialiser la boite aux lettres, vérifier les permissions"
 
-#: admin/models.py:622
+#: admin/models.py:655
 #, python-format
 msgid "Account '%s' already exists"
 msgstr "Le compte %s existe déjà"
 
-#: admin/models.py:675
+#: admin/models.py:705
 msgid "Cannot import this mailbox because the associated domain does not exist"
 msgstr "Impossible d'importer cette boite car le domaine associé n'existe pas"
 
-#: admin/models.py:700
+#: admin/models.py:730
 msgid ""
 "The alias address (without the domain part). For a 'catch-all' address, just "
 "enter an * character."
@@ -353,21 +370,22 @@ msgstr ""
 "L'adresse de l'alias (sans la partie domaine). Pour une adresse 'attrape-"
 "tout', entrer juste un caractère *."
 
-#: admin/models.py:704
+#: admin/models.py:734
 msgid "mailboxes"
 msgstr "Boites aux lettres"
 
-#: admin/models.py:705
+#: admin/models.py:735
 msgid "The mailboxes this alias points to"
 msgstr "Les boites aux lettres sur lesquelles pointe cet alias"
 
-#: admin/models.py:806
+#: admin/models.py:836
 msgid "Check to enable this extension"
 msgstr "Cocher pour activer cette extension"
 
-#: admin/tables.py:12 admin/tables.py:44 extensions/sievefilters/forms.py:53
+#: admin/tables.py:12 admin/tables.py:44
+#: admin/templates/admin/editdomainform.html:9
+#: extensions/sievefilters/forms.py:53
 #: extensions/sievefilters/templates/sievefilters/guieditor.html:6
-#: templates/admin/editdomainform.html:20
 msgid "Name"
 msgstr "Nom"
 
@@ -402,7 +420,7 @@ msgstr "Nom complet/Destinataire"
 msgid "New domain"
 msgstr "Nouveau domaine"
 
-#: admin/views.py:81 admin/views.py:174 admin/views.py:353 admin/views.py:360
+#: admin/views.py:81 admin/views.py:181 admin/views.py:360 admin/views.py:367
 #: extensions/sievefilters/views.py:120 extensions/sievefilters/views.py:187
 #: extensions/webmail/views.py:118
 msgid "Create"
@@ -412,121 +430,118 @@ msgstr "Créer"
 msgid "Domain created"
 msgstr "Domaine créé"
 
-#: admin/views.py:108 admin/views.py:223 admin/views.py:403
-#: extensions/postfix_autoreply/views.py:22
+#: admin/views.py:111 admin/views.py:230 admin/views.py:411
 #: extensions/sievefilters/views.py:139 extensions/webmail/views.py:149
-#: userprefs/views.py:34 userprefs/views.py:66
+#: userprefs/templates/userprefs/form.html:4
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: admin/views.py:115
+#: admin/views.py:122
 msgid "Domain modified"
 msgstr "Domaine modifié"
 
-#: admin/views.py:138
+#: admin/views.py:145
 msgid "You can't delete your own domain"
 msgstr "Vous ne pouvez pas supprimer votre propre domaine"
 
-#: admin/views.py:141
+#: admin/views.py:148
 msgid "Domain deleted"
 msgid_plural "Domains deleted"
 msgstr[0] "Domaine supprimé"
 msgstr[1] "Domaines supprimés"
 
-#: admin/views.py:156
+#: admin/views.py:163
 msgid "Alias with this name already exists"
 msgstr "Un alias de ce nom existe déjà"
 
-#: admin/views.py:194
+#: admin/views.py:201
 msgid "New distribution list"
 msgstr "Nouvelle liste de distribution"
 
-#: admin/views.py:198
+#: admin/views.py:205
 msgid "Distribution list created"
 msgstr "Liste de distribution créée"
 
-#: admin/views.py:204
+#: admin/views.py:211
 msgid "New alias"
 msgstr "Nouvel alias"
 
-#: admin/views.py:208
+#: admin/views.py:215
 msgid "Alias created"
 msgstr "Alias créé"
 
-#: admin/views.py:214
+#: admin/views.py:221
 msgid "New forward"
 msgstr "Nouveau transfert"
 
-#: admin/views.py:218
+#: admin/views.py:225
 msgid "Forward created"
 msgstr "Transfert créé"
 
-#: admin/views.py:235
+#: admin/views.py:242
 msgid "Alias modified"
 msgstr "Alias modifié"
 
-#: admin/views.py:239
+#: admin/views.py:246
 msgid "Distribution list modified"
 msgstr "Liste de distribution modifiée"
 
-#: admin/views.py:243
+#: admin/views.py:250
 msgid "Forward modified"
 msgstr "Transfert modifié"
 
-#: admin/views.py:350
+#: admin/views.py:357
 msgid "New account"
 msgstr "Nouveau compte"
 
-#: admin/views.py:357
+#: admin/views.py:364
 msgid "Next"
 msgstr "Suivante"
 
-#: admin/views.py:361
+#: admin/views.py:368
 msgid "Previous"
 msgstr "Précédente"
 
-#: admin/views.py:372
+#: admin/views.py:380
 msgid "Account created"
 msgstr "Compte créé"
 
-#: admin/views.py:417
+#: admin/views.py:425
 msgid "Account updated"
 msgstr "Compte mis à jour"
 
-#: admin/views.py:437
+#: admin/views.py:445
 msgid "Account deleted"
 msgid_plural "Accounts deleted"
 msgstr[0] "Compte supprimé"
 msgstr[1] "Comptes supprimés"
 
-#: admin/views.py:447 admin/views.py:452
-#: extensions/amavis_quarantine/views.py:196
-#: extensions/amavis_quarantine/views.py:202
-#: extensions/amavis_quarantine/views.py:229
-#: extensions/amavis_quarantine/views.py:233
-#: extensions/amavis_quarantine/views.py:235 extensions/stats/views.py:46
-#: extensions/webmail/views.py:32 extensions/webmail/views.py:55
-#: extensions/webmail/views.py:68 extensions/webmail/views.py:80
-#: extensions/webmail/views.py:96 extensions/webmail/views.py:180
-#: extensions/webmail/views.py:405 extensions/webmail/views.py:416
-#: extensions/webmail/views.py:443 lib/formutils.py:29 lib/formutils.py:34
+#: admin/views.py:455 admin/views.py:460 extensions/amavis/views.py:199
+#: extensions/amavis/views.py:205 extensions/amavis/views.py:232
+#: extensions/amavis/views.py:236 extensions/amavis/views.py:238
+#: extensions/stats/views.py:46 extensions/webmail/views.py:32
+#: extensions/webmail/views.py:55 extensions/webmail/views.py:68
+#: extensions/webmail/views.py:80 extensions/webmail/views.py:96
+#: extensions/webmail/views.py:180 extensions/webmail/views.py:407
+#: extensions/webmail/views.py:418 extensions/webmail/views.py:445
+#: lib/formutils.py:33 lib/formutils.py:38
 msgid "Invalid request"
 msgstr "Requête invalide"
 
-#: admin/views.py:492
+#: admin/views.py:500
 msgid "Parameters saved"
 msgstr "Paramètres enregistrés"
 
-#: admin/views.py:538
+#: admin/views.py:546
 msgid "Modifications applied."
 msgstr "Modifications appliquées."
 
-#: admin/views.py:595
+#: admin/views.py:603
 #, python-format
 msgid "%d objects imported successfully"
 msgstr "%d objets importés avec succès"
 
-#: admin/views.py:614
+#: admin/views.py:621
 msgid ""
 "Provide a CSV file where lines respect one of the following format:\n"
 "<ul>\n"
@@ -544,16 +559,16 @@ msgstr ""
 "</ul>\n"
 "Vous pouvez utiliser un caractère différent comme séparateur.\n"
 
-#: admin/views.py:622
+#: admin/views.py:629
 msgid "Import identities"
 msgstr "Importer des identités"
 
-#: admin/views.py:623 admin/views.py:649 admin/templatetags/admin_extras.py:73
-#: admin/templatetags/admin_extras.py:114
+#: admin/views.py:630 admin/views.py:656 admin/templatetags/admin_extras.py:76
+#: admin/templatetags/admin_extras.py:118
 msgid "Import"
 msgstr "Importer"
 
-#: admin/views.py:641
+#: admin/views.py:648
 msgid ""
 "Provide a CSV file where lines respect the following format:<br/>\n"
 "<em>domain; name; quota</em><br/>\n"
@@ -565,10 +580,100 @@ msgstr ""
 "\n"
 "Vous pouvez utiliser un caractère différent comme séparateur.\n"
 
-#: admin/views.py:648
+#: admin/views.py:655
 msgid "Import domains"
 msgstr "Importer des domaines"
 
+#: admin/templates/admin/domain_general_form.html:3
+#: admin/templates/admin/mailform.html:3
+#: admin/templates/admin/newdomainform.html:3
+msgid "MB"
+msgstr "Mo"
+
+#: admin/templates/admin/domains.html:2 admin/templatetags/admin_extras.py:22
+#: extensions/limits/forms.py:14 extensions/limits/models.py:10
+msgid "Domains"
+msgstr "Domaines"
+
+#: admin/templates/admin/editdomainform.html:3
+msgid "Administrators"
+msgstr "Administrateurs"
+
+#: admin/templates/admin/editdomainform.html:4
+msgid "Miscellaneous"
+msgstr "Divers"
+
+#: admin/templates/admin/editdomainform.html:13
+msgid "No domain administrator defined"
+msgstr "Aucun administrateur de domaine défini"
+
+#: admin/templates/admin/editdomainform.html:16
+msgid "Creation date"
+msgstr "Date de création"
+
+#: admin/templates/admin/editdomainform.html:17
+msgid "Last modification date"
+msgstr "Date de dernière modification"
+
+#: admin/templates/admin/editdomainform.html:18 extensions/limits/forms.py:16
+#: extensions/limits/models.py:11
+msgid "Domain aliases"
+msgstr "Alias de domaine"
+
+#: admin/templates/admin/editdomainform.html:19 extensions/limits/forms.py:18
+#: extensions/limits/models.py:12
+#: extensions/webmail/templates/webmail/folders.html:4
+msgid "Mailboxes"
+msgstr "Boites"
+
+#: admin/templates/admin/editdomainform.html:20 extensions/limits/forms.py:20
+#: extensions/limits/models.py:13
+msgid "Mailbox aliases"
+msgstr "Alias de boite."
+
+#: admin/templates/admin/extensions.html:2
+#: admin/templatetags/admin_extras.py:49
+msgid "Extensions"
+msgstr "Extensions"
+
+#: admin/templates/admin/extensions.html:7
+#: admin/templates/admin/parameters.html:9
+#: userprefs/templates/userprefs/preferences.html:28
+msgid "Save"
+msgstr "Enregistrer"
+
+#: admin/templates/admin/identities.html:2
+#: admin/templatetags/admin_extras.py:30
+msgid "Identities"
+msgstr "Identités"
+
+#: admin/templates/admin/importform.html:5
+msgid "Help"
+msgstr "Aide"
+
+#: admin/templates/admin/importform.html:12
+msgid "Importing..."
+msgstr "Import en cours..."
+
+#: admin/templates/admin/listing.html:12
+#: admin/templates/admin/searchform.html:4
+msgid "Search"
+msgstr "Chercher"
+
+#: admin/templates/admin/mailboxes_raw.html:3
+msgid "Choose a value"
+msgstr "Choisir une valeur"
+
+#: admin/templates/admin/newaccount.html:31
+#: templates/common/generic_modal.html:11
+msgid "Close"
+msgstr "Fermer"
+
+#: admin/templates/admin/parameters.html:2
+#: admin/templatetags/admin_extras.py:54
+msgid "Parameters"
+msgstr "Paramètres"
+
 #: admin/templatetags/admin_extras.py:12
 msgid "enabled_m"
 msgstr "Activé"
@@ -577,72 +682,55 @@ msgstr "Activé"
 msgid "enabled_f"
 msgstr "Activée"
 
-#: admin/templatetags/admin_extras.py:22 extensions/limits/forms.py:14
-#: extensions/limits/models.py:10 templates/admin/domains.html:2
-msgid "Domains"
-msgstr "Domaines"
-
-#: admin/templatetags/admin_extras.py:30 templates/admin/identities.html:2
-msgid "Identities"
-msgstr "Identités"
-
 #: admin/templatetags/admin_extras.py:35
 msgid "Modoboa"
 msgstr "Modoboa"
 
-#: admin/templatetags/admin_extras.py:49 templates/admin/extensions.html:2
-msgid "Extensions"
-msgstr "Extensions"
-
-#: admin/templatetags/admin_extras.py:54 templates/admin/parameters.html:2
-msgid "Parameters"
-msgstr "Paramètres"
-
-#: admin/templatetags/admin_extras.py:67
+#: admin/templatetags/admin_extras.py:70
 msgid "Add domain"
 msgstr "Ajouter un domaine"
 
-#: admin/templatetags/admin_extras.py:90
+#: admin/templatetags/admin_extras.py:94
 msgid "Add account"
 msgstr "Ajouter un compte"
 
-#: admin/templatetags/admin_extras.py:96
+#: admin/templatetags/admin_extras.py:100
 msgid "Add alias"
 msgstr "Ajouter un alias"
 
-#: admin/templatetags/admin_extras.py:102
+#: admin/templatetags/admin_extras.py:106
 msgid "Add forward"
 msgstr "Ajouter un transfert"
 
-#: admin/templatetags/admin_extras.py:108
+#: admin/templatetags/admin_extras.py:112
 msgid "Add distribution list"
 msgstr "Ajouter une liste de distribution"
 
-#: admin/templatetags/admin_extras.py:145
+#: admin/templatetags/admin_extras.py:150
 msgid "Delete this account"
 msgstr "Supprimer ce compte"
 
-#: admin/templatetags/admin_extras.py:155
+#: admin/templatetags/admin_extras.py:160
 msgid "Delete this distribution list"
 msgstr "Supprimer cette liste de distribution"
 
-#: admin/templatetags/admin_extras.py:162
+#: admin/templatetags/admin_extras.py:167
 msgid "Delete this forward"
 msgstr "Supprimer ce transfert"
 
-#: admin/templatetags/admin_extras.py:169
+#: admin/templatetags/admin_extras.py:174
 msgid "Delete this alias"
 msgstr "Supprimer cet alias"
 
-#: admin/templatetags/admin_extras.py:179
+#: admin/templatetags/admin_extras.py:184
 msgid "Remove this permission"
 msgstr "Supprimer cette permission"
 
-#: admin/templatetags/admin_extras.py:213
+#: admin/templatetags/admin_extras.py:214
 msgid "Yes"
 msgstr "Oui"
 
-#: admin/templatetags/admin_extras.py:213
+#: admin/templatetags/admin_extras.py:214
 msgid "No"
 msgstr "Non"
 
@@ -650,25 +738,25 @@ msgstr "Non"
 msgid "Key used to encrypt/decrypt passwords"
 msgstr "Clé utilisée pour chiffrer/déchiffre les mots de passe"
 
-#: auth/views.py:38
+#: auth/views.py:40
 msgid "Account is disabled."
 msgstr "Compte désactivé."
 
-#: auth/views.py:39
+#: auth/views.py:41
 msgid "Your username and password didn't match. Please try again."
 msgstr ""
 "Votre nom d'utilisateur et mot de passe ne correspondent pas. Veuillez "
 "réessayer."
 
-#: demo/__init__.py:19
+#: demo/__init__.py:17
 msgid "Test messages"
 msgstr "Message de test"
 
-#: demo/__init__.py:24
+#: demo/__init__.py:22
 msgid "Send virus"
 msgstr "Envoyer un virus"
 
-#: demo/__init__.py:28
+#: demo/__init__.py:25
 msgid "Send spam"
 msgstr "Envoyer un spam"
 
@@ -707,182 +795,306 @@ msgstr ""
 "  <a href=\"https://groups.google.com/forum/#!forum/modoboa-users\">la liste "
 "de diffusion</a>.</p>\n"
 
-#: extensions/amavis_quarantine/__init__.py:17
-msgid "Simple amavis quarantine management tool"
-msgstr "Outil simple de gestion de quarantaine amavis"
+#: extensions/amavis/__init__.py:21
+msgid "Simple amavis management frontend"
+msgstr "Interface simplifiée pour la gestion d'amavis"
 
-#: extensions/amavis_quarantine/__init__.py:46
+#: extensions/amavis/__init__.py:45
 msgid "Quarantine messages maximum age (in days) before deletion"
 msgstr "Age maximum (en jours) des messages en quarantaine avant suppression"
 
-#: extensions/amavis_quarantine/__init__.py:50
+#: extensions/amavis/__init__.py:49
 msgid "Remove messages marked as released while cleaning up the database"
 msgstr ""
 "Supprimer les messages marqués comme relâchés pendant le nettoyage de la "
 "base de données"
 
-#: extensions/amavis_quarantine/__init__.py:55
+#: extensions/amavis/__init__.py:54
 msgid "Mode used to access the PDP server"
 msgstr "Mode utilisé pour accéder au serveur PDP"
 
-#: extensions/amavis_quarantine/__init__.py:58
+#: extensions/amavis/__init__.py:57
 msgid "PDP server address (if inet mode)"
 msgstr "Adresse du serveur PDP (en mode inet)"
 
-#: extensions/amavis_quarantine/__init__.py:61
+#: extensions/amavis/__init__.py:60
 msgid "PDP server port (if inet mode)"
 msgstr "Port du serveur PDP (en mode inet)"
 
-#: extensions/amavis_quarantine/__init__.py:64
+#: extensions/amavis/__init__.py:63
 msgid "Path to the PDP server socket (if unix mode)"
 msgstr "Emplacement de la socket du serveur PDP (en mode unix)"
 
-#: extensions/amavis_quarantine/__init__.py:67
+#: extensions/amavis/__init__.py:66
 msgid "Interval between two release requests checks"
 msgstr "Intervalle entre deux vérifications de requêtes en attente"
 
-#: extensions/amavis_quarantine/__init__.py:69
+#: extensions/amavis/__init__.py:68
 msgid "Allow users to directly release their messages"
 msgstr "Autoriser les utilisateurs à relâcher directement leurs messages"
 
-#: extensions/amavis_quarantine/__init__.py:71
+#: extensions/amavis/__init__.py:70
 msgid "Activate the 'self-service' mode"
 msgstr "Activer le mode 'libre service'"
 
-#: extensions/amavis_quarantine/__init__.py:76
-#: extensions/webmail/__init__.py:37
+#: extensions/amavis/__init__.py:72
+msgid "The e-mail address used to send notitications"
+msgstr "L'adresse e-mail utilisée pour envoyer les notifications"
+
+#: extensions/amavis/__init__.py:77 extensions/webmail/__init__.py:45
 msgid "Sets the maximum number of messages displayed in a page"
 msgstr "Définit le nombre maximal de messages affichés dans une page"
 
-#: extensions/amavis_quarantine/__init__.py:90
+#: extensions/amavis/__init__.py:93
 msgid "Quarantine"
 msgstr "Quarantaine"
 
-#: extensions/amavis_quarantine/__init__.py:152
+#: extensions/amavis/__init__.py:151
 msgid "pending requests"
 msgstr "requêtes en attente"
 
-#: extensions/amavis_quarantine/__init__.py:168
+#: extensions/amavis/__init__.py:167
 #, python-format
 msgid "%d pending requests"
 msgstr "%d requêtes en attente"
 
-#: extensions/amavis_quarantine/sql_listing.py:23
-#: extensions/webmail/forms.py:5 extensions/webmail/lib.py:34
+#: extensions/amavis/__init__.py:178
+msgid "Content filter"
+msgstr "Filtrage de contenu"
+
+#: extensions/amavis/models.py:78
+msgid "Virus filter"
+msgstr "Filtrage des virus"
+
+#: extensions/amavis/models.py:79 extensions/amavis/models.py:87
+#: extensions/amavis/models.py:95 extensions/amavis/models.py:104
+#: extensions/sievefilters/views.py:265
+msgid "yes"
+msgstr "oui"
+
+#: extensions/amavis/models.py:80 extensions/amavis/models.py:88
+#: extensions/amavis/models.py:96 extensions/amavis/models.py:105
+#: extensions/sievefilters/views.py:269
+msgid "no"
+msgstr "non"
+
+#: extensions/amavis/models.py:81 extensions/amavis/models.py:89
+#: extensions/amavis/models.py:97 extensions/amavis/models.py:106
+msgid "default"
+msgstr "défaut"
+
+#: extensions/amavis/models.py:83
+msgid "Bypass virus checks or not. Choose 'default' to use global settings."
+msgstr ""
+"Désactiver le filtrage des virus ou non. Choisir 'défaut' pour utiliser les "
+"paramètres globaux."
+
+#: extensions/amavis/models.py:86
+msgid "Spam filter"
+msgstr "Filtrage du spam"
+
+#: extensions/amavis/models.py:91
+msgid "Bypass spam checks or not. Choose 'default' to use global settings."
+msgstr ""
+"Désactiver le filtrage du spam ou non. Choisir 'défaut' pour utiliser les "
+"paramètres globaux."
+
+#: extensions/amavis/models.py:94
+msgid "Banned filter"
+msgstr "Filtrage des messages bannis"
+
+#: extensions/amavis/models.py:99
+msgid "Bypass banned checks or not. Choose 'default' to use global settings."
+msgstr ""
+"Désactiver le filtrage des messages bannis ou non. Choisir 'défaut' pour "
+"utiliser les paramètres globaux."
+
+#: extensions/amavis/models.py:103
+msgid "Spam marker"
+msgstr "Marquage du spam"
+
+#: extensions/amavis/models.py:108
+msgid "Modify spam subject or not. Choose 'default' to use global settings."
+msgstr ""
+"Modifier le sujet du spam ou non. Choisir 'défaut' pour utiliser les "
+"paramètres globaux."
+
+#: extensions/amavis/sql_listing.py:23 extensions/webmail/forms.py:5
+#: extensions/webmail/lib.py:34
 msgid "From"
 msgstr "De"
 
-#: extensions/amavis_quarantine/sql_listing.py:24
-#: extensions/sievefilters/forms.py:68 extensions/webmail/forms.py:9
-#: extensions/webmail/lib.py:33 extensions/webmail/lib.py:363
-#: templates/common/email_searchbar.html:6
+#: extensions/amavis/sql_listing.py:24 extensions/sievefilters/forms.py:68
+#: extensions/webmail/forms.py:9 extensions/webmail/lib.py:33
+#: extensions/webmail/lib.py:363 templates/common/email_searchbar.html:6
 msgid "Subject"
 msgstr "Sujet"
 
-#: extensions/amavis_quarantine/sql_listing.py:25 extensions/webmail/lib.py:35
+#: extensions/amavis/sql_listing.py:25 extensions/webmail/lib.py:35
 #: extensions/webmail/lib.py:365
 msgid "Date"
 msgstr "Date"
 
-#: extensions/amavis_quarantine/sql_listing.py:26
-#: extensions/amavis_quarantine/templatetags/amextras.py:102
+#: extensions/amavis/sql_listing.py:26
+#: extensions/amavis/templatetags/amextras.py:102
 #: extensions/webmail/forms.py:6
 msgid "To"
 msgstr "A"
 
-#: extensions/amavis_quarantine/views.py:32
+#: extensions/amavis/views.py:32
 msgid "Empty quarantine"
 msgstr "Quarantaine vide"
 
-#: extensions/amavis_quarantine/views.py:203
+#: extensions/amavis/views.py:206
 msgid "Message deleted"
 msgstr "Message supprimé"
 
-#: extensions/amavis_quarantine/views.py:219
+#: extensions/amavis/views.py:222
 #, python-format
 msgid "%(count)d message deleted successfully"
 msgid_plural "%(count)d messages deleted successfully"
 msgstr[0] "%(count)d message supprimé correctement"
 msgstr[1] "%(count)d messages supprimés correctement"
 
-#: extensions/amavis_quarantine/views.py:238
+#: extensions/amavis/views.py:241
 msgid "Request sent"
 msgstr "Requête envoyée"
 
-#: extensions/amavis_quarantine/views.py:244
+#: extensions/amavis/views.py:247
 msgid "Message released"
 msgstr "Message relâché"
 
-#: extensions/amavis_quarantine/views.py:258
+#: extensions/amavis/views.py:261
 #, python-format
 msgid "%(count)d request sent"
 msgid_plural "%(count)d requests sent"
 msgstr[0] "%(count)d requête envoyée"
 msgstr[1] "%(count)d requêtes envoyées"
 
-#: extensions/amavis_quarantine/views.py:281
+#: extensions/amavis/views.py:284
 #, python-format
 msgid "%(count)d message released successfully"
 msgid_plural "%(count)d messages released successfully"
 msgstr[0] "%(count)d message relâché correctement"
 msgstr[1] "%(count)d messages relâchés correctement"
 
-#: extensions/amavis_quarantine/templates/amavis_quarantine/index.html:2
+#: extensions/amavis/management/commands/amnotify.py:45
+msgid "[modoboa] Pending release requests"
+msgstr "[modoboa] requêtes de libération en attente"
+
+#: extensions/amavis/templates/amavis/domain_content_filter.html:5
+msgid "Thresholds"
+msgstr "Seuils"
+
+#: extensions/amavis/templates/amavis/domain_content_filter.html:7
+msgid "or more is spam"
+msgstr "ou plus est du spam"
+
+#: extensions/amavis/templates/amavis/domain_content_filter.html:8
+msgid "or more throw spam message away"
+msgstr "ou plus rejete le message"
+
+#: extensions/amavis/templates/amavis/index.html:2
 msgid "Quarantine management"
 msgstr "Gestion de la quarantaine"
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:20
-#: extensions/amavis_quarantine/templatetags/amextras.py:52
-#: extensions/amavis_quarantine/templatetags/amextras.py:72
+#: extensions/amavis/templates/amavis/notifications/pending_requests.html:1
+#, python-format
+msgid ""
+"\n"
+"%(counter)s release request is pending for action.\n"
+msgid_plural ""
+"\n"
+"%(counter)s release requests are pending for action.\n"
+msgstr[0] ""
+"\n"
+"%(counter)s requête de libération est en attente d'une action.\n"
+msgstr[1] ""
+"\n"
+"%(counter)s requêtes de libération sont en attente d'une action.\n"
+
+#: extensions/amavis/templates/amavis/notifications/pending_requests.html:6
+msgid "Sketch:"
+msgstr "Aperçu :"
+
+#: extensions/amavis/templates/amavis/notifications/pending_requests.html:8
+msgid "From:"
+msgstr "De :"
+
+#: extensions/amavis/templates/amavis/notifications/pending_requests.html:9
+msgid "To:"
+msgstr "A :"
+
+#: extensions/amavis/templates/amavis/notifications/pending_requests.html:10
+msgid "Date:"
+msgstr "Date :"
+
+#: extensions/amavis/templates/amavis/notifications/pending_requests.html:11
+msgid "Subject:"
+msgstr "Sujet :"
+
+#: extensions/amavis/templates/amavis/notifications/pending_requests.html:12
+msgid "Act on this message:"
+msgstr "Agir sur ce message :"
+
+#: extensions/amavis/templates/amavis/notifications/pending_requests.html:14
+#, python-format
+msgid "Please visit %(listingurl)s for a full listing."
+msgstr "Veuillez visiter %(listingurl)s pour une liste complète."
+
+#: extensions/amavis/templatetags/amextras.py:20
+#: extensions/amavis/templatetags/amextras.py:52
+#: extensions/amavis/templatetags/amextras.py:72
 msgid "Release"
 msgstr "Relâcher"
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:26
-#: extensions/amavis_quarantine/templatetags/amextras.py:59
-#: extensions/amavis_quarantine/templatetags/amextras.py:77
+#: extensions/amavis/templatetags/amextras.py:26
+#: extensions/amavis/templatetags/amextras.py:59
+#: extensions/amavis/templatetags/amextras.py:77
 #: extensions/webmail/templatetags/webextras.py:33
 msgid "Delete"
 msgstr "Supprimer"
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:29
+#: extensions/amavis/templatetags/amextras.py:29
 msgid "View full headers"
 msgstr "Afficher tous les entêtes"
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:80
+#: extensions/amavis/templatetags/amextras.py:80
 msgid "Content Class"
 msgstr "Classe de contenu"
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:84
+#: extensions/amavis/templatetags/amextras.py:84
 msgid "Nothing"
 msgstr "Rien"
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:87
+#: extensions/amavis/templatetags/amextras.py:87
 msgid "Spam"
 msgstr "Spam"
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:90
+#: extensions/amavis/templatetags/amextras.py:90
 msgid "Virus"
 msgstr "Virus"
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:93
+#: extensions/amavis/templatetags/amextras.py:93
 msgid "Bad header"
 msgstr "Mauvais entête"
 
-#: extensions/amavis_quarantine/templatetags/amextras.py:96
+#: extensions/amavis/templatetags/amextras.py:96
 msgid "Bad MIME"
 msgstr "Mauvais type MIME"
 
-#: extensions/limits/__init__.py:55
+#: extensions/limits/__init__.py:23
 msgid ""
 "Per administrator resources to limit the number of objects they can create"
 msgstr ""
-"Ressources par administrateur pour limiter le nombre d'objets qu'ils peuvent créer"
+"Ressources par administrateur pour limiter le nombre d'objets qu'ils peuvent "
+"créer"
 
-#: extensions/limits/__init__.py:62
+#: extensions/limits/__init__.py:60
 msgid "Reseller"
 msgstr "Revendeur"
 
-#: extensions/limits/__init__.py:93
+#: extensions/limits/__init__.py:91
 msgid "Resources"
 msgstr "Ressources"
 
@@ -898,30 +1110,14 @@ msgstr "Nombre maximal d'admins de domaine que cet utilisateur peut créer"
 msgid "Maximum number of domains this user can create"
 msgstr "Nombre maximal de domaines que cet utilisateur peut créer"
 
-#: extensions/limits/forms.py:16 extensions/limits/models.py:11
-#: templates/admin/editdomainform.html:29
-msgid "Domain aliases"
-msgstr "Alias de domaine"
-
 #: extensions/limits/forms.py:17
 msgid "Maximum number of domain aliases this user can create"
 msgstr "Nombre maximal d'alias de domain que cet utilisateur peut créer"
 
-#: extensions/limits/forms.py:18 extensions/limits/models.py:12
-#: extensions/webmail/templates/webmail/folders.html:4
-#: templates/admin/editdomainform.html:30
-msgid "Mailboxes"
-msgstr "Boites"
-
 #: extensions/limits/forms.py:19
 msgid "Maximum number of mailboxes this user can create"
 msgstr "Nombre maximal de boites que cet utilisateur peut créer"
 
-#: extensions/limits/forms.py:20 extensions/limits/models.py:13
-#: templates/admin/editdomainform.html:31
-msgid "Mailbox aliases"
-msgstr "Alias de boite."
-
 #: extensions/limits/forms.py:21
 msgid "Maximum number of mailbox aliases this user can create"
 msgstr "Nombre maximal d'alias de boite que cet utilisateur peut créer"
@@ -963,14 +1159,14 @@ msgstr "Utilisation des ressources"
 msgid "Auto-reply (vacation) functionality using Postfix"
 msgstr "Fonction de réponse automatique (vacances) utilisant Postfix"
 
-#: extensions/postfix_autoreply/__init__.py:45
+#: extensions/postfix_autoreply/__init__.py:43
 msgid "Timeout in seconds between two auto-replies to the same recipient"
 msgstr ""
 "Timeout en secondes entre deux réponses automatiques pour le même "
 "destinataire"
 
 #: extensions/postfix_autoreply/__init__.py:68
-#: extensions/postfix_autoreply/views.py:19
+#: extensions/postfix_autoreply/views.py:42
 msgid "Auto-reply message"
 msgstr "Message de réponse automatique"
 
@@ -991,7 +1187,7 @@ msgid "subject"
 msgstr "sujet"
 
 #: extensions/postfix_autoreply/models.py:16
-msgid "The subject that will appear in sended emails"
+msgid "The subject that will appear in sent emails"
 msgstr "Le sujet qui apparaitra dans les emails envoyés"
 
 #: extensions/postfix_autoreply/models.py:17
@@ -999,46 +1195,50 @@ msgid "content"
 msgstr "contenu"
 
 #: extensions/postfix_autoreply/models.py:18
-msgid "The content that will appear in sended emails"
+msgid "The content that will appear in sent emails"
 msgstr "Le contenu qui apparaitra dans les emails envoyés"
 
 #: extensions/postfix_autoreply/models.py:20
 msgid "Activate/Deactivate your auto reply"
 msgstr "Activer/Désactiver votre réponse automatique"
 
-#: extensions/postfix_autoreply/views.py:43
+#: extensions/postfix_autoreply/views.py:36
 msgid "Auto reply message updated successfully."
 msgstr "Message de réponse auto. mis à jour."
 
-#: extensions/sievefilters/__init__.py:15
-msgid "Address of your MANAGESIEVE server"
-msgstr "Adresse de votre serveur ManageSieve"
+#: extensions/postfix_autoreply/views.py:43
+msgid "Define a message to automatically send when you are off"
+msgstr "Définir un message à envoyer automatiquement quand vous êtes absent"
 
-#: extensions/sievefilters/__init__.py:17
-msgid "Listening port of your MANAGESIEVE server"
-msgstr "Port d'écoute de votre serveur ManageSieve"
-
-#: extensions/sievefilters/__init__.py:19
-msgid "Use the STARTTLS extension"
-msgstr "Utiliser l'extension STARTTLS"
-
-#: extensions/sievefilters/__init__.py:26
-msgid "Prefered authentication mechanism"
-msgstr "Méthode d'authentification préférée"
-
-#: extensions/sievefilters/__init__.py:30
-msgid "Editor mode"
-msgstr "Mode de l'editeur"
-
-#: extensions/sievefilters/__init__.py:32
-msgid "Select the mode you want the editor to work in"
-msgstr "Sélectionner le mode de fonctionnement de l'éditeur"
-
-#: extensions/sievefilters/__init__.py:42
+#: extensions/sievefilters/__init__.py:12
 msgid "Plugin to easily create server-side filters"
 msgstr "Extension pour créer simplement des filtres côté serveur"
 
-#: extensions/sievefilters/__init__.py:56
+#: extensions/sievefilters/__init__.py:20
+msgid "Address of your MANAGESIEVE server"
+msgstr "Adresse de votre serveur ManageSieve"
+
+#: extensions/sievefilters/__init__.py:22
+msgid "Listening port of your MANAGESIEVE server"
+msgstr "Port d'écoute de votre serveur ManageSieve"
+
+#: extensions/sievefilters/__init__.py:24
+msgid "Use the STARTTLS extension"
+msgstr "Utiliser l'extension STARTTLS"
+
+#: extensions/sievefilters/__init__.py:31
+msgid "Prefered authentication mechanism"
+msgstr "Méthode d'authentification préférée"
+
+#: extensions/sievefilters/__init__.py:35
+msgid "Editor mode"
+msgstr "Mode de l'editeur"
+
+#: extensions/sievefilters/__init__.py:37
+msgid "Select the mode you want the editor to work in"
+msgstr "Sélectionner le mode de fonctionnement de l'éditeur"
+
+#: extensions/sievefilters/__init__.py:55
 #: extensions/sievefilters/templates/sievefilters/index.html:2
 msgid "Message filters"
 msgstr "Filtres de messages"
@@ -1162,14 +1362,6 @@ msgstr "Jeu de filtres supprimé"
 msgid "Filters set activated"
 msgstr "Jeu de filtres activé"
 
-#: extensions/sievefilters/views.py:265
-msgid "yes"
-msgstr "oui"
-
-#: extensions/sievefilters/views.py:269
-msgid "no"
-msgstr "non"
-
 #: extensions/sievefilters/templates/sievefilters/filter.html:6
 msgid "Conditions"
 msgstr "Conditions"
@@ -1234,23 +1426,19 @@ msgid "Graphical statistics about emails traffic using RRDtool"
 msgstr ""
 "Statistiques graphiques concernant le trafic des messages utilisant RRDtool"
 
-#: extensions/stats/__init__.py:27
+#: extensions/stats/__init__.py:26
 msgid "Path to log file used to collect statistics"
 msgstr "Emplacement du log utilisé pour collecter les statistiques"
 
-#: extensions/stats/__init__.py:30
+#: extensions/stats/__init__.py:29
 msgid "Path to directory where RRD files are stored"
 msgstr "Emplacement du répertoire de stockage des fichiers RRD"
 
-#: extensions/stats/__init__.py:33
+#: extensions/stats/__init__.py:32
 msgid "Path to directory where PNG files are stored"
 msgstr "Emplacement du répertoire de stockage des fichiers PNG"
 
-#: extensions/stats/__init__.py:36
-msgid "Graphics location (to build URLs)"
-msgstr "Emplacement des graphiques (pour construire les URLs)"
-
-#: extensions/stats/__init__.py:47
+#: extensions/stats/__init__.py:45
 msgid "Statistics"
 msgstr "Statistiques"
 
@@ -1322,11 +1510,11 @@ msgstr "Personnalisée"
 msgid "No statistics available"
 msgstr "Aucune statistique disponible"
 
-#: extensions/stats/views.py:58
+#: extensions/stats/views.py:57
 msgid "Domain not found. Please enter a full name"
 msgstr "Domaine non trouvé. Veuillez entrer un nom complet"
 
-#: extensions/stats/views.py:65
+#: extensions/stats/views.py:64
 msgid "Bad custom period"
 msgstr "Mauvaise période personnalisée"
 
@@ -1351,114 +1539,114 @@ msgid "Apply"
 msgstr "Appliquer"
 
 #: extensions/webmail/__init__.py:12
-msgid "Address of your IMAP server"
-msgstr "Adresse de votre serveur IMAP"
-
-#: extensions/webmail/__init__.py:15
-msgid "Use a secured connection to access IMAP server"
-msgstr "Utiliser une connexion sécurisée pour accéder au serveur IMAP"
-
-#: extensions/webmail/__init__.py:17
-msgid "Listening port of your IMAP server"
-msgstr "Port d'écoute de votre serveur IMAP"
-
-#: extensions/webmail/__init__.py:20
-msgid "Address of your SMTP server"
-msgstr "Adresse de votre serveur SMTP"
-
-#: extensions/webmail/__init__.py:22
-msgid "None"
-msgstr "Aucun"
-
-#: extensions/webmail/__init__.py:26
-msgid "Use a secured connection to access SMTP server"
-msgstr "Utiliser une connexion sécurisée pour accéder au serveur SMTP"
-
-#: extensions/webmail/__init__.py:28
-msgid "Listening port of your SMTP server"
-msgstr "Port d'écoute de votre serveur SMTP"
-
-#: extensions/webmail/__init__.py:31
-msgid "Server needs authentication"
-msgstr "Le serveur nécessite une authentification"
-
-#: extensions/webmail/__init__.py:33
-msgid "Maximum attachment size in bytes (or KB, MB, GB if specified)"
-msgstr "Taille maximum d'une pièce jointe en octets (ou Ko, Mo, Go si précisé)"
-
-#: extensions/webmail/__init__.py:36
-msgid "Number of displayed emails per page"
-msgstr "Nombre d'emails affichés par page"
-
-#: extensions/webmail/__init__.py:39
-msgid "Listing refresh rate"
-msgstr "Taux de rafraichissement de la liste"
-
-#: extensions/webmail/__init__.py:40
-msgid "Automatic folder refresh rate (in seconds)"
-msgstr "Taux de rafraichissement automatique du dossier (en secondes)"
-
-#: extensions/webmail/__init__.py:42
-msgid "Trash folder"
-msgstr "Dossier 'poubelle'"
-
-#: extensions/webmail/__init__.py:43
-msgid "Folder where deleted messages go"
-msgstr "Dossier de destination des messages supprimés"
-
-#: extensions/webmail/__init__.py:45
-msgid "Sent folder"
-msgstr "Dossier 'envoyé'"
-
-#: extensions/webmail/__init__.py:46
-msgid "Folder where copies of sent messages go"
-msgstr "Dossier de destination des copies de messages envoyés"
-
-#: extensions/webmail/__init__.py:48
-msgid "Drafts folder"
-msgstr "Dossier 'brouillons'"
-
-#: extensions/webmail/__init__.py:49
-msgid "Folder where drafts go"
-msgstr "Dossier de destination des brouillons"
-
-#: extensions/webmail/__init__.py:51
-msgid "Signature text"
-msgstr "Texte de signature"
-
-#: extensions/webmail/__init__.py:52
-msgid "User defined email signature"
-msgstr "Signature personnalisée"
-
-#: extensions/webmail/__init__.py:54
-msgid "Default editor"
-msgstr "Editeur par défaut"
-
-#: extensions/webmail/__init__.py:56
-msgid "The default editor to use when composing a message"
-msgstr "L'éditeur a utiliser par défaut pour écrire un message"
-
-#: extensions/webmail/__init__.py:58
-msgid "Default message display mode"
-msgstr "Mode d'affichage par défaut d'un message"
-
-#: extensions/webmail/__init__.py:60
-msgid "The default mode used when displaying a message"
-msgstr "Le mode utilisé par défaut pour afficher un message"
-
-#: extensions/webmail/__init__.py:62
-msgid "Enable HTML links display"
-msgstr "Activer l'affichage des liens HTML"
-
-#: extensions/webmail/__init__.py:63
-msgid "Enable/Disable HTML links display"
-msgstr "Activer/Désactiver l'affichage des liens HTML"
-
-#: extensions/webmail/__init__.py:73
 msgid "Simple IMAP webmail"
 msgstr "Webmail IMAP simple"
 
-#: extensions/webmail/__init__.py:85
+#: extensions/webmail/__init__.py:20
+msgid "Address of your IMAP server"
+msgstr "Adresse de votre serveur IMAP"
+
+#: extensions/webmail/__init__.py:23
+msgid "Use a secured connection to access IMAP server"
+msgstr "Utiliser une connexion sécurisée pour accéder au serveur IMAP"
+
+#: extensions/webmail/__init__.py:25
+msgid "Listening port of your IMAP server"
+msgstr "Port d'écoute de votre serveur IMAP"
+
+#: extensions/webmail/__init__.py:28
+msgid "Address of your SMTP server"
+msgstr "Adresse de votre serveur SMTP"
+
+#: extensions/webmail/__init__.py:30
+msgid "None"
+msgstr "Aucun"
+
+#: extensions/webmail/__init__.py:34
+msgid "Use a secured connection to access SMTP server"
+msgstr "Utiliser une connexion sécurisée pour accéder au serveur SMTP"
+
+#: extensions/webmail/__init__.py:36
+msgid "Listening port of your SMTP server"
+msgstr "Port d'écoute de votre serveur SMTP"
+
+#: extensions/webmail/__init__.py:39
+msgid "Server needs authentication"
+msgstr "Le serveur nécessite une authentification"
+
+#: extensions/webmail/__init__.py:41
+msgid "Maximum attachment size in bytes (or KB, MB, GB if specified)"
+msgstr "Taille maximum d'une pièce jointe en octets (ou Ko, Mo, Go si précisé)"
+
+#: extensions/webmail/__init__.py:44
+msgid "Number of displayed emails per page"
+msgstr "Nombre d'emails affichés par page"
+
+#: extensions/webmail/__init__.py:47
+msgid "Listing refresh rate"
+msgstr "Taux de rafraichissement de la liste"
+
+#: extensions/webmail/__init__.py:48
+msgid "Automatic folder refresh rate (in seconds)"
+msgstr "Taux de rafraichissement automatique du dossier (en secondes)"
+
+#: extensions/webmail/__init__.py:50
+msgid "Trash folder"
+msgstr "Dossier 'poubelle'"
+
+#: extensions/webmail/__init__.py:51
+msgid "Folder where deleted messages go"
+msgstr "Dossier de destination des messages supprimés"
+
+#: extensions/webmail/__init__.py:53
+msgid "Sent folder"
+msgstr "Dossier 'envoyé'"
+
+#: extensions/webmail/__init__.py:54
+msgid "Folder where copies of sent messages go"
+msgstr "Dossier de destination des copies de messages envoyés"
+
+#: extensions/webmail/__init__.py:56
+msgid "Drafts folder"
+msgstr "Dossier 'brouillons'"
+
+#: extensions/webmail/__init__.py:57
+msgid "Folder where drafts go"
+msgstr "Dossier de destination des brouillons"
+
+#: extensions/webmail/__init__.py:59
+msgid "Signature text"
+msgstr "Texte de signature"
+
+#: extensions/webmail/__init__.py:60
+msgid "User defined email signature"
+msgstr "Signature personnalisée"
+
+#: extensions/webmail/__init__.py:62
+msgid "Default editor"
+msgstr "Editeur par défaut"
+
+#: extensions/webmail/__init__.py:64
+msgid "The default editor to use when composing a message"
+msgstr "L'éditeur a utiliser par défaut pour écrire un message"
+
+#: extensions/webmail/__init__.py:66
+msgid "Default message display mode"
+msgstr "Mode d'affichage par défaut d'un message"
+
+#: extensions/webmail/__init__.py:68
+msgid "The default mode used when displaying a message"
+msgstr "Le mode utilisé par défaut pour afficher un message"
+
+#: extensions/webmail/__init__.py:70
+msgid "Enable HTML links display"
+msgstr "Activer l'affichage des liens HTML"
+
+#: extensions/webmail/__init__.py:71
+msgid "Enable/Disable HTML links display"
+msgstr "Activer/Désactiver l'affichage des liens HTML"
+
+#: extensions/webmail/__init__.py:87
 msgid "Webmail"
 msgstr "Webmail"
 
@@ -1483,7 +1671,7 @@ msgstr "a écrit :"
 msgid "Original message"
 msgstr "Message original"
 
-#: extensions/webmail/lib.py:681
+#: extensions/webmail/lib.py:678
 msgid "Red fields are mandatories"
 msgstr "Les champs rouges sont obligatoires"
 
@@ -1496,7 +1684,7 @@ msgid "Empty mailbox"
 msgstr "Boite aux lettre vide"
 
 #: extensions/webmail/views.py:115
-#: extensions/webmail/templatetags/webextras.py:166
+#: extensions/webmail/templatetags/webextras.py:165
 msgid "Create a new mailbox"
 msgstr "Créer une nouvelle boite aux lettres"
 
@@ -1512,8 +1700,8 @@ msgstr "Editer la boite aux lettres"
 msgid "Mailbox updated"
 msgstr "Boite aux lettres mise à jour"
 
-#: extensions/webmail/views.py:194 extensions/webmail/views.py:374
-#: extensions/webmail/views.py:483
+#: extensions/webmail/views.py:194 extensions/webmail/views.py:376
+#: extensions/webmail/views.py:485
 msgid "Bad request"
 msgstr "Mauvaise requête"
 
@@ -1544,7 +1732,7 @@ msgstr "Impossible de supprimer la pièce jointe :"
 msgid "Unknown attachment"
 msgstr "Pièce jointe inconnue"
 
-#: extensions/webmail/views.py:479
+#: extensions/webmail/views.py:481
 msgid "Undefined action"
 msgstr "Action indéfinie"
 
@@ -1587,7 +1775,7 @@ msgstr "Répondre"
 msgid "Reply all"
 msgstr "Répondre à tous"
 
-#: extensions/webmail/templatetags/webextras.py:29
+#: extensions/webmail/templatetags/webextras.py:29 userprefs/views.py:27
 #: userprefs/templatetags/uprefs_extras.py:25
 msgid "Forward"
 msgstr "Transfert"
@@ -1640,11 +1828,11 @@ msgstr "Compresser ce dossier"
 msgid "Empty folder"
 msgstr "Vider ce dossier"
 
-#: extensions/webmail/templatetags/webextras.py:174
+#: extensions/webmail/templatetags/webextras.py:173
 msgid "Edit the selected mailbox"
 msgstr "Editer la boite aux lettres sélectionnée"
 
-#: extensions/webmail/templatetags/webextras.py:179
+#: extensions/webmail/templatetags/webextras.py:178
 msgid "Remove the selected mailbox"
 msgstr "Supprimer la boite aux lettres sélectionnée"
 
@@ -1657,7 +1845,7 @@ msgstr "Permission refusée : %s"
 msgid "Permission denied"
 msgstr "Permission refusée"
 
-#: lib/formutils.py:154 lib/formutils.py:161
+#: lib/formutils.py:158 lib/formutils.py:165
 msgid "Enter a valid domain name"
 msgstr "Entrer un nom de domaine valide"
 
@@ -1673,60 +1861,15 @@ msgstr "Super administrateur"
 msgid "Domain administrator"
 msgstr "Administrateur de domaine"
 
-#: lib/permissions.py:62
+#: lib/permissions.py:70
 #, python-format
 msgid "Failed to grant access (%s)"
 msgstr "Impossible de donner l'accès : %s"
 
-#: lib/tables.py:233
+#: lib/tables.py:232
 msgid "No entries to display"
 msgstr "Aucune entrée à afficher"
 
-#: templates/admin/editdomainform.html:5
-msgid "Administrators"
-msgstr "Administrateurs"
-
-#: templates/admin/editdomainform.html:6
-msgid "Miscellaneous"
-msgstr "Divers"
-
-#: templates/admin/editdomainform.html:24
-msgid "No domain administrator defined"
-msgstr "Aucun administrateur de domaine défini"
-
-#: templates/admin/editdomainform.html:27
-msgid "Creation date"
-msgstr "Date de création"
-
-#: templates/admin/editdomainform.html:28
-msgid "Last modification date"
-msgstr "Date de dernière modification"
-
-#: templates/admin/extensions.html:7 templates/admin/parameters.html:9
-#: templates/userprefs/preferences.html:37
-msgid "Save"
-msgstr "Enregistrer"
-
-#: templates/admin/importform.html:5
-msgid "Help"
-msgstr "Aide"
-
-#: templates/admin/importform.html:12
-msgid "Importing..."
-msgstr "Import en cours..."
-
-#: templates/admin/listing.html:12 templates/admin/searchform.html:4
-msgid "Search"
-msgstr "Chercher"
-
-#: templates/admin/mailboxes_raw.html:3
-msgid "Choose a value"
-msgstr "Choisir une valeur"
-
-#: templates/admin/newaccount.html:31 templates/common/generic_modal.html:11
-msgid "Close"
-msgstr "Fermer"
-
 #: templates/common/email_searchbar.html:5
 msgid "From address"
 msgstr "Emetteur"
@@ -1743,7 +1886,8 @@ msgstr "Chercher..."
 msgid "Error:"
 msgstr "Erreur :"
 
-#: templates/common/generic_field.html:4
+#: templates/common/generic_field.html:3
+#: templates/common/generic_fields_group.html:3
 msgid "Help:"
 msgstr "Aide :"
 
@@ -1755,19 +1899,14 @@ msgstr "Aucun paramètre disponible"
 msgid "Welcome to Modoboa"
 msgstr "Bienvenue dans Modoboa"
 
-#: templates/registration/login.html:35
+#: templates/registration/login.html:36
 msgid "Remember me"
 msgstr "Se souvenir de moi"
 
-#: templates/registration/login.html:37
+#: templates/registration/login.html:38
 msgid "Log in"
 msgstr "Se connecter"
 
-#: templates/userprefs/preferences.html:2
-#: userprefs/templatetags/uprefs_extras.py:53
-msgid "Settings"
-msgstr "Configuration"
-
 #: userprefs/__init__.py:7
 msgid "Prefered language"
 msgstr "Langage préféré"
@@ -1784,23 +1923,31 @@ msgstr "Ancien mot de passe"
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: userprefs/forms.py:27
+#: userprefs/forms.py:37
 msgid "Old password mismatchs"
 msgstr "L'ancien mot de passe est incorrect"
 
-#: userprefs/forms.py:32
+#: userprefs/forms.py:42
 msgid "Passwords mismatch"
 msgstr "Les mots de passe diffèrent"
 
-#: userprefs/forms.py:36
-msgid "Destination(s)"
-msgstr "Destination(s)"
+#: userprefs/forms.py:56
+msgid "Recipient(s)"
+msgstr "Destinataire(s)"
 
-#: userprefs/forms.py:37
+#: userprefs/forms.py:59
+msgid "Indicate one or more recipients separated by a ','"
+msgstr "Indiquer un ou plusieurs destinataires séparés par une ','"
+
+#: userprefs/forms.py:62
 msgid "Keep local copies"
 msgstr "Conserver des copies locales"
 
-#: userprefs/forms.py:50
+#: userprefs/forms.py:64
+msgid "Forward messages and store copies into your local mailbox"
+msgstr "Transférer les messages et conserver une copie dans votre boite locale"
+
+#: userprefs/forms.py:81
 msgid ""
 "You can't define a forward to a local destination. Please ask your "
 "administrator to create an alias instead."
@@ -1808,34 +1955,44 @@ msgstr ""
 "Vous ne pouvez pas définir un transfert vers une destination locale. "
 "Veuillez plutôt demander à votre administrateur de créer un alias"
 
-#: userprefs/views.py:26
-msgid "Password change is disabled for this user"
-msgstr "Le changement de mot de passe est désactivé pour cet utilisateur"
+#: userprefs/views.py:28
+msgid "Automatically forward emails to another address"
+msgstr "Transférer automatiquement les messages vers une autre adresse"
 
-#: userprefs/views.py:31 userprefs/templatetags/uprefs_extras.py:48
-msgid "Change password"
-msgstr "Changer de mot de passe"
-
-#: userprefs/views.py:51
-msgid "Password changed"
-msgstr "Mot de passe changé"
-
-#: userprefs/views.py:63
-msgid "Define a forward"
-msgstr "Définir un transfert"
-
-#: userprefs/views.py:89
+#: userprefs/views.py:52
 msgid "Forward updated"
 msgstr "Transfert mis à jour"
 
-#: userprefs/views.py:142
+#: userprefs/views.py:88
+msgid "Profile updated"
+msgstr "Profil mis à jour"
+
+#: userprefs/views.py:97 userprefs/templatetags/uprefs_extras.py:16
+msgid "Profile"
+msgstr "Profil"
+
+#: userprefs/views.py:98
+msgid "Update your personal information"
+msgstr "Mettez à jour vos informations personnelles"
+
+#: userprefs/views.py:114
 msgid "Preferences saved"
 msgstr "Préférences enregistrées"
 
-#: userprefs/templatetags/uprefs_extras.py:17
+#: userprefs/templates/userprefs/preferences.html:2
+#: userprefs/templatetags/uprefs_extras.py:46
+msgid "Settings"
+msgstr "Configuration"
+
+#: userprefs/templates/userprefs/preferences.html:21
+#: userprefs/templatetags/uprefs_extras.py:19
 msgid "Preferences"
 msgstr "Préférences"
 
-#: userprefs/templatetags/uprefs_extras.py:61
+#: userprefs/templates/userprefs/preferences.html:21
+msgid "Customize Modoboa"
+msgstr "Personnalisez Modoboa"
+
+#: userprefs/templatetags/uprefs_extras.py:55
 msgid "Logout"
 msgstr "Déconnexion"
diff --git a/modoboa/locale/fr/LC_MESSAGES/djangojs.po b/modoboa/locale/fr/LC_MESSAGES/djangojs.po
index 700334440..075cc49fa 100644
--- a/modoboa/locale/fr/LC_MESSAGES/djangojs.po
+++ b/modoboa/locale/fr/LC_MESSAGES/djangojs.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: modoboa-0.9\n"
+"Project-Id-Version: modoboa-0.9.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-03 11:05+0200\n"
+"POT-Creation-Date: 2012-07-03 09:12+0200\n"
 "PO-Revision-Date: 2011-01-07 10:00+0100\n"
 "Last-Translator: Antoine Nguyen <tonio@ngyn.org>\n"
 "Language-Team: FR <tonio@ngyn.org>\n"
@@ -16,74 +16,74 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: extensions/amavis_quarantine/static/js/quarantine.js:126
+#: admin/static/admin/js/admin.js:17
+msgid "No domain administrator defined"
+msgstr "Aucun administrateur de domaine défini"
+
+#: extensions/amavis/static/amavis/js/quarantine.js:126
 msgid "Release this selection?"
 msgstr "Relâcher cette sélection?"
 
-#: extensions/amavis_quarantine/static/js/quarantine.js:130
+#: extensions/amavis/static/amavis/js/quarantine.js:130
 msgid "Delete this selection?"
 msgstr "Supprimer cette sélection?"
 
-#: extensions/amavis_quarantine/static/js/quarantine.js:148
-#: extensions/amavis_quarantine/static/js/selfservice.js:22
+#: extensions/amavis/static/amavis/js/quarantine.js:148
+#: extensions/amavis/static/amavis/js/selfservice.js:22
 msgid "Release this message?"
 msgstr "Relâcher cette message?"
 
-#: extensions/amavis_quarantine/static/js/quarantine.js:152
-#: extensions/amavis_quarantine/static/js/selfservice.js:26
+#: extensions/amavis/static/amavis/js/quarantine.js:152
+#: extensions/amavis/static/amavis/js/selfservice.js:26
 msgid "Delete this message?"
 msgstr "Supprimer ce message?"
 
-#: extensions/amavis_quarantine/static/js/quarantine.js:169
+#: extensions/amavis/static/amavis/js/quarantine.js:169
 msgid "View full headers"
 msgstr "Voir les entêtes complets"
 
-#: extensions/amavis_quarantine/static/js/quarantine.js:174
+#: extensions/amavis/static/amavis/js/quarantine.js:174
 msgid "Hide full headers"
 msgstr "Cacher les entêtes complets"
 
-#: extensions/sievefilters/static/js/lib.js:14
+#: extensions/sievefilters/static/sievefilters/js/lib.js:14
 msgid "Remove this filter?"
 msgstr "Supprimer ce filtre?"
 
-#: extensions/sievefilters/static/js/lib.js:117
+#: extensions/sievefilters/static/sievefilters/js/lib.js:117
 msgid "Save changes?"
 msgstr "Enregistrer les changements?"
 
-#: extensions/sievefilters/static/js/lib.js:144
+#: extensions/sievefilters/static/sievefilters/js/lib.js:144
 msgid "Remove filters set?"
 msgstr "Supprimer ce jeu de filtres?"
 
-#: extensions/sievefilters/static/js/lib.js:161
+#: extensions/sievefilters/static/sievefilters/js/lib.js:161
 msgid "Activate this filters set?"
 msgstr "Activer ce jeu de filtres?"
 
-#: extensions/sievefilters/static/js/lib.js:169
-#: extensions/sievefilters/static/js/lib.js:224
+#: extensions/sievefilters/static/sievefilters/js/lib.js:169
+#: extensions/sievefilters/static/sievefilters/js/lib.js:224
 msgid "active"
 msgstr "actif"
 
-#: extensions/stats/static/js/stats.js:28
+#: extensions/stats/static/stats/js/stats.js:28
 msgid "Search a domain"
 msgstr "Checher un domaine"
 
-#: extensions/webmail/static/js/webmail.js:499
+#: extensions/webmail/static/webmail/js/webmail.js:511
 msgid "Remove the selected mailbox?"
 msgstr "Supprimer la boite sélectionnée?"
 
-#: extensions/webmail/static/js/webmail.js:513
+#: extensions/webmail/static/webmail/js/webmail.js:525
 msgid "Mailbox removed"
 msgstr "Boite aux lettres supprimées"
 
-#: static/js/admin.js:17
-msgid "No domain administrator defined"
-msgstr "Aucun administrateur de domaine défini"
-
 #: static/js/confirmation.js:45
 msgid "Cancel"
 msgstr "Annuler"
 
-#: static/js/confirmation.js:84 static/js/history.js:230
+#: static/js/confirmation.js:84 static/js/history.js:231
 msgid "Internal Error"
 msgstr "Erreur interne"