From 060dc98f0a71e0a87be98131f9403d372ac3f589 Mon Sep 17 00:00:00 2001 From: tonio Date: Fri, 11 Jun 2010 14:16:09 +0200 Subject: [PATCH] German translation update, bugfixes. --- lib/__init__.py | 4 +- locale/de/LC_MESSAGES/django.po | 168 ++++++++++++------------------ locale/de/LC_MESSAGES/djangojs.po | 9 +- locale/fr/LC_MESSAGES/django.po | 25 +---- static/js/infobox.js | 8 +- templates/common/navbar.html | 2 +- 6 files changed, 83 insertions(+), 133 deletions(-) diff --git a/lib/__init__.py b/lib/__init__.py index 1e474f520..a7eff6145 100644 --- a/lib/__init__.py +++ b/lib/__init__.py @@ -60,8 +60,8 @@ def is_not_localadmin(errortpl="error"): def wrapped_f(request, *args, **kwargs): if request.user.id == 1: return _render_error(request, errortpl, { - "error" : _("Invalid action, %s is a local user" \ - % request.user.username) + "error" : _("Invalid action, %(user)s is a local user" \ + % {"user" : request.user.username}) }) return f(request, *args, **kwargs) return wrapped_f diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index b45b134e0..b5ee6b106 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Patrick Ben Koetter , 2010. # #, fuzzy msgid "" @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-06-10 18:03+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"PO-Revision-Date: 2010-06-10 23:21+0200\n" "Last-Translator: Patrick Ben Koetter \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -18,22 +18,23 @@ msgstr "" #: admin/__init__.py:7 msgid "Path to the root directory where messages are stored" -msgstr "" +msgstr "Pfad zum root-Verzeichnis unterhalb dessen E-Mails abgelegt werden" #: admin/__init__.py:9 msgid "" "UID of the virtual user which owns domains/mailboxes/messages on the " "filesystem" -msgstr "" +msgstr "UID des virtuellen Benutzers, der Besitzer der Domains, Mailboxen " +"und Nachrichten im Dateisystem ist." #: admin/__init__.py:11 msgid "" "GID of the virtual user which owns domains/mailboxes/messages on the " "filesystem" -msgstr "" +msgstr "GID des virtuellen Benutzers, der Besitzer der Domains, Mailboxen " +"und Nachrichten im Dateisystem ist." #: admin/__init__.py:14 -#, fuzzy msgid "Mailboxes storage format" msgstr "Mailbox erstellt." @@ -42,10 +43,12 @@ 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:19 msgid "Scheme used to crypt mailbox passwords" -msgstr "" +msgstr "Schema zum crypten der Mailbox-Passworte" #: admin/forms.py:16 templates/admin/domains.html:25 #: templates/admin/mailboxes.html:17 @@ -155,12 +158,10 @@ msgid "The alias address (without the domain part)" msgstr "Die Alias-Adresse (ohne den @domain.tld-Anteil)" #: admin/models.py:105 -#, fuzzy msgid "mailboxes" msgstr "Mailboxen" #: admin/models.py:106 -#, fuzzy msgid "The mailboxes this alias points to" msgstr "Mailbox auf den dieser Alias verweist" @@ -203,7 +204,6 @@ msgid "Failed to rename mailbox, check permissions" msgstr "Mailbox konnte nicht umbenannt werden. Prüfen Sie die Berechtigungen." #: admin/views.py:294 admin/views.py:325 -#, fuzzy msgid "Alias with this name already exists" msgstr "Ein Alias mit dieser Adresse existiert bereits" @@ -212,7 +212,6 @@ msgid "admin is intouchable!!" msgstr "admin ist unantastbar!!" #: admin/views.py:442 -#, fuzzy msgid "Configuration saved." msgstr "Bestätigung" @@ -249,7 +248,6 @@ msgid "Add permission" msgstr "Berechtigung hinzufügen" #: admin/templatetags/admin_extras.py:64 -#, fuzzy msgid "Parameters" msgstr "Eigenschaften" @@ -263,29 +261,27 @@ msgstr "Domäne" #: admin/templatetags/admin_extras.py:112 msgid "Yes" -msgstr "" +msgstr "Ja" #: admin/templatetags/admin_extras.py:112 msgid "No" -msgstr "" +msgstr "Nein" #: admin/templatetags/admin_extras.py:131 msgid "Help" -msgstr "" +msgstr "Hilfe" #: auth/forms.py:5 -#, fuzzy msgid "Username" msgstr "Benutzername" #: auth/forms.py:7 -#, fuzzy msgid "Password used to authenticate" msgstr "Login-Passwort" #: auth/views.py:30 msgid "Account is disabled." -msgstr "" +msgstr "Konto ist deaktiviert" #: auth/views.py:31 msgid "Your username and password didn't match. Please try again." @@ -295,11 +291,11 @@ msgstr "" #: extensions/amavis_quarantine/main.py:14 msgid "Simple amavis quarantine management tool" -msgstr "" +msgstr "Einfaches amavis Quarantäne-Management Werkzeug" #: extensions/amavis_quarantine/main.py:21 msgid "Quarantine messages maximum age (in days) before deletion" -msgstr "" +msgstr "Maximales Alter (in Tagen) von Nachrichten in der Quarantäne bevor sie gelöscht werden" #: extensions/amavis_quarantine/main.py:25 msgid "Mode used to access the PDP server" @@ -307,11 +303,11 @@ msgstr "" #: extensions/amavis_quarantine/main.py:31 msgid "PDP server port (if inet mode)" -msgstr "" +msgstr "PDP-Server port (im inet-Modus)" #: extensions/amavis_quarantine/main.py:34 msgid "Path to the PDP server socket (if unix mode)" -msgstr "" +msgstr "Pfad zum PDP-Server Socket (im UNIX-Modus)" #: extensions/amavis_quarantine/main.py:50 #: extensions/amavis_quarantine/templates/index.html:137 @@ -335,7 +331,6 @@ msgid "Date" msgstr "Datum" #: extensions/amavis_quarantine/views.py:63 -#, fuzzy msgid "Empty quarantine" msgstr "Quarantäne" @@ -347,7 +342,7 @@ msgstr[0] "%(count)d Nachricht erfolgreich gelöscht" msgstr[1] "%(count)d Nachrichten erfolgreich gelöscht" #: extensions/amavis_quarantine/views.py:171 -#, fuzzy, python-format +#, python-format msgid "%(count)d message released successfully" msgid_plural "%(count)d messages released successfully" msgstr[0] "%(count)d Nachicht erfolgreich freigegeben" @@ -418,34 +413,32 @@ msgid "Options" msgstr "Optionen" #: extensions/amavis_quarantine/templatetags/amextras.py:69 -#, fuzzy msgid "Select" msgstr "Löschen" #: extensions/amavis_quarantine/templatetags/amextras.py:74 msgid "Nothing" -msgstr "" +msgstr "Nichts" #: extensions/amavis_quarantine/templatetags/amextras.py:77 msgid "Spam" -msgstr "" +msgstr "Spam" #: extensions/amavis_quarantine/templatetags/amextras.py:80 -#, fuzzy msgid "Bad header" msgstr "Nachrichten-Header" #: extensions/amavis_quarantine/templatetags/amextras.py:83 msgid "Bad MIME" -msgstr "" +msgstr "Schlechtes MIME" #: extensions/postfix_autoreply/forms.py:18 msgid "This date is over" -msgstr "" +msgstr "Das Datum ist vorbei" #: extensions/postfix_autoreply/main.py:33 msgid "Timeout in seconds between two auto-replies to the same recipient" -msgstr "" +msgstr "Zeit in Sekunden zwischen zwei automatisierten Antworten an denselben Empfänger" #: extensions/postfix_autoreply/main.py:59 #: extensions/postfix_autoreply/templates/autoreply.html:24 @@ -458,7 +451,7 @@ msgstr "Betreff" #: extensions/postfix_autoreply/models.py:16 msgid "The subject that will appear in sended emails" -msgstr "" +msgstr "Der Betreff, der in den versendeten Nachrichten verwendet wird" #: extensions/postfix_autoreply/models.py:17 msgid "content" @@ -466,19 +459,19 @@ msgstr "Inhalt" #: extensions/postfix_autoreply/models.py:18 msgid "The content that will appear in sended emails" -msgstr "" +msgstr "Der Inhalt, der in den versendeten Nachrichten verwendet wird" #: extensions/postfix_autoreply/models.py:20 msgid "Activate/Deactivate your auto reply" -msgstr "" +msgstr "Aktivieren/Deaktivieren Sie die automatisierte Antwort" #: extensions/postfix_autoreply/models.py:21 msgid "until" -msgstr "" +msgstr "bis" #: extensions/postfix_autoreply/models.py:22 msgid "Activate your auto reply until this date" -msgstr "" +msgstr "Aktivieren Sie ihre automatisierte Antwort bis zu diesem Datum" #: extensions/postfix_autoreply/views.py:34 msgid "Auto reply message updated successfully." @@ -500,7 +493,7 @@ msgstr "Empfangene Nachrichten" #: extensions/stats/grapher.py:28 msgid "msgs/min" -msgstr "" +msgstr "E-Mails/min" #: extensions/stats/grapher.py:32 msgid "bounced messages" @@ -524,19 +517,19 @@ msgstr "Versendegrösse" #: extensions/stats/main.py:19 msgid "Graphical statistics about emails traffic using RRDtool" -msgstr "" +msgstr "Grafische E-Mail-Statistik (setzt RRDtool ein)" #: extensions/stats/main.py:26 msgid "Path to log file used to collect statistics" -msgstr "" +msgstr "Pfad zur Log-Datei, um Statistiken zu sammeln" #: extensions/stats/main.py:29 msgid "Path to directory where RRD files are stored" -msgstr "" +msgstr "Pfad zum Verzeichnis in dem die RRD-Dateien abgelegt sind" #: extensions/stats/main.py:32 msgid "Path to directory where PNG files are stored" -msgstr "" +msgstr "Pfad zu dem Verzeichnis in die PNG-Dateien abgelegt sind" #: extensions/stats/main.py:45 extensions/stats/main.py:53 msgid "Statistics" @@ -578,19 +571,18 @@ msgstr "Zeitraum:" #: extensions/stats/templates/adminindex.html:55 #: extensions/stats/templates/index.html:41 msgid "Custom period : from" -msgstr "" +msgstr "Individueller Zeitraum : von" #: extensions/stats/templates/adminindex.html:55 #: extensions/stats/templates/index.html:41 templates/common/navbar.html:2 msgid "to" -msgstr "" +msgstr "bis" #: extensions/stats/templates/calendar.html:5 msgid "Start" -msgstr "" +msgstr "Start" #: extensions/stats/templates/calendar.html:6 -#, fuzzy msgid "End" msgstr "Aktiviert" @@ -616,129 +608,125 @@ msgstr "Jahr" #: extensions/webmail/forms.py:6 msgid "To" -msgstr "" +msgstr "An" #: extensions/webmail/forms.py:7 msgid "Cc" -msgstr "" +msgstr "Cc" #: extensions/webmail/lib.py:177 msgid "Connection to IMAP server failed, check your configuration" -msgstr "" +msgstr "Verbindung zu IMAP-Server fehlgeschlagen, Überprüfen Sie Ihre Konfiguration" #: extensions/webmail/lib.py:181 msgid "Authentication failed, check your configuration" -msgstr "" +msgstr "Authentifizierung fehlgeschlagen, Überprüfen Sie Ihre Konfiguration" #: extensions/webmail/main.py:14 msgid "Key used to encrypt/decrypt passwords" -msgstr "" +msgstr "Verwendeter Schlüssel, um Passworte zu ver-/entschlüsseln" #: extensions/webmail/main.py:17 msgid "Address of your IMAP server" -msgstr "" +msgstr "Addresse Ihres IMAP-Servers" #: extensions/webmail/main.py:20 msgid "Use a secured connection to access IMAP server" -msgstr "" +msgstr "Gesicherte Verbindung für Zugriff auf IMAP-Server verwenden" #: extensions/webmail/main.py:22 msgid "Listening port of your IMAP server" -msgstr "" +msgstr "Port auf dem der IMAP-Server lauscht" #: extensions/webmail/main.py:25 msgid "Address of your SMTP server" -msgstr "" +msgstr "Addresse Ihres SMTP-Servers" #: extensions/webmail/main.py:27 msgid "Listening port of your SMTP server" -msgstr "" +msgstr "Port auf dem der SMTP-Server lauscht" #: extensions/webmail/main.py:30 msgid "Server needs authentication" -msgstr "" +msgstr "Server erfordert Authentifizierung" #: extensions/webmail/main.py:33 msgid "Use a secured connection to access SMTP server" -msgstr "" +msgstr "Gesicherte Verbindung für Zugriff auf SMTP-Server verwenden" #: extensions/webmail/main.py:36 -#, fuzzy msgid "Folder where deleted messages go" msgstr "Abgewiesene Nachrichten" #: extensions/webmail/main.py:38 msgid "Folder where copies of sent messages go" -msgstr "" +msgstr "Ordner für Gesendete Nachrichten" #: extensions/webmail/main.py:49 msgid "Simple IMAP webmail" -msgstr "" +msgstr "Einfaches IMAP-Webmail" #: extensions/webmail/main.py:63 extensions/webmail/templates/index.html:385 msgid "Webmail" -msgstr "" +msgstr "Webmail" #: extensions/webmail/views.py:58 #: extensions/webmail/templatetags/webextras.py:87 msgid "Empty folder" -msgstr "" +msgstr "Leerer Ordner" #: extensions/webmail/views.py:304 msgid "wrote:" -msgstr "" +msgstr "schrieb:" #: extensions/webmail/views.py:322 -#, fuzzy msgid "Original message" msgstr "Gesendete Nachrichten" #: extensions/webmail/templates/folders.html:3 msgid "Folders" -msgstr "" +msgstr "Ordner" #: extensions/webmail/templates/headers.html:7 msgid "Attachments" -msgstr "" +msgstr "Dateianhänge" #: extensions/webmail/templatetags/webextras.py:17 #: extensions/webmail/templatetags/webextras.py:46 msgid "Back" -msgstr "" +msgstr "Zurück" #: extensions/webmail/templatetags/webextras.py:21 msgid "Reply" -msgstr "" +msgstr "Antworten" #: extensions/webmail/templatetags/webextras.py:25 msgid "Reply all" -msgstr "" +msgstr "Allen Antworten" #: extensions/webmail/templatetags/webextras.py:29 msgid "Forward" -msgstr "" +msgstr "Weiterleiten" #: extensions/webmail/templatetags/webextras.py:50 msgid "Send" -msgstr "" +msgstr "Senden" #: extensions/webmail/templatetags/webextras.py:62 -#, fuzzy msgid "New message" msgstr "Gesendete Nachrichten" #: extensions/webmail/templatetags/webextras.py:65 -#, fuzzy msgid "Mark messages" msgstr "Nachricht" #: extensions/webmail/templatetags/webextras.py:69 msgid "As read" -msgstr "" +msgstr "Als gelesen" #: extensions/webmail/templatetags/webextras.py:72 msgid "As unread" -msgstr "" +msgstr "Als ungelesen" #: extensions/webmail/templatetags/webextras.py:78 #: templates/admin/aliases.html:13 templates/admin/domains.html:22 @@ -749,12 +737,12 @@ msgstr "Aktionen" #: extensions/webmail/templatetags/webextras.py:83 msgid "Compact folder" -msgstr "" +msgstr "Ordner komprimieren" #: lib/__init__.py:63 #, python-format msgid "Invalid action, %s is a local user" -msgstr "" +msgstr "Unzulässige Aktion, %s ist ein lokaler Benutzer" #: templates/nlayout.html:33 msgid "Admin" @@ -893,11 +881,11 @@ msgstr "Beide" #: templates/common/error.html:3 msgid "Error" -msgstr "" +msgstr "Fehler" #: templates/common/navbar.html:2 msgid "of" -msgstr "" +msgstr "von" #: templates/common/navbar.html:6 msgid "First" @@ -917,11 +905,11 @@ msgstr "Letztes" #: templates/common/parameters.html:3 msgid "Save" -msgstr "" +msgstr "Speichern" #: templates/registration/login.html:7 msgid "Welcome to MailNG" -msgstr "" +msgstr "Willkommen bei MailNG" #: templates/registration/login.html:27 msgid "Welcome" @@ -952,21 +940,3 @@ msgstr "Neues Passwort" #: userprefs/forms.py:26 msgid "Old password mismatchs" msgstr "Altes Passwort stimmt nicht überein" - -#~ msgid "mailbox" -#~ msgstr "Mailbox" - -#~ msgid "No messages in quarantine" -#~ msgstr "Keine Nachrichten in Quarantäne" - -#~ msgid "Type" -#~ msgstr "Typ" - -#~ msgid "General" -#~ msgstr "Allgemein" - -#~ msgid "Your auto-reply message is activated." -#~ msgstr "Automatische Benachrichtigung ist aktiviert." - -#~ msgid "Your auto-reply message is not activated." -#~ msgstr "Automatische Benachrichtigung ist nicht aktiviert." diff --git a/locale/de/LC_MESSAGES/djangojs.po b/locale/de/LC_MESSAGES/djangojs.po index 51da4ea24..3bc38cbf4 100644 --- a/locale/de/LC_MESSAGES/djangojs.po +++ b/locale/de/LC_MESSAGES/djangojs.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Patrick Ben Koetter , 2010. # #, fuzzy msgid "" @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-06-10 18:02+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"PO-Revision-Date: 2010-06-10 22:45+0200\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -18,7 +18,7 @@ msgstr "" #: static/js/common.js:35 msgid "Loading..." -msgstr "" +msgstr "Lade ..." #: static/js/domains.js:15 msgid "Delete this domain?" @@ -35,6 +35,3 @@ msgstr "Diesen Alias löschen?" #: static/js/settings.js:4 msgid "Remove this permission?" msgstr "Diese Berechtigung entziehen?" - -#~ msgid "Help" -#~ msgstr "Hilfe" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 1f1aac760..50c418dc2 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -301,17 +301,16 @@ msgid "Quarantine messages maximum age (in days) before deletion" msgstr "Age maximum (en jours) des messages en quarantaine avant suppression" #: extensions/amavis_quarantine/main.py:25 -#, fuzzy msgid "Mode used to access the PDP server" -msgstr "Utiliser une connexion sécurisée pour accéder au serveur IMAP" +msgstr "Mode utilisé pour accéder au serveur PDP" #: extensions/amavis_quarantine/main.py:31 msgid "PDP server port (if inet mode)" -msgstr "" +msgstr "Port du serveur PDP (en mode inet)" #: extensions/amavis_quarantine/main.py:34 msgid "Path to the PDP server socket (if unix mode)" -msgstr "" +msgstr "Emplacement de la socket du serveur PDP (en mode unix)" #: extensions/amavis_quarantine/main.py:50 #: extensions/amavis_quarantine/templates/index.html:137 @@ -629,10 +628,9 @@ msgid "Authentication failed, check your configuration" msgstr "L'authentification a échoué, vérifiez votre configuration" #: extensions/webmail/main.py:14 -#, fuzzy msgid "Key used to encrypt/decrypt passwords" msgstr "" -"Méthode utilisée pour chiffrer les mots de passe des boites aux lettres" +"Clé utilisée pour chiffrer/déchiffre les mots de passe" #: extensions/webmail/main.py:17 msgid "Address of your IMAP server" @@ -948,18 +946,3 @@ msgstr "Nouveau mot de passe" #: userprefs/forms.py:26 msgid "Old password mismatchs" msgstr "L'ancien mot de passe est incorrect" - -#~ msgid "mailbox" -#~ msgstr "Boite aux lettres" - -#~ msgid "No messages in quarantine" -#~ msgstr "Aucun message dans la quarantaine" - -#~ msgid "General" -#~ msgstr "Général" - -#~ msgid "Your auto-reply message is activated." -#~ msgstr "Votre réponse automatique est active." - -#~ msgid "Your auto-reply message is not activated." -#~ msgstr "Votre réponse automatique n'est pas active." diff --git a/static/js/infobox.js b/static/js/infobox.js index 9852af96b..c6286dd0e 100644 --- a/static/js/infobox.js +++ b/static/js/infobox.js @@ -16,13 +16,13 @@ var InfoBox = new Class({ initialize: function(options) { this.setOptions(options); - var boxleft = document.body.getSize().x / 2 - this.options.width / 2; + var boxleft = $(document.body).getSize().x / 2 - this.options.width / 2; this.box = new Element("div", {"id" : "infobox"}); this.box.setStyles({ - "font-size" : "normal", + "font-size" : "1em", "font-weight" : "bold", "text-align" : "left", - "width" : this.options. width + "px", + "width" : this.options.width + "px", "padding" : "10px", "position" : "absolute", "top" : "0px", @@ -41,7 +41,7 @@ var InfoBox = new Class({ "margin-left" : "10px" }); this.label.inject(this.box); - this.box.inject(document.body); + this.box.inject($(document.body)); }, setMessage: function(text) { diff --git a/templates/common/navbar.html b/templates/common/navbar.html index 668152024..d7ddf6863 100644 --- a/templates/common/navbar.html +++ b/templates/common/navbar.html @@ -1,5 +1,5 @@ {% load i18n %} - + {% if page.previous_page %}