From 65fa753b7ef42b3a5296083a1d7aadbe377c752c Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Wed, 11 Jan 2012 16:59:06 +0100 Subject: [PATCH 01/10] Minor fixes. --- static/js/utils.js | 8 ++++++-- templates/admin/listing.html | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/static/js/utils.js b/static/js/utils.js index 51787fb61..4abc204b4 100644 --- a/static/js/utils.js +++ b/static/js/utils.js @@ -25,6 +25,10 @@ Request.JSON.mdb = new Class({ Extends: Request.JSON, options: { - onComplete: ajax_login_redirect + onComplete: ajax_login_redirect, + onFailure: function(xhr) { + $(document.body).setStyle("overflow", "auto"); + $(document.body).set("html", xhr.responseText); + } } -}); \ No newline at end of file +}); diff --git a/templates/admin/listing.html b/templates/admin/listing.html index eb1d00896..79dd8bf9d 100644 --- a/templates/admin/listing.html +++ b/templates/admin/listing.html @@ -23,7 +23,7 @@ - + {% endif %} From 892e0d0a973e6b3cd0cc57ce95f22cadebe2e1a4 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 17 Jan 2012 10:20:58 +0100 Subject: [PATCH 02/10] * Uncomment the 'import rrdtool' statement, otherwise the script fails to start * Demo application : set the managesieve authentication mechanism to 'PLAIN' by default because the dovecot version provided with Debian squeeze is a buggy one. --- extensions/stats/grapher.py | 2 +- lib/fixtures/demo.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/stats/grapher.py b/extensions/stats/grapher.py index 2dfd5d3e7..ad52da760 100644 --- a/extensions/stats/grapher.py +++ b/extensions/stats/grapher.py @@ -3,7 +3,7 @@ import os import time import datetime -#import rrdtool +import rrdtool from django.utils.translation import ugettext as _ from modoboa.lib import parameters diff --git a/lib/fixtures/demo.json b/lib/fixtures/demo.json index 2917be2f4..6138700ee 100644 --- a/lib/fixtures/demo.json +++ b/lib/fixtures/demo.json @@ -1 +1 @@ -[{"pk": 1, "model": "lib.parameter", "fields": {"name": "stats.IMG_ROOTDIR", "value": "/srv/www/modoboa/static/stats"}}, {"pk": 2, "model": "lib.parameter", "fields": {"name": "webmail.IMAP_SECURED", "value": "no"}}, {"pk": 3, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.AM_PDP_PORT", "value": "9998"}}, {"pk": 4, "model": "lib.parameter", "fields": {"name": "postfix_autoreply.AUTOREPLIES_TIMEOUT", "value": "86400"}}, {"pk": 5, "model": "lib.parameter", "fields": {"name": "sievefilters.AUTHENTICATION_MECH", "value": "AUTO"}}, {"pk": 6, "model": "lib.parameter", "fields": {"name": "general.DEFAULT_TOP_REDIRECTION", "value": "userprefs"}}, {"pk": 7, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.AM_PDP_SOCKET", "value": "/var/amavis/amavisd.sock"}}, {"pk": 8, "model": "lib.parameter", "fields": {"name": "auth.SECRET_KEY", "value": "abcdefghijklmnop"}}, {"pk": 9, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.AM_PDP_MODE", "value": "inet"}}, {"pk": 10, "model": "lib.parameter", "fields": {"name": "webmail.IMAP_PORT", "value": "143"}}, {"pk": 11, "model": "lib.parameter", "fields": {"name": "webmail.SMTP_SECURED_MODE", "value": "none"}}, {"pk": 12, "model": "lib.parameter", "fields": {"name": "admin.STORAGE_PATH", "value": "/srv/vmail"}}, {"pk": 13, "model": "lib.parameter", "fields": {"name": "admin.ITEMS_PER_PAGE", "value": "30"}}, {"pk": 14, "model": "lib.parameter", "fields": {"name": "sievefilters.SERVER", "value": "127.0.0.1"}}, {"pk": 15, "model": "lib.parameter", "fields": {"name": "webmail.SMTP_SERVER", "value": "127.0.0.1"}}, {"pk": 16, "model": "lib.parameter", "fields": {"name": "webmail.MAX_ATTACHMENT_SIZE", "value": "2048"}}, {"pk": 17, "model": "lib.parameter", "fields": {"name": "stats.RRD_ROOTDIR", "value": "/srv/www/modoboa/tmp"}}, {"pk": 18, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.RELEASED_MSGS_CLEANUP", "value": "no"}}, {"pk": 19, "model": "lib.parameter", "fields": {"name": "admin.VIRTUAL_UID", "value": "vmail"}}, {"pk": 20, "model": "lib.parameter", "fields": {"name": "admin.MAILDIR_ROOT", "value": ".maildir"}}, {"pk": 21, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.MAX_MESSAGES_AGE", "value": "14"}}, {"pk": 22, "model": "lib.parameter", "fields": {"name": "webmail.SMTP_PORT", "value": "25"}}, {"pk": 23, "model": "lib.parameter", "fields": {"name": "webmail.SMTP_AUTHENTICATION", "value": "no"}}, {"pk": 24, "model": "lib.parameter", "fields": {"name": "admin.PASSWORD_SCHEME", "value": "crypt"}}, {"pk": 25, "model": "lib.parameter", "fields": {"name": "webmail.IMAP_SERVER", "value": "127.0.0.1"}}, {"pk": 26, "model": "lib.parameter", "fields": {"name": "admin.CREATE_DIRECTORIES", "value": "yes"}}, {"pk": 27, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.AM_PDP_HOST", "value": "localhost"}}, {"pk": 28, "model": "lib.parameter", "fields": {"name": "admin.MAILBOX_TYPE", "value": "maildir"}}, {"pk": 29, "model": "lib.parameter", "fields": {"name": "sievefilters.PORT", "value": "2000"}}, {"pk": 30, "model": "lib.parameter", "fields": {"name": "admin.VIRTUAL_GID", "value": "vmail"}}, {"pk": 31, "model": "lib.parameter", "fields": {"name": "sievefilters.STARTTLS", "value": "no"}}, {"pk": 32, "model": "lib.parameter", "fields": {"name": "stats.LOGFILE", "value": "/var/log/mail.log"}}] \ No newline at end of file +[{"pk": 1, "model": "lib.parameter", "fields": {"name": "stats.IMG_ROOTDIR", "value": "/srv/www/modoboa/static/stats"}}, {"pk": 2, "model": "lib.parameter", "fields": {"name": "webmail.IMAP_SECURED", "value": "no"}}, {"pk": 3, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.AM_PDP_PORT", "value": "9998"}}, {"pk": 4, "model": "lib.parameter", "fields": {"name": "postfix_autoreply.AUTOREPLIES_TIMEOUT", "value": "86400"}}, {"pk": 5, "model": "lib.parameter", "fields": {"name": "sievefilters.AUTHENTICATION_MECH", "value": "PLAIN"}}, {"pk": 6, "model": "lib.parameter", "fields": {"name": "general.DEFAULT_TOP_REDIRECTION", "value": "userprefs"}}, {"pk": 7, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.AM_PDP_SOCKET", "value": "/var/amavis/amavisd.sock"}}, {"pk": 8, "model": "lib.parameter", "fields": {"name": "auth.SECRET_KEY", "value": "abcdefghijklmnop"}}, {"pk": 9, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.AM_PDP_MODE", "value": "inet"}}, {"pk": 10, "model": "lib.parameter", "fields": {"name": "webmail.IMAP_PORT", "value": "143"}}, {"pk": 11, "model": "lib.parameter", "fields": {"name": "webmail.SMTP_SECURED_MODE", "value": "none"}}, {"pk": 12, "model": "lib.parameter", "fields": {"name": "admin.STORAGE_PATH", "value": "/srv/vmail"}}, {"pk": 13, "model": "lib.parameter", "fields": {"name": "admin.ITEMS_PER_PAGE", "value": "30"}}, {"pk": 14, "model": "lib.parameter", "fields": {"name": "sievefilters.SERVER", "value": "127.0.0.1"}}, {"pk": 15, "model": "lib.parameter", "fields": {"name": "webmail.SMTP_SERVER", "value": "127.0.0.1"}}, {"pk": 16, "model": "lib.parameter", "fields": {"name": "webmail.MAX_ATTACHMENT_SIZE", "value": "2048"}}, {"pk": 17, "model": "lib.parameter", "fields": {"name": "stats.RRD_ROOTDIR", "value": "/srv/www/modoboa/tmp"}}, {"pk": 18, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.RELEASED_MSGS_CLEANUP", "value": "no"}}, {"pk": 19, "model": "lib.parameter", "fields": {"name": "admin.VIRTUAL_UID", "value": "vmail"}}, {"pk": 20, "model": "lib.parameter", "fields": {"name": "admin.MAILDIR_ROOT", "value": ".maildir"}}, {"pk": 21, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.MAX_MESSAGES_AGE", "value": "14"}}, {"pk": 22, "model": "lib.parameter", "fields": {"name": "webmail.SMTP_PORT", "value": "25"}}, {"pk": 23, "model": "lib.parameter", "fields": {"name": "webmail.SMTP_AUTHENTICATION", "value": "no"}}, {"pk": 24, "model": "lib.parameter", "fields": {"name": "admin.PASSWORD_SCHEME", "value": "crypt"}}, {"pk": 25, "model": "lib.parameter", "fields": {"name": "webmail.IMAP_SERVER", "value": "127.0.0.1"}}, {"pk": 26, "model": "lib.parameter", "fields": {"name": "admin.CREATE_DIRECTORIES", "value": "yes"}}, {"pk": 27, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.AM_PDP_HOST", "value": "localhost"}}, {"pk": 28, "model": "lib.parameter", "fields": {"name": "admin.MAILBOX_TYPE", "value": "maildir"}}, {"pk": 29, "model": "lib.parameter", "fields": {"name": "sievefilters.PORT", "value": "2000"}}, {"pk": 30, "model": "lib.parameter", "fields": {"name": "admin.VIRTUAL_GID", "value": "vmail"}}, {"pk": 31, "model": "lib.parameter", "fields": {"name": "sievefilters.STARTTLS", "value": "no"}}, {"pk": 32, "model": "lib.parameter", "fields": {"name": "stats.LOGFILE", "value": "/var/log/mail.log"}}] \ No newline at end of file From a57d284f7bd27d3debb2b7727e75a86d7ef0a683 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 17 Jan 2012 10:52:21 +0100 Subject: [PATCH 03/10] Restoring CSS styles for specials mailboxes. see #177 --- extensions/webmail/lib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/webmail/lib.py b/extensions/webmail/lib.py index 8d9281820..23505a80b 100644 --- a/extensions/webmail/lib.py +++ b/extensions/webmail/lib.py @@ -238,7 +238,7 @@ class IMAPconnector(object): if pos == -1: folders += [descr] else: - folders[idx] = descr + folders[idx].update(**descr) from operator import itemgetter return sorted(folders, key=itemgetter("name")) From 960714ca5af4a834c4647ab69d46cd5479464255 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 17 Jan 2012 10:56:12 +0100 Subject: [PATCH 04/10] Documentation update. --- INSTALL | 3 +++ 1 file changed, 3 insertions(+) diff --git a/INSTALL b/INSTALL index 8c756eadb..1be26c6d2 100644 --- a/INSTALL +++ b/INSTALL @@ -8,6 +8,7 @@ Requirements - `Python version 2.6+ `_ - `Django version 1.2+ `_ - `south version 0.7+ `_ +- `ldap python module `_ For extensions (mandatories since 0.8.2): @@ -235,6 +236,8 @@ requires a migration. 0.8.8: CSV import feature and minor fixes ----------------------------------------- +#. Install the `LDAP python module `_ + #. Edit the *settings.py* file and ``'modoboa.lib.middleware.AjaxLoginRedirect'`` to the ``MIDDLEWARE_CLASSES`` variable like this:: From cf91a3edc11ed27cab0aa1cf3991b03c7ce25f29 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 17 Jan 2012 13:47:05 +0100 Subject: [PATCH 05/10] The ldap module should not be a mandatory requirement. see #192 --- admin/models.py | 9 +- locale/de/LC_MESSAGES/django.po | 319 +++++++++++++++----------------- locale/en/LC_MESSAGES/django.po | 54 +++--- locale/es/LC_MESSAGES/django.po | 54 +++--- locale/fr/LC_MESSAGES/django.po | 66 +++---- 5 files changed, 248 insertions(+), 254 deletions(-) diff --git a/admin/models.py b/admin/models.py index 46f979051..623a04b89 100644 --- a/admin/models.py +++ b/admin/models.py @@ -6,11 +6,16 @@ from django.conf import settings from modoboa.lib import parameters, events from modoboa.lib.sysutils import exec_cmd, exec_as_vuser from modoboa.lib.emailutils import split_mailbox -from modoboa.lib.ldaputils import * from modoboa.auth.lib import crypt_password import os import pwd +try: + from modoboa.lib.ldaputils import * + ldap_available = True +except ImportError: + ldap_available = False + class AdminError(Exception): """Custom exception @@ -305,6 +310,8 @@ class Mailbox(DatesAware): self.password = crypt_password(newvalue) self.save() return + if not ldap_available: + raise AdminError(_("Failed to update password: LDAP module not installed")) ab = LDAPAuthBackend() try: diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 8cfedbc71..592f7f392 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Modoboa-0.8.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-10 11:09+0100\n" +"POT-Creation-Date: 2012-01-17 13:45+0100\n" "PO-Revision-Date: 2012-01-10 22:49+0100\n" "Last-Translator: Patrick Ben Koetter \n" "Language-Team: DE \n" @@ -34,20 +34,32 @@ 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:27 msgid "Scheme used to crypt mailbox passwords" @@ -65,9 +77,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" @@ -75,8 +85,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" @@ -84,8 +93,7 @@ msgstr "Passwort" msgid "Password used to log in" msgstr "Login-Passwort" -#: admin/forms.py:56 -#: userprefs/forms.py:17 +#: admin/forms.py:56 userprefs/forms.py:17 msgid "Confirmation" msgstr "Bestätigung" @@ -97,13 +105,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:39 +#: 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)" @@ -123,8 +129,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" @@ -132,13 +137,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" @@ -154,8 +157,7 @@ msgstr "Wählen Sie eine Domäne aus der Liste" msgid "Empty" msgstr "Leer" -#: admin/forms.py:204 -#: extensions/webmail/forms.py:14 +#: admin/forms.py:204 extensions/webmail/forms.py:14 msgid "Select a file" msgstr "Wählen Sie eine Datei" @@ -168,105 +170,109 @@ msgstr "Separator" msgid "Invalid action, %(user)s is a local user" msgstr "Unzulässige Aktion, %(user)s ist ein lokaler Benutzer" -#: admin/models.py:78 -#: admin/models.py:142 -#: admin/models.py:155 +#: admin/models.py:83 admin/models.py:147 admin/models.py:160 msgid "name" msgstr "Name" -#: admin/models.py:79 +#: admin/models.py:84 msgid "The domain name" msgstr "Name der Domäne" -#: admin/models.py:80 +#: admin/models.py:85 msgid "Default quota in MB applied to mailboxes" msgstr "Standard-Quota für Mailboxen (in MB)" -#: admin/models.py:81 -#: admin/models.py:146 -#: admin/models.py:393 -#: admin/models.py:469 -#: extensions/postfix_autoreply/models.py:19 +#: admin/models.py:86 admin/models.py:151 admin/models.py:400 +#: admin/models.py:476 extensions/postfix_autoreply/models.py:19 msgid "enabled" msgstr "aktiviert" -#: admin/models.py:82 +#: admin/models.py:87 msgid "Check to activate this domain" msgstr "Auswählen, um diese Domäne zu aktivieren" -#: admin/models.py:135 +#: admin/models.py:140 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:143 +#: admin/models.py:148 msgid "The alias name" msgstr "Der Alias-Name" -#: admin/models.py:144 +#: admin/models.py:149 msgid "target" msgstr "Ziel" -#: admin/models.py:145 +#: admin/models.py:150 msgid "The domain this alias points to" msgstr "Domäne auf die dieser Alias verweist" -#: admin/models.py:147 -#: admin/models.py:394 +#: admin/models.py:152 admin/models.py:401 msgid "Check to activate this alias" msgstr "Auswählen um den Alias zu aktivieren" -#: admin/models.py:156 +#: admin/models.py:161 msgid "First name and last name of mailbox owner" msgstr "Vor- und Nachname des Mailbox-Besitzers" -#: admin/models.py:157 -#: admin/models.py:387 +#: admin/models.py:162 admin/models.py:394 msgid "address" msgstr "Adresse" -#: admin/models.py:158 +#: admin/models.py:163 msgid "Mailbox address (without the @domain.tld part)" msgstr "Mailbox-Adresse (ohne den @domain.tld-Anteil)" -#: admin/models.py:159 +#: admin/models.py:164 msgid "password" msgstr "Passwort" -#: admin/models.py:246 -#: admin/models.py:327 +#: admin/models.py:251 admin/models.py:334 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:265 +#: admin/models.py:270 msgid "Mailbox with this address already exists" msgstr "Eine Mailbox mit dieser Adresse existiert bereits." -#: admin/models.py:313 +#: admin/models.py:314 +#, fuzzy +msgid "Failed to update password: LDAP module not installed" +msgstr "Konnte Kennwort nicht aktualisieren: %s" + +#: admin/models.py:320 #, python-format msgid "Failed to update password: %s" msgstr "Konnte Kennwort nicht aktualisieren: %s" -#: admin/models.py:353 +#: admin/models.py:360 msgid "Invalid line" msgstr "Ungültige Zeile" -#: admin/models.py:359 +#: admin/models.py:366 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: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:395 +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 +#: admin/models.py:397 msgid "mailboxes" msgstr "Mailboxen" -#: admin/models.py:391 +#: admin/models.py:398 msgid "The mailboxes this alias points to" msgstr "Mailbox auf den dieser Alias verweist" -#: admin/models.py:470 +#: admin/models.py:477 msgid "Check to enable this extension" msgstr "Auswählen, um diese Erweiterung zu aktivieren" @@ -278,52 +284,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/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/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/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/templatetags/admin_extras.py:98 +#: 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 @@ -332,24 +325,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" @@ -357,8 +343,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" @@ -378,13 +363,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" @@ -408,12 +391,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" @@ -426,12 +405,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" @@ -454,14 +430,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" @@ -555,8 +528,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!" @@ -577,14 +549,12 @@ msgstr "Änderungen übernommen." msgid "%d mailboxes imported successfully" msgstr "%d Mailboxen erfolgreich importiert" -#: admin/views.py:641 -#: admin/templatetags/admin_extras.py:112 +#: admin/views.py:641 admin/templatetags/admin_extras.py:112 #: templates/admin/import.html:48 msgid "Import data" msgstr "Daten importieren" -#: admin/views.py:642 -#: templates/admin/import.html:56 +#: admin/views.py:642 templates/admin/import.html:56 msgid "Import" msgstr "Importiere" @@ -605,8 +575,7 @@ msgstr "Admin" 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" @@ -671,8 +640,7 @@ msgstr "Ja" msgid "No" msgstr "Nein" -#: admin/templatetags/admin_extras.py:267 -#: templates/common/genericform.html:6 +#: admin/templatetags/admin_extras.py:267 templates/common/genericform.html:6 msgid "Help" msgstr "Hilfe" @@ -694,7 +662,9 @@ 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 msgid "Test messages" @@ -713,18 +683,21 @@ msgid "" "\n" "

