diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index adc884e51..245532d4e 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Modoboa-0.8.7\n"
-"Report-Msgid-Bugs-To: http://dev.modoboa.org/\n"
-"POT-Creation-Date: 2011-09-30 15:25+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-01-10 11:09+0100\n"
 "PO-Revision-Date: 2011-10-09 00:24+0100\n"
 "Last-Translator: Patrick Ben Koetter <p@state-of-mind.de>\n"
 "Language-Team: DE <p@state-of-mind.de>\n"
@@ -17,39 +17,60 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin/__init__.py:8
+#: admin/__init__.py:9
+msgid "Local"
+msgstr ""
+
+#: admin/__init__.py:11
+#, fuzzy
+msgid "The backend used for authentication"
+msgstr "Login-Passwort"
+
+#: admin/__init__.py:13
 msgid "Modoboa will handle mailbox creation on filesystem"
 msgstr "Modoboa wird die Erstellung der Mailbox im Dateisystem übernehmen"
 
-#: admin/__init__.py:10
+#: admin/__init__.py:15
 msgid "Path to the root directory where messages are stored"
 msgstr "Pfad zum root-Verzeichnis unterhalb dessen E-Mails abgelegt werden"
 
-#: admin/__init__.py:12
-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:14
-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: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."
+
+#: 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."
+
+#: admin/__init__.py:22
 msgid "Mailboxes storage format"
 msgstr "Mailbox erstellt."
 
-#: admin/__init__.py:19
-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: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."
 
-#: admin/__init__.py:22
+#: admin/__init__.py:27
 msgid "Scheme used to crypt mailbox passwords"
 msgstr "Verschlüsselungsschema der Mailbox-Passworte"
 
-#: admin/__init__.py:24
+#: admin/__init__.py:29
 msgid "Number of displayed items per page"
 msgstr "Anzahl dargestellter Einträge pro Seite"
 
-#: admin/__init__.py:31
+#: admin/__init__.py:52
 msgid "The default redirection used when no application is specified"
 msgstr "Die Standardumleitung wenn kein Programm angegeben wurde"
 
@@ -57,9 +78,7 @@ msgstr "Die Standardumleitung wenn kein Programm angegeben wurde"
 msgid "Failed to rename domain, check permissions"
 msgstr "Domäne konnte nicht umbenannt werden. Prüfen Sie die Berechtigungen."
 
-#: admin/forms.py:51
-#: admin/tables.py:20
-#: admin/tables.py:78
+#: admin/forms.py:51 admin/tables.py:20 admin/tables.py:78
 msgid "Quota"
 msgstr "Quota"
 
@@ -67,8 +86,7 @@ msgstr "Quota"
 msgid "Mailbox quota in MB (default to domain quota if blank)"
 msgstr "Mailbox-Quota in MB (standardmäßig Domain-Quota wenn leer)"
 
-#: admin/forms.py:53
-#: auth/forms.py:6
+#: admin/forms.py:53 auth/forms.py:6
 msgid "Password"
 msgstr "Passwort"
 
@@ -76,8 +94,7 @@ msgstr "Passwort"
 msgid "Password used to log in"
 msgstr "Login-Passwort"
 
-#: admin/forms.py:56
-#: userprefs/forms.py:16
+#: admin/forms.py:56 userprefs/forms.py:17
 msgid "Confirmation"
 msgstr "Bestätigung"
 
@@ -89,13 +106,11 @@ msgstr "Passwort Bestätigung"
 msgid "Check to activate this mailbox"
 msgstr "Markieren, um die Mailbox zu aktivieren"
 
-#: admin/forms.py:88
-#: userprefs/forms.py:35
+#: admin/forms.py:88 userprefs/forms.py:39
 msgid "Passwords mismatch"
 msgstr "Passwörter stimmen nicht überein"
 
-#: admin/forms.py:103
-#: admin/tables.py:103
+#: admin/forms.py:103 admin/tables.py:103
 msgid "Target(s)"
 msgstr "Ziel(e)"
 
@@ -115,8 +130,7 @@ msgstr "Zugriff verweigert für"
 msgid "Permission denied on"
 msgstr "Erlaubnis verweigert für"
 
-#: admin/forms.py:183
-#: admin/forms.py:199
+#: admin/forms.py:183 admin/forms.py:199
 msgid "User"
 msgstr "Nutzer"
 
@@ -124,13 +138,11 @@ msgstr "Nutzer"
 msgid "Select a user"
 msgstr "Wählen Sie einen Nutzer"
 
-#: admin/forms.py:185
-#: admin/forms.py:201
+#: admin/forms.py:185 admin/forms.py:201
 msgid "Select a user in the list"
 msgstr "Wählen Sie einen Nutzer aus der Liste"
 
-#: admin/forms.py:194
-#: admin/tables.py:146
+#: admin/forms.py:194 admin/tables.py:146
 msgid "Domain"
 msgstr "Domäne"
 
@@ -146,97 +158,117 @@ msgstr "Wählen Sie eine Domäne aus der Liste"
 msgid "Empty"
 msgstr "Leer"
 
+#: admin/forms.py:204 extensions/webmail/forms.py:14
+msgid "Select a file"
+msgstr "Wählen Sie eine Datei"
+
+#: admin/forms.py:205
+msgid "Separator"
+msgstr ""
+
 #: admin/lib.py:13
 #, python-format
 msgid "Invalid action, %(user)s is a local user"
 msgstr "Unzulässige Aktion, %(user)s ist ein lokaler Benutzer"
 
-#: admin/models.py:77
-#: admin/models.py:141
-#: admin/models.py:154
+#: admin/models.py:78 admin/models.py:142 admin/models.py:155
 msgid "name"
 msgstr "Name"
 
-#: admin/models.py:78
+#: admin/models.py:79
 msgid "The domain name"
 msgstr "Name der Domäne"
 
-#: admin/models.py:79
+#: admin/models.py:80
 msgid "Default quota in MB applied to mailboxes"
 msgstr "Standard-Quota für Mailboxen (in MB)"
 
-#: admin/models.py:80
-#: admin/models.py:145
-#: admin/models.py:352
-#: admin/models.py:428
-#: extensions/postfix_autoreply/models.py:19
+#: admin/models.py:81 admin/models.py:146 admin/models.py:393
+#: admin/models.py:469 extensions/postfix_autoreply/models.py:19
 msgid "enabled"
 msgstr "aktiviert"
 
-#: admin/models.py:81
+#: admin/models.py:82
 msgid "Check to activate this domain"
 msgstr "Auswählen, um diese Domäne zu aktivieren"
 
-#: admin/models.py:134
+#: admin/models.py:135
 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:142
+#: admin/models.py:143
 msgid "The alias name"
 msgstr "Der Alias-Name"
 
-#: admin/models.py:143
+#: admin/models.py:144
 msgid "target"
 msgstr "Ziel"
 
-#: admin/models.py:144
+#: admin/models.py:145
 msgid "The domain this alias points to"
 msgstr "Domäne auf die dieser Alias verweist"
 
-#: admin/models.py:146
-#: admin/models.py:353
+#: admin/models.py:147 admin/models.py:394
 msgid "Check to activate this alias"
 msgstr "Auswählen um den Alias zu aktivieren"
 
-#: admin/models.py:155
+#: admin/models.py:156
 msgid "First name and last name of mailbox owner"
 msgstr "Vor- und Nachname des Mailbox-Besitzers"
 
-#: admin/models.py:156
-#: admin/models.py:346
+#: admin/models.py:157 admin/models.py:387
 msgid "address"
 msgstr "Adresse"
 
-#: admin/models.py:157
+#: admin/models.py:158
 msgid "Mailbox address (without the @domain.tld part)"
 msgstr "Mailbox-Adresse (ohne den @domain.tld-Anteil)"
 
-#: admin/models.py:158
+#: admin/models.py:159
 msgid "password"
 msgstr "Passwort"
 
-#: admin/models.py:245
-#: admin/models.py:306
+#: admin/models.py:246 admin/models.py:327
 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:264
+#: admin/models.py:265
 msgid "Mailbox with this address already exists"
 msgstr "Eine Mailbox mit dieser Adresse existiert bereits."
 
-#: admin/models.py:347
-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:313
+#, python-format
+msgid "Failed to update password: %s"
+msgstr ""
 
-#: admin/models.py:349
+#: admin/models.py:353
+#, fuzzy
+msgid "Invalid line"
+msgstr "Ungültige Mailbox"
+
+#: admin/models.py:359
+msgid "Cannot import this mailbox because the associated domain does not exist"
+msgstr ""
+
+#: admin/models.py:388
+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:390
 msgid "mailboxes"
 msgstr "Mailboxen"
 
-#: admin/models.py:350
+#: admin/models.py:391
 msgid "The mailboxes this alias points to"
 msgstr "Mailbox auf den dieser Alias verweist"
 
-#: admin/models.py:429
+#: admin/models.py:470
 msgid "Check to enable this extension"
 msgstr "Auswählen, um diese Erweiterung zu aktivieren"
 
@@ -248,51 +280,39 @@ msgstr "Super-Administrator hinzufügen"
 msgid "Add domain administrator"
 msgstr "Domänen-Administrator hinzufügen"
 
-#: admin/tables.py:10
-#: admin/tables.py:45
-#: admin/tables.py:71
-#: admin/tables.py:127
-#: extensions/sievefilters/forms.py:16
+#: admin/tables.py:10 admin/tables.py:45 admin/tables.py:71
+#: admin/tables.py:127 extensions/sievefilters/forms.py:16
 #: extensions/sievefilters/templates/sievefilters/filters.html:8
 msgid "Name"
 msgstr "Name"
 
-#: admin/tables.py:11
-#: admin/tables.py:47
-#: admin/tables.py:72
+#: admin/tables.py:11 admin/tables.py:47 admin/tables.py:72
 #: admin/tables.py:104
 msgid "Created"
 msgstr "Erstellt"
 
-#: admin/tables.py:12
-#: admin/tables.py:48
-#: admin/tables.py:74
+#: admin/tables.py:12 admin/tables.py:48 admin/tables.py:74
 #: admin/tables.py:105
 msgid "Last modified"
 msgstr "Zuletzt verändert"
 
-#: admin/tables.py:14
-#: admin/views.py:164
-#: admin/templatetags/admin_extras.py:113
+#: admin/tables.py:14 admin/views.py:164
+#: admin/templatetags/admin_extras.py:128
 msgid "Domain aliases"
 msgstr "Domänen-Aliase"
 
-#: admin/tables.py:16
-#: admin/templatetags/admin_extras.py:36
-#: admin/templatetags/admin_extras.py:116
+#: admin/tables.py:16 admin/templatetags/admin_extras.py:36
+#: admin/templatetags/admin_extras.py:131
 msgid "Mailboxes"
 msgstr "Mailboxen"
 
-#: admin/tables.py:18
-#: admin/views.py:394
-#: admin/templatetags/admin_extras.py:119
+#: admin/tables.py:18 admin/views.py:394
+#: admin/templatetags/admin_extras.py:134
 msgid "Mailbox aliases"
 msgstr "Mailboxen-Aliase"
 
-#: admin/tables.py:24
-#: admin/tables.py:52
-#: admin/tables.py:82
-#: admin/tables.py:109
+#: admin/tables.py:24 admin/tables.py:52 admin/tables.py:82
+#: admin/tables.py:109 admin/templatetags/admin_extras.py:98
 #: extensions/sievefilters/templates/sievefilters/filter.html:86
 #: extensions/sievefilters/templates/sievefilters/filters.html:7
 #: extensions/sievefilters/templates/sievefilters/guieditor.html:3
