diff --git a/django/conf/admin_templates/404.html b/django/conf/admin_templates/404.html index 099466c4f1..ac70bf27b9 100644 --- a/django/conf/admin_templates/404.html +++ b/django/conf/admin_templates/404.html @@ -1,11 +1,11 @@ {% extends "base_site" %} -{% block title %}Page not found{% endblock %} +{% block title %}{% i18n _('Page not found') %}{% endblock %} {% block content %} -

Page not found

+

{% i18n _('Page not found') %}

-

We're sorry, but the requested page could not be found.

+

{% i18n _("We're sorry, but the requested page could not be found.") %}

{% endblock %} diff --git a/django/conf/admin_templates/500.html b/django/conf/admin_templates/500.html index 124e4018a9..0bb6e5eed2 100644 --- a/django/conf/admin_templates/500.html +++ b/django/conf/admin_templates/500.html @@ -2,10 +2,10 @@ {% block breadcrumbs %}{% endblock %} -{% block title %}Server error (500){% endblock %} +{% block title %}{% i18n _('Server error (500)') %}{% endblock %} {% block content %} -

Server Error (500)

-

There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience.

+

{% i18n _('Server Error (500)') %}

+

{% i18n _("There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience.") %}

{% endblock %} diff --git a/django/conf/admin_templates/base.html b/django/conf/admin_templates/base.html index 64c80b934c..115e28a11b 100644 --- a/django/conf/admin_templates/base.html +++ b/django/conf/admin_templates/base.html @@ -19,13 +19,13 @@ {% block branding %}{% endblock %} {% if not user.is_anonymous %} -
Welcome, {% if user.first_name %}{{ user.first_name }}{% else %}{{ user.username }}{% endif %}.
{% block userlinks %}Change password / Log out{% endblock %}
+
{% i18n _('Welcome,') %} {% if user.first_name %}{{ user.first_name }}{% else %}{{ user.username }}{% endif %}.
{% block userlinks %}{% i18n _('Change password') %} / {% i18n _('Log out') %}{% endblock %}
{% endif %} {% block nav-global %}{% endblock %}
- {% block breadcrumbs %}{% endblock %} + {% block breadcrumbs %}{% endblock %} {% endif %} {% if messages %} diff --git a/django/conf/admin_templates/base_site.html b/django/conf/admin_templates/base_site.html index 8e0874e401..bfbf9a2e34 100644 --- a/django/conf/admin_templates/base_site.html +++ b/django/conf/admin_templates/base_site.html @@ -1,9 +1,9 @@ {% extends "base" %} -{% block title %}{{ title }} | Django site admin{% endblock %} +{% block title %}{{ title }} | {% i18n _('Django site admin') %}{% endblock %} {% block branding %} -

Django administration

+

{% i18n _('Django administration') %}

example.com

{% endblock %} diff --git a/django/conf/admin_templates/changelist_generic.html b/django/conf/admin_templates/changelist_generic.html index d8f51c537b..ab8e449373 100644 --- a/django/conf/admin_templates/changelist_generic.html +++ b/django/conf/admin_templates/changelist_generic.html @@ -5,7 +5,7 @@ {% block content %} {% if not hide_add_link %} - + {% endif %}
@@ -23,7 +23,7 @@ {% if changelist %} {% endif %} diff --git a/django/conf/admin_templates/delete_confirmation_generic.html b/django/conf/admin_templates/delete_confirmation_generic.html index e46b611baf..a41c3764c1 100644 --- a/django/conf/admin_templates/delete_confirmation_generic.html +++ b/django/conf/admin_templates/delete_confirmation_generic.html @@ -3,18 +3,18 @@ {% block content %} {% if perms_lacking %} -

Deleting the {{ object_name }} "{{ object }}" would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:

+

{% i18n _("Deleting the %(object_name)s '%(object)s' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:") %}

{% else %} -

Are you sure you want to delete the {{ object_name }} "{{ object }}"? All of the following related items will be deleted:

+

{% i18n _('Are you sure you want to delete the %(object_name)s "%(object)s"? All of the following related items will be deleted:') %}

- +
{% endif %} diff --git a/django/conf/admin_templates/index.html b/django/conf/admin_templates/index.html index 1a6949cf6c..48bd5d91c1 100644 --- a/django/conf/admin_templates/index.html +++ b/django/conf/admin_templates/index.html @@ -39,7 +39,7 @@
{% endfor %} {% else %} -