Welcome to the online demo!

\n" "

Warning: the demo's concent is resetted every two hours.

\n" -"

To try the demo, the following users are available (username/password):

\n" +"

To try the demo, the following users are available (username/password):

\n" "
    \n" "
  • A super administrator : admin/password
    • \n" "
  • A domain administrator : admin@demo.local/admin
    • \n" "
  • A simple user : user@demo.local/user
    • \n" "
\n" "

Please report any issue of give any suggestion to \n" -" the mailing list.

\n" +" the " +"mailing list.

\n" msgstr "" "\n" "

Willkommen zur Online Demo!

\n" -"

Warnung: die Inhalte der Demo werden alle zwei Stunden gelöscht.

\n" +"

Warnung: die Inhalte der Demo werden alle zwei Stunden gelöscht.\n" #: extensions/amavis_quarantine/main.py:15 msgid "Simple amavis quarantine management tool" @@ -732,7 +705,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" @@ -758,10 +733,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 @@ -774,10 +750,8 @@ 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:525 -#: 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" @@ -885,11 +859,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 @@ -960,8 +937,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" @@ -987,7 +963,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" @@ -1085,8 +1063,7 @@ msgid "Match type" msgstr "Übereinstimmung" #: extensions/sievefilters/templates/sievefilters/filter.html:92 -#: templates/admin/parameters.html:14 -#: templates/userprefs/preferences.html:18 +#: templates/admin/parameters.html:14 templates/userprefs/preferences.html:18 msgid "Save" msgstr "Speichern" @@ -1111,8 +1088,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" @@ -1194,8 +1174,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" @@ -1240,8 +1219,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" @@ -1275,7 +1253,8 @@ 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" @@ -1285,8 +1264,7 @@ msgstr "Authentifizierung fehlgeschlagen. Überprüfen Sie Ihre Konfiguration" msgid "wrote:" msgstr "schrieb:" -#: extensions/webmail/lib.py:539 -#: extensions/webmail/lib.py:543 +#: extensions/webmail/lib.py:539 extensions/webmail/lib.py:543 msgid "Original message" msgstr "Gesendete Nachrichten" @@ -1403,8 +1381,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" @@ -1568,28 +1545,23 @@ msgstr "Importiere …" 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" @@ -1672,8 +1644,12 @@ msgid "Keep local copies" msgstr "Lokale Kopien behalten" #: 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." +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" @@ -1686,4 +1662,3 @@ msgstr "Passwort geändert" #: userprefs/views.py:79 msgid "Forward updated" msgstr "Weiterleitung aktualisiert" - diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 3b72b736e..c55ec5fea 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: 2012-01-10 11:09+0100\n" +"POT-Creation-Date: 2012-01-17 13:45+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -164,99 +164,103 @@ msgstr "" msgid "Invalid action, %(user)s is a local user" msgstr "" -#: admin/models.py:78 admin/models.py:142 admin/models.py:155 +#: admin/models.py:83 admin/models.py:147 admin/models.py:160 msgid "name" msgstr "" -#: admin/models.py:79 +#: admin/models.py:84 msgid "The domain name" msgstr "" -#: admin/models.py:80 +#: admin/models.py:85 msgid "Default quota in MB applied to mailboxes" msgstr "" -#: admin/models.py:81 admin/models.py:146 admin/models.py:393 -#: admin/models.py:469 extensions/postfix_autoreply/models.py:19 +#: admin/models.py:86 admin/models.py:151 admin/models.py:400 +#: admin/models.py:476 extensions/postfix_autoreply/models.py:19 msgid "enabled" msgstr "" -#: admin/models.py:82 +#: admin/models.py:87 msgid "Check to activate this domain" msgstr "" -#: admin/models.py:135 +#: admin/models.py:140 msgid "Failed to initialise domain, check permissions" msgstr "" -#: admin/models.py:143 +#: admin/models.py:148 msgid "The alias name" msgstr "" -#: admin/models.py:144 +#: admin/models.py:149 msgid "target" msgstr "" -#: admin/models.py:145 +#: admin/models.py:150 msgid "The domain this alias points to" msgstr "" -#: admin/models.py:147 admin/models.py:394 +#: admin/models.py:152 admin/models.py:401 msgid "Check to activate this alias" msgstr "" -#: admin/models.py:156 +#: admin/models.py:161 msgid "First name and last name of mailbox owner" msgstr "" -#: admin/models.py:157 admin/models.py:387 +#: admin/models.py:162 admin/models.py:394 msgid "address" msgstr "" -#: admin/models.py:158 +#: admin/models.py:163 msgid "Mailbox address (without the @domain.tld part)" msgstr "" -#: admin/models.py:159 +#: admin/models.py:164 msgid "password" msgstr "" -#: admin/models.py:246 admin/models.py:327 +#: admin/models.py:251 admin/models.py:334 msgid "Failed to initialise mailbox, check permissions" msgstr "" -#: admin/models.py:265 +#: admin/models.py:270 msgid "Mailbox with this address already exists" msgstr "" -#: admin/models.py:313 +#: admin/models.py:314 +msgid "Failed to update password: LDAP module not installed" +msgstr "" + +#: admin/models.py:320 #, python-format msgid "Failed to update password: %s" msgstr "" -#: admin/models.py:353 +#: admin/models.py:360 msgid "Invalid line" msgstr "" -#: admin/models.py:359 +#: admin/models.py:366 msgid "Cannot import this mailbox because the associated domain does not exist" msgstr "" -#: admin/models.py:388 +#: admin/models.py:395 msgid "" "The alias address (without the domain part). For a 'catch-all' address, just " "enter an * character." msgstr "" -#: admin/models.py:390 +#: admin/models.py:397 msgid "mailboxes" msgstr "" -#: admin/models.py:391 +#: admin/models.py:398 msgid "The mailboxes this alias points to" msgstr "" -#: admin/models.py:470 +#: admin/models.py:477 msgid "Check to enable this extension" msgstr "" diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index 9cc26e720..e0ae7612b 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Modoboa-0.8.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-10 11:09+0100\n" +"POT-Creation-Date: 2012-01-17 13:45+0100\n" "PO-Revision-Date: 2011-10-12 08:40+0000\n" "Last-Translator: lasarux \n" "Language-Team: ES \n" @@ -176,86 +176,90 @@ msgstr "" msgid "Invalid action, %(user)s is a local user" msgstr "Acción inválida, %(user)s es un usuario local" -#: admin/models.py:78 admin/models.py:142 admin/models.py:155 +#: admin/models.py:83 admin/models.py:147 admin/models.py:160 msgid "name" msgstr "nombre" -#: admin/models.py:79 +#: admin/models.py:84 msgid "The domain name" msgstr "Nombre del dominio" -#: admin/models.py:80 +#: admin/models.py:85 msgid "Default quota in MB applied to mailboxes" msgstr "Cuota por defecto en MB que se aplicarán a los \"mailboxes\"" -#: admin/models.py:81 admin/models.py:146 admin/models.py:393 -#: admin/models.py:469 extensions/postfix_autoreply/models.py:19 +#: admin/models.py:86 admin/models.py:151 admin/models.py:400 +#: admin/models.py:476 extensions/postfix_autoreply/models.py:19 msgid "enabled" msgstr "activado" -#: admin/models.py:82 +#: admin/models.py:87 msgid "Check to activate this domain" msgstr "Activar este dominio" -#: admin/models.py:135 +#: admin/models.py:140 msgid "Failed to initialise domain, check permissions" msgstr "Ha fallado la inicialización del dominio, compruebe permisos" -#: admin/models.py:143 +#: admin/models.py:148 msgid "The alias name" msgstr "Nombre del alias" -#: admin/models.py:144 +#: admin/models.py:149 msgid "target" msgstr "objetivo" -#: admin/models.py:145 +#: admin/models.py:150 msgid "The domain this alias points to" msgstr "El dominio de este alias apuntan a" -#: admin/models.py:147 admin/models.py:394 +#: admin/models.py:152 admin/models.py:401 msgid "Check to activate this alias" msgstr "Activar este alias" -#: admin/models.py:156 +#: admin/models.py:161 msgid "First name and last name of mailbox owner" msgstr "Nombre y apellidos del propietario del \"mailbox\"" -#: admin/models.py:157 admin/models.py:387 +#: admin/models.py:162 admin/models.py:394 msgid "address" msgstr "dirección" -#: admin/models.py:158 +#: admin/models.py:163 msgid "Mailbox address (without the @domain.tld part)" msgstr "Dirección del \"mailbox\" (sin la parte @dominio.tld)" -#: admin/models.py:159 +#: admin/models.py:164 msgid "password" msgstr "contraseña" -#: admin/models.py:246 admin/models.py:327 +#: admin/models.py:251 admin/models.py:334 msgid "Failed to initialise mailbox, check permissions" msgstr "Ha fallado la inicialización del \"mailbox\", compruebe permisos" -#: admin/models.py:265 +#: admin/models.py:270 msgid "Mailbox with this address already exists" msgstr "Ya existe un \"Mailbox\" con esta dirección" -#: admin/models.py:313 +#: admin/models.py:314 +msgid "Failed to update password: LDAP module not installed" +msgstr "" + +#: admin/models.py:320 #, python-format msgid "Failed to update password: %s" msgstr "" -#: admin/models.py:353 +#: admin/models.py:360 #, fuzzy msgid "Invalid line" msgstr "'mailbox' inválido" -#: admin/models.py:359 +#: admin/models.py:366 msgid "Cannot import this mailbox because the associated domain does not exist" msgstr "" -#: admin/models.py:388 +#: admin/models.py:395 msgid "" "The alias address (without the domain part). For a 'catch-all' address, just " "enter an * character." @@ -263,15 +267,15 @@ 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 +#: admin/models.py:397 msgid "mailboxes" msgstr "'mailboxes'" -#: admin/models.py:391 +#: admin/models.py:398 msgid "The mailboxes this alias points to" msgstr "Los 'mailboxes' de este alias apuntan a" -#: admin/models.py:470 +#: admin/models.py:477 msgid "Check to enable this extension" msgstr "Activar esta extensión" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 6ff10223b..e2a76e7ba 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: modoboa-0.8.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-10 11:09+0100\n" +"POT-Creation-Date: 2012-01-17 13:45+0100\n" "PO-Revision-Date: 2011-01-07 10:00+100\n" "Last-Translator: Antoine Nguyen \n" "Language-Team: FR \n" @@ -174,86 +174,90 @@ msgstr "Séparateur" msgid "Invalid action, %(user)s is a local user" msgstr "Action invalide, %(user)s est un utilisateur local" -#: admin/models.py:78 admin/models.py:142 admin/models.py:155 +#: admin/models.py:83 admin/models.py:147 admin/models.py:160 msgid "name" msgstr "Nom" -#: admin/models.py:79 +#: admin/models.py:84 msgid "The domain name" msgstr "Le nom du domaine" -#: admin/models.py:80 +#: admin/models.py:85 msgid "Default quota in MB applied to mailboxes" msgstr "Quota par défaut en Mo appliqué aux boites aux lettres" -#: admin/models.py:81 admin/models.py:146 admin/models.py:393 -#: admin/models.py:469 extensions/postfix_autoreply/models.py:19 +#: admin/models.py:86 admin/models.py:151 admin/models.py:400 +#: admin/models.py:476 extensions/postfix_autoreply/models.py:19 msgid "enabled" msgstr "Activé" -#: admin/models.py:82 +#: admin/models.py:87 msgid "Check to activate this domain" msgstr "Cocher pour activer ce domaine" -#: admin/models.py:135 +#: admin/models.py:140 msgid "Failed to initialise domain, check permissions" msgstr "Impossible d'initialiser le domaine, vérifier les permissions" -#: admin/models.py:143 +#: admin/models.py:148 msgid "The alias name" msgstr "Le nom de l'alias" -#: admin/models.py:144 +#: admin/models.py:149 msgid "target" msgstr "cible" -#: admin/models.py:145 +#: admin/models.py:150 msgid "The domain this alias points to" msgstr "Le domaine vers lequel cet alias pointe" -#: admin/models.py:147 admin/models.py:394 +#: admin/models.py:152 admin/models.py:401 msgid "Check to activate this alias" msgstr "Cocher pour activer cet alias" -#: admin/models.py:156 +#: admin/models.py:161 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:157 admin/models.py:387 +#: admin/models.py:162 admin/models.py:394 msgid "address" msgstr "Adresse" -#: admin/models.py:158 +#: admin/models.py:163 msgid "Mailbox address (without the @domain.tld part)" msgstr "Adresse de la boite aux lettres (sans la partie @domain.tld)" -#: admin/models.py:159 +#: admin/models.py:164 msgid "password" msgstr "Mot de passe" -#: admin/models.py:246 admin/models.py:327 +#: admin/models.py:251 admin/models.py:334 msgid "Failed to initialise mailbox, check permissions" msgstr "" "Impossible d'initialiser la boite aux lettres, vérifier les permissions" -#: admin/models.py:265 +#: admin/models.py:270 msgid "Mailbox with this address already exists" msgstr "Une boite aux lettres pour cette adresse existe déjà" -#: admin/models.py:313 +#: admin/models.py:314 +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:320 #, python-format msgid "Failed to update password: %s" msgstr "Echec de la mise à jour du mot de passe : %s" -#: admin/models.py:353 +#: admin/models.py:360 msgid "Invalid line" msgstr "Ligne invalide" -#: admin/models.py:359 +#: admin/models.py:366 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 +#: admin/models.py:395 msgid "" "The alias address (without the domain part). For a 'catch-all' address, just " "enter an * character." @@ -261,15 +265,15 @@ msgstr "" "L'adresse de l'alias (sans la partie domaine). Pour une adresse 'attrape-" "tout', entrer juste un caractère *." -#: admin/models.py:390 +#: admin/models.py:397 msgid "mailboxes" msgstr "Boites aux lettres" -#: admin/models.py:391 +#: admin/models.py:398 msgid "The mailboxes this alias points to" msgstr "Les boites aux lettres sur lesquelles pointe cet alias" -#: admin/models.py:470 +#: admin/models.py:477 msgid "Check to enable this extension" msgstr "Cocher pour activer cette extension" @@ -693,17 +697,18 @@ msgid "" msgstr "" "\n" "