@@ -301,24 +321,17 @@ msgstr "Mailboxen-Aliase"
 msgid "Actions"
 msgstr "Aktionen"
 
-#: admin/tables.py:36
-#: admin/tables.py:93
+#: admin/tables.py:36 admin/tables.py:93
 msgid "MB"
 msgstr "MB"
 
-#: admin/tables.py:39
-#: admin/tables.py:64
-#: admin/tables.py:96
-#: admin/tables.py:122
-#: extensions/sievefilters/views.py:248
+#: admin/tables.py:39 admin/tables.py:64 admin/tables.py:96
+#: admin/tables.py:122 extensions/sievefilters/views.py:248
 msgid "yes"
 msgstr "Ja"
 
-#: admin/tables.py:39
-#: admin/tables.py:64
-#: admin/tables.py:96
-#: admin/tables.py:122
-#: extensions/sievefilters/views.py:252
+#: admin/tables.py:39 admin/tables.py:64 admin/tables.py:96
+#: admin/tables.py:122 extensions/sievefilters/views.py:252
 msgid "no"
 msgstr "Nein"
 
@@ -326,8 +339,7 @@ msgstr "Nein"
 msgid "Targeted domain"
 msgstr "Ziel-Domäne"
 
-#: admin/tables.py:70
-#: admin/tables.py:102
+#: admin/tables.py:70 admin/tables.py:102
 msgid "Address"
 msgstr "Adresse"
 
@@ -347,13 +359,11 @@ msgstr "Beschreibung"
 msgid "User name"
 msgstr "Benutzername"
 
-#: admin/tables.py:137
-#: admin/tables.py:147
+#: admin/tables.py:137 admin/tables.py:147
 msgid "Full name"
 msgstr "Voller Name"
 
-#: admin/tables.py:138
-#: admin/tables.py:148
+#: admin/tables.py:138 admin/tables.py:148
 msgid "Defined"
 msgstr "Definiert"
 
@@ -377,12 +387,8 @@ msgstr "Es existiert bereits eine Domain mit diesem Namen"
 msgid "New domain"
 msgstr "Neue Domäne"
 
-#: admin/views.py:104
-#: admin/views.py:173
-#: admin/views.py:297
-#: admin/views.py:328
-#: admin/views.py:432
-#: extensions/sievefilters/views.py:175
+#: admin/views.py:104 admin/views.py:173 admin/views.py:297 admin/views.py:328
+#: admin/views.py:432 extensions/sievefilters/views.py:175
 #: extensions/webmail/views.py:371
 msgid "Create"
 msgstr "Erstellen"
@@ -395,12 +401,9 @@ msgstr "Domäne erstellt."
 msgid "Domain editing"
 msgstr "Domäne Bearbeitung"
 
-#: admin/views.py:121
-#: admin/views.py:208
-#: admin/views.py:451
+#: admin/views.py:121 admin/views.py:208 admin/views.py:451
 #: extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html:38
-#: extensions/webmail/views.py:398
-#: templates/userprefs/chpassword.html:15
+#: extensions/webmail/views.py:398 templates/userprefs/chpassword.html:15
 #: templates/userprefs/setforward.html:15
 msgid "Update"
 msgstr "Aktualisieren"
@@ -423,14 +426,11 @@ msgstr[1] "Domänen gelöscht"
 msgid "New domain alias"
 msgstr "Neuer Domänen-Alias"
 
-#: admin/views.py:182
-#: admin/views.py:217
+#: admin/views.py:182 admin/views.py:217
 msgid "A domain with this name already exists"
 msgstr "Eine Domäne mit diesem Namen existiert bereits"
 
-#: admin/views.py:187
-#: admin/views.py:222
-#: admin/views.py:412
+#: admin/views.py:187 admin/views.py:222 admin/views.py:412
 msgid "Alias with this name already exists"
 msgstr "Ein Alias mit diesem Namen existiert bereits"
 
@@ -524,8 +524,7 @@ msgstr "Super-Administratoren"
 msgid "Domain administrators"
 msgstr "Domänen-Administratoren"
 
-#: admin/views.py:505
-#: admin/views.py:522
+#: admin/views.py:505 admin/views.py:522
 msgid "Permission denied!"
 msgstr "Berechtigung verweigert!"
 
@@ -541,6 +540,20 @@ msgstr "Berechtigungen entfernt"
 msgid "Modifications applied."
 msgstr "Änderungen übernommen."
 
+#: admin/views.py:631
+#, fuzzy, python-format
+msgid "%d mailboxes imported successfully"
+msgstr "%(count)d Nachricht erfolgreich gelöscht"
+
+#: admin/views.py:641 admin/templatetags/admin_extras.py:112
+#: templates/admin/import.html:48
+msgid "Import data"
+msgstr ""
+
+#: admin/views.py:642 templates/admin/import.html:56
+msgid "Import"
+msgstr ""
+
 #: admin/templatetags/admin_extras.py:12
 msgid "enabled_m"
 msgstr "aktiviert_m"
@@ -554,12 +567,11 @@ msgid "Admin"
 msgstr "Admin"
 
 #: admin/templatetags/admin_extras.py:29
-#: admin/templatetags/admin_extras.py:108
+#: admin/templatetags/admin_extras.py:123
 msgid "Domains"
 msgstr "Domänen"
 
-#: admin/templatetags/admin_extras.py:46
-#: templates/admin/permissions.html:6
+#: admin/templatetags/admin_extras.py:46 templates/admin/permissions.html:6
 msgid "Permissions"
 msgstr "Berechtigungen"
 
@@ -576,56 +588,55 @@ msgstr "Parameter"
 msgid "Extensions"
 msgstr "Erweiterungen"
 
-#: admin/templatetags/admin_extras.py:97
+#: admin/templatetags/admin_extras.py:103
 msgid "New"
 msgstr "Neu"
 
-#: admin/templatetags/admin_extras.py:101
+#: admin/templatetags/admin_extras.py:107
 msgid "Remove"
 msgstr "Entfernen"
 
-#: admin/templatetags/admin_extras.py:134
+#: admin/templatetags/admin_extras.py:149
 msgid "Add permission"
 msgstr "Berechtigung hinzufügen"
 
-#: admin/templatetags/admin_extras.py:138
+#: admin/templatetags/admin_extras.py:153
 msgid "Remove permissions"
 msgstr "Berechtigung entziehen"
 
-#: admin/templatetags/admin_extras.py:151
+#: admin/templatetags/admin_extras.py:166
 msgid "Edit domain"
 msgstr "Domäne bearbeiten"
 
-#: admin/templatetags/admin_extras.py:157
+#: admin/templatetags/admin_extras.py:172
 msgid "View aliases of this domain"
 msgstr "Aliase dieser Domäne ansehen"
 
-#: admin/templatetags/admin_extras.py:167
+#: admin/templatetags/admin_extras.py:182
 msgid "Edit alias"
 msgstr "Alias bearbeiten"
 
-#: admin/templatetags/admin_extras.py:179
+#: admin/templatetags/admin_extras.py:194
 msgid "Edit mailbox"
 msgstr "Mailbox bearbeiten"
 
-#: admin/templatetags/admin_extras.py:185
+#: admin/templatetags/admin_extras.py:200
 msgid "View this mailbox aliases"
 msgstr "Aliase dieser Mailbox ansehen"
 
-#: admin/templatetags/admin_extras.py:200
+#: admin/templatetags/admin_extras.py:215
 msgid "Edit mailbox alias"
 msgstr "Mailbox-Alias bearbeiten"
 
-#: admin/templatetags/admin_extras.py:235
+#: admin/templatetags/admin_extras.py:250
 msgid "Yes"
 msgstr "Ja"
 
-#: admin/templatetags/admin_extras.py:235
+#: admin/templatetags/admin_extras.py:250
 msgid "No"
 msgstr "Nein"
 
-#: admin/templatetags/admin_extras.py:252
-#: templates/common/genericform.html:6
+#: admin/templatetags/admin_extras.py:267 templates/common/genericform.html:6
 msgid "Help"
 msgstr "Hilfe"
 
@@ -647,7 +658,41 @@ msgstr "Konto ist deaktiviert"
 
 #: auth/views.py:39
 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:16
+#, fuzzy
+msgid "Test messages"
+msgstr "Gesendete Nachrichten"
+
+#: demo/__init__.py:21
+#, fuzzy
+msgid "Send virus"
+msgstr "Sender"
+
+#: demo/__init__.py:25
+#, fuzzy
+msgid "Send spam"
+msgstr "Senden"
+
+#: demo/templates/demo/login_announcement.html:2
+msgid ""
+"\n"
+"<h1>Welcome to the online demo!</h1>\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"
+"<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 of give any suggestion to \n"
+"  <a href=\"https://groups.google.com/forum/#!forum/modoboa-users\">the "
+"mailing list</a>.</p>\n"
+msgstr ""
 
 #: extensions/amavis_quarantine/main.py:15
 msgid "Simple amavis quarantine management tool"
@@ -655,7 +700,9 @@ msgstr "Einfaches amavis Quarantäne-Management Werkzeug"
 
 #: extensions/amavis_quarantine/main.py:23
 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/main.py:25
 msgid "Remove messages marked as released while cleaning up the database"
@@ -681,10 +728,11 @@ msgstr "/var/amavis/amavisd.sock"
 msgid "Path to the PDP server socket (if unix mode)"
 msgstr "Pfad zum PDP-Server Socket (im UNIX-Modus)"
 
-#: extensions/amavis_quarantine/main.py:42
-#: extensions/webmail/main.py:40
+#: extensions/amavis_quarantine/main.py:42 extensions/webmail/main.py:40
 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"
+msgstr ""
+"Legt die maximale Anzahl von Nachrichten fest, die in einer Seite "
+"dargestellt werden"
 
 #: extensions/amavis_quarantine/main.py:58
 #: extensions/amavis_quarantine/templates/amavis_quarantine/index.html:42
@@ -697,15 +745,13 @@ msgid "From"
 msgstr "Von"
 
 #: extensions/amavis_quarantine/sql_listing.py:22
-#: extensions/sievefilters/forms.py:29
-#: extensions/webmail/forms.py:8
-#: extensions/webmail/lib.py:521
-#: templates/common/email_searchbar.html:7
+#: extensions/sievefilters/forms.py:29 extensions/webmail/forms.py:8
+#: extensions/webmail/lib.py:525 templates/common/email_searchbar.html:7
 msgid "Subject"
 msgstr "Betreff"
 
 #: extensions/amavis_quarantine/sql_listing.py:23
-#: extensions/webmail/lib.py:523
+#: extensions/webmail/lib.py:527
 msgid "Date"
 msgstr "Datum"
 
@@ -808,11 +854,14 @@ msgstr "Das Datum ist vorbei"
 
 #: extensions/postfix_autoreply/main.py:21
 msgid "Auto-reply (vacation) functionality using Postfix"
-msgstr "Automatische Antwort (Abwesenheitsbenachrichtigung) über Postfix-Programm"
+msgstr ""
+"Automatische Antwort (Abwesenheitsbenachrichtigung) über Postfix-Programm"
 
 #: extensions/postfix_autoreply/main.py:35
 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/main.py:61
 #: extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html:30
@@ -883,8 +932,7 @@ msgstr "Sender"
 msgid "Recipient"
 msgstr "Empfänger"
 
-#: extensions/sievefilters/forms.py:32
-#: extensions/webmail/forms.py:7
+#: extensions/sievefilters/forms.py:32 extensions/webmail/forms.py:7
 msgid "Cc"
 msgstr "Cc"
 
@@ -910,7 +958,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:78
 msgid "Not enough space on server"