You don't have permission to edit anything.

+

{% i18n _("You don't have permission to edit anything.") %}

{% endif %} {% endblock %} diff --git a/django/conf/admin_templates/login.html b/django/conf/admin_templates/login.html index 7dec8e796a..47a5e05750 100644 --- a/django/conf/admin_templates/login.html +++ b/django/conf/admin_templates/login.html @@ -11,16 +11,16 @@

- +

- + -{% comment %} Have you forgotten your password?{% endcomment %} +{% comment %} {% i18n _('Have you forgotten your password?') %}{% endcomment %}

- +
diff --git a/django/conf/admin_templates/registration/logged_out.html b/django/conf/admin_templates/registration/logged_out.html index 92cf77e35b..404b8c37fc 100644 --- a/django/conf/admin_templates/registration/logged_out.html +++ b/django/conf/admin_templates/registration/logged_out.html @@ -1,11 +1,11 @@ {% extends "base_site" %} -{% block breadcrumbs %}{% endblock %} +{% block breadcrumbs %}{% endblock %} {% block content %} -

Thanks for spending some quality time with the Web site today.

+

{% i18n _("Thanks for spending some quality time with the Web site today.") %}

-

Log in again

+

{% i18n _('Log in again') %}

{% endblock %} diff --git a/django/conf/admin_templates/registration/password_change_done.html b/django/conf/admin_templates/registration/password_change_done.html index 8028c9f0d9..f5242c7076 100644 --- a/django/conf/admin_templates/registration/password_change_done.html +++ b/django/conf/admin_templates/registration/password_change_done.html @@ -1,13 +1,13 @@ {% extends "base_site" %} -{% block breadcrumbs %}{% endblock %} +{% block breadcrumbs %}{% endblock %} -{% block title %}Password change successful{% endblock %} +{% block title %}{% i18n _('Password change successful') %}{% endblock %} {% block content %} -

Password change successful

+

{% i18n _('Password change successful') %}

-

Your password was changed.

+

{% i18n _('Your password was changed.') %}

{% endblock %} diff --git a/django/conf/admin_templates/registration/password_change_form.html b/django/conf/admin_templates/registration/password_change_form.html index 8ceefed86e..0544c4182b 100644 --- a/django/conf/admin_templates/registration/password_change_form.html +++ b/django/conf/admin_templates/registration/password_change_form.html @@ -1,25 +1,25 @@ {% extends "base_site" %} -{% block breadcrumbs %}{% endblock %} +{% block breadcrumbs %}{% endblock %} -{% block title %}Password change{% endblock %} +{% block title %}{% _('Password change') %}{% endblock %} {% block content %} -

Password change

+

{% i18n _('Password change') %}

-

Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly.

+

{% i18n _("Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly.") %}

{% if form.old_password.errors %}{{ form.old_password.html_error_list }}{% endif %} -

{{ form.old_password }}

+

{{ form.old_password }}

{% if form.new_password1.errors %}{{ form.new_password1.html_error_list }}{% endif %} -

{{ form.new_password1 }}

+

{{ form.new_password1 }}

{% if form.new_password2.errors %}{{ form.new_password2.html_error_list }}{% endif %} -

{{ form.new_password2 }}

+

{{ form.new_password2 }}

-

+

{% endblock %} diff --git a/django/conf/admin_templates/registration/password_reset_done.html b/django/conf/admin_templates/registration/password_reset_done.html index 5c41d9f1d5..625ed0c833 100644 --- a/django/conf/admin_templates/registration/password_reset_done.html +++ b/django/conf/admin_templates/registration/password_reset_done.html @@ -1,13 +1,13 @@ {% extends "base_site" %} -{% block breadcrumbs %}{% endblock %} +{% block breadcrumbs %}{% endblock %} -{% block title %}Password reset successful{% endblock %} +{% block title %}{% i18n _('Password reset successful') %}{% endblock %} {% block content %} -

Password reset successful

+

{% i18n _('Password reset successful') %}

-

We've e-mailed a new password to the e-mail address you submitted. You should be receiving it shortly.

+

{% i18n _("We've e-mailed a new password to the e-mail address you submitted. You should be receiving it shortly.") %}

