From 5ef1cef1586d2fdb0ebf22bb4c7304cc6c00ab3d Mon Sep 17 00:00:00 2001 From: Georg Bauer Date: Fri, 4 Nov 2005 14:25:54 +0000 Subject: [PATCH] new_admin: fixed a problem with make-messages.py and added first new translations (mostly to checkout the toolchain) git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@1075 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/conf/locale/de/LC_MESSAGES/django.mo | Bin 17824 -> 18082 bytes django/conf/locale/de/LC_MESSAGES/django.po | 235 ++++++++++-------- .../admin/templates/admin/change_form.html | 21 +- django/utils/translation.py | 4 +- 4 files changed, 143 insertions(+), 117 deletions(-) diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo index 73ce9d047600948438135522050afee211debf63..b2f356ab5e314dfc304811c6b2eee985c9784676 100644 GIT binary patch delta 4612 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 delta 4377 zcmYk<3v`Zk0LStFd%VonE@o_O6T)nm%akUvH#0MrX_=VFW#rO@Rkl{_!Q|46@+Q|@ zVlJWETa#`wN0n#$;g+Y=a>4cJ$ClZ`_H^@f=1QhZ88YWk(o$)le6_0sCSIj>jaNipjVfd*VK9g+HKXCN$Q) zaVqNkOzeR(a0qU|Li`TZ!J%<)Q)#pp*(VHoo%qfsMiVe4&CBTu&VuIQtF z6RN|-s0PX~8_Q7xJBD+y&ejWB8sq4K=@fK95!T)XYfHW*cbz~1N#yV8Ph1a`__CZv~7orBV4D|?CITX~R_4b4+q)oFIHPuH^ zZ^5Ui#d865qhYPxsT_&@sE5ArhWgq1VDwVYxAg*hybwd! zKNA~ciFF=2T3k!*jt!_0RH1GhKs9s#`N)~0s2iO{jrct3ykD^~niRJKp{Nc=qRwlE zO|UKM{%Q8OFNOKng#&ehhu;94L486eV^Z-LYHeJ_p*W&5?<{Uc){_bE;y#-0sE*x? zYB&QIV-{*gPM{v)C#V6RMs?)JF3i6U{K*b}28@SR^=x8MBThozB-0l)(y`WQ7)JeJ zR09rbAPcb?D{&AG=<2@zmB?4!Y{HJX4R6BNtOLx$KDY>Vehn65I47%v<*0!!LH&5Gz%A$;qM(sY;U(7;7GWrs+Il(a z!U|hoi9YJyr~SvsvehS?a6hfwXDLUrhC@51Zj$yT1nc+?!9ZIbK3OhNcmpOU+~oY9KvP9r2-NWH@HgzL`j2 zGVVYvj&L4)CEkc-Sc4k*ZRzeObq02(z6*EZDQt=k3r8Qam8gO2MGc@D^@!dXg%goJnH|WBV7@|r zw@hST_k)&-8>#2_W&X!dxWbN>n0qUqS)7L17{Da_3ybgueo+eWY1A{ki0V-53}y#& z@OG>~t${PB0h~vzjZ3KZenrjnaG&E|SmJX}+>a3)sIm2vs1cmTIT%7KgK#0v!xN|m za{IfhdlYI03y~Mg6eH`-?8IdJ0u!+jzd#y5JBNZU$VV-*si*d9M=_t&8obzN~2IpWytVFfrM-Sdd9@qP?t%Hl%Z_USTM2oUF zX-}Reo5?DoO^uci)}|RoUM8hP3yWn@|3lRZQ^*dYjdfoC&p0hYJ(jlqs)z*7o&JLn zF$I3=*+gABLXH!bOa1?{z&t>-24l%MqDd$qkC8aCmvklCZYOEv6|%*j8W}fkD+A?K~AcjL(u?WIpLk^!3%+(x$gd+g+p$d4ceD*MBw+ zqqaN9Wb!`ABibG&Ye*%zn=B)b5G@(D;6%FrxYeFbMpH3@FpDLhCXB`?~Y`cQm8R+2^JEwY@nBTLA0B)H9^5MwJXa0*#RrfS{j z0}|Z21Pj)8Fqyn$>&I{cd6LW^+BUfS_cy=5^}l43@Or!VRUAsZWTD+R3-8gojilfs zZ;*o|l{`<1$V23HGMc0lZ3kS;J`9i%wk}rK@|ze>?k5Q(hXl8s6q=F&q*&`KxGfIc zAN_G?AU7e+JpR(|5rOFR M??MBi{nvW`1rImKAOHXW diff --git a/django/conf/locale/de/LC_MESSAGES/django.po b/django/conf/locale/de/LC_MESSAGES/django.po index 337076bae4..d22ef4a829 100644 --- a/django/conf/locale/de/LC_MESSAGES/django.po +++ b/django/conf/locale/de/LC_MESSAGES/django.po @@ -7,15 +7,69 @@ msgid "" msgstr "" "Project-Id-Version: Django 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-03 12:26+0100\n" +"POT-Creation-Date: 2005-11-04 15:21+0100\n" "PO-Revision-Date: 2005-10-08 00:03+0200\n" "Last-Translator: Georg Bauer \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: contrib/admin/templates/admin/object_history.html:5 +#: contrib/admin/models/admin.py:6 +msgid "action time" +msgstr "Zeit der Aktion" + +#: contrib/admin/models/admin.py:9 +msgid "object id" +msgstr "Objekt ID" + +#: contrib/admin/models/admin.py:10 +msgid "object repr" +msgstr "Objekt Darst." + +#: contrib/admin/models/admin.py:11 +msgid "action flag" +msgstr "Aktionskennzeichen" + +#: contrib/admin/models/admin.py:12 +msgid "change message" +msgstr "Änderungsmeldung" + +#: contrib/admin/models/admin.py:15 +msgid "log entry" +msgstr "Logeintrag" + +#: contrib/admin/models/admin.py:16 +msgid "log entries" +msgstr "Logeinträge" + +#: contrib/admin/templates/admin/index.html:27 +#: contrib/admin/templates/admin/change_form.html:14 +msgid "Add" +msgstr "Zufügen" + +#: contrib/admin/templates/admin/index.html:33 +msgid "Change" +msgstr "Ändern" + +#: contrib/admin/templates/admin/index.html:43 +msgid "You don't have permission to edit anything." +msgstr "Sie haben keine Berechtigung irgendwas zu ändern." + +#: contrib/admin/templates/admin/index.html:51 +msgid "Recent Actions" +msgstr "Kürzliche Aktionen" + +#: contrib/admin/templates/admin/index.html:52 +msgid "My Actions" +msgstr "Meine Aktionen" + +#: contrib/admin/templates/admin/index.html:56 +msgid "None available" +msgstr "Keine vorhanden" + #: contrib/admin/templates/admin/500.html:4 +#: contrib/admin/templates/admin/object_history.html:5 +#: contrib/admin/templates/admin/change_form.html:12 #: contrib/admin/templates/admin/base.html:29 #: contrib/admin/templates/registration/password_change_done.html:4 #: contrib/admin/templates/registration/password_reset_form.html:4 @@ -25,7 +79,29 @@ msgstr "" msgid "Home" msgstr "Start" +#: contrib/admin/templates/admin/500.html:4 +msgid "Server error" +msgstr "Serverfehler" + +#: contrib/admin/templates/admin/500.html:6 +msgid "Server error (500)" +msgstr "Serverfehler (500)" + +#: contrib/admin/templates/admin/500.html:9 +msgid "Server Error (500)" +msgstr "Serverfehler (500)" + +#: contrib/admin/templates/admin/500.html:10 +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." + #: contrib/admin/templates/admin/object_history.html:5 +#: contrib/admin/templates/admin/change_form.html:19 msgid "History" msgstr "Geschichte" @@ -61,61 +137,6 @@ msgstr "Django Systemverwaltung" msgid "Django administration" msgstr "Django Verwaltung" -#: contrib/admin/templates/admin/500.html:4 -msgid "Server error" -msgstr "Serverfehler" - -#: contrib/admin/templates/admin/500.html:6 -msgid "Server error (500)" -msgstr "Serverfehler (500)" - -#: contrib/admin/templates/admin/500.html:9 -msgid "Server Error (500)" -msgstr "Serverfehler (500)" - -#: contrib/admin/templates/admin/500.html:10 -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." - -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Seite nicht gefunden" - -#: contrib/admin/templates/admin/404.html:10 -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." - -#: contrib/admin/templates/admin/index.html:27 -msgid "Add" -msgstr "Zufügen" - -#: contrib/admin/templates/admin/index.html:33 -msgid "Change" -msgstr "Ändern" - -#: contrib/admin/templates/admin/index.html:43 -msgid "You don't have permission to edit anything." -msgstr "Sie haben keine Berechtigung irgendwas zu ändern." - -#: contrib/admin/templates/admin/index.html:51 -msgid "Recent Actions" -msgstr "Kürzliche Aktionen" - -#: contrib/admin/templates/admin/index.html:52 -msgid "My Actions" -msgstr "Meine Aktionen" - -#: contrib/admin/templates/admin/index.html:56 -msgid "None available" -msgstr "Keine vorhanden" - #: contrib/admin/templates/admin/login.html:15 msgid "Username:" msgstr "Benutzername:" @@ -132,17 +153,33 @@ msgstr "Haben Sie ihr Passwort vergessen?" msgid "Log in" msgstr "Anmelden" -#: contrib/admin/templates/admin/base.html:23 -msgid "Welcome," -msgstr "Willkommen," +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "Seite nicht gefunden" -#: contrib/admin/templates/admin/base.html:23 -msgid "Change password" -msgstr "Passwort ändern" +#: contrib/admin/templates/admin/404.html:10 +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." -#: contrib/admin/templates/admin/base.html:23 -msgid "Log out" -msgstr "Abmelden" +#: contrib/admin/templates/admin/change_form.html:20 +msgid "View on site" +msgstr "Im Web Anzeigen" + +#: contrib/admin/templates/admin/change_form.html:28 +msgid "Please correct the error below." +msgid_plural "Please correct the errors below." +msgstr[0] "Bitte den Fehler korrigieren." +msgstr[1] "Bitte die Fehler korrigieren." + +#: contrib/admin/templates/admin/change_form.html:45 +msgid "Ordering" +msgstr "Sortierung" + +#: contrib/admin/templates/admin/change_form.html:48 +msgid "Order:" +msgstr "Reihenfolge:" #: contrib/admin/templates/admin/delete_confirmation.html:7 #, python-format @@ -168,6 +205,18 @@ msgstr "" msgid "Yes, I'm sure" msgstr "Ja, ich bin sicher" +#: contrib/admin/templates/admin/base.html:23 +msgid "Welcome," +msgstr "Willkommen," + +#: contrib/admin/templates/admin/base.html:23 +msgid "Change password" +msgstr "Passwort ändern" + +#: contrib/admin/templates/admin/base.html:23 +msgid "Log out" +msgstr "Abmelden" + #: contrib/admin/templates/registration/password_change_done.html:4 #: contrib/admin/templates/registration/password_change_form.html:4 #: contrib/admin/templates/registration/password_change_form.html:6 @@ -284,34 +333,6 @@ msgstr "Vielen Dank, das Sie unsere Seiten benutzen!" msgid "The %(site_name)s team" msgstr "Das Team von %(site_name)s" -#: contrib/admin/models/admin.py:6 -msgid "action time" -msgstr "Zeit der Aktion" - -#: contrib/admin/models/admin.py:9 -msgid "object id" -msgstr "Objekt ID" - -#: contrib/admin/models/admin.py:10 -msgid "object repr" -msgstr "Objekt Darst." - -#: contrib/admin/models/admin.py:11 -msgid "action flag" -msgstr "Aktionskennzeichen" - -#: contrib/admin/models/admin.py:12 -msgid "change message" -msgstr "Änderungsmeldung" - -#: contrib/admin/models/admin.py:15 -msgid "log entry" -msgstr "Logeintrag" - -#: contrib/admin/models/admin.py:16 -msgid "log entries" -msgstr "Logeinträge" - #: utils/dates.py:6 msgid "Monday" msgstr "Montag" @@ -656,47 +677,47 @@ msgstr "Wichtige Daten" msgid "Message" msgstr "Mitteilung" -#: conf/global_settings.py:37 +#: conf/global_settings.py:38 msgid "Czech" msgstr "Tschechisch" -#: conf/global_settings.py:38 +#: conf/global_settings.py:39 msgid "German" msgstr "Deutsch" -#: conf/global_settings.py:39 +#: conf/global_settings.py:40 msgid "English" msgstr "Englisch" -#: conf/global_settings.py:40 +#: conf/global_settings.py:41 msgid "Spanish" msgstr "Spanisch" -#: conf/global_settings.py:41 +#: conf/global_settings.py:42 msgid "French" msgstr "Französisch" -#: conf/global_settings.py:42 +#: conf/global_settings.py:43 msgid "Galician" msgstr "Galicisch" -#: conf/global_settings.py:43 +#: conf/global_settings.py:44 msgid "Italian" msgstr "Italienisch" -#: conf/global_settings.py:44 +#: conf/global_settings.py:45 msgid "Brazilian" msgstr "Brasilianisch" -#: conf/global_settings.py:45 +#: conf/global_settings.py:46 msgid "Russian" msgstr "Russisch" -#: conf/global_settings.py:46 +#: conf/global_settings.py:47 msgid "Serbian" msgstr "Serbisch" -#: conf/global_settings.py:47 +#: conf/global_settings.py:48 msgid "Traditional Chinese" msgstr "" @@ -972,11 +993,11 @@ msgstr "" "Das Attribut %(attr)s in Zeile %(line)s hat einen ungültigen Wert. Die Zeile " "beginnt mit \"%(start)s\"." -#: core/meta/fields.py:95 +#: core/meta/fields.py:114 msgid " Separate multiple IDs with commas." msgstr "Mehrere IDs können mit Komma getrennt werden." -#: core/meta/fields.py:98 +#: core/meta/fields.py:117 msgid "" " Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" diff --git a/django/contrib/admin/templates/admin/change_form.html b/django/contrib/admin/templates/admin/change_form.html index 73981c835c..ac9e5279cc 100644 --- a/django/contrib/admin/templates/admin/change_form.html +++ b/django/contrib/admin/templates/admin/change_form.html @@ -1,4 +1,5 @@ {% extends "admin/base_site" %} +{% load i18n %} {% load admin_modify %} {% load adminmedia %} {% block extrahead %} @@ -8,21 +9,25 @@ {% block bodyclass %}{{app_label}}-{{bound_manipulator.object_name.lower}} change-form{% endblock %} {% block breadcrumbs %}{% if not is_popup %}
- Home › + {% trans "Home" %} › {{bound_manipulator.verbose_name_plural|capfirst}} › - {% if add %}Add {{bound_manipulator.verbose_name}}{% else %}{{bound_manipulator.original|striptags|truncatewords:"18"}}{% endif %} + {% if add %}{% trans "Add" %} {{bound_manipulator.verbose_name}}{% else %}{{bound_manipulator.original|striptags|truncatewords:"18"}}{% endif %}
{% endif %}{% endblock %} {% block content %}
{% if change %}{% if not is_popup %} -
  • History
    • - {% if bound_manipulator.has_absolute_url %}
  • View on site
    • {% endif%} + {% endif %}{% endif %}
    {% block form_top %}{%endblock%} {% if is_popup %}{% endif %} {% if bound_manipulator.save_on_top %}{% submit_row %}{% endif %} -{% if form.error_dict %}

    Please correct the error{{ form.error_dict.items|pluralize }} below.

    {% endif %} +{% if form.error_dict %} +

    + {% blocktrans count form.error_dict.items|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %} +

    +{% endif %} {% for bound_field_set in bound_manipulator.bound_field_sets %}
    {% if bound_field_set.name %}

    {{bound_field_set.name }}

    {% endif %} @@ -37,10 +42,10 @@ {% block after_field_sets %}{% endblock %} {% if change %} {% if bound_manipulator.ordered_objects %} -

    Ordering

    +

    {% trans "Ordering" %}

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

    {{ form.order_ }}

    +

    {{ form.order_ }}

    {% endif %} {% endif %} @@ -68,4 +73,4 @@ {% endif %} {% endif %}
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/django/utils/translation.py b/django/utils/translation.py index 0d40a636c8..1df99ad1ce 100644 --- a/django/utils/translation.py +++ b/django/utils/translation.py @@ -366,7 +366,7 @@ endblock_re = re.compile(r"""^\s*endblocktrans$""") plural_re = re.compile(r"""^\s*plural$""") constant_re = re.compile(r"""_\(((?:".*?")|(?:'.*?'))\)""") def templateize(src): - from django.core.template import tokenize, TOKEN_TEXT, TOKEN_VAR, TOKEN_BLOCK + from django.core.template import Lexer, TOKEN_TEXT, TOKEN_VAR, TOKEN_BLOCK """ This function turns a django template into something that is understood by xgettext. It does so by translating the django @@ -377,7 +377,7 @@ def templateize(src): inplural = False singular = [] plural = [] - for t in tokenize(src): + for t in Lexer(src, None).tokenize(): if intrans: if t.token_type == TOKEN_BLOCK: endbmatch = endblock_re.match(t.contents)