@@ -1008,7 +1058,7 @@ msgid "Match type"
 msgstr "Übereinstimmung"
 
 #: extensions/sievefilters/templates/sievefilters/filter.html:92
-#: templates/common/parameters.html:4
+#: templates/admin/parameters.html:14 templates/userprefs/preferences.html:18
 msgid "Save"
 msgstr "Speichern"
 
@@ -1033,8 +1083,11 @@ msgid "active"
 msgstr "aktiv"
 
 #: extensions/sievefilters/templates/sievefilters/index.html:38
-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:17
 msgid "New filters set"
@@ -1116,8 +1169,7 @@ msgstr "Pfad zum Verzeichnis in dem die RRD-Dateien abgelegt werden"
 msgid "Path to directory where PNG files are stored"
 msgstr "Pfad zu dem Verzeichnis in dem PNG-Dateien abgelegt werden"
 
-#: extensions/stats/main.py:47
-#: extensions/stats/templates/stats/index.html:84
+#: extensions/stats/main.py:47 extensions/stats/templates/stats/index.html:84
 msgid "Statistics"
 msgstr "Statistiken"
 
@@ -1162,8 +1214,7 @@ msgid "Custom period : from"
 msgstr "Individueller Zeitraum : von"
 
 #: extensions/stats/templates/stats/graphs.html:3
-#: templates/admin/listing.html:12
-#: templates/common/navbar.html:2
+#: templates/admin/listing.html:12 templates/common/navbar.html:2
 msgid "to"
 msgstr "bis"
 
@@ -1191,28 +1242,24 @@ msgstr "Start"
 msgid "End"
 msgstr "Aktiviert"
 
-#: extensions/webmail/forms.py:14
-msgid "Select a file"
-msgstr "Wählen Sie eine Datei"
-
 #: extensions/webmail/lib.py:33
 msgid "Server response"
 msgstr "Server-Antwort"
 
 #: extensions/webmail/lib.py:145
 msgid "Connection to IMAP server failed, check your configuration"
-msgstr "Verbindung zu IMAP-Server fehlgeschlagen. Überprüfen Sie Ihre Konfiguration"
+msgstr ""
+"Verbindung zu IMAP-Server fehlgeschlagen. Überprüfen Sie Ihre Konfiguration"
 
 #: extensions/webmail/lib.py:149
 msgid "Authentication failed, check your configuration"
 msgstr "Authentifizierung fehlgeschlagen. Überprüfen Sie Ihre Konfiguration"
 
-#: extensions/webmail/lib.py:468
+#: extensions/webmail/lib.py:472
 msgid "wrote:"
 msgstr "schrieb:"
 
-#: extensions/webmail/lib.py:535
-#: extensions/webmail/lib.py:539
+#: extensions/webmail/lib.py:539 extensions/webmail/lib.py:543
 msgid "Original message"
 msgstr "Gesendete Nachrichten"
 
@@ -1329,8 +1376,7 @@ msgstr "Einfaches IMAP-Webmail"
 msgid "Webmail"
 msgstr "Webmail"
 
-#: extensions/webmail/views.py:61
-#: lib/email_listing.py:132
+#: extensions/webmail/views.py:61 lib/email_listing.py:132
 msgid "This folder contains no messages"
 msgstr "Dieser Ordner enthält keine Nachrichten"
 
@@ -1470,7 +1516,7 @@ msgstr "Leerer Ordner"
 msgid "No entries to display"
 msgstr "Keine Einträge darzustellen"
 
-#: templates/nlayout.html:49
+#: templates/nlayout.html:50
 msgid "Logout"
 msgstr "Logout"
 
@@ -1478,11 +1524,7 @@ msgstr "Logout"
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: templates/admin/domains_header.html:44
-msgid "Remove this selection?"
-msgstr "Diese Auswahl entfernen?"
-
-#: templates/admin/domains_header.html:52
+#: templates/admin/domains_header.html:13
 msgid "for"
 msgstr "Für"
 
@@ -1490,32 +1532,32 @@ msgstr "Für"
 msgid "Apply"
 msgstr "Antworten"
 
+#: templates/admin/import.html:62
+#, fuzzy
+msgid "Importing..."
+msgstr "Lade hoch …"
+
 #: templates/admin/listing.html:12
 msgid "Items"
 msgstr "Einträge"
 
-#: templates/admin/listing.html:12
-#: templates/common/navbar.html:2
+#: templates/admin/listing.html:12 templates/common/navbar.html:2
 msgid "of"
 msgstr "von"
 
-#: templates/admin/listing.html:16
-#: templates/common/navbar.html:6
+#: templates/admin/listing.html:16 templates/common/navbar.html:6
 msgid "First"
 msgstr "Erstes"
 
-#: templates/admin/listing.html:19
-#: templates/common/navbar.html:9
+#: templates/admin/listing.html:19 templates/common/navbar.html:9
 msgid "Previous"
 msgstr "Vorheriges"
 
-#: templates/admin/listing.html:24
-#: templates/common/navbar.html:14
+#: templates/admin/listing.html:24 templates/common/navbar.html:14
 msgid "Next"
 msgstr "Nächstes"
 
-#: templates/admin/listing.html:27
-#: templates/common/navbar.html:17
+#: templates/admin/listing.html:27 templates/common/navbar.html:17
 msgid "Last"
 msgstr "Letztes"
 
@@ -1543,7 +1585,7 @@ msgstr "Fehler"
 msgid "Messages"
 msgstr "Nachrichten"
 
-#: templates/common/parameters.html:16
+#: templates/common/parameters.html:15
 msgid "No parameters available"
 msgstr "Keine Parameter verfügbar"
 
@@ -1577,39 +1619,42 @@ msgstr "Bevorzugte Sprache"
 msgid "Prefered language to display pages"
 msgstr "Bevorzugte Sprache für Seitendarstellung"
 
-#: userprefs/forms.py:12
+#: userprefs/forms.py:13
 msgid "Old password"
 msgstr "Altes Passwort"
 
-#: userprefs/forms.py:14
+#: userprefs/forms.py:15
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: userprefs/forms.py:30
+#: userprefs/forms.py:34
 msgid "Old password mismatchs"
 msgstr "Altes Passwort stimmt nicht überein"
 
-#: userprefs/forms.py:39
+#: userprefs/forms.py:43
 msgid "Destination(s)"
 msgstr "Ziel(e)"
 
-#: userprefs/forms.py:52
-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:44
+msgid "Keep local copies"
+msgstr ""
 
-#: userprefs/views.py:34
+#: userprefs/forms.py:57
+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:27
+msgid "Password change is disabled for this user"
+msgstr ""
+
+#: userprefs/views.py:46
 msgid "Password changed"
 msgstr "Passwort geändert"
 
-#: userprefs/views.py:63
+#: userprefs/views.py:79
 msgid "Forward updated"
 msgstr "Weiterleitung aktualisiert"
-
-#~ msgid "Enabled"
-#~ msgstr "Aktiviert"
-
-#~ msgid "Release this message?"
-#~ msgstr "Diese Nachricht freigeben?"
-
-#~ msgid "Delete this message?"
-#~ msgstr "Diese Nachricht löschen?"
diff --git a/locale/de/LC_MESSAGES/djangojs.po b/locale/de/LC_MESSAGES/djangojs.po
index 1044e6832..c82c10a23 100644
--- a/locale/de/LC_MESSAGES/djangojs.po
+++ b/locale/de/LC_MESSAGES/djangojs.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Modoboa-0.8.7\n"
-"Report-Msgid-Bugs-To: http://dev.modoboa.org/\n"
-"POT-Creation-Date: 2011-09-30 15:26+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-01-10 11:09+0100\n"
 "PO-Revision-Date: 2011-10-09 00:26+0100\n"
 "Last-Translator: Patrick Ben Koetter <p@state-of-mind.de>\n"
 "Language-Team: DE <p@state-of-mind.fr>\n"
@@ -61,17 +61,16 @@ msgstr "Ordner bearbeiten"
 msgid "Folder deleted"
 msgstr "Ordner gelöscht"
 
-#: extensions/webmail/static/js/webmail.js:94
+#: extensions/webmail/static/js/webmail.js:95
 msgid "Sending..."
 msgstr "Sende …"
 
-#: extensions/webmail/static/js/webmail.js:227
-#: extensions/webmail/static/js/webmail.js:251
-#: static/js/anchor_nav.js:212
+#: extensions/webmail/static/js/webmail.js:229
+#: extensions/webmail/static/js/webmail.js:254 static/js/anchor_nav.js:215
 msgid "Done"
 msgstr "Abgeschlossen"
 
-#: extensions/webmail/static/js/webmail.js:240
+#: extensions/webmail/static/js/webmail.js:243
 msgid "Waiting..."
 msgstr "Warte..."
 
@@ -79,10 +78,18 @@ msgstr "Warte..."
 msgid "Loading..."
 msgstr "Lade..."
 
-#: static/js/common.js:172
+#: static/js/common.js:17
+msgid "Message sent"
+msgstr ""
+
+#: static/js/common.js:188
 msgid "Search..."
 msgstr "Suchen..."
 
+#: static/js/domains.js:61
+msgid "Remove this selection?"
+msgstr "Diese Auswahl entfernen?"
+
 #: static/js/preferences.js:14
 msgid "Preferences saved"
 msgstr "Einstellungen gespeichert"
@@ -90,4 +97,3 @@ msgstr "Einstellungen gespeichert"
 #: static/js/settings.js:14
 msgid "Parameters saved"
 msgstr "Parameter gespeichert"
-
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 9818ff1f3..3b72b736e 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/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: 2011-09-30 15:26+0200\n"
+"POT-Creation-Date: 2012-01-10 11:09+0100\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,45 +17,53 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin/__init__.py:8
+#: admin/__init__.py:9
+msgid "Local"
+msgstr ""
+
+#: admin/__init__.py:11
+msgid "The backend used for authentication"
+msgstr ""
+
+#: admin/__init__.py:13
 msgid "Modoboa will handle mailbox creation on filesystem"
 msgstr ""
 
-#: admin/__init__.py:10
+#: admin/__init__.py:15
 msgid "Path to the root directory where messages are stored"
 msgstr ""
 
-#: admin/__init__.py:12
+#: admin/__init__.py:17
 msgid ""
 "UID of the virtual user which owns domains/mailboxes/messages on the "
 "filesystem"
 msgstr ""
 
-#: admin/__init__.py:14
+#: admin/__init__.py:19
 msgid ""
 "GID of the virtual user which owns domains/mailboxes/messages on the "
 "filesystem"
 msgstr ""
 
-#: admin/__init__.py:17
+#: admin/__init__.py:22
 msgid "Mailboxes storage format"
 msgstr ""
 
-#: admin/__init__.py:19
+#: admin/__init__.py:24
 msgid ""
 "Sub-directory (inside the mailbox) where messages are stored when using the "
 "maildir format"
 msgstr ""
 
-#: admin/__init__.py:22
+#: admin/__init__.py:27
 msgid "Scheme used to crypt mailbox passwords"
 msgstr ""
 
-#: admin/__init__.py:24
+#: admin/__init__.py:29
 msgid "Number of displayed items per page"
 msgstr ""
 
-#: admin/__init__.py:31
+#: admin/__init__.py:52
 msgid "The default redirection used when no application is specified"
 msgstr ""
 
@@ -79,7 +87,7 @@ msgstr ""
 msgid "Password used to log in"
 msgstr ""
 
-#: admin/forms.py:56 userprefs/forms.py:16
+#: admin/forms.py:56 userprefs/forms.py:17
 msgid "Confirmation"
 msgstr ""
 
@@ -91,7 +99,7 @@ msgstr ""
 msgid "Check to activate this mailbox"
 msgstr ""
 
