Merge with piranha
authorpythy <the.pythy@gmail.com>
Fri Oct 17 08:23:09 2008 +0700 (8 days ago)
changeset 105334586edd6d5f
parent 104712c199afdcde
parent 10523552cd0d34cd
child 1058e1e99c66a1de
Merge with piranha
       1 --- a/apps/blog/models.py	Tue Oct 07 09:18:38 2008 +0700
       2 +++ b/apps/blog/models.py	Fri Oct 17 08:23:09 2008 +0700
       3 @@ -102,7 +102,6 @@
       4  
       5  xmlrpc.dispatcher.register_function(create_ping_func(**ping_details), 'pingback.ping')
       6  
       7 -
       8  if settings.ENABLE_PINGBACK:
       9      ping_links = ping_external_links(content_attr='html', url_attr='get_absolute_url',
      10                                       filtr=lambda x: not x.is_draft)
      11 @@ -111,3 +110,11 @@
      12      ping_dirs = ping_directories(content_attr='html', url_attr='get_absolute_url',
      13                                   filtr=lambda x: not x.is_draft)
      14      models.signals.post_save.connect(ping_dirs, sender=Post)
      15 +
      16 +if 'watchlist' in settings.INSTALLED_APPS:
      17 +    from watchlist.models import Subscription
      18 +    def subscribe_author(instance, created, **kwargs):
      19 +        if not created:
      20 +            return
      21 +        Subscription.objects.subscribe(instance.author, instance)
      22 +    models.signals.post_save.connect(subscribe_author, sender=Post)
     1.1 --- a/apps/livejournal/admin.py	Tue Oct 07 09:18:38 2008 +0700
     1.2 +++ b/apps/livejournal/admin.py	Fri Oct 17 08:23:09 2008 +0700
     1.3 @@ -13,11 +13,14 @@
     1.4  
     1.5  
     1.6  if settings.ENABLE_LJ_CROSSPOST:
     1.7 +    from blog.models import Post
     1.8      from blog.admin import PostAdmin
     1.9      class LiveJournalPostInlineAdmin(admin.TabularInline):
    1.10          model = LiveJournalPost
    1.11          max_num = 1
    1.12      PostAdmin.list_display += ('lj_object', )
    1.13 -    PostAdmin.inlines += (LiveJournalPostInlineAdmin, )
    1.14 +    pa = admin.site._registry[Post]
    1.15 +    pa.inline_instances.append(
    1.16 +        LiveJournalPostInlineAdmin(pa.model, pa.admin_site))
    1.17      models.signals.pre_save.connect(lj_crosspost, sender=LiveJournalPost)
    1.18      models.signals.pre_delete.connect(lj_delete, sender=LiveJournalPost)
     2.1 --- a/apps/patches.py	Tue Oct 07 09:18:38 2008 +0700
     2.2 +++ b/apps/patches.py	Fri Oct 17 08:23:09 2008 +0700
     2.3 @@ -23,4 +23,4 @@
     2.4      ErrorDict.as_json = as_json
     2.5  
     2.6  
     2.7 -template.loader.get_template = cached_get_template
     2.8 \ No newline at end of file
     2.9 +#template.loader.get_template = cached_get_template
     3.1 Binary file locale/de/LC_MESSAGES/django.mo has changed
     4.1 --- a/locale/de/LC_MESSAGES/django.po	Tue Oct 07 09:18:38 2008 +0700
     4.2 +++ b/locale/de/LC_MESSAGES/django.po	Fri Oct 17 08:23:09 2008 +0700
     4.3 @@ -7,7 +7,7 @@
     4.4  msgstr ""
     4.5  "Project-Id-Version: PACKAGE VERSION\n"
     4.6  "Report-Msgid-Bugs-To: \n"
     4.7 -"POT-Creation-Date: 2008-09-30 15:07+0300\n"
     4.8 +"POT-Creation-Date: 2008-10-11 18:05+0200\n"
     4.9  "PO-Revision-Date: 2008-03-02 15:00+0100\n"
    4.10  "Last-Translator: Nico Gulden <[email protected]>\n"
    4.11  "Language-Team: LANGUAGE <[email protected]>\n"
    4.12 @@ -39,7 +39,6 @@
    4.13  msgstr "Passwort"
    4.14  
    4.15  #: apps/accounts/forms.py:13
    4.16 -#, fuzzy
    4.17  msgid "Leave blank to keep current"
    4.18  msgstr "Frei lassen, um das aktuelle Passwort beizubehalten"
    4.19  
    4.20 @@ -60,9 +59,8 @@
    4.21  msgstr "Das selbe Passwort muss jedesmal eingegeben werden"
    4.22  
    4.23  #: apps/accounts/views.py:41
    4.24 -#, fuzzy
    4.25  msgid "Email or password was not supplied"
    4.26 -msgstr "E-Mailadresse oder Password sind falsch!"
    4.27 +msgstr "E-Mailadresse oder Password wurden nicht angegeben!"
    4.28  
    4.29  #: apps/accounts/views.py:48
    4.30  msgid "Email or password are incorrect!"
    4.31 @@ -102,10 +100,6 @@
    4.32  msgid "Changes to profile saved."
    4.33  msgstr "Г„nderungen wurden im Profil gespeichert."
    4.34  
    4.35 -#: apps/blog/admin.py:35
    4.36 -msgid "Author"
    4.37 -msgstr ""
    4.38 -
    4.39  #: apps/blog/models.py:24
    4.40  msgid "Slug"
    4.41  msgstr "Schlagzeile"
    4.42 @@ -130,167 +124,157 @@
    4.43  msgid "Date"
    4.44  msgstr "Datum"
    4.45  
    4.46 -#: apps/blog/models.py:97
    4.47 +#: apps/blog/models.py:89
    4.48  msgid "view"
    4.49  msgstr "betrachten"
    4.50  
    4.51 -#: apps/blog/views.py:74
    4.52 +#: apps/blog/views.py:97
    4.53  msgid "Please look in your mailbox for info about your account."
    4.54  msgstr "Bitte schauen Sie wegen Informationen zu Ihrem Konto in ihr Postfach."
    4.55  
    4.56 -#: apps/blog/views.py:77
    4.57 +#: apps/blog/views.py:100
    4.58  msgid "Please look in your mailbox for comment approval link."
    4.59  msgstr "Bitte schauen Sie nach dem Kommentar-Zustimmungslink in Ihr Postfach."
    4.60  
    4.61  #: apps/blogroll/models.py:14
    4.62  msgid "URL"
    4.63 -msgstr ""
    4.64 +msgstr "URL"
    4.65  
    4.66  #: apps/blogroll/models.py:16
    4.67  msgid "Relations"
    4.68 -msgstr ""
    4.69 +msgstr "Beziehungen"
    4.70  
    4.71  #: apps/blogroll/models.py:17
    4.72 -#, fuzzy
    4.73  msgid "Weight"
    4.74 -msgstr "bearbeiten"
    4.75 +msgstr "Gewichtung"
    4.76  
    4.77  #: apps/blogroll/models.py:17
    4.78  msgid "You can order links by this field. Link with smaller number goes first."
    4.79 -msgstr ""
    4.80 +msgstr "Du kannst links nach diesem Feld sortieren. Links mit kleiner Nummer kommen zuerst."
    4.81  
    4.82  #: apps/blogroll/models.py:19
    4.83  msgid "Friendship relation"
    4.84 -msgstr ""
    4.85 +msgstr "Freundschafsbeziehung"
    4.86  
    4.87  #: apps/blogroll/models.py:20
    4.88  msgid "Physical relation"
    4.89 -msgstr ""
    4.90 +msgstr "Physische Beziehung"
    4.91  
    4.92  #: apps/blogroll/models.py:21
    4.93 -#, fuzzy
    4.94  msgid "Profesional relation"
    4.95 -msgstr "Profil bearbeiten"
    4.96 +msgstr "Geschäftsbeziehung"
    4.97  
    4.98  #: apps/blogroll/models.py:22
    4.99  msgid "Geographical relation"
   4.100 -msgstr ""
   4.101 +msgstr "Geografische Beziehung"
   4.102  
   4.103  #: apps/blogroll/models.py:23
   4.104 -#, fuzzy
   4.105  msgid "Family relation"
   4.106 -msgstr "NamensГјbersetzung"
   4.107 +msgstr "Familienbeziehung"
   4.108  
   4.109  #: apps/blogroll/models.py:24
   4.110  msgid "Romantic relation"
   4.111 -msgstr ""
   4.112 +msgstr "Liebesbeziehung"
   4.113  
   4.114  #: apps/blogroll/models.py:25
   4.115 -#, fuzzy
   4.116  msgid "Identity relation"
   4.117 -msgstr "NamensГјbersetzung"
   4.118 +msgstr "Identitätsbeziehung"
   4.119  
   4.120  #: apps/blogroll/models.py:29
   4.121  msgid "Link"
   4.122 -msgstr ""
   4.123 +msgstr "Link"
   4.124  
   4.125  #: apps/blogroll/models.py:30 themes/buriy/blog/sidebar.html:65
   4.126  msgid "Links"
   4.127 -msgstr ""
   4.128 +msgstr "Links"
   4.129  
   4.130  #: apps/blogroll/relations.py:4
   4.131  msgid "contact"
   4.132 -msgstr ""
   4.133 +msgstr "Contact"
   4.134  
   4.135  #: apps/blogroll/relations.py:5
   4.136  msgid "acquaintance"
   4.137 -msgstr ""
   4.138 +msgstr "Bekanntschaft"
   4.139  
   4.140  #: apps/blogroll/relations.py:6
   4.141  msgid "friend"
   4.142 -msgstr ""
   4.143 +msgstr "Freund"
   4.144  
   4.145  #: apps/blogroll/relations.py:10
   4.146 -#, fuzzy
   4.147  msgid "met"
   4.148 -msgstr "Kommentar"
   4.149 +msgstr "getroffen"
   4.150  
   4.151  #: apps/blogroll/relations.py:14
   4.152  msgid "co-worker"
   4.153 -msgstr ""
   4.154 +msgstr "Mitarbeiter"
   4.155  
   4.156  #: apps/blogroll/relations.py:15
   4.157  msgid "colleague"
   4.158 -msgstr ""
   4.159 +msgstr "Kollege"
   4.160  
   4.161  #: apps/blogroll/relations.py:19
   4.162  msgid "co-resident"
   4.163 -msgstr ""
   4.164 +msgstr "Mitbewohner"
   4.165  
   4.166  #: apps/blogroll/relations.py:20
   4.167  msgid "neighbor"
   4.168 -msgstr ""
   4.169 +msgstr "Nachbar"
   4.170  
   4.171  #: apps/blogroll/relations.py:24
   4.172  msgid "child"
   4.173 -msgstr ""
   4.174 +msgstr "Kind"
   4.175  
   4.176  #: apps/blogroll/relations.py:25
   4.177 -#, fuzzy
   4.178  msgid "parent"
   4.179 -msgstr "Muster"
   4.180 +msgstr "Eltern"
   4.181  
   4.182  #: apps/blogroll/relations.py:26
   4.183  msgid "sibling"
   4.184 -msgstr ""
   4.185 +msgstr "Geschwister"
   4.186  
   4.187  #: apps/blogroll/relations.py:27
   4.188  msgid "spouse"
   4.189 -msgstr ""
   4.190 +msgstr "Ehegatte"
   4.191  
   4.192  #: apps/blogroll/relations.py:28
   4.193  msgid "kin"
   4.194 -msgstr ""
   4.195 +msgstr "Verwandtschaft"
   4.196  
   4.197  #: apps/blogroll/relations.py:32
   4.198  msgid "muse"
   4.199 -msgstr ""
   4.200 +msgstr "Muse"
   4.201  
   4.202  #: apps/blogroll/relations.py:33
   4.203 -#, fuzzy
   4.204  msgid "crush"
   4.205 -msgstr "Regeln"
   4.206 +msgstr "verknallt"
   4.207  
   4.208  #: apps/blogroll/relations.py:34
   4.209 -#, fuzzy
   4.210  msgid "date"
   4.211  msgstr "Datum"
   4.212  
   4.213  #: apps/blogroll/relations.py:35
   4.214  msgid "sweetheart"
   4.215 -msgstr ""
   4.216 +msgstr "Liebling"
   4.217  
   4.218  #: apps/blogroll/relations.py:39
   4.219 -#, fuzzy
   4.220  msgid "me"
   4.221 -msgstr "Name"
   4.222 +msgstr "mich"
   4.223  
   4.224  #: apps/captcha/fields.py:42
   4.225  msgid "Captcha"
   4.226 -msgstr ""
   4.227 +msgstr "Captcha"
   4.228  
   4.229  #: apps/captcha/fields.py:43
   4.230  msgid "Please, enter symbols, which you see on the image"
   4.231 -msgstr ""
   4.232 +msgstr "Bitte geben Sie die Symbole auf dem Bild ein"
   4.233  
   4.234  #: apps/captcha/fields.py:52
   4.235  msgid "Wrong answer"
   4.236 -msgstr ""
   4.237 +msgstr "Falsche Antwort"
   4.238  
   4.239  #: apps/discussion/forms.py:19
   4.240 -#, fuzzy
   4.241  msgid "Subscribe to comments"
   4.242 -msgstr "Kommentare deaktivieren"
   4.243 +msgstr "Kommentare abonnieren"
   4.244  
   4.245  #: apps/discussion/forms.py:40
   4.246  msgid "You are trying to reply to unavailable comment"
   4.247 @@ -310,7 +294,7 @@
   4.248  
   4.249  #: apps/discussion/forms.py:66
   4.250  msgid "Are you human?"
   4.251 -msgstr ""
   4.252 +msgstr "Sind Sie menschlich?"
   4.253  
   4.254  #: apps/discussion/models.py:80
   4.255  msgid "Publishing date"
   4.256 @@ -349,6 +333,7 @@
   4.257  msgstr "Kommentare deaktivieren"
   4.258  
   4.259  #: apps/livejournal/models.py:28
   4.260 +#, fuzzy
   4.261  msgid "Comments screening"
   4.262  msgstr ""
   4.263  
   4.264 @@ -367,11 +352,9 @@
   4.265  
   4.266  #: apps/openidconsumer/forms.py:54
   4.267  msgid "This email is already in database. Please choose another."
   4.268 -msgstr ""
   4.269 -"Die E-Mailadresse ist bereits in der Datenbank. Bitte eine andere auswählen."
   4.270 +msgstr "Die E-Mailadresse ist bereits in der Datenbank. Bitte eine andere auswählen."
   4.271  
   4.272  #: apps/openidconsumer/forms.py:80
   4.273 -#, fuzzy
   4.274  msgid "This email doesn't exist. Please choose another."
   4.275  msgstr "Die E-Mailadresse existiert nicht. Bitte eine andere auswählen."
   4.276  
   4.277 @@ -401,8 +384,7 @@
   4.278  
   4.279  #: apps/openidconsumer/views.py:281
   4.280  msgid "You must have at least one OpenID if you don't have email!"
   4.281 -msgstr ""
   4.282 -"Sie mГјssen mindestens ein OpenID haben, wenn Sie keine E-Mailadresse haben!"
   4.283 +msgstr "Sie mГјssen mindestens ein OpenID haben, wenn Sie keine E-Mailadresse haben!"
   4.284  
   4.285  #: apps/openidconsumer/views.py:287
   4.286  msgid "OpenID deassociated successfully"
   4.287 @@ -410,75 +392,79 @@
   4.288  
   4.289  #: apps/postimage/forms.py:19
   4.290  msgid "Description"
   4.291 -msgstr ""
   4.292 +msgstr "Beschreibung"
   4.293  
   4.294  #: apps/postimage/forms.py:19
   4.295  msgid "Image"
   4.296 -msgstr ""
   4.297 +msgstr "Bild"
   4.298  
   4.299  #: apps/postimage/forms.py:23 apps/postimage/forms.py:30
   4.300  msgid "Select a file to attach"
   4.301 -msgstr ""
   4.302 +msgstr "Bitte eine Datei zum Anhängen auswählen"
   4.303  
   4.304  #: apps/postimage/forms.py:29
   4.305  msgid "Subdirectory"
   4.306 -msgstr ""
   4.307 +msgstr "Unterverzeichnis"
   4.308  
   4.309  #: apps/postimage/forms.py:35
   4.310  msgid "The subdirectory can't contain dots (.)"
   4.311 -msgstr ""
   4.312 +msgstr "Das Unterverzeichniss kann keine Punkte (.) enthalten"
   4.313  
   4.314  #: apps/postimage/views.py:21
   4.315  msgid "Attach file"
   4.316 -msgstr ""
   4.317 +msgstr "Datei anhängen"
   4.318  
   4.319  #: apps/postimage/views.py:46
   4.320  msgid "Upload file"
   4.321 -msgstr ""
   4.322 +msgstr "Datei hochladen"
   4.323  
   4.324  #: apps/recaptcha/recaptcha_newforms.py:20
   4.325  msgid "Unknown error."
   4.326 -msgstr ""
   4.327 +msgstr "Unbekannter Fehler."
   4.328  
   4.329  #: apps/recaptcha/recaptcha_newforms.py:21
   4.330  msgid "We weren't able to verify the public key. Please try again later."
   4.331 -msgstr ""
   4.332 +msgstr "Wir können keinen öffentlichen Schlüssel identifizieren. Bitte später nochmal versuchen."
   4.333  
   4.334  #: apps/recaptcha/recaptcha_newforms.py:22
   4.335  msgid "We weren't able to verify the private key. Please try again later."
   4.336 -msgstr ""
   4.337 +msgstr "Wir können den Privatschlüssel nicht überprüfen. Bitte nochmal versuchen."
   4.338  
   4.339  #: apps/recaptcha/recaptcha_newforms.py:23
   4.340 +#, fuzzy
   4.341  msgid "The challenge parameter of the verify script was incorrect."
   4.342  msgstr ""
   4.343  
   4.344  #: apps/recaptcha/recaptcha_newforms.py:24
   4.345  msgid "The CAPTCHA solution was incorrect."
   4.346 -msgstr ""
   4.347 +msgstr "Die CAPTCHA Lösung war inkorrekt."
   4.348  
   4.349  #: apps/recaptcha/recaptcha_newforms.py:25
   4.350 +#, fuzzy
   4.351  msgid ""
   4.352  "The parameters to /verify were incorrect, make sure you are passing all the "
   4.353  "required parameters.  Please try again later."
   4.354  msgstr ""
   4.355  
   4.356  #: apps/recaptcha/recaptcha_newforms.py:26
   4.357 +#, fuzzy
   4.358  msgid ""
   4.359  "reCAPTCHA API keys are tied to a specific domain name for security reasons.  "
   4.360  "Please try again later."
   4.361  msgstr ""
   4.362  
   4.363  #: apps/recaptcha/recaptcha_newforms.py:27
   4.364 +#, fuzzy
   4.365  msgid "Unable to contact the reCAPTCHA verify server.  Please try again later."
   4.366  msgstr ""
   4.367  
   4.368  #: apps/recaptcha/recaptcha_newforms.py:64
   4.369  msgid "An error occured with the CAPTCHA service. Please try again."
   4.370 -msgstr ""
   4.371 +msgstr "Es unterlief ein Fehler mit dem CAPTCHA Dienst. Bitte nochmal versuchen."
   4.372  
   4.373  #: apps/recaptcha/recaptcha_newforms.py:66
   4.374  msgid "Please enter the CAPTCHA solution."
   4.375 -msgstr ""
   4.376 +msgstr "Bitte CAPTCHA Lösung eingeben."
   4.377  
   4.378  #: apps/robots/admin.py:10
   4.379  msgid "URL patterns"
   4.380 @@ -493,6 +479,7 @@
   4.381  msgstr "Muster"
   4.382  
   4.383  #: apps/robots/models.py:14
   4.384 +#, fuzzy
   4.385  msgid ""
   4.386  "Case-sensitive. A missing trailing slash does also match to files which "
   4.387  "start with the name of the pattern, e.g., '/admin' matches /admin.html too. "
   4.388 @@ -509,6 +496,7 @@
   4.389  msgstr "Robot"
   4.390  
   4.391  #: apps/robots/models.py:36
   4.392 +#, fuzzy
   4.393  msgid ""
   4.394  "This should be a user agent string like 'Googlebot'. Enter an asterisk (*) "
   4.395  "for all user agents. For a full list look at the <a target=_blank "
   4.396 @@ -591,21 +579,22 @@
   4.397  
   4.398  #: apps/tagging/models.py:46
   4.399  msgid "content type"
   4.400 -msgstr ""
   4.401 +msgstr "Inhaltstyp"
   4.402  
   4.403  #: apps/tagging/models.py:47
   4.404  msgid "object id"
   4.405 -msgstr ""
   4.406 +msgstr "Objekt-ID"
   4.407  
   4.408  #: apps/tagging/models.py:54
   4.409  msgid "tagged item"
   4.410 -msgstr ""
   4.411 +msgstr "Taggged Element"
   4.412  
   4.413  #: apps/tagging/models.py:55
   4.414  msgid "tagged items"
   4.415 -msgstr ""
   4.416 +msgstr "Tagged Elemente"
   4.417  
   4.418  #: apps/tagging/utils.py:183
   4.419 +#, fuzzy
   4.420  msgid ""
   4.421  "If a list or tuple of tags is provided, they must all be tag names, Tag "
   4.422  "objects or Tag ids."
   4.423 @@ -621,17 +610,17 @@
   4.424  msgstr "Ungültiger Verteilalgorithmus gewählt: %s."
   4.425  
   4.426  #: apps/tagging/templatetags/tagging_tags.py:19
   4.427 -#, python-format
   4.428 +#, fuzzy, python-format
   4.429  msgid "tags_for_model tag was given an invalid model: %s"
   4.430  msgstr ""
   4.431  
   4.432  #: apps/tagging/templatetags/tagging_tags.py:32
   4.433 -#, python-format
   4.434 +#, fuzzy, python-format
   4.435  msgid "tag_cloud_for_model tag was given an invalid model: %s"
   4.436  msgstr ""
   4.437  
   4.438  #: apps/tagging/templatetags/tagging_tags.py:56
   4.439 -#, python-format
   4.440 +#, fuzzy, python-format
   4.441  msgid "tagged_objects tag was given an invalid model: %s"
   4.442  msgstr ""
   4.443  
   4.444 @@ -645,41 +634,41 @@
   4.445  #: apps/tagging/templatetags/tagging_tags.py:198
   4.446  #, python-format
   4.447  msgid "second argument to %s tag must be 'as'"
   4.448 -msgstr ""
   4.449 +msgstr "zweite Argument fГјr %s Tag muss ein 'as' sein"
   4.450  
   4.451  #: apps/tagging/templatetags/tagging_tags.py:94
   4.452  #: apps/tagging/templatetags/tagging_tags.py:147
   4.453 -#, python-format
   4.454 +#, fuzzy, python-format
   4.455  msgid "if given, fourth argument to %s tag must be 'with'"
   4.456  msgstr ""
   4.457  
   4.458  #: apps/tagging/templatetags/tagging_tags.py:96
   4.459 -#, python-format
   4.460 +#, fuzzy, python-format
   4.461  msgid "if given, fifth argument to %s tag must be 'counts'"
   4.462  msgstr ""
   4.463  
   4.464  #: apps/tagging/templatetags/tagging_tags.py:141
   4.465 -#, python-format
   4.466 +#, fuzzy, python-format
   4.467  msgid "%s tag requires either three or between five and seven arguments"
   4.468  msgstr ""
   4.469  
   4.470  #: apps/tagging/templatetags/tagging_tags.py:155
   4.471 -#, python-format
   4.472 +#, fuzzy, python-format
   4.473  msgid "%(tag)s tag's '%(option)s' option was not a valid integer: '%(value)s'"
   4.474  msgstr ""
   4.475  
   4.476  #: apps/tagging/templatetags/tagging_tags.py:164
   4.477 -#, python-format
   4.478 +#, fuzzy, python-format
   4.479  msgid "%(tag)s tag's '%(option)s' option was not a valid choice: '%(value)s'"
   4.480  msgstr ""
   4.481  
   4.482  #: apps/tagging/templatetags/tagging_tags.py:170
   4.483 -#, python-format
   4.484 +#, fuzzy, python-format
   4.485  msgid "%(tag)s tag was given an invalid option: '%(option)s'"
   4.486  msgstr ""
   4.487  
   4.488  #: apps/tagging/templatetags/tagging_tags.py:175
   4.489 -#, python-format
   4.490 +#, fuzzy, python-format
   4.491  msgid "%(tag)s tag was given a badly formatted option: '%(option)s'"
   4.492  msgstr ""
   4.493  
   4.494 @@ -694,61 +683,59 @@
   4.495  msgstr "Tag %s erfordert genau fГјnf Argumente"
   4.496  
   4.497  #: apps/tagging/templatetags/tagging_tags.py:223
   4.498 -#, python-format
   4.499 +#, fuzzy, python-format
   4.500  msgid "second argument to %s tag must be 'in'"
   4.501  msgstr ""
   4.502  
   4.503  #: apps/tagging/templatetags/tagging_tags.py:225
   4.504 -#, python-format
   4.505 +#, fuzzy, python-format
   4.506  msgid "fourth argument to %s tag must be 'as'"
   4.507  msgstr ""
   4.508  
   4.509  #: apps/textblocks/models.py:10
   4.510  msgid "Unique system code"
   4.511 -msgstr ""
   4.512 +msgstr "Eindeutiger Systemcode"
   4.513  
   4.514  #: apps/textblocks/models.py:11
   4.515  msgid "The key attribute"
   4.516 -msgstr ""
   4.517 +msgstr "Das SchlГјsselattribut"
   4.518  
   4.519  #: apps/textblocks/models.py:12
   4.520  msgid "Block name"
   4.521 -msgstr ""
   4.522 +msgstr "Blockname"
   4.523  
   4.524  #: apps/textblocks/models.py:13
   4.525  msgid "The name is renders as h4 (if it is not blank)"
   4.526 -msgstr ""
   4.527 +msgstr "Der Name wird als h4 dargestellt (falls nicht leer)"
   4.528  
   4.529  #: apps/textblocks/models.py:14
   4.530  msgid "Block content"
   4.531 -msgstr ""
   4.532 +msgstr "Blockinhalt"
   4.533  
   4.534  #: apps/textblocks/models.py:18
   4.535 -#, fuzzy
   4.536  msgid "Comments about block"
   4.537 -msgstr "Keine Kommentare im Blog"
   4.538 +msgstr "Kommentare Гјber Block"
   4.539  
   4.540  #: apps/textblocks/models.py:19
   4.541  msgid "The comment on text block is shown only in admin interface"
   4.542 -msgstr ""
   4.543 +msgstr "Der Kommentar im Textblock wird nur in der Adminansicht dargestellt"
   4.544  
   4.545  #: templates/footer.html:3 themes/lite/footer.html:5
   4.546  msgid "Powered by "
   4.547 -msgstr ""
   4.548 +msgstr "Powered by "
   4.549  
   4.550  #: templates/head.html:7 templates/head.html.py:14
   4.551  msgid "close"
   4.552 -msgstr ""
   4.553 +msgstr "schlieГџen"
   4.554  
   4.555  #: templates/head.html:8
   4.556  msgid "forgot it?"
   4.557 -msgstr ""
   4.558 +msgstr "Vergessen?"
   4.559  
   4.560  #: templates/head.html:11 templates/head.html.py:16
   4.561  #: templates/accounts/login.html:13 templates/accounts/openid.html:11
   4.562 -#, fuzzy
   4.563  msgid "Login"
   4.564 -msgstr "Anmelden mit"
   4.565 +msgstr "Anmelden"
   4.566  
   4.567  #: templates/head.html:18 themes/catap.ru/login.html:17
   4.568  #: themes/lite/head.html:21 themes/white/head.html:18
   4.569 @@ -807,7 +794,7 @@
   4.570  #: templates/accounts/profile_edit.html:9 templates/watchlist/list.html:6
   4.571  #: templates/watchlist/list.html.py:9 themes/lite/accounts/profile_edit.html:9
   4.572  msgid "Subscriptions list"
   4.573 -msgstr ""
   4.574 +msgstr "Abonnementenliste"
   4.575  
   4.576  #: templates/accounts/reset.html:8
   4.577  msgid "Password reset"
   4.578 @@ -823,16 +810,16 @@
   4.579  
   4.580  #: templates/admin/postimage/attach.html:15
   4.581  msgid "Upload new"
   4.582 -msgstr ""
   4.583 +msgstr "Neu uploaden"
   4.584  
   4.585  #: templates/admin/postimage/attach.html:16
   4.586  #: templates/admin/postimage/upload.html:14
   4.587  #: themes/lite/accounts/profile_edit.html:14
   4.588 -#, fuzzy
   4.589  msgid "Submit"
   4.590 -msgstr "Website"
   4.591 +msgstr "Senden"
   4.592  
   4.593  #: templates/admin/postimage/upload.html:13
   4.594 +#, fuzzy
   4.595  msgid "Select uploaded"
   4.596  msgstr ""
   4.597  
   4.598 @@ -868,7 +855,7 @@
   4.599  
   4.600  #: templates/blog/comment_form.html:4 themes/catap.ru/blog/comment_form.html:4
   4.601  #: themes/lite/blog/comment_form.html:4
   4.602 -#, python-format
   4.603 +#, fuzzy, python-format
   4.604  msgid "Comment form for &laquo;%(object)s&raquo;"
   4.605  msgstr ""
   4.606  
   4.607 @@ -899,9 +886,8 @@
   4.608  msgstr "weiterlesen"
   4.609  
   4.610  #: templates/blog/post_archive_year.html:5
   4.611 -#, fuzzy
   4.612  msgid "Posts year archive"
   4.613 -msgstr "Klicken fГјr Jahresarchiv"
   4.614 +msgstr "Jahresarchiv für Beiträge"
   4.615  
   4.616  #: templates/blog/post_archive_year.html:10
   4.617  #: templates/blog/post_archive_year.html:14 templates/blog/post_list.html:25
   4.618 @@ -922,12 +908,12 @@
   4.619  #: templates/blog/post_detail.html:29 templates/watchlist/subscribe.html:11
   4.620  #: themes/lite/blog/post_detail.html:31
   4.621  msgid "Subscribe"
   4.622 -msgstr ""
   4.623 +msgstr "Abonnieren"
   4.624  
   4.625  #: templates/blog/post_detail.html:31 templates/watchlist/unsubscribe.html:12
   4.626  #: themes/lite/blog/post_detail.html:33
   4.627  msgid "Unsubscribe"
   4.628 -msgstr ""
   4.629 +msgstr "Abonnement kГјndigen"
   4.630  
   4.631  #: templates/blog/post_detail.html:38 themes/buriy/blog/post_detail.html:27
   4.632  #: themes/catap.ru/blog/post_detail.html:28
   4.633 @@ -964,14 +950,12 @@
   4.634  msgstr "Beiträge"
   4.635  
   4.636  #: templates/blog/post_list.html:32 themes/lite/blog/post_list.html:32
   4.637 -#, fuzzy
   4.638  msgid "All articles, tagged with union of tags"
   4.639 -msgstr "Alle Artikle getagged mit"
   4.640 +msgstr "Alle Artikel, getagged mit einer Vereinigung von Tags"
   4.641  
   4.642  #: templates/blog/post_list.html:34 themes/lite/blog/post_list.html:34
   4.643 -#, fuzzy
   4.644  msgid "All articles, tagged with intersection of tags"
   4.645 -msgstr "Alle Artikle getagged mit"
   4.646 +msgstr "Alle Artikel, getagged mit einer Schnittmenge von Tags"
   4.647  
   4.648  #: templates/blog/post_list.html:37 themes/buriy/blog/post_list.html:23
   4.649  #: themes/catap.ru/blog/post_list.html:23 themes/lite/blog/post_list.html:37
   4.650 @@ -1043,9 +1027,8 @@
   4.651  msgstr "Benutzername"
   4.652  
   4.653  #: templates/openid/complete.html:23
   4.654 -#, fuzzy
   4.655  msgid "Associate with exisiting account"
   4.656 -msgstr "Ein bestehendes Konto"
   4.657 +msgstr "Kollege mit bestehendem Konto"
   4.658  
   4.659  #: templates/openid/list.html:5 templates/openid/list.html.py:8
   4.660  msgid "Your OpenIDs"
   4.661 @@ -1077,7 +1060,7 @@
   4.662  msgstr "OpenID zur Benutzung eintragen"
   4.663  
   4.664  #: templates/openidserver/accept_root.html:6
   4.665 -#, python-format
   4.666 +#, fuzzy, python-format
   4.667  msgid ""
   4.668  "\n"
   4.669  "  <p>We've got a request from <a href=\"%(root)s\">%(root)s</a> \n"
   4.670 @@ -1090,13 +1073,14 @@
   4.671  
   4.672  #: templates/openidserver/accept_root.html:15
   4.673  msgid "Remember my answer"
   4.674 -msgstr ""
   4.675 +msgstr "Meine Antwort merken"
   4.676  
   4.677  #: templates/openidserver/accept_root.html:17
   4.678  msgid "Accept"
   4.679 -msgstr ""
   4.680 +msgstr "Akzeptieren"
   4.681  
   4.682  #: templates/openidserver/accept_root.html:18
   4.683 +#, fuzzy
   4.684  msgid "Dismiss"
   4.685  msgstr ""
   4.686  
   4.687 @@ -1121,34 +1105,37 @@
   4.688  
   4.689  #: templates/watchlist/list.html:13
   4.690  msgid "unsubscribe"
   4.691 -msgstr ""
   4.692 +msgstr "Abonnement kГјndigen"
   4.693  
   4.694  #: templates/watchlist/list.html:17
   4.695 +#, fuzzy
   4.696  msgid "Unsubscribe from subscription type"
   4.697  msgstr ""
   4.698  
   4.699  #: templates/watchlist/list.html:22
   4.700 -#, python-format
   4.701 +#, fuzzy, python-format
   4.702  msgid "Unsubscribe from all %(ctype)ss."
   4.703  msgstr ""
   4.704  
   4.705  #: templates/watchlist/subscribe.html:5
   4.706 +#, fuzzy
   4.707  msgid "Subscribing to"
   4.708  msgstr ""
   4.709  
   4.710  #: templates/watchlist/subscribe.html:8
   4.711 -#, python-format
   4.712 +#, fuzzy, python-format
   4.713  msgid "Subscribing to \"%(object)s\". Are you sure you want to do that?"
   4.714  msgstr ""
   4.715  
   4.716  #: templates/watchlist/unsubscribe.html:5
   4.717  #: templates/watchlist/unsubscribe.html:8
   4.718 +#, fuzzy
   4.719  msgid "Unsubscribing from"
   4.720  msgstr ""
   4.721  
   4.722  #: templates/watchlist/unsubscribe.html:9
   4.723  msgid "Are you sure you want to do that?"
   4.724 -msgstr ""
   4.725 +msgstr "Sind Sie sicher, dass Sie das tun wollen?"
   4.726  
   4.727  #: themes/buriy/head.html:20 themes/web_brains/head.html:20
   4.728  msgid "About"
   4.729 @@ -1170,7 +1157,7 @@
   4.730  msgstr "Mit OpenID anmelden"
   4.731  
   4.732  #: themes/buriy/blog/comment_form.html:4
   4.733 -#, python-format
   4.734 +#, fuzzy, python-format
   4.735  msgid "Reply to &laquo;%(object)s&raquo;"
   4.736  msgstr ""
   4.737  
   4.738 @@ -1184,9 +1171,8 @@
   4.739  
   4.740  #: themes/buriy/blog/post_detail.html:53
   4.741  #: themes/catap.ru/blog/post_detail.html:25
   4.742 -#, fuzzy
   4.743  msgid "Add comment"
   4.744 -msgstr "Letzten Kommentare"
   4.745 +msgstr "Kommentar hinzufГјgen"
   4.746  
   4.747  #: themes/buriy/blog/sidebar.html:38 themes/lite/blog/sidebar.html:6
   4.748  #: themes/web_brains/blog/sidebar.html:6
   4.749 @@ -1210,43 +1196,40 @@
   4.750  
   4.751  #: themes/catap.ru/blogroll.html:5 themes/lite/blog/sidebar.html:60
   4.752  msgid "Blogroll"
   4.753 -msgstr ""
   4.754 +msgstr "Blogroll"
   4.755  
   4.756  #: themes/catap.ru/navigation.html:4
   4.757  msgid "Navigation"
   4.758 -msgstr ""
   4.759 +msgstr "Navigation"
   4.760  
   4.761  #: themes/catap.ru/search.html:4
   4.762  msgid "Search"
   4.763 -msgstr ""
   4.764 +msgstr "Suche"
   4.765  
   4.766  #: themes/catap.ru/blog/post_entry.html:21
   4.767 +#, fuzzy
   4.768  msgid "Write on:"
   4.769  msgstr ""
   4.770  
   4.771  #: themes/catap.ru/blog/post_entry.html:41
   4.772 -#, fuzzy
   4.773  msgid "tags:"
   4.774 -msgstr "Tags"
   4.775 +msgstr "Tags:"
   4.776  
   4.777  #: themes/catap.ru/blog/post_entry.html:46
   4.778  msgid "permalink"
   4.779 -msgstr ""
   4.780 +msgstr "Permamentlink"
   4.781  
   4.782  #: themes/lite/base.html:11
   4.783 -#, fuzzy
   4.784  msgid "blog entries feed"
   4.785 -msgstr "Feed fГјr Kommentare"
   4.786 +msgstr "Feed für Blogeinträge"
   4.787  
   4.788  #: themes/lite/base.html:12
   4.789 -#, fuzzy
   4.790  msgid "comments feed"
   4.791  msgstr "Feed fГјr Kommentare"
   4.792  
   4.793  #: themes/lite/blog/post_detail.html:35
   4.794 -#, fuzzy
   4.795  msgid "Make comment"
   4.796 -msgstr "Letzten Kommentare"
   4.797 +msgstr "Kommentar eintragen"
   4.798  
   4.799  #: themes/lite/blog/sidebar.html:16 themes/web_brains/blog/sidebar.html:14
   4.800  msgid "No comments on blog"
   4.801 @@ -1258,13 +1241,12 @@
   4.802  msgstr "Keine Beiträge im Blog"
   4.803  
   4.804  #: themes/lite/blog/sidebar.html:36
   4.805 -#, fuzzy
   4.806  msgid "Popular posts"
   4.807 -msgstr "Ältere Beiträge"
   4.808 +msgstr "Beliebte Beiträge"
   4.809  
   4.810  #: themes/lite/blog/sidebar.html:37
   4.811  msgid "Feature not ready yet"
   4.812 -msgstr ""
   4.813 +msgstr "Funktion noch nicht fertig"
   4.814  
   4.815  #: themes/lite/blog/sidebar.html:67 themes/web_brains/blog/sidebar.html:49
   4.816  msgid "Advertize"