{% endblock %} diff --git a/django/conf/admin_templates/registration/password_reset_email.html b/django/conf/admin_templates/registration/password_reset_email.html index 4a5bb920d6..f707fbb279 100644 --- a/django/conf/admin_templates/registration/password_reset_email.html +++ b/django/conf/admin_templates/registration/password_reset_email.html @@ -1,14 +1,14 @@ -You're receiving this e-mail because you requested a password reset -for your user account at {{ site_name }}. +{% i18n _("You're receiving this e-mail because you requested a password reset") %} +{% i18n _("for your user account at %(site_name)s") %}. -Your new password is: {{ new_password }} +{% i18n _("Your new password is: %(new_password)s") %} -Feel free to change this password by going to this page: +{% i18n _("Feel free to change this password by going to this page:") %} http://{{ domain }}/password_change/ -Your username, in case you've forgotten, is {{ user.username }} +{% i18n _("Your username, in case you've forgotten:") %} {{ user.username }} -Thanks for using our site! +{% i18n _("Thanks for using our site!") %} -The {{ site_name }} team +{% i18n _("The %(site_name)s team") %} diff --git a/django/conf/admin_templates/registration/password_reset_form.html b/django/conf/admin_templates/registration/password_reset_form.html index c2dae2a5b3..3c378def29 100644 --- a/django/conf/admin_templates/registration/password_reset_form.html +++ b/django/conf/admin_templates/registration/password_reset_form.html @@ -1,18 +1,18 @@ {% extends "base_site" %} -{% block breadcrumbs %}{% endblock %} +{% block breadcrumbs %}{% endblock %} -{% block title %}Password reset{% endblock %} +{% block title %}{% i18n _("Password reset") %}{% endblock %} {% block content %} -

Password reset

+

{% i18n _("Password reset") %}

-

Forgotten your password? Enter your e-mail address below, and we'll reset your password and e-mail the new one to you.

+

{% i18n _("Forgotten your password? Enter your e-mail address below, and we'll reset your password and e-mail the new one to you.") %}

{% if form.email.errors %}{{ form.email.html_error_list }}{% endif %} -

{{ form.email }}

+

{{ form.email }}