-#: admin/forms.py:88 userprefs/forms.py:35
+#: admin/forms.py:88 userprefs/forms.py:39
 msgid "Passwords mismatch"
 msgstr ""
 
@@ -143,91 +151,112 @@ msgstr ""
 msgid "Empty"
 msgstr ""
 
+#: admin/forms.py:204 extensions/webmail/forms.py:14
+msgid "Select a file"
+msgstr ""
+
+#: admin/forms.py:205
+msgid "Separator"
+msgstr ""
+
 #: admin/lib.py:13
 #, python-format
 msgid "Invalid action, %(user)s is a local user"
 msgstr ""
 
-#: admin/models.py:77 admin/models.py:141 admin/models.py:154
+#: admin/models.py:78 admin/models.py:142 admin/models.py:155
 msgid "name"
 msgstr ""
 
-#: admin/models.py:78
+#: admin/models.py:79
 msgid "The domain name"
 msgstr ""
 
-#: admin/models.py:79
+#: admin/models.py:80
 msgid "Default quota in MB applied to mailboxes"
 msgstr ""
 
-#: admin/models.py:80 admin/models.py:145 admin/models.py:352
-#: admin/models.py:428 extensions/postfix_autoreply/models.py:19
+#: admin/models.py:81 admin/models.py:146 admin/models.py:393
+#: admin/models.py:469 extensions/postfix_autoreply/models.py:19
 msgid "enabled"
 msgstr ""
 
-#: admin/models.py:81
+#: admin/models.py:82
 msgid "Check to activate this domain"
 msgstr ""
 
-#: admin/models.py:134
+#: admin/models.py:135
 msgid "Failed to initialise domain, check permissions"
 msgstr ""
 
-#: admin/models.py:142
+#: admin/models.py:143
 msgid "The alias name"
 msgstr ""
 
-#: admin/models.py:143
+#: admin/models.py:144
 msgid "target"
 msgstr ""
 
-#: admin/models.py:144
+#: admin/models.py:145
 msgid "The domain this alias points to"
 msgstr ""
 
-#: admin/models.py:146 admin/models.py:353
+#: admin/models.py:147 admin/models.py:394
 msgid "Check to activate this alias"
 msgstr ""
 
-#: admin/models.py:155
+#: admin/models.py:156
 msgid "First name and last name of mailbox owner"
 msgstr ""
 
-#: admin/models.py:156 admin/models.py:346
+#: admin/models.py:157 admin/models.py:387
 msgid "address"
 msgstr ""
 
-#: admin/models.py:157
+#: admin/models.py:158
 msgid "Mailbox address (without the @domain.tld part)"
 msgstr ""
 
-#: admin/models.py:158
+#: admin/models.py:159
 msgid "password"
 msgstr ""
 
-#: admin/models.py:245 admin/models.py:306
+#: admin/models.py:246 admin/models.py:327
 msgid "Failed to initialise mailbox, check permissions"
 msgstr ""
 
-#: admin/models.py:264
+#: admin/models.py:265
 msgid "Mailbox with this address already exists"
 msgstr ""
 
-#: admin/models.py:347
+#: admin/models.py:313
+#, python-format
+msgid "Failed to update password: %s"
+msgstr ""
+
+#: admin/models.py:353
+msgid "Invalid line"
+msgstr ""
+
+#: admin/models.py:359
+msgid "Cannot import this mailbox because the associated domain does not exist"
+msgstr ""
+
+#: admin/models.py:388
 msgid ""
 "The alias address (without the domain part). For a 'catch-all' address, just "
 "enter an * character."
 msgstr ""
 
-#: admin/models.py:349
+#: admin/models.py:390
 msgid "mailboxes"
 msgstr ""
 
-#: admin/models.py:350
+#: admin/models.py:391
 msgid "The mailboxes this alias points to"
 msgstr ""
 
-#: admin/models.py:429
+#: admin/models.py:470
 msgid "Check to enable this extension"
 msgstr ""
 
@@ -256,22 +285,22 @@ msgid "Last modified"
 msgstr ""
 
 #: admin/tables.py:14 admin/views.py:164
-#: admin/templatetags/admin_extras.py:113
+#: admin/templatetags/admin_extras.py:128
 msgid "Domain aliases"
 msgstr ""
 
 #: admin/tables.py:16 admin/templatetags/admin_extras.py:36
-#: admin/templatetags/admin_extras.py:116
+#: admin/templatetags/admin_extras.py:131
 msgid "Mailboxes"
 msgstr ""
 
 #: admin/tables.py:18 admin/views.py:394
-#: admin/templatetags/admin_extras.py:119
+#: admin/templatetags/admin_extras.py:134
 msgid "Mailbox aliases"
 msgstr ""
 
 #: admin/tables.py:24 admin/tables.py:52 admin/tables.py:82
-#: admin/tables.py:109
+#: admin/tables.py:109 admin/templatetags/admin_extras.py:98
 #: extensions/sievefilters/templates/sievefilters/filter.html:86
 #: extensions/sievefilters/templates/sievefilters/filters.html:7
 #: extensions/sievefilters/templates/sievefilters/guieditor.html:3
@@ -499,6 +528,20 @@ msgstr ""
 msgid "Modifications applied."
 msgstr ""
 
+#: admin/views.py:631
+#, python-format
+msgid "%d mailboxes imported successfully"
+msgstr ""
+
+#: admin/views.py:641 admin/templatetags/admin_extras.py:112
+#: templates/admin/import.html:48
+msgid "Import data"
+msgstr ""
+
+#: admin/views.py:642 templates/admin/import.html:56
+msgid "Import"
+msgstr ""
+
 #: admin/templatetags/admin_extras.py:12
 msgid "enabled_m"
 msgstr ""
@@ -512,7 +555,7 @@ msgid "Admin"
 msgstr ""
 
 #: admin/templatetags/admin_extras.py:29
-#: admin/templatetags/admin_extras.py:108
+#: admin/templatetags/admin_extras.py:123
 msgid "Domains"
 msgstr ""
 
@@ -533,55 +576,55 @@ msgstr ""
 msgid "Extensions"
 msgstr ""
 
-#: admin/templatetags/admin_extras.py:97
+#: admin/templatetags/admin_extras.py:103
 msgid "New"
 msgstr ""
 
-#: admin/templatetags/admin_extras.py:101
+#: admin/templatetags/admin_extras.py:107
 msgid "Remove"
 msgstr ""
 
-#: admin/templatetags/admin_extras.py:134
+#: admin/templatetags/admin_extras.py:149
 msgid "Add permission"
 msgstr ""
 
-#: admin/templatetags/admin_extras.py:138
+#: admin/templatetags/admin_extras.py:153
 msgid "Remove permissions"
 msgstr ""
 
-#: admin/templatetags/admin_extras.py:151
+#: admin/templatetags/admin_extras.py:166
 msgid "Edit domain"
 msgstr ""
 
-#: admin/templatetags/admin_extras.py:157
+#: admin/templatetags/admin_extras.py:172
 msgid "View aliases of this domain"
 msgstr ""
 
-#: admin/templatetags/admin_extras.py:167
+#: admin/templatetags/admin_extras.py:182
 msgid "Edit alias"
 msgstr ""
 
-#: admin/templatetags/admin_extras.py:179
+#: admin/templatetags/admin_extras.py:194
 msgid "Edit mailbox"
 msgstr ""
 
-#: admin/templatetags/admin_extras.py:185
+#: admin/templatetags/admin_extras.py:200
 msgid "View this mailbox aliases"
 msgstr ""
 
-#: admin/templatetags/admin_extras.py:200
+#: admin/templatetags/admin_extras.py:215
 msgid "Edit mailbox alias"
 msgstr ""
 
-#: admin/templatetags/admin_extras.py:235
+#: admin/templatetags/admin_extras.py:250
 msgid "Yes"
 msgstr ""
 
-#: admin/templatetags/admin_extras.py:235
+#: admin/templatetags/admin_extras.py:250
 msgid "No"
 msgstr ""
 
-#: admin/templatetags/admin_extras.py:252 templates/common/genericform.html:6
+#: admin/templatetags/admin_extras.py:267 templates/common/genericform.html:6
 msgid "Help"
 msgstr ""
 
@@ -605,6 +648,35 @@ msgstr ""
 msgid "Your username and password didn't match. Please try again."
 msgstr ""
 
+#: demo/__init__.py:16
+msgid "Test messages"
+msgstr ""
+
+#: demo/__init__.py:21
+msgid "Send virus"
+msgstr ""
+
+#: demo/__init__.py:25
+msgid "Send spam"
+msgstr ""
+
+#: demo/templates/demo/login_announcement.html:2
+msgid ""
+"\n"
+"<h1>Welcome to the online demo!</h1>\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"
+"<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 of give any suggestion to \n"
+"  <a href=\"https://groups.google.com/forum/#!forum/modoboa-users\">the "
+"mailing list</a>.</p>\n"
+msgstr ""
+
 #: extensions/amavis_quarantine/main.py:15
 msgid "Simple amavis quarantine management tool"
 msgstr ""
@@ -653,12 +725,12 @@ msgstr ""
 
 #: extensions/amavis_quarantine/sql_listing.py:22
 #: extensions/sievefilters/forms.py:29 extensions/webmail/forms.py:8
-#: extensions/webmail/lib.py:521 templates/common/email_searchbar.html:7
+#: extensions/webmail/lib.py:525 templates/common/email_searchbar.html:7
 msgid "Subject"
 msgstr ""
 
 #: extensions/amavis_quarantine/sql_listing.py:23
-#: extensions/webmail/lib.py:523
+#: extensions/webmail/lib.py:527
 msgid "Date"
 msgstr ""
 
@@ -960,7 +1032,7 @@ msgid "Match type"
 msgstr ""
 
 #: extensions/sievefilters/templates/sievefilters/filter.html:92
-#: templates/common/parameters.html:4
+#: templates/admin/parameters.html:14 templates/userprefs/preferences.html:18
 msgid "Save"
 msgstr ""
 
@@ -1142,10 +1214,6 @@ msgstr ""
 msgid "End"
 msgstr ""
 
-#: extensions/webmail/forms.py:14
-msgid "Select a file"
-msgstr ""
-
 #: extensions/webmail/lib.py:33
 msgid "Server response"
 msgstr ""
@@ -1158,11 +1226,11 @@ msgstr ""
 msgid "Authentication failed, check your configuration"
 msgstr ""
 
-#: extensions/webmail/lib.py:468
+#: extensions/webmail/lib.py:472
 msgid "wrote:"
 msgstr ""
 
-#: extensions/webmail/lib.py:535 extensions/webmail/lib.py:539
+#: extensions/webmail/lib.py:539 extensions/webmail/lib.py:543
 msgid "Original message"
 msgstr ""
 
@@ -1419,7 +1487,7 @@ msgstr ""
 msgid "No entries to display"
 msgstr ""
 
-#: templates/nlayout.html:49
+#: templates/nlayout.html:50
 msgid "Logout"
 msgstr ""
 
@@ -1427,11 +1495,7 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/admin/domains_header.html:44
-msgid "Remove this selection?"
-msgstr ""
-
-#: templates/admin/domains_header.html:52
+#: templates/admin/domains_header.html:13
 msgid "for"
 msgstr ""
 
@@ -1439,6 +1503,10 @@ msgstr ""
 msgid "Apply"
 msgstr ""
 
+#: templates/admin/import.html:62
+msgid "Importing..."
+msgstr ""
+
 #: templates/admin/listing.html:12
 msgid "Items"
 msgstr ""