Bienvenue sur la démo en ligne!

\n" -"

Attention: Le contenu de la démo est réinitialisé toutes les deux heures.

\n" -"

Pour essayer la démo, les utilisateurs suivants sont disponibles (nom d'utilisateur/mot de passe):

\n" +"

Attention: Le contenu de la démo est réinitialisé toutes les deux " +"heures.

\n" +"

Pour essayer la démo, les utilisateurs suivants sont disponibles (nom " +"d'utilisateur/mot de passe):

\n" "
    \n" "
  • Un super administrateur : admin/password
    • \n" "
  • Un administrateur de domaine : admin@demo.local/admin
    • \n" "
  • Un simple utilisateur : user@demo.local/user
    • \n" "
\n" "

Veuillez svp rapporter toute erreur sur \n" -" la " -"liste de diffusion.

\n" +" la liste " +"de diffusion.

\n" #: extensions/amavis_quarantine/main.py:15 msgid "Simple amavis quarantine management tool" @@ -1664,4 +1669,3 @@ msgstr "Mot de passe changé" #: userprefs/views.py:79 msgid "Forward updated" msgstr "Transfert mis à jour" - From 4a5bc46302eb84476c13537b8ad8dd854211fc9d Mon Sep 17 00:00:00 2001 From: Patrick Ben Koetter Date: Tue, 17 Jan 2012 14:29:47 +0100 Subject: [PATCH 06/10] Translation Updated LDAP error message --- locale/de/LC_MESSAGES/django.po | 281 ++++++++++++++++++-------------- 1 file changed, 155 insertions(+), 126 deletions(-) diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 592f7f392..f489b9d7e 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Modoboa-0.8.8\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-01-17 13:45+0100\n" -"PO-Revision-Date: 2012-01-10 22:49+0100\n" +"PO-Revision-Date: 2012-01-17 14:28+0100\n" "Last-Translator: Patrick Ben Koetter \n" "Language-Team: DE \n" "Language: de\n" @@ -34,32 +34,20 @@ 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:27 msgid "Scheme used to crypt mailbox passwords" @@ -77,7 +65,9 @@ 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" @@ -85,7 +75,8 @@ 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" @@ -93,7 +84,8 @@ msgstr "Passwort" msgid "Password used to log in" msgstr "Login-Passwort" -#: admin/forms.py:56 userprefs/forms.py:17 +#: admin/forms.py:56 +#: userprefs/forms.py:17 msgid "Confirmation" msgstr "Bestätigung" @@ -105,11 +97,13 @@ msgstr "Passwort Bestätigung" msgid "Check to activate this mailbox" msgstr "Markieren, um die Mailbox zu aktivieren" -#: admin/forms.py:88 userprefs/forms.py:39 +#: 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)" @@ -129,7 +123,8 @@ 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" @@ -137,11 +132,13 @@ 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" @@ -157,7 +154,8 @@ msgstr "Wählen Sie eine Domäne aus der Liste" msgid "Empty" msgstr "Leer" -#: admin/forms.py:204 extensions/webmail/forms.py:14 +#: admin/forms.py:204 +#: extensions/webmail/forms.py:14 msgid "Select a file" msgstr "Wählen Sie eine Datei" @@ -170,7 +168,9 @@ msgstr "Separator" msgid "Invalid action, %(user)s is a local user" msgstr "Unzulässige Aktion, %(user)s ist ein lokaler Benutzer" -#: admin/models.py:83 admin/models.py:147 admin/models.py:160 +#: admin/models.py:83 +#: admin/models.py:147 +#: admin/models.py:160 msgid "name" msgstr "Name" @@ -182,8 +182,11 @@ msgstr "Name der Domäne" msgid "Default quota in MB applied to mailboxes" msgstr "Standard-Quota für Mailboxen (in MB)" -#: admin/models.py:86 admin/models.py:151 admin/models.py:400 -#: admin/models.py:476 extensions/postfix_autoreply/models.py:19 +#: admin/models.py:86 +#: admin/models.py:151 +#: admin/models.py:400 +#: admin/models.py:476 +#: extensions/postfix_autoreply/models.py:19 msgid "enabled" msgstr "aktiviert" @@ -193,8 +196,7 @@ msgstr "Auswählen, um diese Domäne zu aktivieren" #: admin/models.py:140 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:148 msgid "The alias name" @@ -208,7 +210,8 @@ msgstr "Ziel" msgid "The domain this alias points to" msgstr "Domäne auf die dieser Alias verweist" -#: admin/models.py:152 admin/models.py:401 +#: admin/models.py:152 +#: admin/models.py:401 msgid "Check to activate this alias" msgstr "Auswählen um den Alias zu aktivieren" @@ -216,7 +219,8 @@ msgstr "Auswählen um den Alias zu aktivieren" msgid "First name and last name of mailbox owner" msgstr "Vor- und Nachname des Mailbox-Besitzers" -#: admin/models.py:162 admin/models.py:394 +#: admin/models.py:162 +#: admin/models.py:394 msgid "address" msgstr "Adresse" @@ -228,19 +232,18 @@ msgstr "Mailbox-Adresse (ohne den @domain.tld-Anteil)" msgid "password" msgstr "Passwort" -#: admin/models.py:251 admin/models.py:334 +#: admin/models.py:251 +#: admin/models.py:334 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:270 msgid "Mailbox with this address already exists" msgstr "Eine Mailbox mit dieser Adresse existiert bereits." #: admin/models.py:314 -#, fuzzy msgid "Failed to update password: LDAP module not installed" -msgstr "Konnte Kennwort nicht aktualisieren: %s" +msgstr "Konnte Kennwort nicht aktualisieren: LDAP-Modul nicht installiert" #: admin/models.py:320 #, python-format @@ -253,16 +256,11 @@ msgstr "Ungültige Zeile" #: admin/models.py:366 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:395 -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." +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:397 msgid "mailboxes" @@ -284,39 +282,52 @@ 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/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/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/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/templatetags/admin_extras.py:98 +#: 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 @@ -325,17 +336,24 @@ 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" @@ -343,7 +361,8 @@ 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" @@ -363,11 +382,13 @@ 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" @@ -391,8 +412,12 @@ 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" @@ -405,9 +430,12 @@ 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" @@ -430,11 +458,14 @@ 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" @@ -528,7 +559,8 @@ 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!" @@ -549,12 +581,14 @@ msgstr "Änderungen übernommen." msgid "%d mailboxes imported successfully" msgstr "%d Mailboxen erfolgreich importiert" -#: admin/views.py:641 admin/templatetags/admin_extras.py:112 +#: admin/views.py:641 +#: admin/templatetags/admin_extras.py:112 #: templates/admin/import.html:48 msgid "Import data" msgstr "Daten importieren" -#: admin/views.py:642 templates/admin/import.html:56 +#: admin/views.py:642 +#: templates/admin/import.html:56 msgid "Import" msgstr "Importiere" @@ -575,7 +609,8 @@ msgstr "Admin" 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" @@ -640,7 +675,8 @@ msgstr "Ja" msgid "No" msgstr "Nein" -#: admin/templatetags/admin_extras.py:267 templates/common/genericform.html:6 +#: admin/templatetags/admin_extras.py:267 +#: templates/common/genericform.html:6 msgid "Help" msgstr "Hilfe" @@ -662,9 +698,7 @@ 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 msgid "Test messages" @@ -683,21 +717,18 @@ msgid "" "\n" "

Welcome to the online demo!

\n" "

Warning: the demo's concent is resetted every two hours.

\n" -"

To try the demo, the following users are available (username/password):

\n" +"

To try the demo, the following users are available (username/password):

\n" "
    \n" "
  • A super administrator : admin/password
    • \n" "
  • A domain administrator : admin@demo.local/admin
    • \n" "
  • A simple user : user@demo.local/user
    • \n" "
\n" "

Please report any issue of give any suggestion to \n" -" the " -"mailing list.

\n" +" the mailing list.

\n" msgstr "" "\n" "

Willkommen zur Online Demo!

\n" -"

Warnung: die Inhalte der Demo werden alle zwei Stunden gelöscht.\n" +"

Warnung: die Inhalte der Demo werden alle zwei Stunden gelöscht.

\n" #: extensions/amavis_quarantine/main.py:15 msgid "Simple amavis quarantine management tool" @@ -705,9 +736,7 @@ 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" @@ -733,11 +762,10 @@ 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 @@ -750,8 +778,10 @@ 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:525 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" @@ -859,14 +889,11 @@ 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 @@ -937,7 +964,8 @@ 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" @@ -963,9 +991,7 @@ 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" @@ -1063,7 +1089,8 @@ msgid "Match type" msgstr "Übereinstimmung" #: extensions/sievefilters/templates/sievefilters/filter.html:92 -#: templates/admin/parameters.html:14 templates/userprefs/preferences.html:18 +#: templates/admin/parameters.html:14 +#: templates/userprefs/preferences.html:18 msgid "Save" msgstr "Speichern" @@ -1088,11 +1115,8 @@ 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" @@ -1174,7 +1198,8 @@ 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" @@ -1219,7 +1244,8 @@ 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" @@ -1253,8 +1279,7 @@ 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" @@ -1264,7 +1289,8 @@ msgstr "Authentifizierung fehlgeschlagen. Überprüfen Sie Ihre Konfiguration" msgid "wrote:" msgstr "schrieb:" -#: extensions/webmail/lib.py:539 extensions/webmail/lib.py:543 +#: extensions/webmail/lib.py:539 +#: extensions/webmail/lib.py:543 msgid "Original message" msgstr "Gesendete Nachrichten" @@ -1381,7 +1407,8 @@ 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" @@ -1545,23 +1572,28 @@ msgstr "Importiere …" 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" @@ -1644,12 +1676,8 @@ msgid "Keep local copies" msgstr "Lokale Kopien behalten" #: 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." +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" @@ -1662,3 +1690,4 @@ msgstr "Passwort geändert" #: userprefs/views.py:79 msgid "Forward updated" msgstr "Weiterleitung aktualisiert" + From 82c9018a3cebf19c596e34dd05c0459b20689308 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Mon, 23 Jan 2012 10:01:33 +0100 Subject: [PATCH 07/10] Updated spanish translation. --- locale/es/LC_MESSAGES/django.po | 157 +++++++++++++++--------------- locale/es/LC_MESSAGES/djangojs.po | 20 ++-- 2 files changed, 92 insertions(+), 85 deletions(-) diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index e0ae7612b..808e962e8 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -1,32 +1,31 @@ # Modoboa spanish translation. -# Copyright (C) 2011 +# Copyright (C) 2012 # This file is distributed under the same license as the Modoboa package. -# +# # Translators: -# Pedro Gracia , 2011. +# Pedro Gracia , 2011, 2012. # Pedro Gracia , 2010, 2011. msgid "" msgstr "" -"Project-Id-Version: Modoboa-0.8.7\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-17 13:45+0100\n" -"PO-Revision-Date: 2011-10-12 08:40+0000\n" -"Last-Translator: lasarux \n" +"Project-Id-Version: Modoboa-0.8.8\n" +"Report-Msgid-Bugs-To: http://dev.modoboa.org/\n" +"POT-Creation-Date: 2012-01-10 11:09+0100\n" +"PO-Revision-Date: 2012-01-23 08:44+0000\n" +"Last-Translator: Pedro Gracia \n" "Language-Team: ES \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 msgid "Local" -msgstr "" +msgstr "Local" #: admin/__init__.py:11 -#, fuzzy msgid "The backend used for authentication" -msgstr "Contraseña usada para autenticar" +msgstr "El 'backend' usados para autenticación" #: admin/__init__.py:13 msgid "Modoboa will handle mailbox creation on filesystem" @@ -42,16 +41,16 @@ 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: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:22 msgid "Mailboxes storage format" @@ -89,7 +88,8 @@ 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" @@ -169,113 +169,111 @@ msgstr "Seleccione un fichero" #: admin/forms.py:205 msgid "Separator" -msgstr "" +msgstr "Separador" #: 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:83 admin/models.py:147 admin/models.py:160 +#: admin/models.py:78 admin/models.py:142 admin/models.py:155 msgid "name" msgstr "nombre" -#: admin/models.py:84 +#: admin/models.py:79 msgid "The domain name" msgstr "Nombre del dominio" -#: admin/models.py:85 +#: 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:86 admin/models.py:151 admin/models.py:400 -#: admin/models.py:476 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:87 +#: admin/models.py:82 msgid "Check to activate this domain" msgstr "Activar este dominio" -#: admin/models.py:140 +#: admin/models.py:135 msgid "Failed to initialise domain, check permissions" msgstr "Ha fallado la inicialización del dominio, compruebe permisos" -#: admin/models.py:148 +#: admin/models.py:143 msgid "The alias name" msgstr "Nombre del alias" -#: admin/models.py:149 +#: admin/models.py:144 msgid "target" msgstr "objetivo" -#: admin/models.py:150 +#: admin/models.py:145 msgid "The domain this alias points to" msgstr "El dominio de este alias apuntan a" -#: admin/models.py:152 admin/models.py:401 +#: admin/models.py:147 admin/models.py:394 msgid "Check to activate this alias" msgstr "Activar este alias" -#: admin/models.py:161 +#: admin/models.py:156 msgid "First name and last name of mailbox owner" msgstr "Nombre y apellidos del propietario del \"mailbox\"" -#: admin/models.py:162 admin/models.py:394 +#: admin/models.py:157 admin/models.py:387 msgid "address" msgstr "dirección" -#: admin/models.py:163 +#: 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:164 +#: admin/models.py:159 msgid "password" msgstr "contraseña" -#: admin/models.py:251 admin/models.py:334 +#: 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:270 +#: admin/models.py:265 msgid "Mailbox with this address already exists" msgstr "Ya existe un \"Mailbox\" con esta dirección" -#: admin/models.py:314 -msgid "Failed to update password: LDAP module not installed" -msgstr "" - -#: admin/models.py:320 +#: admin/models.py:313 #, python-format msgid "Failed to update password: %s" -msgstr "" +msgstr "Falló en la actualización del password: %s" -#: admin/models.py:360 -#, fuzzy +#: admin/models.py:353 msgid "Invalid line" -msgstr "'mailbox' inválido" +msgstr "Línea inválida" -#: admin/models.py:366 -msgid "Cannot import this mailbox because the associated domain does not exist" -msgstr "" - -#: admin/models.py:395 +#: admin/models.py:359 msgid "" -"The alias address (without the domain part). For a 'catch-all' address, just " -"enter an * character." +"Cannot import this mailbox because the associated domain does not exist" msgstr "" -"La dirección del alias (sin la parte del dominio). Para una dirección que lo " -"recoja todo, ponga un asterisco (*)." +"No ha sido posible importar este 'mailbox' ya que el dominio asociado no " +"existe" -#: admin/models.py:397 +#: 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:398 +#: admin/models.py:391 msgid "The mailboxes this alias points to" msgstr "Los 'mailboxes' de este alias apuntan a" -#: admin/models.py:477 +#: admin/models.py:470 msgid "Check to enable this extension" msgstr "Activar esta extensión" @@ -548,18 +546,18 @@ msgid "Modifications applied." msgstr "Modificaciones aplicadas." #: admin/views.py:631 -#, fuzzy, python-format +#, python-format msgid "%d mailboxes imported successfully" -msgstr "%(count)d mensaje eliminado correctamente" +msgstr "%d 'mailboxes' importadas con éxito" #: admin/views.py:641 admin/templatetags/admin_extras.py:112 #: templates/admin/import.html:48 msgid "Import data" -msgstr "" +msgstr "Importar datos" #: admin/views.py:642 templates/admin/import.html:56 msgid "Import" -msgstr "" +msgstr "Importar" #: admin/templatetags/admin_extras.py:12 msgid "enabled_m" @@ -670,17 +668,14 @@ msgstr "" "nuevo." #: demo/__init__.py:16 -#, fuzzy msgid "Test messages" -msgstr "mensajes enviados" +msgstr "Mensajes de test" #: demo/__init__.py:21 -#, fuzzy msgid "Send virus" -msgstr "Remitente" +msgstr "Enviar virus" #: demo/__init__.py:25 -#, fuzzy msgid "Send spam" msgstr "Enviar" @@ -689,17 +684,25 @@ msgid "" "\n" "

Welcome to the online demo!

\n" "

Warning: the demo's concent is resetted every two hours.

\n" -"

To try the demo, the following users are available (username/password):

\n" +"

To try the demo, the following users are available (username/password):

\n" "
    \n" "
  • A super administrator : admin/password
    • \n" "
  • A domain administrator : admin@demo.local/admin
    • \n" "
  • A simple user : user@demo.local/user
    • \n" "
\n" "

Please report any issue of give any suggestion to \n" -" the " -"mailing list.

\n" +" the mailing list.

\n" msgstr "" +"\n" +"

¡Bienvenido a la demo online!

\n" +"

Aviso: Los datos de esta demo serán borrados cada dos horas.

\n" +"

Para probar la demo puede usar cualquiera de los siguientes usuarios disponibles (username/password):

\n" +"
    \n" +"
  • Un super administrador : admin/password
    • \n" +"
  • Un administrador dominio : admin@demo.local/admin
    • \n" +"
  • Un usuario normal: user@demo.local/user
    • \n" +"
\n" +"

Por favor, informe de cualquier incidencia o sugerencia que tenga a la lista de correo .

\n" #: extensions/amavis_quarantine/main.py:15 msgid "Simple amavis quarantine management tool" @@ -714,8 +717,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" @@ -962,7 +965,8 @@ 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" @@ -1534,9 +1538,8 @@ msgid "Apply" msgstr "Aplicar" #: templates/admin/import.html:62 -#, fuzzy msgid "Importing..." -msgstr "Subiendo..." +msgstr "Importando..." #: templates/admin/listing.html:12 msgid "Items" @@ -1638,7 +1641,7 @@ msgstr "Destino(s)" #: userprefs/forms.py:44 msgid "Keep local copies" -msgstr "" +msgstr "Mantener copias locales" #: userprefs/forms.py:57 msgid "" @@ -1650,7 +1653,7 @@ msgstr "" #: userprefs/views.py:27 msgid "Password change is disabled for this user" -msgstr "" +msgstr "El cambio de contraseña está deshabilitado para este usuario" #: userprefs/views.py:46 msgid "Password changed" @@ -1659,3 +1662,5 @@ msgstr "Contraseña cambiada" #: 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 cdbfd786f..3c6013667 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 +# Copyright (C) 2012 # This file is distributed under the same license as the Modoboa package. -# +# # Translators: # Pedro Gracia , 2011. # Pedro Gracia , 2010, 2011. msgid "" msgstr "" -"Project-Id-Version: Modoboa-0.8.7\n" -"Report-Msgid-Bugs-To: \n" +"Project-Id-Version: Modoboa-0.8.8\n" +"Report-Msgid-Bugs-To: http://dev.modoboa.org/\n" "POT-Creation-Date: 2012-01-10 11:09+0100\n" -"PO-Revision-Date: 2011-10-12 08:42+0000\n" -"Last-Translator: lasarux \n" -"Language-Team: LANGUAGE \n" -"Language: es\n" +"PO-Revision-Date: 2012-01-10 10:34+0000\n" +"Last-Translator: Antoine Nguyen \n" +"Language-Team: 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 @@ -90,7 +90,7 @@ msgstr "Buscar..." #: static/js/domains.js:61 msgid "Remove this selection?" -msgstr "¿Eliminar esta selección?" +msgstr "" #: static/js/preferences.js:14 msgid "Preferences saved" @@ -99,3 +99,5 @@ msgstr "Preferencias guardas" #: static/js/settings.js:14 msgid "Parameters saved" msgstr "Parámetros guardados" + + From 8d6c2dcacb3ca4ff3a565cc239e78c2cf615f45a Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Mon, 23 Jan 2012 10:52:37 +0100 Subject: [PATCH 08/10] Do not try to calculate current quota state if it's not defined for the user. see #194 --- extensions/webmail/lib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/webmail/lib.py b/extensions/webmail/lib.py index 23505a80b..658d71aa6 100644 --- a/extensions/webmail/lib.py +++ b/extensions/webmail/lib.py @@ -327,7 +327,7 @@ class IMAPconnector(object): return status, data = self.m.getquotaroot(self._encodefolder(folder)) - if status == "OK": + if status == "OK" and data[1][0] is not None: quotadef = data[1][0] m = re.match("[^\s]+ \(STORAGE (\d+) (\d+)\)", quotadef) if not m: From df4b725e644fdaf249af4490b988ec2118301b6c Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 24 Jan 2012 11:32:53 +0100 Subject: [PATCH 09/10] Documentation update. --- INSTALL | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/INSTALL b/INSTALL index 1be26c6d2..7093f3e46 100644 --- a/INSTALL +++ b/INSTALL @@ -43,15 +43,12 @@ need to install a python database backend (like *MySQLdb*). Initialize the database by running the following command:: - $ python manage.py syncdb + $ python manage.py syncdb --migrate It will let you create the default super administrator. -Since version 0.8, Modoboa is using *south* to handle schema -migrations. To finish the database initialization, you must apply -existing migrations like this:: - - $ python manage.py migrate +Since version 0.8, Modoboa uses *south* to handle schema migrations, +this is the reason why you must add the ``--migrate`` option. Finally, create the ``scripts`` directory:: @@ -236,8 +233,6 @@ requires a migration. 0.8.8: CSV import feature and minor fixes ----------------------------------------- -#. Install the `LDAP python module `_ - #. Edit the *settings.py* file and ``'modoboa.lib.middleware.AjaxLoginRedirect'`` to the ``MIDDLEWARE_CLASSES`` variable like this:: From e42b2c44430c031538e51cba3198f1139e01bfa4 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 24 Jan 2012 11:32:59 +0100 Subject: [PATCH 10/10] Added tag 0.8.8 for changeset 779943af3bea