Django

Code

Changeset 798

Show
Ignore:
Timestamp:
10/07/05 18:18:29 (3 years ago)
Author:
hugo
Message:

i18n: made the make-messages.py script work much better by using msgmerge and msguniq
and fixed the german translation file (mostly the header)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/i18n/django/bin/make-messages.py

    r777 r798  
    3838    os.makedirs(basedir) 
    3939 
    40 lf = os.path.join(basedir, '%s.po' % domain) 
    41  
    4240tpl_i18n_re = re.compile(r'{%\s+i18n\s+.*?%}') 
    4341tpl_value_re = re.compile(r'{{\s*_\(.*?\)\s*}}') 
    4442tpl_tag_re = re.compile(r"""{%.*_\((?:".*?")|(?:'.*?')\).*%}""") 
     43 
     44pofile = os.path.join(basedir, '%s.po' % domain) 
     45potfile = os.path.join(basedir, '%s.pot' % domain) 
     46 
     47if os.path.exists(potfile): 
     48    os.unlink(potfile) 
    4549 
    4650for (dirpath, dirnames, filenames) in os.walk("."): 
    …… 
    6064                thefile = '%s.py' % file 
    6165            if verbose: sys.stdout.write('processing file %s in %s\n' % (file, dirpath)) 
    62             if os.path.isfile(lf): 
    63                 cmd = 'xgettext -j -d %s -L Python -p "%s" "%s"' % (domain, basedir, os.path.join(dirpath, thefile)) 
    64             else: 
    65                 cmd = 'xgettext -d %s -L Python -p "%s" "%s"' % (domain, basedir, os.path.join(dirpath, thefile)) 
    66             os.system(cmd) 
     66            cmd = 'xgettext %s -d %s -L Python -o - "%s"' % ( 
     67                os.path.exists(potfile) and '--omit-header' or '', domain, os.path.join(dirpath, thefile)) 
     68            msgs = os.popen(cmd, 'r').read() 
     69            if msgs: 
     70                open(potfile, 'ab').write(msgs) 
    6771            if thefile != file: 
    6872                os.unlink(os.path.join(dirpath, thefile)) 
    6973 
     74msgs = os.popen('msguniq %s' % potfile, 'r').read() 
     75open(potfile, 'w').write(msgs) 
     76msgs = os.popen('msgmerge %s %s' % (pofile, potfile), 'r').read() 
     77open(pofile, 'wb').write(msgs) 
     78os.unlink(potfile) 
     79 

  • django/branches/i18n/django/conf/locale/de/LC_MESSAGES/django.po

    r764 r798  
    77msgid "" 
    88msgstr "" 
    9 "Project-Id-Version: PACKAGE VERSION\n" 
     9"Project-Id-Version: Django 1.0\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2005-10-01 18:22+0200\n" 
    12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 
    14 "Language-Team: LANGUAGE <LL@li.org>\n" 
     11"POT-Creation-Date: 2005-10-08 00:07+0200\n" 
     12"PO-Revision-Date: 2005-10-08 00:03+0200\n" 
     13"Last-Translator: Georg Bauer <gb@bofh.ms>\n" 
    1514"MIME-Version: 1.0\n" 
    1615"Content-Type: text/plain; charset=iso-8859-1\n" 
    1716"Content-Transfer-Encoding: 8bit\n" 
    1817 
    19 #: core/validators.py:56 
    20 msgid "This value must contain only letters, numbers and underscores." 
    21 msgstr "Der Wert darf nur Buchstaben, Ziffern und Unterstriche enthalten." 
    22  
    23 #: conf/admin_templates/404.html:3 conf/admin_templates/404.html:7 
    24 #: conf/admin_templates/404.html.py:1 conf/admin_templates/404.html.py:2 
    25 msgid "Page not found" 
    26 msgstr "Seite nicht gefunden" 
    27  
    28 #: conf/admin_templates/404.html:9 conf/admin_templates/404.html.py:3 
    29 msgid "We're sorry, but the requested page could not be found." 
    30 msgstr "" 
    31 "Es tut uns leid, aber die angeforderte Seite kann nicht gefunden werden." 
    32  
    33 #: conf/admin_templates/index.html:26 
    34 #: conf/admin_templates/changelist_generic.html:8 
    35 #: conf/admin_templates/changelist_generic.html.py:1 
    36 #: conf/admin_templates/index.html.py:1 
    37 msgid "Add" 
    38 msgstr "Zuf� 
    39 #: conf/admin_templates/index.html:32 conf/admin_templates/index.html.py:2 
    40 msgid "Change" 
    41 msgstr "�dern" 
    42  
    43 #: conf/admin_templates/index.html:50 conf/admin_templates/index.html.py:4 
    44 msgid "Recent Actions" 
    45 msgstr "K�he Aktionen" 
    46  
    47 #: conf/admin_templates/index.html:51 conf/admin_templates/index.html.py:5 
    48 msgid "My Actions" 
    49 msgstr "Meine Aktionen" 
    50  
    51 #: conf/admin_templates/index.html:55 conf/admin_templates/index.html.py:6 
    52 msgid "None available" 
    53 msgstr "Keine vorhanden" 
    54  
    55 #: conf/admin_templates/base_site.html:3 
    56 #: conf/admin_templates/base_site.html.py:1 
    57 msgid "Django site admin" 
    58 msgstr "Django Systemverwaltung" 
    59  
    60 #: conf/admin_templates/base_site.html:6 
    61 #: conf/admin_templates/base_site.html.py:2 
    62 msgid "Django administration" 
    63 msgstr "Django Verwaltung" 
    64  
    65 #: conf/admin_templates/500.html:5 conf/admin_templates/500.html.py:1 
    66 msgid "Server error (500)" 
    67 msgstr "Serverfehler (500)" 
    68  
    69 #: conf/admin_templates/500.html:8 
    70 msgid "Server error <em>(500)</em>" 
    71 msgstr "Serverfehler <em>(500)</em>" 
    72  
    73 #: conf/admin_templates/500.html:9 conf/admin_templates/500.html.py:3 
    74 msgid "" 
    75 "There's been an error. It's been reported to the site administrators via e-" 
    76 "mail and should be fixed shortly. Thanks for your patience." 
    77 msgstr "" 
    78 "Es hat einen Fehler gegeben. Dieser Fehler wurde an die Serververwalter per " 
    79 "eMail weitergegeben und sollte bald behoben sein. Vielen Dank f� " 
    80 "Verst�nis." 
    81  
    82 #: conf/admin_templates/delete_confirmation_generic.html:6 
    83 #: conf/admin_templates/delete_confirmation_generic.html.py:1 
    84 #, python-format 
    85 msgid "" 
    86 "Deleting the %(object_name)s  '%(object)s' would result in deleting related " 
    87 "objects, but your account doesn't have permission to delete the following " 
    88 "types of objects:" 
    89 msgstr "" 
    90 "Die L�ung des %(object_name)s '%(object)s' h�e die L�ung von " 
    91 "abh�igen Daten zur Folge, aber Sie haben nicht die n�en Rechte um die " 
    92 "folgenden abh�igen Daten zu l�en:" 
    93  
    94 #: conf/admin_templates/delete_confirmation_generic.html:13 
    95 #: conf/admin_templates/delete_confirmation_generic.html.py:2 
    96 #, python-format 
    97 msgid "" 
    98 "Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " 
    99 "the following related items will be deleted:" 
    100 msgstr "" 
    101 "Sind Sie sicher, das Sie %(object_name)s \"%(object)s\" l�en wollen? Es " 
    102 "werden zus�lich die folgenden abh�igen Daten mit gel�t:" 
    103  
    104 #: conf/admin_templates/login.html:14 conf/admin_templates/login.html.py:1 
    105 msgid "Username:" 
    106 msgstr "Benutzername:" 
    107  
    108 #: conf/admin_templates/login.html:17 conf/admin_templates/login.html.py:2 
    109 msgid "Password:" 
    110 msgstr "Passwort:" 
    111  
    112 #: conf/admin_templates/login.html:19 conf/admin_templates/login.html.py:3 
    113 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?" 
    114 msgstr "Haben Sie <a href=\"/password_reset/\">ihr Passwort vergessen</a>?" 
    115  
    116 #: conf/admin_templates/base.html:22 conf/admin_templates/base.html.py:1 
    117 msgid "Welcome," 
    118 msgstr "Willkommen," 
    119  
    120 #: conf/admin_templates/base.html:22 conf/admin_templates/base.html.py:2 
    121 #: conf/admin_templates/base.html.py:5 
    122 msgid "Change password" 
    123 msgstr "Passwort �ern" 
    124  
    125 #: conf/admin_templates/base.html:22 conf/admin_templates/base.html.py:3 
    126 #: conf/admin_templates/base.html.py:5 
    127 msgid "Log out" 
    128 msgstr "Abmelden" 
    129  
    130 #: conf/admin_templates/base.html:28 conf/admin_templates/base.html.py:4 
     18#: conf/admin_templates/admin_object_history.html.py:1 
     19#: conf/admin_templates/base.html.py:4 
    13120#: conf/admin_templates/registration/password_change_done.html.py:1 
    13221#: conf/admin_templates/registration/password_reset_form.html.py:1 
    …… 
    13423#: conf/admin_templates/registration/password_reset_done.html.py:1 
    13524#: conf/admin_templates/registration/password_change_form.html.py:1 
    136 #: conf/admin_templates/admin_object_history.html.py:1 
    13725msgid "Home" 
    13826msgstr "Start" 
    13927 
    140 #: conf/admin_templates/index.html:42 conf/admin_templates/index.html.py:3 
    141 msgid "You don't have permission to edit anything." 
    142 msgstr "Sie haben keine Berechtigung irgendwas zu �ern." 
    143  
     28#: conf/admin_templates/admin_object_history.html.py:2 
     29msgid "History" 
     30msgstr "Geschichte" 
     31 
     32#: conf/admin_templates/admin_object_history.html.py:3 
     33msgid "Date/time" 
     34msgstr "Datum/Zeit" 
     35 
     36#: conf/admin_templates/admin_object_history.html.py:4 
     37msgid "User" 
     38msgstr "Benutzer" 
     39 
     40#: conf/admin_templates/admin_object_history.html.py:5 
     41msgid "Action" 
     42msgstr "Aktion" 
     43 
     44#: conf/admin_templates/admin_object_history.html.py:6 
     45msgid "" 
     46"This object doesn't have a change history. It probably wasn't added via this " 
     47"admin site." 
     48msgstr "" 
     49"Dieses Objekt hat keine �derungsgeschichte. Es wurde m�cherweise nicht " 
     50"�iese Verwaltungsseiten angelegt." 
     51 
     52#: conf/admin_templates/changelist_generic.html.py:1 
     53#: conf/admin_templates/index.html.py:1 
     54msgid "Add" 
     55msgstr "Zuf� 
    14456#: conf/admin_templates/changelist_generic.html.py:2 
    14557msgid "Click to change" 
    14658msgstr "Zur �derung klicken" 
    14759 
     60#: conf/admin_templates/base_site.html.py:1 
     61msgid "Django site admin" 
     62msgstr "Django Systemverwaltung" 
     63 
     64#: conf/admin_templates/base_site.html.py:2 
     65msgid "Django administration" 
     66msgstr "Django Verwaltung" 
     67 
     68#: conf/admin_templates/index.html.py:2 
     69msgid "Change" 
     70msgstr "�dern" 
     71 
     72#: conf/admin_templates/index.html.py:3 
     73msgid "You don't have permission to edit anything." 
     74msgstr "Sie haben keine Berechtigung irgendwas zu �ern." 
     75 
     76#: conf/admin_templates/index.html.py:4 
     77msgid "Recent Actions" 
     78msgstr "K�he Aktionen" 
     79 
     80#: conf/admin_templates/index.html.py:5 
     81msgid "My Actions" 
     82msgstr "Meine Aktionen" 
     83 
     84#: conf/admin_templates/index.html.py:6 
     85msgid "None available" 
     86msgstr "Keine vorhanden" 
     87 
     88#: conf/admin_templates/500.html.py:1 
     89msgid "Server error (500)" 
     90msgstr "Serverfehler (500)" 
     91 
    14892#: conf/admin_templates/500.html.py:2 
    14993msgid "Server Error <em>(500)</em>" 
    15094msgstr "Serverfehler <em>(500)</em>" 
    15195 
     96#: conf/admin_templates/500.html.py:3 
     97msgid "" 
     98"There's been an error. It's been reported to the site administrators via e-" 
     99"mail and should be fixed shortly. Thanks for your patience." 
     100msgstr "" 
     101"Es hat einen Fehler gegeben. Dieser Fehler wurde an die Serververwalter per " 
     102"eMail weitergegeben und sollte bald behoben sein. Vielen Dank f� " 
     103"Verst�nis." 
     104 
     105#: conf/admin_templates/404.html.py:1 conf/admin_templates/404.html.py:2 
     106msgid "Page not found" 
     107msgstr "Seite nicht gefunden" 
     108 
     109#: conf/admin_templates/404.html.py:3 
     110msgid "We're sorry, but the requested page could not be found." 
     111msgstr "" 
     112"Es tut uns leid, aber die angeforderte Seite kann nicht gefunden werden." 
     113 
     114#: conf/admin_templates/delete_confirmation_generic.html.py:1 
     115#, python-format 
     116msgid "" 
     117"Deleting the %(object_name)s  '%(object)s' would result in deleting related " 
     118"objects, but your account doesn't have permission to delete the following " 
     119"types of objects:" 
     120msgstr "" 
     121"Die L�ung des %(object_name)s '%(object)s' h�e die L�ung von " 
     122"abh�igen Daten zur Folge, aber Sie haben nicht die n�en Rechte um die " 
     123"folgenden abh�igen Daten zu l�en:" 
     124 
     125#: conf/admin_templates/delete_confirmation_generic.html.py:2 
     126#, python-format 
     127msgid "" 
     128"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " 
     129"the following related items will be deleted:" 
     130msgstr "" 
     131"Sind Sie sicher, das Sie %(object_name)s \"%(object)s\" l�en wollen? Es " 
     132"werden zus�lich die folgenden abh�igen Daten mit gel�t:" 
     133 
    152134#: conf/admin_templates/delete_confirmation_generic.html.py:3 
    153135msgid "Yes, I'm sure" 
    154136msgstr "Ja, ich bin sicher" 
    155137 
     138#: conf/admin_templates/login.html.py:1 
     139msgid "Username:" 
     140msgstr "Benutzername:" 
     141 
     142#: conf/admin_templates/login.html.py:2 
     143msgid "Password:" 
     144msgstr "Passwort:" 
     145 
     146#: conf/admin_templates/login.html.py:3 
     147msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?" 
     148msgstr "Haben Sie <a href=\"/password_reset/\">ihr Passwort vergessen</a>?" 
     149 
    156150#: conf/admin_templates/login.html.py:4 
    157151msgid "Log in" 
    158152msgstr "Anmelden" 
    159153 
     154#: conf/admin_templates/base.html.py:1 
     155msgid "Welcome," 
     156msgstr "Willkommen," 
     157 
     158#: conf/admin_templates/base.html.py:2 conf/admin_templates/base.html.py:5 
     159msgid "Change password" 
     160msgstr "Passwort �ern" 
     161 
     162#: conf/admin_templates/base.html.py:3 conf/admin_templates/base.html.py:5 
     163msgid "Log out" 
     164msgstr "Abmelden" 
     165 
    160166#: conf/admin_templates/registration/password_change_done.html.py:2 
     167#: conf/admin_templates/registration/password_change_done.html.py:6 
    161168#: conf/admin_templates/registration/password_change_form.html.py:2 
    162169#: conf/admin_templates/registration/password_change_form.html.py:3 
    163 #: conf/admin_templates/registration/password_change_done.html.py:6 
    164170#: conf/admin_templates/registration/password_change_form.html.py:4 
    165171#: conf/admin_templates/registration/password_change_form.html.py:10 
    …… 
    179185#: conf/admin_templates/registration/password_reset_form.html.py:3 
    180186#: conf/admin_templates/registration/password_reset_form.html.py:4 
    181 #: conf/admin_templates/registration/password_reset_done.html.py:2 
    182187#: conf/admin_templates/registration/password_reset_form.html.py:8 
    183188#: conf/admin_templates/registration/password_reset_form.html.py:9 
     189#: conf/admin_templates/registration/password_reset_done.html.py:2 
    184190#: conf/admin_templates/registration/password_reset_done.html.py:6 
    185191msgid "Password reset" 
    …… 
    224230"Sie uns gegeben haben. Es sollte in K�nkommen." 
    225231 
    226 #: conf/admin_templates/registration/password_change_form.html.py:4 
    227232#: conf/admin_templates/registration/password_change_form.html.py:5 
    228233msgid "" 
    …… 
    234239"neue Kennwort ein." 
    235240 
    236 #: conf/admin_templates/registration/password_change_form.html.py:5 
    237241#: conf/admin_templates/registration/password_change_form.html.py:6 
    238242msgid "Old password:" 
    239243msgstr "altes Kennwort:" 
    240244 
    241 #: conf/admin_templates/registration/password_change_form.html.py:6 
    242245#: conf/admin_templates/registration/password_change_form.html.py:7 
    243246msgid "New password:" 
    244247msgstr "neues Kennwort:" 
    245248 
    246 #: conf/admin_templates/registration/password_change_form.html.py:7 
    247249#: conf/admin_templates/registration/password_change_form.html.py:8 
    248250msgid "Confirm password:" 
    249251msgstr "Kennwortwiederholung:" 
    250252 
    251 #: conf/admin_templates/registration/password_change_form.html.py:8 
    252253#: conf/admin_templates/registration/password_change_form.html.py:9 
    253254msgid "Change my password" 
    …… 
    285286msgstr "Das Team von %(site_name)s" 
    286287 
    287 #: conf/admin_templates/admin_object_history.html.py:2 
    288 msgid "History" 
    289 msgstr "Geschichte" 
    290  
    291 #: conf/admin_templates/admin_object_history.html.py:3 
    292 msgid "Date/time" 
    293 msgstr "Datum/Zeit" 
    294  
    295 #: conf/admin_templates/admin_object_history.html.py:4 
    296 msgid "User" 
    297 msgstr "Benutzer" 
    298  
    299 #: conf/admin_templates/admin_object_history.html.py:5 
    300 msgid "Action" 
    301 msgstr "Aktion" 
    302  
    303 #: conf/admin_templates/admin_object_history.html.py:6 
    304 msgid "" 
    305 "This object doesn't have a change history. It probably wasn't added via this " 
    306 "admin site." 
    307 msgstr "" 
    308 "Dieses Objekt hat keine �derungsgeschichte. Es wurde m�cherweise nicht " 
    309 "�iese Verwaltungsseiten angelegt." 
    310  
     288#: core/validators.py:56 
     289msgid "This value must contain only letters, numbers and underscores." 
     290msgstr "Der Wert darf nur Buchstaben, Ziffern und Unterstriche enthalten."