@@ -1487,7 +1555,7 @@ msgstr ""
 msgid "Messages"
 msgstr ""
 
-#: templates/common/parameters.html:16
+#: templates/common/parameters.html:15
 msgid "No parameters available"
 msgstr ""
 
@@ -1521,32 +1589,40 @@ msgstr ""
 msgid "Prefered language to display pages"
 msgstr ""
 
-#: userprefs/forms.py:12
+#: userprefs/forms.py:13
 msgid "Old password"
 msgstr ""
 
-#: userprefs/forms.py:14
+#: userprefs/forms.py:15
 msgid "New password"
 msgstr ""
 
-#: userprefs/forms.py:30
+#: userprefs/forms.py:34
 msgid "Old password mismatchs"
 msgstr ""
 
-#: userprefs/forms.py:39
+#: userprefs/forms.py:43
 msgid "Destination(s)"
 msgstr ""
 
-#: userprefs/forms.py:52
+#: userprefs/forms.py:44
+msgid "Keep local copies"
+msgstr ""
+
+#: userprefs/forms.py:57
 msgid ""
 "You can't define a forward to a local destination. Please ask your "
 "administrator to create an alias instead."
 msgstr ""
 
-#: userprefs/views.py:34
+#: userprefs/views.py:27
+msgid "Password change is disabled for this user"
+msgstr ""
+
+#: userprefs/views.py:46
 msgid "Password changed"
 msgstr ""
 
-#: userprefs/views.py:63
+#: userprefs/views.py:79
 msgid "Forward updated"
 msgstr ""
diff --git a/locale/en/LC_MESSAGES/djangojs.po b/locale/en/LC_MESSAGES/djangojs.po
index ac4d241da..c8806e7e8 100644
--- a/locale/en/LC_MESSAGES/djangojs.po
+++ b/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: 2011-09-30 15:26+0200\n"
+"POT-Creation-Date: 2012-01-10 11:09+0100\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"
@@ -61,16 +61,16 @@ msgstr ""
 msgid "Folder deleted"
 msgstr ""
 
-#: extensions/webmail/static/js/webmail.js:94
+#: extensions/webmail/static/js/webmail.js:95
 msgid "Sending..."
 msgstr ""
 
-#: extensions/webmail/static/js/webmail.js:227
-#: extensions/webmail/static/js/webmail.js:251 static/js/anchor_nav.js:212
+#: extensions/webmail/static/js/webmail.js:229
+#: extensions/webmail/static/js/webmail.js:254 static/js/anchor_nav.js:215
 msgid "Done"
 msgstr ""
 
-#: extensions/webmail/static/js/webmail.js:240
+#: extensions/webmail/static/js/webmail.js:243
 msgid "Waiting..."
 msgstr ""
 
@@ -78,10 +78,18 @@ msgstr ""
 msgid "Loading..."
 msgstr ""
 
-#: static/js/common.js:172
+#: static/js/common.js:17
+msgid "Message sent"
+msgstr ""
+
+#: static/js/common.js:188
 msgid "Search..."
 msgstr ""
 
+#: static/js/domains.js:61
+msgid "Remove this selection?"
+msgstr ""
+
 #: static/js/preferences.js:14
 msgid "Preferences saved"
 msgstr ""
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index fb51b22d3..9cc26e720 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -1,54 +1,63 @@
 # Modoboa spanish translation.
 # Copyright (C) 2011
 # This file is distributed under the same license as the Modoboa package.
-# 
+#
 # Translators:
 # Pedro Gracia <lasarux@neuroomante.com>, 2011.
 # Pedro Gracia <pedro.gracia@impulzia.com>, 2010, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Modoboa-0.8.7\n"
-"Report-Msgid-Bugs-To: http://dev.modoboa.org/\n"
-"POT-Creation-Date: 2011-09-30 15:26+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-01-10 11:09+0100\n"
 "PO-Revision-Date: 2011-10-12 08:40+0000\n"
 "Last-Translator: lasarux <lasarux@neuroomante.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:8
+#: admin/__init__.py:9
+msgid "Local"
+msgstr ""
+
+#: admin/__init__.py:11
+#, fuzzy
+msgid "The backend used for authentication"
+msgstr "Contraseña usada para autenticar"
+
+#: 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."
 
-#: admin/__init__.py:10
+#: admin/__init__.py:15
 msgid "Path to the root directory where messages are stored"
 msgstr "Directorio raiz dónde están almacenados los mensajes"
 
-#: admin/__init__.py:12
+#: admin/__init__.py:17
 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"
+"UID del usuario virtual que es el propietario de los dominios/mailboxes/"
+"mensajes en el sistema"
 
-#: admin/__init__.py:14
+#: 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"
+"GID del usuario virtual que es el propietario de los dominios/mailboxes/"
+"mensajes en el sistema"
 
-#: admin/__init__.py:17
+#: admin/__init__.py:22
 msgid "Mailboxes storage format"
 msgstr "Formato de almacenamiento de los \"Mailboxes\""
 
-#: admin/__init__.py:19
+#: admin/__init__.py:24
 msgid ""
 "Sub-directory (inside the mailbox) where messages are stored when using the "
 "maildir format"
@@ -56,15 +65,15 @@ msgstr ""
 "Subdirectorio (dentro del \"mailbox\") dónde los mensajes son almacenados "
 "cuando se usa el formato maildir"
 
-#: admin/__init__.py:22
+#: admin/__init__.py:27
 msgid "Scheme used to crypt mailbox passwords"
 msgstr "Esquema usado para cifrar las contraseñas del \"mailbox\""
 
-#: admin/__init__.py:24
+#: admin/__init__.py:29
 msgid "Number of displayed items per page"
 msgstr "Número de ítems mostrado por página"
 
-#: admin/__init__.py:31
+#: admin/__init__.py:52
 msgid "The default redirection used when no application is specified"
 msgstr ""
 "La redirección que será usada cuando ninguna aplicación sea especificada."
@@ -80,8 +89,7 @@ msgstr "Cuota"
 #: admin/forms.py:52
 msgid "Mailbox quota in MB (default to domain quota if blank)"
 msgstr ""
-"Cuota del \"Mailbox\" en MB (por defecto la del dominio, si no se "
-"especifica)"
+"Cuota del \"Mailbox\" en MB (por defecto la del dominio, si no se especifica)"
 
 #: admin/forms.py:53 auth/forms.py:6
 msgid "Password"
@@ -91,7 +99,7 @@ msgstr "Contraseña"
 msgid "Password used to log in"
 msgstr "Contraseña usada para identificarse (\"log in\")"
 
-#: admin/forms.py:56 userprefs/forms.py:16
+#: admin/forms.py:56 userprefs/forms.py:17
 msgid "Confirmation"
 msgstr "Confirmación"
 
@@ -103,7 +111,7 @@ msgstr "Confirmación de la contraseña"
 msgid "Check to activate this mailbox"
 msgstr "Activar este 'mailbox'"
 
-#: admin/forms.py:88 userprefs/forms.py:35
+#: admin/forms.py:88 userprefs/forms.py:39
 msgid "Passwords mismatch"
 msgstr "Las contraseñas no coinciden"
 
@@ -155,93 +163,115 @@ msgstr "Elija un dominio de la lista"
 msgid "Empty"
 msgstr "Vacío"
 
+#: admin/forms.py:204 extensions/webmail/forms.py:14
+msgid "Select a file"
+msgstr "Seleccione un fichero"
+
+#: admin/forms.py:205
+msgid "Separator"
+msgstr ""
+
 #: admin/lib.py:13
 #, python-format
 msgid "Invalid action, %(user)s is a local user"
 msgstr "Acción inválida, %(user)s es un usuario local"
 
-#: admin/models.py:77 admin/models.py:141 admin/models.py:154
+#: admin/models.py:78 admin/models.py:142 admin/models.py:155
 msgid "name"
 msgstr "nombre"
 
-#: admin/models.py:78
+#: admin/models.py:79
 msgid "The domain name"
 msgstr "Nombre del dominio"
 
-#: admin/models.py:79
+#: admin/models.py:80
 msgid "Default quota in MB applied to mailboxes"
 msgstr "Cuota por defecto en MB que se aplicarán a los \"mailboxes\""
 
-#: admin/models.py:80 admin/models.py:145 admin/models.py:352
-#: admin/models.py:428 extensions/postfix_autoreply/models.py:19
+#: admin/models.py:81 admin/models.py:146 admin/models.py:393
+#: admin/models.py:469 extensions/postfix_autoreply/models.py:19
 msgid "enabled"
 msgstr "activado"
 
-#: admin/models.py:81
+#: admin/models.py:82
 msgid "Check to activate this domain"
 msgstr "Activar este dominio"
 
-#: admin/models.py:134
+#: admin/models.py:135
 msgid "Failed to initialise domain, check permissions"
 msgstr "Ha fallado la inicialización del dominio, compruebe permisos"
 
-#: admin/models.py:142
+#: admin/models.py:143
 msgid "The alias name"
 msgstr "Nombre del alias"
 
-#: admin/models.py:143
+#: admin/models.py:144
 msgid "target"
 msgstr "objetivo"
 
-#: admin/models.py:144
+#: admin/models.py:145
 msgid "The domain this alias points to"
 msgstr "El dominio de este alias apuntan a"
 
-#: admin/models.py:146 admin/models.py:353
+#: admin/models.py:147 admin/models.py:394
 msgid "Check to activate this alias"
 msgstr "Activar este alias"
 
-#: admin/models.py:155
+#: admin/models.py:156
 msgid "First name and last name of mailbox owner"
 msgstr "Nombre y apellidos del propietario del \"mailbox\""
 
-#: admin/models.py:156 admin/models.py:346
+#: admin/models.py:157 admin/models.py:387
 msgid "address"
 msgstr "dirección"
 
-#: admin/models.py:157
+#: admin/models.py:158
 msgid "Mailbox address (without the @domain.tld part)"
 msgstr "Dirección del \"mailbox\" (sin la parte @dominio.tld)"
 
-#: admin/models.py:158
+#: admin/models.py:159
 msgid "password"
 msgstr "contraseña"
 
-#: admin/models.py:245 admin/models.py:306
+#: admin/models.py:246 admin/models.py:327
 msgid "Failed to initialise mailbox, check permissions"
 msgstr "Ha fallado la inicialización del \"mailbox\", compruebe permisos"
 
-#: admin/models.py:264
+#: admin/models.py:265
 msgid "Mailbox with this address already exists"
 msgstr "Ya existe un \"Mailbox\" con esta dirección"
 
-#: admin/models.py:347
-msgid ""
-"The alias address (without the domain part). For a 'catch-all' address, just"
-" enter an * character."
+#: admin/models.py:313
+#, python-format
+msgid "Failed to update password: %s"
 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:349
+#: admin/models.py:353
+#, fuzzy
+msgid "Invalid line"
+msgstr "'mailbox' inválido"
+
+#: admin/models.py:359
+msgid "Cannot import this mailbox because the associated domain does not exist"
+msgstr ""
+
+#: admin/models.py:388
+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 (*)."
+
+#: admin/models.py:390
 msgid "mailboxes"
 msgstr "'mailboxes'"
 
-#: admin/models.py:350
+#: admin/models.py:391
 msgid "The mailboxes this alias points to"
 msgstr "Los 'mailboxes' de este alias apuntan a"
 
-#: admin/models.py:429
+#: admin/models.py:470
 msgid "Check to enable this extension"
 msgstr "Activar esta extensión"
 
@@ -270,22 +300,22 @@ msgid "Last modified"
 msgstr "Última modificación"
 
 #: admin/tables.py:14 admin/views.py:164
