From cceaa3c22f259e0ac171947a1e17b46ae853aba6 Mon Sep 17 00:00:00 2001 From: tonio Date: Fri, 23 Jul 2010 16:28:48 +0200 Subject: [PATCH] fix: automatic reload was also active for other pages like 'compose'. Translations update. --- .../amavis_quarantine/templates/index.html | 5 +- extensions/webmail/templates/index.html | 3 +- locale/de/LC_MESSAGES/django.po | 54 ++++++++++++------- locale/de/LC_MESSAGES/djangojs.po | 12 ++++- locale/fr/LC_MESSAGES/django.po | 53 +++++++++++------- locale/fr/LC_MESSAGES/djangojs.po | 14 +++-- 6 files changed, 96 insertions(+), 45 deletions(-) diff --git a/extensions/amavis_quarantine/templates/index.html b/extensions/amavis_quarantine/templates/index.html index 1c8178937..1f7aee4fc 100644 --- a/extensions/amavis_quarantine/templates/index.html +++ b/extensions/amavis_quarantine/templates/index.html @@ -102,10 +102,11 @@ $("menubar").set("html", ""); $("navbar").set("html", ""); if (resp.status == "ok") { - infobox.show(resp.message, "green", 1); + infobox.notice(resp.message); } else { - infobox.show(resp.message, "red", 1); + infobox.error(resp.message); } + infobox.hide(1); current_anchor.parse_string(resp.url, true).setparams(navparams); current_anchor.update(1); } diff --git a/extensions/webmail/templates/index.html b/extensions/webmail/templates/index.html index 0330143a8..68071f193 100644 --- a/extensions/webmail/templates/index.html +++ b/extensions/webmail/templates/index.html @@ -92,6 +92,7 @@ loadCompose = function(event) { event.stop(); + $clear(rtimer); current_anchor.baseurl("compose").update(); } register_callback("compose", compose_callback); @@ -116,7 +117,7 @@ refreshFolder = function() { var query = current_anchor.serialized.substring(1); $clear(rtimer); - infobox.show('{% trans "Refreshing..." %}', { + infobox.show('{% trans "Reloading..." %}', { profile : "gray", spinner : true }); diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 697217fe8..e707fec89 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-13 17:13+0200\n" +"POT-Creation-Date: 2010-07-23 16:23+0200\n" "PO-Revision-Date: 2010-06-10 23:21+0200\n" "Last-Translator: Patrick Ben Koetter \n" "Language-Team: LANGUAGE \n" @@ -213,10 +213,6 @@ msgstr "Ein Alias mit dieser Adresse existiert bereits" msgid "admin is intouchable!!" msgstr "admin ist unantastbar!!" -#: admin/views.py:443 -msgid "Configuration saved." -msgstr "Bestätigung" - #: admin/templatetags/admin_extras.py:11 msgid "enabled_m" msgstr "aktiviert_m" @@ -261,15 +257,15 @@ msgstr "Neue Domäne" msgid "Domains" msgstr "Domäne" -#: admin/templatetags/admin_extras.py:112 +#: admin/templatetags/admin_extras.py:118 msgid "Yes" msgstr "Ja" -#: admin/templatetags/admin_extras.py:112 +#: admin/templatetags/admin_extras.py:118 msgid "No" msgstr "Nein" -#: admin/templatetags/admin_extras.py:131 +#: admin/templatetags/admin_extras.py:135 msgid "Help" msgstr "Hilfe" @@ -318,7 +314,7 @@ msgid "Path to the PDP server socket (if unix mode)" msgstr "Pfad zum PDP-Server Socket (im UNIX-Modus)" #: extensions/amavis_quarantine/main.py:50 -#: extensions/amavis_quarantine/templates/index.html:130 +#: extensions/amavis_quarantine/templates/index.html:131 msgid "Quarantine" msgstr "Quarantäne" @@ -329,12 +325,12 @@ msgstr "Von" #: extensions/amavis_quarantine/sql_listing.py:15 #: extensions/webmail/forms.py:8 extensions/webmail/lib.py:25 -#: extensions/webmail/views.py:333 templates/common/email_searchbar.html:7 +#: extensions/webmail/views.py:353 templates/common/email_searchbar.html:7 msgid "Subject" msgstr "Betreff" #: extensions/amavis_quarantine/sql_listing.py:16 extensions/webmail/lib.py:28 -#: extensions/webmail/views.py:334 +#: extensions/webmail/views.py:354 msgid "Date" msgstr "Datum" @@ -667,30 +663,38 @@ msgid "Use a secured connection to access SMTP server" msgstr "Gesicherte Verbindung für Zugriff auf SMTP-Server verwenden" #: extensions/webmail/main.py:36 +msgid "Automatic folder refresh rate (in seconds)" +msgstr "" + +#: extensions/webmail/main.py:38 msgid "Folder where deleted messages go" msgstr "Abgewiesene Nachrichten" -#: extensions/webmail/main.py:38 +#: extensions/webmail/main.py:40 msgid "Folder where copies of sent messages go" msgstr "Ordner für Gesendete Nachrichten" -#: extensions/webmail/main.py:49 +#: extensions/webmail/main.py:42 +msgid "User defined email signature" +msgstr "" + +#: extensions/webmail/main.py:53 msgid "Simple IMAP webmail" msgstr "Einfaches IMAP-Webmail" -#: extensions/webmail/main.py:63 extensions/webmail/templates/index.html:275 +#: extensions/webmail/main.py:67 extensions/webmail/templates/index.html:309 msgid "Webmail" msgstr "Webmail" -#: extensions/webmail/views.py:63 lib/email_listing.py:124 +#: extensions/webmail/views.py:67 lib/email_listing.py:124 msgid "This folder contains no messages" msgstr "Dieser Ordner enthält keine Einträge" -#: extensions/webmail/views.py:314 +#: extensions/webmail/views.py:334 msgid "wrote:" msgstr "schrieb:" -#: extensions/webmail/views.py:332 +#: extensions/webmail/views.py:352 msgid "Original message" msgstr "Gesendete Nachrichten" @@ -702,6 +706,20 @@ msgstr "Ordner" msgid "Attachments" msgstr "Dateianhänge" +#: extensions/webmail/templates/index.html:120 +msgid "Reloading..." +msgstr "" + +#: extensions/webmail/templates/index.html:127 +#, fuzzy +msgid "Done" +msgstr "Domäne" + +#: extensions/webmail/templates/index.html:315 +#, fuzzy +msgid "Mailbox quota" +msgstr "Mailbox" + #: extensions/webmail/templatetags/webextras.py:17 #: extensions/webmail/templatetags/webextras.py:46 msgid "Back" @@ -750,7 +768,7 @@ msgstr "Aktionen" msgid "Compress folder" msgstr "Ordner komprimieren" -#: extensions/webmail/templatetags/webextras.py:87 +#: extensions/webmail/templatetags/webextras.py:92 msgid "Empty folder" msgstr "Leerer Ordner" diff --git a/locale/de/LC_MESSAGES/djangojs.po b/locale/de/LC_MESSAGES/djangojs.po index bcb386e2b..827bbc6fd 100644 --- a/locale/de/LC_MESSAGES/djangojs.po +++ b/locale/de/LC_MESSAGES/djangojs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-13 17:13+0200\n" +"POT-Creation-Date: 2010-07-23 16:23+0200\n" "PO-Revision-Date: 2010-06-10 22:45+0200\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,7 +20,7 @@ msgstr "" msgid "Loading..." msgstr "Lade ..." -#: static/js/common.js:40 +#: static/js/common.js:43 msgid "Done" msgstr "Abgeschlossen" @@ -36,6 +36,14 @@ msgstr "Diese Mailbox löschen?" msgid "Delete this alias?" msgstr "Diesen Alias löschen?" +#: static/js/preferences.js:14 +msgid "Preferences saved" +msgstr "" + #: static/js/settings.js:4 msgid "Remove this permission?" msgstr "Diese Berechtigung entziehen?" + +#: static/js/settings.js:20 +msgid "Parameters saved" +msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 1dd54cf1d..186b5114d 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-13 17:13+0200\n" +"POT-Creation-Date: 2010-07-23 16:23+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Antoine Nguyen \n" "Language-Team: LANGUAGE \n" @@ -214,10 +214,6 @@ msgstr "Un alias avec ce nom existe déjà" msgid "admin is intouchable!!" msgstr "admin est intouchable!!" -#: admin/views.py:443 -msgid "Configuration saved." -msgstr "Configuration sauvegardée." - #: admin/templatetags/admin_extras.py:11 msgid "enabled_m" msgstr "Activé" @@ -262,15 +258,15 @@ msgstr "Nouveau domaine" msgid "Domains" msgstr "Domaines" -#: admin/templatetags/admin_extras.py:112 +#: admin/templatetags/admin_extras.py:118 msgid "Yes" msgstr "Oui" -#: admin/templatetags/admin_extras.py:112 +#: admin/templatetags/admin_extras.py:118 msgid "No" msgstr "Non" -#: admin/templatetags/admin_extras.py:131 +#: admin/templatetags/admin_extras.py:135 msgid "Help" msgstr "Aide" @@ -317,7 +313,7 @@ msgid "Path to the PDP server socket (if unix mode)" msgstr "Emplacement de la socket du serveur PDP (en mode unix)" #: extensions/amavis_quarantine/main.py:50 -#: extensions/amavis_quarantine/templates/index.html:130 +#: extensions/amavis_quarantine/templates/index.html:131 msgid "Quarantine" msgstr "Quarantaine" @@ -328,12 +324,12 @@ msgstr "De" #: extensions/amavis_quarantine/sql_listing.py:15 #: extensions/webmail/forms.py:8 extensions/webmail/lib.py:25 -#: extensions/webmail/views.py:333 templates/common/email_searchbar.html:7 +#: extensions/webmail/views.py:353 templates/common/email_searchbar.html:7 msgid "Subject" msgstr "Sujet" #: extensions/amavis_quarantine/sql_listing.py:16 extensions/webmail/lib.py:28 -#: extensions/webmail/views.py:334 +#: extensions/webmail/views.py:354 msgid "Date" msgstr "" @@ -665,30 +661,38 @@ msgid "Use a secured connection to access SMTP server" msgstr "Utiliser une connexion sécurisée pour accéder au serveur SMTP" #: extensions/webmail/main.py:36 +msgid "Automatic folder refresh rate (in seconds)" +msgstr "" + +#: extensions/webmail/main.py:38 msgid "Folder where deleted messages go" msgstr "Dossier de destination des messages supprimés" -#: extensions/webmail/main.py:38 +#: extensions/webmail/main.py:40 msgid "Folder where copies of sent messages go" msgstr "Dossier de destination des copies de messages envoyés" -#: extensions/webmail/main.py:49 +#: extensions/webmail/main.py:42 +msgid "User defined email signature" +msgstr "" + +#: extensions/webmail/main.py:53 msgid "Simple IMAP webmail" msgstr "" -#: extensions/webmail/main.py:63 extensions/webmail/templates/index.html:275 +#: extensions/webmail/main.py:67 extensions/webmail/templates/index.html:309 msgid "Webmail" msgstr "" -#: extensions/webmail/views.py:63 lib/email_listing.py:124 +#: extensions/webmail/views.py:67 lib/email_listing.py:124 msgid "This folder contains no messages" msgstr "Ce dossier ne contient pas de messages" -#: extensions/webmail/views.py:314 +#: extensions/webmail/views.py:334 msgid "wrote:" msgstr "a écrit :" -#: extensions/webmail/views.py:332 +#: extensions/webmail/views.py:352 msgid "Original message" msgstr "Message original" @@ -700,6 +704,18 @@ msgstr "Dossiers" msgid "Attachments" msgstr "Pièces jointes" +#: extensions/webmail/templates/index.html:120 +msgid "Reloading..." +msgstr "Rechargement..." + +#: extensions/webmail/templates/index.html:127 +msgid "Done" +msgstr "Effectué" + +#: extensions/webmail/templates/index.html:315 +msgid "Mailbox quota" +msgstr "Quota de la boite aux lettres" + #: extensions/webmail/templatetags/webextras.py:17 #: extensions/webmail/templatetags/webextras.py:46 msgid "Back" @@ -748,7 +764,7 @@ msgstr "" msgid "Compress folder" msgstr "Compresser ce dossier" -#: extensions/webmail/templatetags/webextras.py:87 +#: extensions/webmail/templatetags/webextras.py:92 msgid "Empty folder" msgstr "Vider ce dossier" @@ -925,7 +941,6 @@ msgid "Save" msgstr "Sauvegarder" #: templates/registration/login.html:8 -#, fuzzy msgid "Welcome to Modoboa" msgstr "Bienvenue dans Modoboa" diff --git a/locale/fr/LC_MESSAGES/djangojs.po b/locale/fr/LC_MESSAGES/djangojs.po index 36f29515e..173ac897d 100644 --- a/locale/fr/LC_MESSAGES/djangojs.po +++ b/locale/fr/LC_MESSAGES/djangojs.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-13 17:13+0200\n" +"POT-Creation-Date: 2010-07-23 16:23+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" +"Last-Translator: Antoine Nguyen \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +20,7 @@ msgstr "" msgid "Loading..." msgstr "Chargement..." -#: static/js/common.js:40 +#: static/js/common.js:43 msgid "Done" msgstr "Effectué" @@ -36,6 +36,14 @@ msgstr "Supprimer cette boite aux lettres?" msgid "Delete this alias?" msgstr "Supprimer cet alias?" +#: static/js/preferences.js:14 +msgid "Preferences saved" +msgstr "Préférences enregistrées" + #: static/js/settings.js:4 msgid "Remove this permission?" msgstr "Supprimer cette permission?" + +#: static/js/settings.js:20 +msgid "Parameters saved" +msgstr "Paramètres enregistrés"