{% endblock %} diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo index 7dad6c8f66..552b355bb9 100644 Binary files a/django/conf/locale/de/LC_MESSAGES/django.mo and b/django/conf/locale/de/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/de/LC_MESSAGES/django.po b/django/conf/locale/de/LC_MESSAGES/django.po index 68b7de76fe..fc1aa63aea 100644 --- a/django/conf/locale/de/LC_MESSAGES/django.po +++ b/django/conf/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: 2005-09-29 14:11+0200\n" +"POT-Creation-Date: 2005-09-29 22:07+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,31 +21,253 @@ msgid "This value must contain only letters, numbers and underscores." msgstr "Der Wert darf nur Buchstaben, Ziffern und Unterstriche enthalten." #: conf/admin_templates/404.html:3 conf/admin_templates/404.html:7 +#: conf/admin_templates/404.html.py:1 conf/admin_templates/404.html.py:2 msgid "Page not found" msgstr "Seite nicht gefunden" -#: conf/admin_templates/404.html:9 +#: conf/admin_templates/404.html:9 conf/admin_templates/404.html.py:3 msgid "We're sorry, but the requested page could not be found." msgstr "" "Es tut uns leid, aber die angeforderte Seite kann nicht gefunden werden." #: conf/admin_templates/index.html:26 +#: conf/admin_templates/changelist_generic.html:8 +#: conf/admin_templates/changelist_generic.html.py:1 +#: conf/admin_templates/index.html.py:1 msgid "Add" msgstr "Zufügen" -#: conf/admin_templates/index.html:32 +#: conf/admin_templates/index.html:32 conf/admin_templates/index.html.py:2 msgid "Change" msgstr "Ändern" -#: conf/admin_templates/index.html:50 +#: conf/admin_templates/index.html:50 conf/admin_templates/index.html.py:4 msgid "Recent Actions" msgstr "Kürzliche Aktionen" -#: conf/admin_templates/index.html:51 +#: conf/admin_templates/index.html:51 conf/admin_templates/index.html.py:5 msgid "My Actions" msgstr "Meine Aktionen" -#: conf/admin_templates/index.html:55 +#: conf/admin_templates/index.html:55 conf/admin_templates/index.html.py:6 msgid "None available" msgstr "Keine vorhanden" +#: conf/admin_templates/base_site.html:3 +#: conf/admin_templates/base_site.html.py:1 +msgid "Django site admin" +msgstr "Django Systemverwaltung" + +#: conf/admin_templates/base_site.html:6 +#: conf/admin_templates/base_site.html.py:2 +msgid "Django administration" +msgstr "Django Verwaltung" + +#: conf/admin_templates/500.html:5 conf/admin_templates/500.html.py:1 +msgid "Server error (500)" +msgstr "Serverfehler (500)" + +#: conf/admin_templates/500.html:8 +msgid "Server error (500)" +msgstr "Serverfehler (500)" + +#: conf/admin_templates/500.html:9 conf/admin_templates/500.html.py:3 +msgid "" +"There's been an error. It's been reported to the site administrators via e-" +"mail and should be fixed shortly. Thanks for your patience." +msgstr "" +"Es hat einen Fehler gegeben. Dieser Fehler wurde an die Serververwalter per " +"eMail weitergegeben und sollte bald behoben sein. Vielen Dank für Ihr " +"Verständnis." + +#: conf/admin_templates/delete_confirmation_generic.html:6 +#: conf/admin_templates/delete_confirmation_generic.html.py:1 +#, python-format +msgid "" +"Deleting the %(object_name)s '%(object)s' would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" +"Die Löschung des %(object_name)s '%(object)s' hätte die Löschung von " +"abhängigen Daten zur Folge, aber Sie haben nicht die nötigen Rechte um die " +"folgenden abhängigen Daten zu löschen:" + +#: conf/admin_templates/delete_confirmation_generic.html:13 +#: conf/admin_templates/delete_confirmation_generic.html.py:2 +#, python-format +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " +"the following related items will be deleted:" +msgstr "" +"Sind Sie sicher, das Sie %(object_name)s \"%(object)s\" löschen wollen? Es " +"werden zusätzlich die folgenden abhängigen Daten mit gelöscht:" + +#: conf/admin_templates/login.html:14 conf/admin_templates/login.html.py:1 +msgid "Username:" +msgstr "Benutzername:" + +#: conf/admin_templates/login.html:17 conf/admin_templates/login.html.py:2 +msgid "Password:" +msgstr "Passwort:" + +#: conf/admin_templates/login.html:19 conf/admin_templates/login.html.py:3 +msgid "Have you forgotten your password?" +msgstr "Haben Sie ihr Passwort vergessen?" + +#: conf/admin_templates/base.html:22 conf/admin_templates/base.html.py:1 +msgid "Welcome," +msgstr "Willkommen," + +#: conf/admin_templates/base.html:22 conf/admin_templates/base.html.py:2 +msgid "Change password" +msgstr "Passwort ändern" + +#: conf/admin_templates/base.html:22 conf/admin_templates/base.html.py:3 +msgid "Log out" +msgstr "Abmelden" + +#: conf/admin_templates/base.html:28 conf/admin_templates/base.html.py:4 +#: conf/admin_templates/registration/password_change_done.html.py:1 +#: conf/admin_templates/registration/password_reset_form.html.py:1 +#: conf/admin_templates/registration/logged_out.html.py:1 +#: conf/admin_templates/registration/password_reset_done.html.py:1 +#: conf/admin_templates/registration/password_change_form.html.py:1 +msgid "Home" +msgstr "Start" + +#: conf/admin_templates/index.html:42 conf/admin_templates/index.html.py:3 +msgid "You don't have permission to edit anything." +msgstr "Sie haben keine Berechtigung irgendwas zu ändern." + +#: conf/admin_templates/changelist_generic.html.py:2 +msgid "Click to change" +msgstr "Zur Änderung klicken" + +#: conf/admin_templates/500.html.py:2 +msgid "Server Error (500)" +msgstr "Serverfehler (500)" + +#: conf/admin_templates/delete_confirmation_generic.html.py:3 +msgid "Yes, I'm sure" +msgstr "Ja, ich bin sicher" + +#: conf/admin_templates/login.html.py:4 +msgid "Log in" +msgstr "Anmelden" + +#: conf/admin_templates/registration/password_change_done.html.py:2 +#: conf/admin_templates/registration/password_change_form.html.py:2 +#: conf/admin_templates/registration/password_change_form.html.py:3 +msgid "Password change" +msgstr "Kennwort ändern" + +#: conf/admin_templates/registration/password_change_done.html.py:3 +#: conf/admin_templates/registration/password_change_done.html.py:4 +msgid "Password change successful" +msgstr "Erfolgreiche Kennwortänderung" + +#: conf/admin_templates/registration/password_change_done.html.py:5 +msgid "Your password was changed." +msgstr "Ihr Kennwort wurde geändert." + +#: conf/admin_templates/registration/password_reset_form.html.py:2 +#: conf/admin_templates/registration/password_reset_form.html.py:3 +#: conf/admin_templates/registration/password_reset_form.html.py:4 +#: conf/admin_templates/registration/password_reset_done.html.py:2 +msgid "Password reset" +msgstr "Kennwort zurücksetzen" + +#: conf/admin_templates/registration/password_reset_form.html.py:5 +msgid "" +"Forgotten your password? Enter your e-mail address below, and we'll reset " +"your password and e-mail the new one to you." +msgstr "" +"Sie haben Ihr Kennwort vergessen? Geben Sie bitte Ihre eMail-Adresse ein und " +"wir setzen das Kennwort auf einen neuen Wert und schicken den per eMail an Sie " +"raus." + +#: conf/admin_templates/registration/password_reset_form.html.py:6 +msgid "E-mail address:" +msgstr "eMail-Adresse:" + +#: conf/admin_templates/registration/password_reset_form.html.py:7 +msgid "Reset my password" +msgstr "Mein Kennwort zurücksetzen" + +#: conf/admin_templates/registration/logged_out.html.py:2 +msgid "Thanks for spending some quality time with the Web site today." +msgstr "Danke, dass Sie eine Weile bei uns waren." + +#: conf/admin_templates/registration/logged_out.html.py:3 +msgid "Log in again" +msgstr "Neu anmelden" + +#: conf/admin_templates/registration/password_reset_done.html.py:3 +#: conf/admin_templates/registration/password_reset_done.html.py:4 +msgid "Password reset successful" +msgstr "Erfolgreich Kennwort zurückgesetzt" + +#: conf/admin_templates/registration/password_reset_done.html.py:5 +msgid "" +"We've e-mailed a new password to the e-mail address you submitted. You " +"should be receiving it shortly." +msgstr "" +"Wir haben Ihnen ein neues Kennwort per eMail zugeschickt an die Adresse, " +"die Sie uns gegeben haben. Es sollte in Kürze ankommen." + +#: conf/admin_templates/registration/password_change_form.html.py:4 +msgid "" +"Please enter your old password, for security's sake, and then enter your new " +"password twice so we can verify you typed it in correctly." +msgstr "" +"Bitte geben Sie aus Sicherheitsgründen erst Ihr altes Kennwort und darunter " +"dann zweimal (um sicherzustellen, das Sie es korrekt eingegeben haben) das " +"neue Kennwort ein." + +#: conf/admin_templates/registration/password_change_form.html.py:5 +msgid "Old password:" +msgstr "altes Kennwort:" + +#: conf/admin_templates/registration/password_change_form.html.py:6 +msgid "New password:" +msgstr "neues Kennwort:" + +#: conf/admin_templates/registration/password_change_form.html.py:7 +msgid "Confirm password:" +msgstr "Kennwortwiederholung:" + +#: conf/admin_templates/registration/password_change_form.html.py:8 +msgid "Change my password" +msgstr "Mein Kennwort ändern" + +#: conf/admin_templates/registration/password_reset_email.html.py:1 +msgid "You're receiving this e-mail because you requested a password reset" +msgstr "Sie erhalten diese Mail, weil Sie ein neues Kennwort" + +#: conf/admin_templates/registration/password_reset_email.html.py:2 +#, python-format +msgid "for your user account at %(site_name)s" +msgstr "für ihren Benutzer bei %(site_name)s angefordert haben." + +#: conf/admin_templates/registration/password_reset_email.html.py:3 +#, python-format +msgid "Your new password is: %(new_password)s" +msgstr "Ihr neues Kennwort ist: %(new_password)s" + +#: conf/admin_templates/registration/password_reset_email.html.py:4 +msgid "Feel free to change this password by going to this page:" +msgstr "Sie können das Kennwort auf folgender Seite ändern:" + +#: conf/admin_templates/registration/password_reset_email.html.py:5 +msgid "Your username, in case you've forgotten:" +msgstr "Ihr Benutzername, falls Sie ihn vergessen haben:" + +#: conf/admin_templates/registration/password_reset_email.html.py:6 +msgid "Thanks for using our site!" +msgstr "Vielen Dank, das Sie unsere Seiten benutzen!" + +#: conf/admin_templates/registration/password_reset_email.html.py:7 +#, python-format +msgid "The %(site_name)s team" +msgstr "Das Team von %(site_name)s" +