-#: admin/templatetags/admin_extras.py:113
+#: admin/templatetags/admin_extras.py:128
 msgid "Domain aliases"
 msgstr "Alias del dominio"
 
 #: admin/tables.py:16 admin/templatetags/admin_extras.py:36
-#: admin/templatetags/admin_extras.py:116
+#: admin/templatetags/admin_extras.py:131
 msgid "Mailboxes"
 msgstr "'Mailboxes'"
 
 #: admin/tables.py:18 admin/views.py:394
-#: admin/templatetags/admin_extras.py:119
+#: admin/templatetags/admin_extras.py:134
 msgid "Mailbox aliases"
 msgstr "Alias del \"mailbox\""
 
 #: admin/tables.py:24 admin/tables.py:52 admin/tables.py:82
-#: admin/tables.py:109
+#: admin/tables.py:109 admin/templatetags/admin_extras.py:98
 #: extensions/sievefilters/templates/sievefilters/filter.html:86
 #: extensions/sievefilters/templates/sievefilters/filters.html:7
 #: extensions/sievefilters/templates/sievefilters/guieditor.html:3
@@ -513,6 +543,20 @@ msgstr "Permisos eliminados"
 msgid "Modifications applied."
 msgstr "Modificaciones aplicadas."
 
+#: admin/views.py:631
+#, fuzzy, python-format
+msgid "%d mailboxes imported successfully"
+msgstr "%(count)d mensaje eliminado correctamente"
+
+#: admin/views.py:641 admin/templatetags/admin_extras.py:112
+#: templates/admin/import.html:48
+msgid "Import data"
+msgstr ""
+
+#: admin/views.py:642 templates/admin/import.html:56
+msgid "Import"
+msgstr ""
+
 #: admin/templatetags/admin_extras.py:12
 msgid "enabled_m"
 msgstr "Activado"
@@ -526,7 +570,7 @@ msgid "Admin"
 msgstr "Administrador"
 
 #: admin/templatetags/admin_extras.py:29
-#: admin/templatetags/admin_extras.py:108
+#: admin/templatetags/admin_extras.py:123
 msgid "Domains"
 msgstr "Dominios"
 
@@ -547,55 +591,55 @@ msgstr "Parámetros"
 msgid "Extensions"
 msgstr "Extensiones"
 
-#: admin/templatetags/admin_extras.py:97
+#: admin/templatetags/admin_extras.py:103
 msgid "New"
 msgstr "Nuevo"
 
-#: admin/templatetags/admin_extras.py:101
+#: admin/templatetags/admin_extras.py:107
 msgid "Remove"
 msgstr "Eliminar"
 
-#: admin/templatetags/admin_extras.py:134
+#: admin/templatetags/admin_extras.py:149
 msgid "Add permission"
 msgstr "Añadir un permiso"
 
-#: admin/templatetags/admin_extras.py:138
+#: admin/templatetags/admin_extras.py:153
 msgid "Remove permissions"
 msgstr "Elminar permisos"
 
-#: admin/templatetags/admin_extras.py:151
+#: admin/templatetags/admin_extras.py:166
 msgid "Edit domain"
 msgstr "Editar el dominio"
 
-#: admin/templatetags/admin_extras.py:157
+#: admin/templatetags/admin_extras.py:172
 msgid "View aliases of this domain"
 msgstr "Activar los alias este dominio"
 
-#: admin/templatetags/admin_extras.py:167
+#: admin/templatetags/admin_extras.py:182
 msgid "Edit alias"
 msgstr "Editar el alias"
 
-#: admin/templatetags/admin_extras.py:179
+#: admin/templatetags/admin_extras.py:194
 msgid "Edit mailbox"
 msgstr "Editar el \"mailbox\""
 
-#: admin/templatetags/admin_extras.py:185
+#: admin/templatetags/admin_extras.py:200
 msgid "View this mailbox aliases"
 msgstr "Mostrar este alias del \"mailbox\""
 
-#: admin/templatetags/admin_extras.py:200
+#: admin/templatetags/admin_extras.py:215
 msgid "Edit mailbox alias"
 msgstr "Editar el alias del \"mailbox\""
 
-#: admin/templatetags/admin_extras.py:235
+#: admin/templatetags/admin_extras.py:250
 msgid "Yes"
 msgstr "Sí"
 
-#: admin/templatetags/admin_extras.py:235
+#: admin/templatetags/admin_extras.py:250
 msgid "No"
 msgstr "No "
 
-#: admin/templatetags/admin_extras.py:252 templates/common/genericform.html:6
+#: admin/templatetags/admin_extras.py:267 templates/common/genericform.html:6
 msgid "Help"
 msgstr "Ayuda"
 
@@ -621,6 +665,38 @@ msgstr ""
 "Su nombre de usuario y contraseña no concuerdan. Por favor, inténtelo de "
 "nuevo."
 
+#: demo/__init__.py:16
+#, fuzzy
+msgid "Test messages"
+msgstr "mensajes enviados"
+
+#: demo/__init__.py:21
+#, fuzzy
+msgid "Send virus"
+msgstr "Remitente"
+
+#: demo/__init__.py:25
+#, fuzzy
+msgid "Send spam"
+msgstr "Enviar"
+
+#: demo/templates/demo/login_announcement.html:2
+msgid ""
+"\n"
+"<h1>Welcome to the online demo!</h1>\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"
+"<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 of give any suggestion to \n"
+"  <a href=\"https://groups.google.com/forum/#!forum/modoboa-users\">the "
+"mailing list</a>.</p>\n"
+msgstr ""
+
 #: extensions/amavis_quarantine/main.py:15
 msgid "Simple amavis quarantine management tool"
 msgstr "Herramienta simple de adminitración de cuarentena para amavis "
@@ -634,8 +710,8 @@ msgstr ""
 #: extensions/amavis_quarantine/main.py:25
 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"
+"Eliminar los mensajes marcados como publicados cuando se haga limpieza de la "
+"base de datos"
 
 #: extensions/amavis_quarantine/main.py:29
 msgid "Mode used to access the PDP server"
@@ -673,12 +749,12 @@ msgstr "Desde"
 
 #: extensions/amavis_quarantine/sql_listing.py:22
 #: extensions/sievefilters/forms.py:29 extensions/webmail/forms.py:8
-#: extensions/webmail/lib.py:521 templates/common/email_searchbar.html:7
+#: extensions/webmail/lib.py:525 templates/common/email_searchbar.html:7
 msgid "Subject"
 msgstr "Tema"
 
 #: extensions/amavis_quarantine/sql_listing.py:23
-#: extensions/webmail/lib.py:523
+#: extensions/webmail/lib.py:527
 msgid "Date"
 msgstr "Fecha"
 
@@ -882,8 +958,7 @@ msgstr "Redirigir el mensaje a"
 
 #: extensions/sievefilters/lib.py:37
 msgid "Connection to MANAGESIEVE server failed, check your configuration"
-msgstr ""
-"La conexión al servidor MANAGESIEVE falló, verifique su configuración."
+msgstr "La conexión al servidor MANAGESIEVE falló, verifique su configuración."
 
 #: extensions/sievefilters/lib.py:78
 msgid "Not enough space on server"
@@ -981,7 +1056,7 @@ msgid "Match type"
 msgstr "Tipo de coincidencia"
 
 #: extensions/sievefilters/templates/sievefilters/filter.html:92
-#: templates/common/parameters.html:4
+#: templates/admin/parameters.html:14 templates/userprefs/preferences.html:18
 msgid "Save"
 msgstr "Guardar"
 
@@ -1165,10 +1240,6 @@ msgstr "Inicio"
 msgid "End"
 msgstr "Fin"
 
-#: extensions/webmail/forms.py:14
-msgid "Select a file"
-msgstr "Seleccione un fichero"
-
 #: extensions/webmail/lib.py:33
 msgid "Server response"
 msgstr "Respuesta del servidor"
@@ -1181,11 +1252,11 @@ msgstr "Ha fallado la conexión al servidor IMAP, compruebe su configuración"
 msgid "Authentication failed, check your configuration"
 msgstr "Ha fallado la autenticación, compruebe su configuración"
 
-#: extensions/webmail/lib.py:468
+#: extensions/webmail/lib.py:472
 msgid "wrote:"
 msgstr "escribió:"
 
-#: extensions/webmail/lib.py:535 extensions/webmail/lib.py:539
+#: extensions/webmail/lib.py:539 extensions/webmail/lib.py:543
 msgid "Original message"
 msgstr "Mensaje original"
 
@@ -1442,7 +1513,7 @@ msgstr "Vaciar la carpeta"
 msgid "No entries to display"
 msgstr "No hay entradas que mostrar"
 
-#: templates/nlayout.html:49
+#: templates/nlayout.html:50
 msgid "Logout"
 msgstr "Salir"
 
@@ -1450,11 +1521,7 @@ msgstr "Salir"
 msgid "Add"
 msgstr "Añadir"
 
-#: templates/admin/domains_header.html:44
-msgid "Remove this selection?"
-msgstr "¿Eliminar esta selección?"
-
-#: templates/admin/domains_header.html:52
+#: templates/admin/domains_header.html:13
 msgid "for"
 msgstr "para"
 
@@ -1462,6 +1529,11 @@ msgstr "para"
 msgid "Apply"
 msgstr "Aplicar"
 
+#: templates/admin/import.html:62
+#, fuzzy
+msgid "Importing..."
+msgstr "Subiendo..."
+
 #: templates/admin/listing.html:12
 msgid "Items"
 msgstr "Ítems"
@@ -1510,7 +1582,7 @@ msgstr "Error"
 msgid "Messages"
 msgstr "Mensajes"
 
-#: templates/common/parameters.html:16
+#: templates/common/parameters.html:15
 msgid "No parameters available"
 msgstr "No hay parámetros disponibles"
 
@@ -1544,23 +1616,27 @@ msgstr "Idioma preferido"
 msgid "Prefered language to display pages"
 msgstr "Idioma preferido para mostrar las páginas"
 
-#: userprefs/forms.py:12
+#: userprefs/forms.py:13
 msgid "Old password"
 msgstr "Contraseña anterior"
 
-#: userprefs/forms.py:14
+#: userprefs/forms.py:15
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: userprefs/forms.py:30
+#: userprefs/forms.py:34
 msgid "Old password mismatchs"
 msgstr "La contraseña no concuerda con la anterior"
 
-#: userprefs/forms.py:39
+#: userprefs/forms.py:43
 msgid "Destination(s)"
 msgstr "Destino(s)"
 
-#: userprefs/forms.py:52
+#: userprefs/forms.py:44
+msgid "Keep local copies"
+msgstr ""
+
+#: userprefs/forms.py:57
 msgid ""
 "You can't define a forward to a local destination. Please ask your "
 "administrator to create an alias instead."
@@ -1568,12 +1644,14 @@ 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:34
+#: userprefs/views.py:27
+msgid "Password change is disabled for this user"
+msgstr ""
+
+#: userprefs/views.py:46
 msgid "Password changed"
 msgstr "Contraseña cambiada"
 
-#: userprefs/views.py:63
+#: userprefs/views.py:79
 msgid "Forward updated"
 msgstr "Reenvío actualizado"
-
-
diff --git a/locale/es/LC_MESSAGES/djangojs.po b/locale/es/LC_MESSAGES/djangojs.po
index d3d2b2215..cdbfd786f 100644
--- a/locale/es/LC_MESSAGES/djangojs.po
+++ b/locale/es/LC_MESSAGES/djangojs.po
@@ -1,22 +1,22 @@
 # Modoboa spanish translation.
 # Copyright (C) 2011
 # This file is distributed under the same license as the Modoboa package.
-# 
+#
 # Translators:
 # Pedro Gracia <lasarux@neuroomante.com>, 2011.
 # Pedro Gracia <pedro.gracia@impulzia.com>, 2010, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Modoboa-0.8.7\n"
-"Report-Msgid-Bugs-To: http://dev.modoboa.org/\n"
-"POT-Creation-Date: 2011-09-30 15:26+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-01-10 11:09+0100\n"
 "PO-Revision-Date: 2011-10-12 08:42+0000\n"
 "Last-Translator: lasarux <lasarux@neuroomante.com>\n"
 "Language-Team: LANGUAGE <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:41
@@ -63,16 +63,16 @@ msgstr "Editar carpeta"
 msgid "Folder deleted"
 msgstr "Carpeta eliminada"
 
-#: extensions/webmail/static/js/webmail.js:94
+#: extensions/webmail/static/js/webmail.js:95
 msgid "Sending..."
 msgstr "Enviando..."
 
-#: extensions/webmail/static/js/webmail.js:227
-#: extensions/webmail/static/js/webmail.js:251 static/js/anchor_nav.js:212
+#: extensions/webmail/static/js/webmail.js:229
+#: extensions/webmail/static/js/webmail.js:254 static/js/anchor_nav.js:215
 msgid "Done"
 msgstr "Hecho"
 
-#: extensions/webmail/static/js/webmail.js:240
+#: extensions/webmail/static/js/webmail.js:243
 msgid "Waiting..."
 msgstr "Esperando..."
 
@@ -80,10 +80,18 @@ msgstr "Esperando..."
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: static/js/common.js:172
+#: static/js/common.js:17
+msgid "Message sent"
+msgstr ""
+
+#: static/js/common.js:188
 msgid "Search..."
 msgstr "Buscar..."
 
+#: static/js/domains.js:61
+msgid "Remove this selection?"
+msgstr "¿Eliminar esta selección?"
+
 #: static/js/preferences.js:14
 msgid "Preferences saved"
 msgstr "Preferencias guardas"
@@ -91,5 +99,3 @@ msgstr "Preferencias guardas"
 #: static/js/settings.js:14
 msgid "Parameters saved"
 msgstr "Parámetros guardados"
-
-
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 95595d7fc..6ff10223b 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -5,9 +5,9 @@
 # Antoine Nguyen <tonio@ngyn.org>, 2010-2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: modoboa-0.8.7\n"
-"Report-Msgid-Bugs-To: http://dev.modoboa.org/\n"
-"POT-Creation-Date: 2011-09-30 15:25+0200\n"
+"Project-Id-Version: modoboa-0.8.8\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-01-10 11:09+0100\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"
@@ -17,16 +17,24 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/__init__.py:8
+#: admin/__init__.py:9
+msgid "Local"
+msgstr "Locale"
+
+#: admin/__init__.py:11
+msgid "The backend used for authentication"
+msgstr "Le backend utilisé pour l'authentification"
+
+#: admin/__init__.py:13
 msgid "Modoboa will handle mailbox creation on filesystem"
 msgstr ""
 "Modoboa prendra en charge la création des boites sur le système de fichiers"
 
-#: admin/__init__.py:10
+#: admin/__init__.py:15
 msgid "Path to the root directory where messages are stored"
 msgstr "Emplacement du répertoire ou sont stockés les messages"
 
-#: admin/__init__.py:12
+#: admin/__init__.py:17
 msgid ""
 "UID of the virtual user which owns domains/mailboxes/messages on the "
 "filesystem"
@@ -34,7 +42,7 @@ msgstr ""
 "UID du propriétaire virtuel des domaines/bals/messages sur le système de "
 "fichiers"
 
-#: admin/__init__.py:14
+#: admin/__init__.py:19
 msgid ""
 "GID of the virtual user which owns domains/mailboxes/messages on the "
 "filesystem"
@@ -42,11 +50,11 @@ msgstr ""
 "GID du propriétaire virtuel des domaines/bals/messages sur le système de "
 "fichiers"
 
-#: admin/__init__.py:17
+#: admin/__init__.py:22
 msgid "Mailboxes storage format"
 msgstr "Format de stockage des boites aux lettres"
 
-#: admin/__init__.py:19
+#: admin/__init__.py:24
 msgid ""
 "Sub-directory (inside the mailbox) where messages are stored when using the "
 "maildir format"
@@ -54,16 +62,16 @@ 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:22
+#: admin/__init__.py:27
 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:24
+#: admin/__init__.py:29
 msgid "Number of displayed items per page"
 msgstr "Nombre d'éléments affichés par page"
 
-#: admin/__init__.py:31
+#: admin/__init__.py:52
 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"
@@ -89,7 +97,7 @@ msgstr "Mot de passe"
 msgid "Password used to log in"
 msgstr "Mot de passe utilisé pour se connecter"
 
-#: admin/forms.py:56 userprefs/forms.py:16
+#: admin/forms.py:56 userprefs/forms.py:17
 msgid "Confirmation"
 msgstr "Confirmation"
 
@@ -101,7 +109,7 @@ msgstr "Confirmation du mot de passe"
 msgid "Check to activate this mailbox"
 msgstr "Cocher pour activer cette boite aux lettres"
 
-#: admin/forms.py:88 userprefs/forms.py:35
+#: admin/forms.py:88 userprefs/forms.py:39
 msgid "Passwords mismatch"
 msgstr "Les mots de passe diffèrent"
 
@@ -153,78 +161,99 @@ msgstr "Sélectionner un domaine dans la liste"
 msgid "Empty"
 msgstr "Vide"
 
+#: admin/forms.py:204 extensions/webmail/forms.py:14
+msgid "Select a file"
+msgstr "Sélectionner un fichier"
+
+#: admin/forms.py:205
+msgid "Separator"
+msgstr "Séparateur"
+
 #: admin/lib.py:13
 #, python-format
 msgid "Invalid action, %(user)s is a local user"
 msgstr "Action invalide, %(user)s est un utilisateur local"
 
-#: admin/models.py:77 admin/models.py:141 admin/models.py:154
+#: admin/models.py:78 admin/models.py:142 admin/models.py:155
 msgid "name"
 msgstr "Nom"
 
-#: admin/models.py:78
+#: admin/models.py:79
 msgid "The domain name"
 msgstr "Le nom du domaine"
 
-#: admin/models.py:79
+#: admin/models.py:80
 msgid "Default quota in MB applied to mailboxes"
 msgstr "Quota par défaut en Mo appliqué aux boites aux lettres"
 
-#: admin/models.py:80 admin/models.py:145 admin/models.py:352
-#: admin/models.py:428 extensions/postfix_autoreply/models.py:19
+#: admin/models.py:81 admin/models.py:146 admin/models.py:393
+#: admin/models.py:469 extensions/postfix_autoreply/models.py:19
 msgid "enabled"
 msgstr "Activé"
 
-#: admin/models.py:81
+#: admin/models.py:82
 msgid "Check to activate this domain"
 msgstr "Cocher pour activer ce domaine"
 
-#: admin/models.py:134
+#: admin/models.py:135
 msgid "Failed to initialise domain, check permissions"
 msgstr "Impossible d'initialiser le domaine, vérifier les permissions"
 
-#: admin/models.py:142
+#: admin/models.py:143
 msgid "The alias name"
 msgstr "Le nom de l'alias"
 
-#: admin/models.py:143
+#: admin/models.py:144
 msgid "target"
 msgstr "cible"
 
-#: admin/models.py:144
+#: admin/models.py:145
 msgid "The domain this alias points to"
 msgstr "Le domaine vers lequel cet alias pointe"
 
-#: admin/models.py:146 admin/models.py:353
+#: admin/models.py:147 admin/models.py:394
 msgid "Check to activate this alias"
 msgstr "Cocher pour activer cet alias"
 
-#: admin/models.py:155
+#: admin/models.py:156
 msgid "First name and last name of mailbox owner"
 msgstr "Prénom et nom du propriétaire de la boite aux lettres"
 
-#: admin/models.py:156 admin/models.py:346
+#: admin/models.py:157 admin/models.py:387
 msgid "address"
 msgstr "Adresse"
 
-#: admin/models.py:157
+#: admin/models.py:158
 msgid "Mailbox address (without the @domain.tld part)"
 msgstr "Adresse de la boite aux lettres (sans la partie @domain.tld)"
 
-#: admin/models.py:158
+#: admin/models.py:159
 msgid "password"
 msgstr "Mot de passe"
 
-#: admin/models.py:245 admin/models.py:306
+#: admin/models.py:246 admin/models.py:327
 msgid "Failed to initialise mailbox, check permissions"
 msgstr ""
 "Impossible d'initialiser la boite aux lettres, vérifier les permissions"
 
-#: admin/models.py:264
+#: admin/models.py:265
 msgid "Mailbox with this address already exists"
 msgstr "Une boite aux lettres pour cette adresse existe déjà"
 
-#: admin/models.py:347
+#: admin/models.py:313
+#, python-format
+msgid "Failed to update password: %s"
+msgstr "Echec de la mise à jour du mot de passe : %s"
+
+#: admin/models.py:353
+msgid "Invalid line"
+msgstr "Ligne invalide"
+
+#: admin/models.py:359
+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:388
 msgid ""
 "The alias address (without the domain part). For a 'catch-all' address, just "
 "enter an * character."
@@ -232,15 +261,15 @@ msgstr ""
 "L'adresse de l'alias (sans la partie domaine). Pour une adresse 'attrape-"
 "tout', entrer juste un caractère *."
 
-#: admin/models.py:349
+#: admin/models.py:390
 msgid "mailboxes"
 msgstr "Boites aux lettres"
 
-#: admin/models.py:350
+#: admin/models.py:391
 msgid "The mailboxes this alias points to"
 msgstr "Les boites aux lettres sur lesquelles pointe cet alias"
 
-#: admin/models.py:429
+#: admin/models.py:470
 msgid "Check to enable this extension"
 msgstr "Cocher pour activer cette extension"
 
@@ -269,22 +298,22 @@ msgid "Last modified"
 msgstr "Modifié"
 
 #: admin/tables.py:14 admin/views.py:164
-#: admin/templatetags/admin_extras.py:113
+#: admin/templatetags/admin_extras.py:128
 msgid "Domain aliases"
 msgstr "Alias de domaine"
 
 #: admin/tables.py:16 admin/templatetags/admin_extras.py:36
-#: admin/templatetags/admin_extras.py:116
+#: admin/templatetags/admin_extras.py:131
 msgid "Mailboxes"
 msgstr "Boites"
 
 #: admin/tables.py:18 admin/views.py:394
-#: admin/templatetags/admin_extras.py:119
+#: admin/templatetags/admin_extras.py:134
 msgid "Mailbox aliases"
 msgstr "Alias de boite."
 
 #: admin/tables.py:24 admin/tables.py:52 admin/tables.py:82
-#: admin/tables.py:109
+#: admin/tables.py:109 admin/templatetags/admin_extras.py:98
 #: extensions/sievefilters/templates/sievefilters/filter.html:86
 #: extensions/sievefilters/templates/sievefilters/filters.html:7
 #: extensions/sievefilters/templates/sievefilters/guieditor.html:3
@@ -512,6 +541,20 @@ msgstr "Permission supprimée"
 msgid "Modifications applied."
 msgstr "Modifications appliquées"
 
+#: admin/views.py:631
+#, python-format
+msgid "%d mailboxes imported successfully"
+msgstr "%d boites importées avec succès"
+
+#: admin/views.py:641 admin/templatetags/admin_extras.py:112
+#: templates/admin/import.html:48
+msgid "Import data"
+msgstr "Importer des données"
+
+#: admin/views.py:642 templates/admin/import.html:56
+msgid "Import"
+msgstr "Importer"
+
 #: admin/templatetags/admin_extras.py:12
 msgid "enabled_m"
 msgstr "Activé"
@@ -525,7 +568,7 @@ msgid "Admin"
 msgstr "Admin"
 
 #: admin/templatetags/admin_extras.py:29
-#: admin/templatetags/admin_extras.py:108
+#: admin/templatetags/admin_extras.py:123
 msgid "Domains"
 msgstr "Domaines"
 
@@ -546,55 +589,55 @@ msgstr "Paramètres"
 msgid "Extensions"
 msgstr "Extensions"
 
-#: admin/templatetags/admin_extras.py:97
+#: admin/templatetags/admin_extras.py:103
 msgid "New"
 msgstr "Nouveau"
 
-#: admin/templatetags/admin_extras.py:101
+#: admin/templatetags/admin_extras.py:107
 msgid "Remove"
 msgstr "Supprimer"
 
-#: admin/templatetags/admin_extras.py:134
+#: admin/templatetags/admin_extras.py:149
 msgid "Add permission"
 msgstr "Ajouter une permission"
 
-#: admin/templatetags/admin_extras.py:138
+#: admin/templatetags/admin_extras.py:153
 msgid "Remove permissions"
 msgstr "Supprimer les permissions"
 
-#: admin/templatetags/admin_extras.py:151
+#: admin/templatetags/admin_extras.py:166
 msgid "Edit domain"
 msgstr "Editer le domaine"
 
-#: admin/templatetags/admin_extras.py:157
+#: admin/templatetags/admin_extras.py:172
 msgid "View aliases of this domain"
 msgstr "Voir les alias de ce domaine"
 
-#: admin/templatetags/admin_extras.py:167
+#: admin/templatetags/admin_extras.py:182
 msgid "Edit alias"
 msgstr "Editer cet alias"
 
-#: admin/templatetags/admin_extras.py:179
+#: admin/templatetags/admin_extras.py:194
 msgid "Edit mailbox"
 msgstr "Editer la boite aux lettres"
 
-#: admin/templatetags/admin_extras.py:185
+#: admin/templatetags/admin_extras.py:200
 msgid "View this mailbox aliases"
 msgstr "Voir les alias de cette boite"
 
-#: admin/templatetags/admin_extras.py:200
+#: admin/templatetags/admin_extras.py:215
 msgid "Edit mailbox alias"
 msgstr "Editer l'alias de boite"
 
-#: admin/templatetags/admin_extras.py:235
+#: admin/templatetags/admin_extras.py:250
 msgid "Yes"
 msgstr "Oui"
 
-#: admin/templatetags/admin_extras.py:235
+#: admin/templatetags/admin_extras.py:250
 msgid "No"
 msgstr "Non"
 
-#: admin/templatetags/admin_extras.py:252 templates/common/genericform.html:6
+#: admin/templatetags/admin_extras.py:267 templates/common/genericform.html:6
 msgid "Help"
 msgstr "Aide"
 
@@ -620,6 +663,48 @@ msgstr ""
 "Votre nom d'utilisateur et mot de passe ne correspondent pas. Veuillez "
 "réessayer."
 
+#: demo/__init__.py:16
+msgid "Test messages"
+msgstr "Message de test"
+
+#: demo/__init__.py:21
+msgid "Send virus"
+msgstr "Envoyer un virus"
+
+#: demo/__init__.py:25
+msgid "Send spam"
+msgstr "Envoyer un spam"
+
+#: demo/templates/demo/login_announcement.html:2
+msgid ""
+"\n"
+"<h1>Welcome to the online demo!</h1>\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"
+"<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 of give any suggestion to \n"
+"  <a href=\"https://groups.google.com/forum/#!forum/modoboa-users\">the "
+"mailing list</a>.</p>\n"
+msgstr ""
+"\n"
+"<h1>Bienvenue sur la démo en ligne!</h1>\n"
+"<p><b>Attention:</b> Le contenu de la démo est réinitialisé toutes les deux heures.</p>\n"
+"<p>Pour essayer la démo, les utilisateurs suivants sont disponibles (<i>nom d'utilisateur/mot de passe</"
+"i>): </p>\n"
+"<ul>\n"
+"  <li>Un super administrateur : <b>admin/password</b></li>\n"
+"  <li>Un administrateur de domaine : <b>admin@demo.local/admin</b></li>\n"
+"  <li>Un simple utilisateur : <b>user@demo.local/user</b></li>\n"
+"</ul>\n"
+"<p>Veuillez svp rapporter toute erreur sur \n"
+"  <a href=\"https://groups.google.com/forum/#!forum/modoboa-users\">la "
+"liste de diffusion</a>.</p>\n"
+
 #: extensions/amavis_quarantine/main.py:15
 msgid "Simple amavis quarantine management tool"
 msgstr "Outil simple de gestion de quarantaine amavis"
@@ -670,12 +755,12 @@ msgstr "De"
 
 #: extensions/amavis_quarantine/sql_listing.py:22
 #: extensions/sievefilters/forms.py:29 extensions/webmail/forms.py:8
-#: extensions/webmail/lib.py:521 templates/common/email_searchbar.html:7
+#: extensions/webmail/lib.py:525 templates/common/email_searchbar.html:7
 msgid "Subject"
 msgstr "Sujet"
 
 #: extensions/amavis_quarantine/sql_listing.py:23
-#: extensions/webmail/lib.py:523
+#: extensions/webmail/lib.py:527
 msgid "Date"
 msgstr "Date"
 
@@ -980,7 +1065,7 @@ msgid "Match type"
 msgstr "Type de comparaison"
 
 #: extensions/sievefilters/templates/sievefilters/filter.html:92
-#: templates/common/parameters.html:4
+#: templates/admin/parameters.html:14 templates/userprefs/preferences.html:18
 msgid "Save"
 msgstr "Sauvegarder"
 
@@ -1165,10 +1250,6 @@ msgstr "Démarrer"
 msgid "End"
 msgstr "Fin"
 
-#: extensions/webmail/forms.py:14
-msgid "Select a file"
-msgstr "Sélectionner un fichier"
-
 #: extensions/webmail/lib.py:33
 msgid "Server response"
 msgstr "Réponse du serveur"
@@ -1181,11 +1262,11 @@ msgstr "La connexion au serveur IMAP a échoué, vérifiez votre configuration"
 msgid "Authentication failed, check your configuration"
 msgstr "L'authentification a échoué, vérifiez votre configuration"
 
-#: extensions/webmail/lib.py:468
+#: extensions/webmail/lib.py:472
 msgid "wrote:"
 msgstr "a écrit :"
 
-#: extensions/webmail/lib.py:535 extensions/webmail/lib.py:539
+#: extensions/webmail/lib.py:539 extensions/webmail/lib.py:543
 msgid "Original message"
 msgstr "Message original"
 
@@ -1442,7 +1523,7 @@ msgstr "Vider ce dossier"
 msgid "No entries to display"
 msgstr "Aucune entrée à afficher"
 
-#: templates/nlayout.html:49
+#: templates/nlayout.html:50
 msgid "Logout"
 msgstr "Déconnexion"
 
@@ -1450,11 +1531,7 @@ msgstr "Déconnexion"
 msgid "Add"
 msgstr "Ajouter"
 
-#: templates/admin/domains_header.html:44
-msgid "Remove this selection?"
-msgstr "Supprimer cette sélection ?"
-
-#: templates/admin/domains_header.html:52
+#: templates/admin/domains_header.html:13
 msgid "for"
 msgstr "pour"
 
@@ -1462,6 +1539,10 @@ msgstr "pour"
 msgid "Apply"
 msgstr "Appliquer"
 
+#: templates/admin/import.html:62
+msgid "Importing..."
+msgstr "Import en cours..."
+
 #: templates/admin/listing.html:12
 msgid "Items"
 msgstr "Eléments"
@@ -1510,7 +1591,7 @@ msgstr "Erreur"
 msgid "Messages"
 msgstr "Messages"
 
-#: templates/common/parameters.html:16
+#: templates/common/parameters.html:15
 msgid "No parameters available"
 msgstr "Aucun paramètre disponible"
 
@@ -1544,23 +1625,27 @@ msgstr "Langage préféré"
 msgid "Prefered language to display pages"
 msgstr "Langage préféré pour afficher les pages"
 
-#: userprefs/forms.py:12
+#: userprefs/forms.py:13
 msgid "Old password"
 msgstr "Ancien mot de passe"
 
-#: userprefs/forms.py:14
+#: userprefs/forms.py:15
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: userprefs/forms.py:30
+#: userprefs/forms.py:34
 msgid "Old password mismatchs"
 msgstr "L'ancien mot de passe est incorrect"
 
-#: userprefs/forms.py:39
+#: userprefs/forms.py:43
 msgid "Destination(s)"
 msgstr "Destination(s)"
 
-#: userprefs/forms.py:52
+#: userprefs/forms.py:44
+msgid "Keep local copies"
+msgstr "Conserver des copies locales"
+
+#: userprefs/forms.py:57
 msgid ""
 "You can't define a forward to a local destination. Please ask your "
 "administrator to create an alias instead."
@@ -1568,10 +1653,15 @@ 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:34
+#: userprefs/views.py:27
+msgid "Password change is disabled for this user"
+msgstr "Le changement de mot de passe est désactivé pour cet utilisateur"
+
+#: userprefs/views.py:46
 msgid "Password changed"
 msgstr "Mot de passe changé"
 
-#: userprefs/views.py:63
+#: userprefs/views.py:79
 msgid "Forward updated"
 msgstr "Transfert mis à jour"
+
diff --git a/locale/fr/LC_MESSAGES/djangojs.po b/locale/fr/LC_MESSAGES/djangojs.po
index c007338c5..04f96028e 100644
--- a/locale/fr/LC_MESSAGES/djangojs.po
+++ b/locale/fr/LC_MESSAGES/djangojs.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: modoboa-0.8.7\n"
-"Report-Msgid-Bugs-To: http://dev.modoboa.org/\n"
-"POT-Creation-Date: 2011-09-30 15:26+0200\n"
+"Project-Id-Version: modoboa-0.8.8\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-01-10 11:09+0100\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"
@@ -60,16 +60,16 @@ msgstr "Editer le dossier"
 msgid "Folder deleted"
 msgstr "Dossier supprimé"
 
-#: extensions/webmail/static/js/webmail.js:94
+#: extensions/webmail/static/js/webmail.js:95
 msgid "Sending..."
 msgstr "Envoi..."
 
-#: extensions/webmail/static/js/webmail.js:227
-#: extensions/webmail/static/js/webmail.js:251 static/js/anchor_nav.js:212
+#: extensions/webmail/static/js/webmail.js:229
+#: extensions/webmail/static/js/webmail.js:254 static/js/anchor_nav.js:215
 msgid "Done"
 msgstr "Effectué"
 
-#: extensions/webmail/static/js/webmail.js:240
+#: extensions/webmail/static/js/webmail.js:243
 msgid "Waiting..."
 msgstr "En attente..."
 
@@ -77,10 +77,18 @@ msgstr "En attente..."
 msgid "Loading..."
 msgstr "Chargement..."
 
-#: static/js/common.js:172
+#: static/js/common.js:17
+msgid "Message sent"
+msgstr "Message envoyé"
+
+#: static/js/common.js:188
 msgid "Search..."
 msgstr "Chercher..."
 
+#: static/js/domains.js:61
+msgid "Remove this selection?"
+msgstr "Supprimer cette sélection?"
+
 #: static/js/preferences.js:14
 msgid "Preferences saved"
 msgstr "Préférences enregistrées"