Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

gis: Merged revisions 7643-7662,7667-7668,7672-7682,7686-7693,7695-76…

…98,7700-7702,7704-7706,7710,7712-7729,7731-7732,7738-7758,7760-7766 via svnmerge from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7768 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit aef8a8305d2190b00386b8b1603deb03a2949f5b 1 parent 9fcc6c3
@jbronn jbronn authored
Showing with 11,114 additions and 2,651 deletions.
  1. +3 −0  AUTHORS
  2. +1 −1  LICENSE
  3. +2 −0  django/bin/profiling/gather_profile_stats.py
  4. +2 −0  django/conf/global_settings.py
  5. BIN  django/conf/locale/ca/LC_MESSAGES/django.mo
  6. +162 −154 django/conf/locale/ca/LC_MESSAGES/django.po
  7. BIN  django/conf/locale/de/LC_MESSAGES/django.mo
  8. +415 −675 django/conf/locale/de/LC_MESSAGES/django.po
  9. BIN  django/conf/locale/de/LC_MESSAGES/djangojs.mo
  10. +35 −38 django/conf/locale/de/LC_MESSAGES/djangojs.po
  11. BIN  django/conf/locale/es/LC_MESSAGES/django.mo
  12. +129 −130 django/conf/locale/es/LC_MESSAGES/django.po
  13. BIN  django/conf/locale/et/LC_MESSAGES/django.mo
  14. +4,340 −0 django/conf/locale/et/LC_MESSAGES/django.po
  15. BIN  django/conf/locale/et/LC_MESSAGES/djangojs.mo
  16. +115 −0 django/conf/locale/et/LC_MESSAGES/djangojs.po
  17. BIN  django/conf/locale/he/LC_MESSAGES/django.mo
  18. +933 −500 django/conf/locale/he/LC_MESSAGES/django.po
  19. BIN  django/conf/locale/hr/LC_MESSAGES/django.mo
  20. +622 −613 django/conf/locale/hr/LC_MESSAGES/django.po
  21. BIN  django/conf/locale/hr/LC_MESSAGES/djangojs.mo
  22. +1 −1  django/conf/locale/hr/LC_MESSAGES/djangojs.po
  23. BIN  django/conf/locale/lt/LC_MESSAGES/django.mo
  24. +2,868 −0 django/conf/locale/lt/LC_MESSAGES/django.po
  25. BIN  django/conf/locale/lt/LC_MESSAGES/djangojs.mo
  26. +116 −0 django/conf/locale/lt/LC_MESSAGES/djangojs.po
  27. BIN  django/conf/locale/pl/LC_MESSAGES/django.mo
  28. +117 −109 django/conf/locale/pl/LC_MESSAGES/django.po
  29. +14 −9 django/contrib/auth/views.py
  30. +2 −1  django/contrib/flatpages/models.py
  31. +4 −0 django/contrib/formtools/tests.py
  32. +1 −1  django/contrib/formtools/wizard.py
  33. +6 −6 django/contrib/localflavor/ar/forms.py
  34. +2 −2 django/contrib/localflavor/au/forms.py
  35. +1 −1  django/contrib/localflavor/br/forms.py
  36. +3 −3 django/contrib/localflavor/ca/forms.py
  37. +3 −3 django/contrib/localflavor/ch/forms.py
  38. +4 −4 django/contrib/localflavor/cl/forms.py
  39. +3 −3 django/contrib/localflavor/de/forms.py
  40. +1 −1  django/contrib/localflavor/es/forms.py
  41. +3 −3 django/contrib/localflavor/fi/forms.py
  42. +2 −2 django/contrib/localflavor/fr/forms.py
  43. +3 −3 django/contrib/localflavor/is_/forms.py
  44. +5 −5 django/contrib/localflavor/it/forms.py
  45. +2 −2 django/contrib/localflavor/jp/forms.py
  46. +1 −1  django/contrib/localflavor/nl/forms.py
  47. +3 −3 django/contrib/localflavor/no/forms.py
  48. +5 −5 django/contrib/localflavor/pe/forms.py
  49. +1 −1  django/contrib/localflavor/pl/forms.py
  50. +2 −2 django/contrib/localflavor/sk/forms.py
  51. +2 −2 django/contrib/localflavor/uk/forms.py
  52. +1 −1  django/contrib/localflavor/uk/uk_regions.py
  53. +3 −3 django/contrib/localflavor/us/forms.py
  54. +1 −0  django/contrib/redirects/models.py
  55. +25 −5 django/contrib/sessions/backends/base.py
  56. +2 −1  django/contrib/sessions/backends/cache.py
  57. +4 −2 django/contrib/sessions/backends/db.py
  58. +10 −6 django/contrib/sessions/backends/file.py
  59. +1 −1  django/contrib/sessions/middleware.py
  60. +7 −2 django/contrib/sessions/models.py
  61. +60 −0 django/contrib/sessions/tests.py
  62. +1 −0  django/contrib/sites/management.py
  63. +9 −0 django/contrib/sites/models.py
  64. +13 −0 django/contrib/sites/tests.py
  65. +5 −2 django/core/management/commands/loaddata.py
  66. +1 −1  django/core/management/commands/sql.py
  67. +1 −1  django/core/management/commands/sqlall.py
  68. +1 −1  django/core/management/commands/sqlclear.py
  69. +1 −1  django/core/management/commands/sqlcustom.py
  70. +1 −1  django/core/management/commands/sqlflush.py
  71. +1 −1  django/core/management/commands/sqlindexes.py
  72. +1 −1  django/core/management/commands/sqlreset.py
  73. +1 −1  django/core/management/commands/sqlsequencereset.py
  74. +11 −2 django/core/management/commands/startapp.py
  75. +5 −7 django/core/management/commands/startproject.py
  76. +8 −2 django/core/management/commands/syncdb.py
  77. +1 −1  django/core/servers/basehttp.py
  78. +1 −1  django/core/urlresolvers.py
  79. +9 −1 django/db/backends/__init__.py
  80. +1 −0  django/db/backends/mysql/base.py
  81. +1 −0  django/db/backends/mysql_old/base.py
  82. +3 −1 django/db/backends/oracle/base.py
  83. +8 −4 django/db/backends/oracle/creation.py
  84. +9 −10 django/db/models/base.py
  85. +19 −17 django/db/models/fields/__init__.py
  86. +6 −3 django/db/models/fields/related.py
  87. +8 −6 django/db/models/loading.py
  88. +7 −4 django/db/models/options.py
  89. +127 −19 django/db/models/query.py
  90. +50 −22 django/db/models/sql/query.py
  91. +5 −3 django/db/models/sql/subqueries.py
  92. +1 −1  django/middleware/common.py
  93. +0 −1  django/newforms/fields.py
  94. +13 −12 django/newforms/models.py
  95. +12 −4 django/newforms/widgets.py
  96. +13 −11 django/template/defaulttags.py
  97. +10 −6 django/template/loader_tags.py
  98. +14 −11 django/templatetags/cache.py
  99. +1 −1  django/utils/cache.py
  100. +31 −0 django/utils/datastructures.py
  101. +26 −26 django/utils/html.py
  102. +1 −2  django/views/defaults.py
  103. +11 −0 docs/cache.txt
  104. +64 −36 docs/contributing.txt
  105. +5 −5 docs/db-api.txt
  106. +15 −8 docs/django-admin.txt
  107. +2 −4 docs/form_preview.txt
  108. +34 −4 docs/model-api.txt
  109. +7 −0 docs/modelforms.txt
  110. +14 −0 docs/newforms.txt
  111. +2 −2 docs/sessions.txt
  112. +11 −3 docs/settings.txt
  113. +2 −2 docs/templates.txt
  114. +4 −3 docs/templates_python.txt
  115. +2 −2 docs/tutorial01.txt
  116. +9 −3 extras/django_bash_completion
  117. +2 −2 setup.py
  118. +1 −0  tests/modeltests/delete/__init__.py
  119. +179 −0 tests/modeltests/delete/models.py
  120. +42 −3 tests/modeltests/model_inheritance/models.py
  121. +8 −0 tests/regressiontests/datastructures/tests.py
  122. +22 −1 tests/regressiontests/defaultfilters/tests.py
  123. +10 −10 tests/regressiontests/forms/forms.py
  124. +2 −2 tests/regressiontests/forms/regressions.py
  125. +9 −9 tests/regressiontests/forms/widgets.py
  126. +18 −4 tests/regressiontests/model_inheritance_regress/models.py
  127. +89 −6 tests/regressiontests/queries/models.py
  128. +13 −13 tests/regressiontests/templates/loaders.py
  129. +51 −36 tests/regressiontests/templates/tests.py
  130. +1 −0  tests/regressiontests/urlpatterns_reverse/tests.py
View
3  AUTHORS
@@ -65,6 +65,7 @@ answer newbie questions, and generally made Django that much better:
Mikaël Barbero <mikael.barbero nospam at nospam free.fr>
Jiri Barton
Ned Batchelder <http://www.nedbatchelder.com/>
+ batiste@dosimple.ch
Shannon -jj Behrens <http://jjinux.blogspot.com/>
Esdras Beleza <linux@esdrasbeleza.com>
Chris Bennett <chrisrbennett@yahoo.com>
@@ -228,6 +229,7 @@ answer newbie questions, and generally made Django that much better:
Nicola Larosa <nico@teknico.net>
Rune Rønde Laursen <runerl@skjoldhoej.dk>
Eugene Lazutkin <http://lazutkin.com/blog/>
+ lcordier@point45.com
Jeong-Min Lee <falsetru@gmail.com>
Jannis Leidel <jl@websushi.org>
Christopher Lenz <http://www.cmlenz.net/>
@@ -374,6 +376,7 @@ answer newbie questions, and generally made Django that much better:
Wang Chun <wangchun@exoweb.net>
Filip Wasilewski <filip.wasilewski@gmail.com>
Dan Watson <http://theidioteque.net/>
+ Joel Watts <joel@joelwatts.com>
Chris Wesseling <Chris.Wesseling@cwi.nl>
James Wheare <django@sparemint.com>
charly.wilhelm@gmail.com
View
2  LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2005, the Lawrence Journal-World
+Copyright (c) Django Software Foundation.
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
View
2  django/bin/profiling/gather_profile_stats.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
"""
gather_profile_stats.py /path/to/dir/of/profiles
View
2  django/conf/global_settings.py
@@ -52,6 +52,7 @@
('el', gettext_noop('Greek')),
('en', gettext_noop('English')),
('es', gettext_noop('Spanish')),
+ ('et', gettext_noop('Estonian')),
('es-ar', gettext_noop('Argentinean Spanish')),
('eu', gettext_noop('Basque')),
('fa', gettext_noop('Persian')),
@@ -70,6 +71,7 @@
('km', gettext_noop('Khmer')),
('kn', gettext_noop('Kannada')),
('lv', gettext_noop('Latvian')),
+ ('lt', gettext_noop('Lithuanian')),
('mk', gettext_noop('Macedonian')),
('nl', gettext_noop('Dutch')),
('no', gettext_noop('Norwegian')),
View
BIN  django/conf/locale/ca/LC_MESSAGES/django.mo
Binary file not shown
View
316 django/conf/locale/ca/LC_MESSAGES/django.po
@@ -5,8 +5,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-26 10:35+0200\n"
-"PO-Revision-Date: 2008-05-14 11:15+0200\n"
+"POT-Creation-Date: 2008-06-20 12:36+0200\n"
+"PO-Revision-Date: 2008-06-20 12:48+0200\n"
"Last-Translator: Django Catalan Group <django-cat@googlegroups.com>\n"
"Language-Team: Catalan <ca@li.org>\n"
"MIME-Version: 1.0\n"
@@ -14,193 +14,201 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: conf/global_settings.py:43
-msgid "Arabic"
-msgstr "Arabic"
-
#: conf/global_settings.py:44
-msgid "Bengali"
-msgstr "Bengalí"
+msgid "Arabic"
+msgstr "aràbic"
#: conf/global_settings.py:45
-msgid "Bulgarian"
-msgstr "Búlgar"
+msgid "Bengali"
+msgstr "bengalí"
#: conf/global_settings.py:46
-msgid "Catalan"
-msgstr "Català"
+msgid "Bulgarian"
+msgstr "búlgar"
#: conf/global_settings.py:47
-msgid "Czech"
-msgstr "Txec"
+msgid "Catalan"
+msgstr "català"
#: conf/global_settings.py:48
-msgid "Welsh"
-msgstr "Galès"
+msgid "Czech"
+msgstr "txec"
#: conf/global_settings.py:49
-msgid "Danish"
-msgstr "Danès"
+msgid "Welsh"
+msgstr "galès"
#: conf/global_settings.py:50
-msgid "German"
-msgstr "Alemany"
+msgid "Danish"
+msgstr "danès"
#: conf/global_settings.py:51
-msgid "Greek"
-msgstr "Grec"
+msgid "German"
+msgstr "alemany"
#: conf/global_settings.py:52
-msgid "English"
-msgstr "Anglès"
+msgid "Greek"
+msgstr "grec"
#: conf/global_settings.py:53
-msgid "Spanish"
-msgstr "Espanyol"
+msgid "English"
+msgstr "anglès"
#: conf/global_settings.py:54
-msgid "Argentinean Spanish"
-msgstr "Castellà Argentí"
+msgid "Spanish"
+msgstr "espanyol"
#: conf/global_settings.py:55
-msgid "Basque"
-msgstr "Euskera"
+msgid "Estonian"
+msgstr "estonià"
#: conf/global_settings.py:56
-msgid "Persian"
-msgstr "Persa"
+msgid "Argentinean Spanish"
+msgstr "castellà argentí"
#: conf/global_settings.py:57
-msgid "Finnish"
-msgstr "Finlandès"
+msgid "Basque"
+msgstr "euskera"
#: conf/global_settings.py:58
-msgid "French"
-msgstr "Francès"
+msgid "Persian"
+msgstr "persa"
#: conf/global_settings.py:59
-msgid "Irish"
-msgstr "Irlandès"
+msgid "Finnish"
+msgstr "finlandès"
#: conf/global_settings.py:60
-msgid "Galician"
-msgstr "Gallec"
+msgid "French"
+msgstr "francès"
#: conf/global_settings.py:61
-msgid "Hungarian"
-msgstr "Húngar"
+msgid "Irish"
+msgstr "irlandès"
#: conf/global_settings.py:62
-msgid "Hebrew"
-msgstr "Hebreu"
+msgid "Galician"
+msgstr "gallec"
#: conf/global_settings.py:63
-msgid "Croatian"
-msgstr "Croat"
+msgid "Hungarian"
+msgstr "húngar"
#: conf/global_settings.py:64
-msgid "Icelandic"
-msgstr "Islandès"
+msgid "Hebrew"
+msgstr "hebreu"
#: conf/global_settings.py:65
-msgid "Italian"
-msgstr "Italià"
+msgid "Croatian"
+msgstr "croat"
#: conf/global_settings.py:66
-msgid "Japanese"
-msgstr "Japonès"
+msgid "Icelandic"
+msgstr "islandès"
#: conf/global_settings.py:67
-msgid "Georgian"
-msgstr "Georgià"
+msgid "Italian"
+msgstr "italià"
#: conf/global_settings.py:68
-msgid "Korean"
-msgstr "Coreà"
+msgid "Japanese"
+msgstr "japonès"
#: conf/global_settings.py:69
-msgid "Khmer"
-msgstr "Khmer"
+msgid "Georgian"
+msgstr "georgià"
#: conf/global_settings.py:70
-msgid "Kannada"
-msgstr "Canès"
+msgid "Korean"
+msgstr "coreà"
#: conf/global_settings.py:71
-msgid "Latvian"
-msgstr "Letó"
+msgid "khmer"
+msgstr "khmer"
#: conf/global_settings.py:72
-msgid "Macedonian"
-msgstr "Macedoni"
+msgid "Kannada"
+msgstr "canès"
#: conf/global_settings.py:73
-msgid "Dutch"
-msgstr "Holandès"
+msgid "Latvian"
+msgstr "letó"
#: conf/global_settings.py:74
-msgid "Norwegian"
-msgstr "Norueg"
+msgid "Lithuanian"
+msgstr "lituà"
#: conf/global_settings.py:75
-msgid "Polish"
-msgstr "Polac"
+msgid "Macedonian"
+msgstr "macedoni"
#: conf/global_settings.py:76
-msgid "Portugese"
-msgstr "Portuguès"
+msgid "Dutch"
+msgstr "holandès"
#: conf/global_settings.py:77
-msgid "Brazilian Portuguese"
-msgstr "Portuguès de Brasil"
+msgid "Norwegian"
+msgstr "norueg"
#: conf/global_settings.py:78
-msgid "Romanian"
-msgstr "Rumanès"
+msgid "Polish"
+msgstr "polac"
#: conf/global_settings.py:79
-msgid "Russian"
-msgstr "Rús"
+msgid "Portugese"
+msgstr "portuguès"
#: conf/global_settings.py:80
-msgid "Slovak"
-msgstr "Eslovac"
+msgid "Brazilian Portuguese"
+msgstr "portuguès de brasil"
#: conf/global_settings.py:81
-msgid "Slovenian"
-msgstr "Esloveni"
+msgid "Romanian"
+msgstr "rumanès"
#: conf/global_settings.py:82
-msgid "Serbian"
-msgstr "Serbi"
+msgid "Russian"
+msgstr "rús"
#: conf/global_settings.py:83
-msgid "Swedish"
-msgstr "Suec"
+msgid "Slovak"
+msgstr "eslovac"
#: conf/global_settings.py:84
-msgid "Tamil"
-msgstr "Tàmil"
+msgid "Slovenian"
+msgstr "esloveni"
#: conf/global_settings.py:85
-msgid "Telugu"
-msgstr "Telugu"
+msgid "Serbian"
+msgstr "serbi"
#: conf/global_settings.py:86
-msgid "Turkish"
-msgstr "Turc"
+msgid "Swedish"
+msgstr "suec"
#: conf/global_settings.py:87
-msgid "Ukrainian"
-msgstr "Ucranià"
+msgid "Tamil"
+msgstr "tàmil"
#: conf/global_settings.py:88
-msgid "Simplified Chinese"
-msgstr "Xinès simplificat"
+msgid "Telugu"
+msgstr "telugu"
#: conf/global_settings.py:89
+msgid "Turkish"
+msgstr "turc"
+
+#: conf/global_settings.py:90
+msgid "Ukrainian"
+msgstr "ucranià"
+
+#: conf/global_settings.py:91
+msgid "Simplified Chinese"
+msgstr "xinès simplificat"
+
+#: conf/global_settings.py:92
msgid "Traditional Chinese"
-msgstr "Xinès tradicional"
+msgstr "xinès tradicional"
#: contrib/admin/filterspecs.py:44
#, python-format
@@ -1137,15 +1145,15 @@ msgstr "permisos"
msgid "group"
msgstr "grup"
-#: contrib/auth/models.py:98 contrib/auth/models.py:141
+#: contrib/auth/models.py:98 contrib/auth/models.py:148
msgid "groups"
msgstr "grups"
-#: contrib/auth/models.py:131
+#: contrib/auth/models.py:138
msgid "username"
msgstr "nom d'usuari"
-#: contrib/auth/models.py:131
+#: contrib/auth/models.py:138
msgid ""
"Required. 30 characters or fewer. Alphanumeric characters only (letters, "
"digits and underscores)."
@@ -1153,23 +1161,23 @@ msgstr ""
"Obligatori. 30 o menys caràcters. Només caràcters alfanumèrics (lletres, "
"dígits i el guió baix)."
-#: contrib/auth/models.py:132
+#: contrib/auth/models.py:139
msgid "first name"
msgstr "nom propi"
-#: contrib/auth/models.py:133
+#: contrib/auth/models.py:140
msgid "last name"
msgstr "cognoms"
-#: contrib/auth/models.py:134
+#: contrib/auth/models.py:141
msgid "e-mail address"
msgstr "adreça de correu electrònic"
-#: contrib/auth/models.py:135
+#: contrib/auth/models.py:142
msgid "password"
msgstr "contrasenya"
-#: contrib/auth/models.py:135
+#: contrib/auth/models.py:142
msgid ""
"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
"password form</a>."
@@ -1177,19 +1185,19 @@ msgstr ""
"Utilitzeu '[algo]$[salt]$[hexdigest]' o el <a href=\"password/\">formulari "
"de canvi de contrasenya</a>."
-#: contrib/auth/models.py:136
+#: contrib/auth/models.py:143
msgid "staff status"
msgstr "membre del personal"
-#: contrib/auth/models.py:136
+#: contrib/auth/models.py:143
msgid "Designates whether the user can log into this admin site."
msgstr "Indica si l'usuari pot entrar en el lloc administratiu."
-#: contrib/auth/models.py:137
+#: contrib/auth/models.py:144
msgid "active"
msgstr "actiu"
-#: contrib/auth/models.py:137
+#: contrib/auth/models.py:144
msgid ""
"Designates whether this user should be treated as active. Unselect this "
"instead of deleting accounts."
@@ -1197,11 +1205,11 @@ msgstr ""
"Designa si aquest usuari ha de ser tractat com a actiu. Deseleccioneu-ho "
"enlloc d'esborrar comptes d'usuari."
-#: contrib/auth/models.py:138
+#: contrib/auth/models.py:145
msgid "superuser status"
msgstr "estat de superusuari"
-#: contrib/auth/models.py:138
+#: contrib/auth/models.py:145
msgid ""
"Designates that this user has all permissions without explicitly assigning "
"them."
@@ -1209,15 +1217,15 @@ msgstr ""
"Designa que aquest usuari té tots els permissos sense assignar-los "
"explícitament."
-#: contrib/auth/models.py:139
+#: contrib/auth/models.py:146
msgid "last login"
msgstr "últim inici de sessió"
-#: contrib/auth/models.py:140
+#: contrib/auth/models.py:147
msgid "date joined"
msgstr "data de creació"
-#: contrib/auth/models.py:142
+#: contrib/auth/models.py:149
msgid ""
"In addition to the permissions manually assigned, this user will also get "
"all permissions granted to each group he/she is in."
@@ -1225,39 +1233,39 @@ msgstr ""
"Junt amb els permissos asignats manualment, aquest usuari tindrà, també, els "
"permissos dels grups dels que sigui membre."
-#: contrib/auth/models.py:143
+#: contrib/auth/models.py:150
msgid "user permissions"
msgstr "permissos de l'usuari"
-#: contrib/auth/models.py:147
+#: contrib/auth/models.py:154
msgid "user"
msgstr "usuari"
-#: contrib/auth/models.py:148
+#: contrib/auth/models.py:155
msgid "users"
msgstr "usuaris"
-#: contrib/auth/models.py:154
+#: contrib/auth/models.py:161
msgid "Personal info"
msgstr "Informació personal"
-#: contrib/auth/models.py:155
+#: contrib/auth/models.py:162
msgid "Permissions"
msgstr "permisos"
-#: contrib/auth/models.py:156
+#: contrib/auth/models.py:163
msgid "Important dates"
msgstr "Dates importants"
-#: contrib/auth/models.py:157
+#: contrib/auth/models.py:164
msgid "Groups"
msgstr "Grups"
-#: contrib/auth/models.py:316
+#: contrib/auth/models.py:323
msgid "message"
msgstr "missatge"
-#: contrib/auth/views.py:47
+#: contrib/auth/views.py:48
msgid "Logged out"
msgstr "Sessió finalitzada"
@@ -3897,12 +3905,12 @@ msgstr ""
msgid "%(object)s with this %(type)s already exists for the given %(field)s."
msgstr "Ja existeix un %(object)s del tipus %(type)s amb aquest %(field)s."
-#: db/models/fields/__init__.py:54
+#: db/models/fields/__init__.py:51
#, python-format
msgid "%(optname)s with this %(fieldname)s already exists."
msgstr "Ja existeix %(optname)s amb aquest %(fieldname)s."
-#: db/models/fields/__init__.py:179 db/models/fields/__init__.py:348
+#: db/models/fields/__init__.py:176 db/models/fields/__init__.py:348
#: db/models/fields/__init__.py:780 db/models/fields/__init__.py:791
#: newforms/fields.py:46 oldforms/__init__.py:374
msgid "This field is required."
@@ -3937,18 +3945,18 @@ msgstr "Aquest valor ha de ser None (Cap), True (Veritat) o False (Fals)"
msgid "Please enter a valid %s."
msgstr "Si us plau, introduïu un %s vàlid."
-#: db/models/fields/related.py:721
+#: db/models/fields/related.py:746
msgid "Separate multiple IDs with commas."
msgstr "Separi múltiples IDs amb comes."
-#: db/models/fields/related.py:723
+#: db/models/fields/related.py:748
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Premeu la tecla \"Control\" -o \"Command\" en un Mac- per seleccionar més "
"d'un valor."
-#: db/models/fields/related.py:770
+#: db/models/fields/related.py:795
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
@@ -4007,11 +4015,11 @@ msgstr "Assegureu-vos de que no hi ha més de %s decimals."
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Assegureu-vos de que no hi ha més de %s dígits decimals."
-#: newforms/fields.py:263 newforms/fields.py:751
+#: newforms/fields.py:263 newforms/fields.py:750
msgid "Enter a valid date."
msgstr "Introduïu una data vàlida."
-#: newforms/fields.py:296 newforms/fields.py:752
+#: newforms/fields.py:296 newforms/fields.py:751
msgid "Enter a valid time."
msgstr "Introduïu una hora vàlida."
@@ -4035,25 +4043,25 @@ msgstr "Introduïu una URL vàlida."
msgid "This URL appears to be a broken link."
msgstr "Aquesta URL sembla ser un enllaç trencat."
-#: newforms/fields.py:560 newforms/models.py:299
+#: newforms/fields.py:559 newforms/models.py:305
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Escolli una opció vàlida; Aquesta opció no és una de les opcions disponibles."
-#: newforms/fields.py:599
+#: newforms/fields.py:598
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Esculliu una opció vàlida. %(value)s no és una de les opcions vàlides."
-#: newforms/fields.py:600 newforms/fields.py:662 newforms/models.py:371
+#: newforms/fields.py:599 newforms/fields.py:661 newforms/models.py:372
msgid "Enter a list of values."
msgstr "Introduïu una llista de valors."
-#: newforms/fields.py:780
+#: newforms/fields.py:779
msgid "Enter a valid IPv4 address."
msgstr "Introduïu una adreça IPv4 vàlida."
-#: newforms/models.py:372
+#: newforms/models.py:373
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Escolliu una opció vàlida; %s' no és una de les opcions vàlides."
@@ -4194,51 +4202,51 @@ msgstr "Dg"
#: utils/dates.py:18
msgid "January"
-msgstr "Gener"
+msgstr "gener"
#: utils/dates.py:18
msgid "February"
-msgstr "Febrer"
+msgstr "febrer"
#: utils/dates.py:18 utils/dates.py:31
msgid "March"
-msgstr "Març"
+msgstr "març"
#: utils/dates.py:18 utils/dates.py:31
msgid "April"
-msgstr "Abril"
+msgstr "abril"
#: utils/dates.py:18 utils/dates.py:31
msgid "May"
-msgstr "Maig"
+msgstr "maig"
#: utils/dates.py:18 utils/dates.py:31
msgid "June"
-msgstr "Juny"
+msgstr "juny"
#: utils/dates.py:19 utils/dates.py:31
msgid "July"
-msgstr "Juliol"
+msgstr "juliol"
#: utils/dates.py:19
msgid "August"
-msgstr "Agost"
+msgstr "agost"
#: utils/dates.py:19
msgid "September"
-msgstr "Setembre"
+msgstr "setembre"
#: utils/dates.py:19
msgid "October"
-msgstr "Octubre"
+msgstr "octubre"
#: utils/dates.py:19
msgid "November"
-msgstr "Novembre"
+msgstr "novembre"
#: utils/dates.py:20
msgid "December"
-msgstr "Desembre"
+msgstr "desembre"
#: utils/dates.py:23
msgid "jan"
@@ -4290,31 +4298,31 @@ msgstr "des"
#: utils/dates.py:31
msgid "Jan."
-msgstr "Gen."
+msgstr "gen."
#: utils/dates.py:31
msgid "Feb."
-msgstr "Feb."
+msgstr "feb."
#: utils/dates.py:32
msgid "Aug."
-msgstr "Ago."
+msgstr "ago."
#: utils/dates.py:32
msgid "Sept."
-msgstr "Set."
+msgstr "set."
#: utils/dates.py:32
msgid "Oct."
-msgstr "Oct."
+msgstr "oct."
#: utils/dates.py:32
msgid "Nov."
-msgstr "Nov."
+msgstr "nov."
#: utils/dates.py:32
msgid "Dec."
-msgstr "Des."
+msgstr "des."
#: utils/text.py:127
msgid "or"
View
BIN  django/conf/locale/de/LC_MESSAGES/django.mo
Binary file not shown
View
1,090 django/conf/locale/de/LC_MESSAGES/django.po
@@ -1,14 +1,14 @@
# Translation of django.po to German
#
-# Copyright (C) 2005-2007,
+# Copyright (C) 2005-2008,
# This file is distributed under the same license as the django package.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-18 15:10-0500\n"
-"PO-Revision-Date: 2008-03-03 16:10+0100\n"
+"POT-Creation-Date: 2008-06-23 20:23+0200\n"
+"PO-Revision-Date: 2008-06-23 20:51+0100\n"
"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -19,191 +19,199 @@ msgstr ""
"X-Poedit-SourceCharset: utf-8\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: conf/global_settings.py:39
+#: conf/global_settings.py:44
msgid "Arabic"
msgstr "Arabisch"
-#: conf/global_settings.py:40
+#: conf/global_settings.py:45
msgid "Bengali"
msgstr "Bengali"
-#: conf/global_settings.py:41
+#: conf/global_settings.py:46
msgid "Bulgarian"
msgstr "Bulgarisch"
-#: conf/global_settings.py:42
+#: conf/global_settings.py:47
msgid "Catalan"
msgstr "Katalanisch"
-#: conf/global_settings.py:43
+#: conf/global_settings.py:48
msgid "Czech"
msgstr "Tschechisch"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:49
msgid "Welsh"
msgstr "Walisisch"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:50
msgid "Danish"
msgstr "Dänisch"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:51
msgid "German"
msgstr "Deutsch"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:52
msgid "Greek"
msgstr "Griechisch"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:53
msgid "English"
msgstr "Englisch"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:54
msgid "Spanish"
msgstr "Spanisch"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:55
+msgid "Estonian"
+msgstr "Estnisch"
+
+#: conf/global_settings.py:56
msgid "Argentinean Spanish"
msgstr "Argentinisches Spanisch"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:57
msgid "Basque"
msgstr "Baskisch"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:58
msgid "Persian"
msgstr "Persisch"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:59
msgid "Finnish"
msgstr "Finnisch"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:60
msgid "French"
msgstr "Französisch"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:61
msgid "Irish"
msgstr "Irisch"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:62
msgid "Galician"
msgstr "Galicisch"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:63
msgid "Hungarian"
msgstr "Ungarisch"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:64
msgid "Hebrew"
msgstr "Hebräisch"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:65
msgid "Croatian"
msgstr "Kroatisch"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:66
msgid "Icelandic"
msgstr "Isländisch"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:67
msgid "Italian"
msgstr "Italienisch"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:68
msgid "Japanese"
msgstr "Japanisch"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:69
msgid "Georgian"
msgstr "Georgisch"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:70
msgid "Korean"
msgstr "Koreanisch"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:71
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:72
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:73
msgid "Latvian"
msgstr "Lettisch"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:74
+msgid "Lithuanian"
+msgstr "Litauisch"
+
+#: conf/global_settings.py:75
msgid "Macedonian"
msgstr "Mazedonisch"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:76
msgid "Dutch"
msgstr "Holländisch"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:77
msgid "Norwegian"
msgstr "Norwegisch"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:78
msgid "Polish"
msgstr "Polnisch"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:79
msgid "Portugese"
msgstr "Portugiesisch"
-#: conf/global_settings.py:73
-msgid "Brazilian"
+#: conf/global_settings.py:80
+msgid "Brazilian Portuguese"
msgstr "Brasilianisches Portugiesisch"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:81
msgid "Romanian"
msgstr "Rumänisch"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:82
msgid "Russian"
msgstr "Russisch"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:83
msgid "Slovak"
msgstr "Slowakisch"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:84
msgid "Slovenian"
msgstr "Slowenisch"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:85
msgid "Serbian"
msgstr "Serbisch"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:86
msgid "Swedish"
msgstr "Schwedisch"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:87
msgid "Tamil"
msgstr "Tamilisch"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:88
msgid "Telugu"
msgstr "Telugisch"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:89
msgid "Turkish"
msgstr "Türkisch"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:90
msgid "Ukrainian"
msgstr "Ukrainisch"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:91
msgid "Simplified Chinese"
msgstr "Vereinfachtes Chinesisch"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:92
msgid "Traditional Chinese"
msgstr "Traditionelles Chinesisch"
@@ -216,8 +224,10 @@ msgstr ""
"<h3>Nach %s:</h3>\n"
"<ul>\n"
-#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:92
-#: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173
+#: contrib/admin/filterspecs.py:74
+#: contrib/admin/filterspecs.py:92
+#: contrib/admin/filterspecs.py:147
+#: contrib/admin/filterspecs.py:173
msgid "All"
msgstr "Alle"
@@ -241,17 +251,20 @@ msgstr "Diesen Monat"
msgid "This year"
msgstr "Dieses Jahr"
-#: contrib/admin/filterspecs.py:147 newforms/widgets.py:231
+#: contrib/admin/filterspecs.py:147
+#: newforms/widgets.py:231
#: oldforms/__init__.py:592
msgid "Yes"
msgstr "Ja"
-#: contrib/admin/filterspecs.py:147 newforms/widgets.py:231
+#: contrib/admin/filterspecs.py:147
+#: newforms/widgets.py:231
#: oldforms/__init__.py:592
msgid "No"
msgstr "Nein"
-#: contrib/admin/filterspecs.py:154 newforms/widgets.py:231
+#: contrib/admin/filterspecs.py:154
+#: newforms/widgets.py:231
#: oldforms/__init__.py:592
msgid "Unknown"
msgstr "Unbekannt"
@@ -291,8 +304,7 @@ 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 konnte nicht gefunden werden."
+msgstr "Es tut uns leid, aber die angeforderte Seite konnte nicht gefunden werden."
#: contrib/admin/templates/admin/500.html:4
#: contrib/admin/templates/admin/base.html:37
@@ -324,13 +336,8 @@ msgid "Server Error <em>(500)</em>"
msgstr "Serverfehler <em>(500)</em>"
#: 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 ""
-"Ein Fehler ist aufgetreten. Dieser Fehler wurde an die Serververwalter per E-"
-"Mail weitergegeben und sollte bald behoben sein. Vielen Dank für Ihr "
-"Verständnis."
+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 "Ein Fehler ist aufgetreten. Dieser Fehler wurde an die Serververwalter per E-Mail weitergegeben und sollte bald behoben sein. Vielen Dank für Ihr Verständnis."
#: contrib/admin/templates/admin/base.html:26
msgid "Welcome,"
@@ -401,23 +408,13 @@ msgstr "Löschen"
#: contrib/admin/templates/admin/delete_confirmation.html:13
#, python-format
-msgid ""
-"Deleting the %(object_name)s '%(escaped_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 '%(escaped_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:"
+msgid "Deleting the %(object_name)s '%(escaped_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 '%(escaped_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:"
#: contrib/admin/templates/admin/delete_confirmation.html:20
#, python-format
-msgid ""
-"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
-"All of the following related items will be deleted:"
-msgstr ""
-"Sind Sie sicher, dass Sie %(object_name)s \"%(escaped_object)s\" löschen "
-"wollen? Es werden zusätzlich die folgenden abhängigen Daten mit gelöscht:"
+msgid "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? All of the following related items will be deleted:"
+msgstr "Sind Sie sicher, dass Sie %(object_name)s \"%(escaped_object)s\" löschen wollen? Es werden zusätzlich die folgenden abhängigen Daten mit gelöscht:"
#: contrib/admin/templates/admin/delete_confirmation.html:25
msgid "Yes, I'm sure"
@@ -463,14 +460,8 @@ msgid "None available"
msgstr "Keine vorhanden"
#: contrib/admin/templates/admin/invalid_setup.html:8
-msgid ""
-"Something's wrong with your database installation. Make sure the appropriate "
-"database tables have been created, and make sure the database is readable by "
-"the appropriate user."
-msgstr ""
-"Etwas stimmt nicht mit der Datenbankkonfiguration. Bitte sicherstellen, dass "
-"die richtigen Datenbanktabellen angelegt wurden und die Datenbank vom "
-"verwendeten Datenbankbenutzer auch lesbar ist."
+msgid "Something's wrong with your database installation. Make sure the appropriate database tables have been created, and make sure the database is readable by the appropriate user."
+msgstr "Etwas stimmt nicht mit der Datenbankkonfiguration. Bitte sicherstellen, dass die richtigen Datenbanktabellen angelegt wurden und die Datenbank vom verwendeten Datenbankbenutzer auch lesbar ist."
#: contrib/admin/templates/admin/login.html:17
#: contrib/comments/templates/comments/form.html:6
@@ -505,12 +496,8 @@ msgid "DATE_WITH_TIME_FULL"
msgstr "j. N Y, H:i"
#: contrib/admin/templates/admin/object_history.html:35
-msgid ""
-"This object doesn't have a change history. It probably wasn't added via this "
-"admin site."
-msgstr ""
-"Dieses Objekt hat keine Änderungsgeschichte. Es wurde möglicherweise nicht "
-"über diese Verwaltungsseiten angelegt."
+msgid "This object doesn't have a change history. It probably wasn't added via this admin site."
+msgstr "Dieses Objekt hat keine Änderungsgeschichte. Es wurde möglicherweise nicht über diese Verwaltungsseiten angelegt."
#: contrib/admin/templates/admin/pagination.html:10
msgid "Show all"
@@ -549,12 +536,8 @@ msgid "Save"
msgstr "Sichern"
#: contrib/admin/templates/admin/auth/user/add_form.html:6
-msgid ""
-"First, enter a username and password. Then, you'll be able to edit more user "
-"options."
-msgstr ""
-"Zuerst einen Benutzer und ein Passwort eingeben. Danach können weitere "
-"Optionen für den Benutzer geändert werden."
+msgid "First, enter a username and password. Then, you'll be able to edit more user options."
+msgstr "Zuerst einen Benutzer und ein Passwort eingeben. Danach können weitere Optionen für den Benutzer geändert werden."
#: contrib/admin/templates/admin/auth/user/add_form.html:12
msgid "Username"
@@ -578,9 +561,7 @@ msgstr "Bitte das gleiche Passwort zur Überprüfung nochmal eingeben."
#: contrib/admin/templates/admin/auth/user/change_password.html:27
#, python-format
msgid "Enter a new password for the user <strong>%(username)s</strong>."
-msgstr ""
-"Bitte geben Sie ein neues Passwort für den Benutzer <strong>%(username)s</"
-"strong> ein."
+msgstr "Bitte geben Sie ein neues Passwort für den Benutzer <strong>%(username)s</strong> ein."
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
msgid "Bookmarklets"
@@ -601,12 +582,9 @@ msgid ""
"your computer is \"internal\").</p>\n"
msgstr ""
"\n"
-"<p class=\"help\">Um Bookmarklets zu installieren, müssen diese Links in "
-"die\n"
-"Browser-Werkzeugleiste gezogen werden, oder mittels rechter Maustaste in "
-"die\n"
-"Bookmarks gespeichert werden. Danach können die Bookmarklets von jeder "
-"Seite\n"
+"<p class=\"help\">Um Bookmarklets zu installieren, müssen diese Links in die\n"
+"Browser-Werkzeugleiste gezogen werden, oder mittels rechter Maustaste in die\n"
+"Bookmarks gespeichert werden. Danach können die Bookmarklets von jeder Seite\n"
"aufgerufen werden. Einige Bookmarklets sind für den Zugriff von 'internen'\n"
"Rechnern eingeschränkt. Falls nicht klar ist, ob ein Rechner als 'intern'\n"
"bewertet wird, bitte den Administrator fragen.</p>\n"
@@ -616,24 +594,16 @@ msgid "Documentation for this page"
msgstr "Dokumentation für diese Seite"
#: contrib/admin/templates/admin_doc/bookmarklets.html:19
-msgid ""
-"Jumps you from any page to the documentation for the view that generates "
-"that page."
-msgstr ""
-"Springt von jeder Seite zu der Dokumentation für den View der diese Seite "
-"erzeugt."
+msgid "Jumps you from any page to the documentation for the view that generates that page."
+msgstr "Springt von jeder Seite zu der Dokumentation für den View der diese Seite erzeugt."
#: contrib/admin/templates/admin_doc/bookmarklets.html:21
msgid "Show object ID"
msgstr "Objekt-ID anzeigen"
#: contrib/admin/templates/admin_doc/bookmarklets.html:22
-msgid ""
-"Shows the content-type and unique ID for pages that represent a single "
-"object."
-msgstr ""
-"Zeigt den Content-Type und die eindeutige ID für Seiten die ein einzelnes "
-"Objekt repräsentieren."
+msgid "Shows the content-type and unique ID for pages that represent a single object."
+msgstr "Zeigt den Content-Type und die eindeutige ID für Seiten die ein einzelnes Objekt repräsentieren."
#: contrib/admin/templates/admin_doc/bookmarklets.html:24
msgid "Edit this object (current window)"
@@ -641,9 +611,7 @@ msgstr "Dieses Objekt im aktuellen Fenster ändern."
#: contrib/admin/templates/admin_doc/bookmarklets.html:25
msgid "Jumps to the admin page for pages that represent a single object."
-msgstr ""
-"Springt zu der Administrationsseite für dieses Objekt, wenn diese Seite ein "
-"Objekt repräsentiert."
+msgstr "Springt zu der Administrationsseite für dieses Objekt, wenn diese Seite ein Objekt repräsentiert."
#: contrib/admin/templates/admin_doc/bookmarklets.html:27
msgid "Edit this object (new window)"
@@ -651,8 +619,7 @@ msgstr "Dieses Objekt in einem neuen Fenster ändern."
#: contrib/admin/templates/admin_doc/bookmarklets.html:28
msgid "As above, but opens the admin page in a new window."
-msgstr ""
-"Wie zuvor, aber öffnet die Administrationsseite in einem neuen Fenster."
+msgstr "Wie zuvor, aber öffnet die Administrationsseite in einem neuen Fenster."
#: contrib/admin/templates/registration/logged_out.html:8
msgid "Thanks for spending some quality time with the Web site today."
@@ -679,13 +646,8 @@ msgid "Your password was changed."
msgstr "Ihr Passwort wurde geändert."
#: contrib/admin/templates/registration/password_change_form.html:11
-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 Passwort und darunter "
-"dann zweimal (um sicherzustellen, dass Sie es korrekt eingegeben haben) das "
-"neue Kennwort ein."
+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 Passwort und darunter dann zweimal (um sicherzustellen, dass Sie es korrekt eingegeben haben) das neue Kennwort ein."
#: contrib/admin/templates/registration/password_change_form.html:16
msgid "Old password:"
@@ -716,12 +678,8 @@ msgid "Password reset successful"
msgstr "Passwort wurde erfolgreich zurückgesetzt"
#: contrib/admin/templates/registration/password_reset_done.html:12
-msgid ""
-"We've e-mailed a new password to the e-mail address you submitted. You "
-"should be receiving it shortly."
-msgstr ""
-"Wir haben ein neues Passwort an die von Ihnen angegebene E-Mail-Adresse "
-"geschickt. Sie sollten es in Kürze erhalten."
+msgid "We've e-mailed a new password to the e-mail address you submitted. You should be receiving it shortly."
+msgstr "Wir haben ein neues Passwort an die von Ihnen angegebene E-Mail-Adresse geschickt. Sie sollten es in Kürze erhalten."
#: contrib/admin/templates/registration/password_reset_email.html:2
msgid "You're receiving this e-mail because you requested a password reset"
@@ -755,12 +713,8 @@ msgid "The %(site_name)s team"
msgstr "Das Team von %(site_name)s"
#: contrib/admin/templates/registration/password_reset_form.html:12
-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 ""
-"Passwort vergessen? Einfach die E-Mail-Adresse eingeben und wir setzen das "
-"Passwort zurück und lassen es Ihnen per E-Mail zukommen."
+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 "Passwort vergessen? Einfach die E-Mail-Adresse eingeben und wir setzen das Passwort zurück und lassen es Ihnen per E-Mail zukommen."
#: contrib/admin/templates/registration/password_reset_form.html:16
msgid "E-mail address:"
@@ -790,12 +744,14 @@ msgstr "Ändern:"
msgid "All dates"
msgstr "Alle Tage"
-#: contrib/admin/views/auth.py:20 contrib/admin/views/main.py:267
+#: contrib/admin/views/auth.py:20
+#: contrib/admin/views/main.py:267
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "%(name)s \"%(obj)s\" wurde erfolgreich hinzugefügt."
-#: contrib/admin/views/auth.py:25 contrib/admin/views/main.py:271
+#: contrib/admin/views/auth.py:25
+#: contrib/admin/views/main.py:271
#: contrib/admin/views/main.py:356
msgid "You may edit it again below."
msgstr "Das Element kann jetzt weiter bearbeitet werden."
@@ -813,52 +769,42 @@ msgstr "Passwort erfolgreich geändert."
msgid "Change password: %s"
msgstr "Passwort ändern: %s"
-#: contrib/admin/views/decorators.py:17 contrib/auth/forms.py:60
-msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
-msgstr ""
-"Bitte einen gültigen Benutzernamen und ein Passwort eingeben. Beide Felder "
-"berücksichtigen die Groß-/Kleinschreibung."
+#: contrib/admin/views/decorators.py:17
+#: contrib/auth/forms.py:60
+msgid "Please enter a correct username and password. Note that both fields are case-sensitive."
+msgstr "Bitte einen gültigen Benutzernamen und ein Passwort eingeben. Beide Felder berücksichtigen die Groß-/Kleinschreibung."
#: contrib/admin/views/decorators.py:69
-msgid ""
-"Please log in again, because your session has expired. Don't worry: Your "
-"submission has been saved."
-msgstr ""
-"Bitte neu anmelden, da die Session ausgelaufen ist. Keine Angst, die "
-"Beiträge wurden gesichert."
+msgid "Please log in again, because your session has expired. Don't worry: Your submission has been saved."
+msgstr "Bitte neu anmelden, da die Session ausgelaufen ist. Keine Angst, die Beiträge wurden gesichert."
#: contrib/admin/views/decorators.py:76
-msgid ""
-"Looks like your browser isn't configured to accept cookies. Please enable "
-"cookies, reload this page, and try again."
-msgstr ""
-"Es sieht danach aus, dass der Browser keine Cookies akzeptiert. Bitte im "
-"Browser Cookies aktivieren und diese Seite neu laden."
-
-#: contrib/admin/views/decorators.py:90
-msgid "Usernames cannot contain the '@' character."
-msgstr "Benutzernamen dürfen das Zeichen '@' nicht enthalten."
+msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again."
+msgstr "Es sieht danach aus, dass der Browser keine Cookies akzeptiert. Bitte im Browser Cookies aktivieren und diese Seite neu laden."
-#: contrib/admin/views/decorators.py:92
+#: contrib/admin/views/decorators.py:89
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-"Die E-Mail-Adresse entspricht nicht Ihrem Benutzernamen. Bitte stattdessen "
-"'%s' versuchen."
+msgstr "Die E-Mail-Adresse entspricht nicht Ihrem Benutzernamen. Bitte stattdessen '%s' versuchen."
+
+#: contrib/admin/views/decorators.py:93
+msgid "Usernames cannot contain the '@' character."
+msgstr "Benutzernamen dürfen das Zeichen '@' nicht enthalten."
-#: contrib/admin/views/doc.py:48 contrib/admin/views/doc.py:50
+#: contrib/admin/views/doc.py:48
+#: contrib/admin/views/doc.py:50
#: contrib/admin/views/doc.py:52
msgid "tag:"
msgstr "Schlagwort:"
-#: contrib/admin/views/doc.py:79 contrib/admin/views/doc.py:81
+#: contrib/admin/views/doc.py:79
+#: contrib/admin/views/doc.py:81
#: contrib/admin/views/doc.py:83
msgid "filter:"
msgstr "Filter:"
-#: contrib/admin/views/doc.py:137 contrib/admin/views/doc.py:139
+#: contrib/admin/views/doc.py:137
+#: contrib/admin/views/doc.py:139
#: contrib/admin/views/doc.py:141
msgid "view:"
msgstr "Ansicht:"
@@ -878,8 +824,10 @@ msgstr "Modell %(name)r wurde nicht in Anwendung %(label)r gefunden"
msgid "the related `%(label)s.%(type)s` object"
msgstr "Das verknüpfte `%(label)s.%(type)s` Objekt"
-#: contrib/admin/views/doc.py:185 contrib/admin/views/doc.py:207
-#: contrib/admin/views/doc.py:221 contrib/admin/views/doc.py:226
+#: contrib/admin/views/doc.py:185
+#: contrib/admin/views/doc.py:207
+#: contrib/admin/views/doc.py:221
+#: contrib/admin/views/doc.py:226
msgid "model:"
msgstr "Modell:"
@@ -903,9 +851,12 @@ msgstr "Anzahl von %s"
msgid "Fields on %s objects"
msgstr "Felder am %s Objekt"
-#: contrib/admin/views/doc.py:293 contrib/admin/views/doc.py:304
-#: contrib/admin/views/doc.py:306 contrib/admin/views/doc.py:312
-#: contrib/admin/views/doc.py:313 contrib/admin/views/doc.py:315
+#: contrib/admin/views/doc.py:293
+#: contrib/admin/views/doc.py:304
+#: contrib/admin/views/doc.py:306
+#: contrib/admin/views/doc.py:312
+#: contrib/admin/views/doc.py:313
+#: contrib/admin/views/doc.py:315
msgid "Integer"
msgstr "Ganzzahl"
@@ -913,7 +864,8 @@ msgstr "Ganzzahl"
msgid "Boolean (Either True or False)"
msgstr "Boolscher Wert (True oder False)"
-#: contrib/admin/views/doc.py:295 contrib/admin/views/doc.py:314
+#: contrib/admin/views/doc.py:295
+#: contrib/admin/views/doc.py:314
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Zeichenkette (bis zu %(max_length)s Zeichen)"
@@ -938,7 +890,8 @@ msgstr "Dezimalzahl"
msgid "E-mail address"
msgstr "E-Mail-Adresse"
-#: contrib/admin/views/doc.py:301 contrib/admin/views/doc.py:302
+#: contrib/admin/views/doc.py:301
+#: contrib/admin/views/doc.py:302
#: contrib/admin/views/doc.py:305
msgid "File path"
msgstr "Dateipfad"
@@ -947,7 +900,8 @@ msgstr "Dateipfad"
msgid "Floating point number"
msgstr "Fließkommazahl"
-#: contrib/admin/views/doc.py:307 contrib/comments/models.py:89
+#: contrib/admin/views/doc.py:307
+#: contrib/comments/models.py:89
msgid "IP address"
msgstr "IP-Adresse"
@@ -971,7 +925,8 @@ msgstr "Text"
msgid "Time"
msgstr "Zeit"
-#: contrib/admin/views/doc.py:318 contrib/flatpages/models.py:7
+#: contrib/admin/views/doc.py:318
+#: contrib/flatpages/models.py:8
msgid "URL"
msgstr "Adresse (URL)"
@@ -992,7 +947,8 @@ msgstr "%s ist scheinbar kein urlpattern Objekt"
msgid "Site administration"
msgstr "Website-Verwaltung"
-#: contrib/admin/views/main.py:280 contrib/admin/views/main.py:365
+#: contrib/admin/views/main.py:280
+#: contrib/admin/views/main.py:365
#, python-format
msgid "You may add another %s below."
msgstr "Jetzt kann ein weiteres Element vom Typ %s angelegt werden."
@@ -1007,8 +963,10 @@ msgstr "%s hinzufügen"
msgid "Added %s."
msgstr "%s hinzugefügt."
-#: contrib/admin/views/main.py:344 contrib/admin/views/main.py:346
-#: contrib/admin/views/main.py:348 core/validators.py:283
+#: contrib/admin/views/main.py:344
+#: contrib/admin/views/main.py:346
+#: contrib/admin/views/main.py:348
+#: core/validators.py:283
#: db/models/manipulators.py:309
msgid "and"
msgstr "und"
@@ -1034,11 +992,8 @@ msgstr "%(name)s \"%(obj)s\" wurde erfolgreich geändert."
#: contrib/admin/views/main.py:362
#, python-format
-msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-msgstr ""
-"%(name)s \"%(obj)s\" wurde erfolgreich hinzugefügt. Das Element kann jetzt "
-"geändert werden."
+msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr "%(name)s \"%(obj)s\" wurde erfolgreich hinzugefügt. Das Element kann jetzt geändert werden."
#: contrib/admin/views/main.py:400
#, python-format
@@ -1079,11 +1034,12 @@ msgstr "%s auswählen"
msgid "Select %s to change"
msgstr "%s zur Änderung auswählen"
-#: contrib/admin/views/main.py:784
+#: contrib/admin/views/main.py:765
msgid "Database error"
msgstr "Datenbankfehler"
-#: contrib/auth/forms.py:17 contrib/auth/forms.py:138
+#: contrib/auth/forms.py:17
+#: contrib/auth/forms.py:138
msgid "The two password fields didn't match."
msgstr "Die beiden Passwörter sind nicht identisch."
@@ -1092,24 +1048,16 @@ msgid "A user with that username already exists."
msgstr "Ein Benutzer mit diesem Namen existiert bereits."
#: contrib/auth/forms.py:53
-msgid ""
-"Your Web browser doesn't appear to have cookies enabled. Cookies are "
-"required for logging in."
-msgstr ""
-"Der Webbrowser scheint keine Cookies aktiviert zu haben. Cookies sind für "
-"die Anmeldung zwingend erforderlich."
+msgid "Your Web browser doesn't appear to have cookies enabled. Cookies are required for logging in."
+msgstr "Der Webbrowser scheint keine Cookies aktiviert zu haben. Cookies sind für die Anmeldung zwingend erforderlich."
#: contrib/auth/forms.py:62
msgid "This account is inactive."
msgstr "Dieser Benutzer ist inaktiv."
#: contrib/auth/forms.py:84
-msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
-"you've registered?"
-msgstr ""
-"Zu dieser E-Mail-Adresse existiert kein Benutzer. Sicher, dass Sie sich mit "
-"dieser Adresse angemeldet haben?"
+msgid "That e-mail address doesn't have an associated user account. Are you sure you've registered?"
+msgstr "Zu dieser E-Mail-Adresse existiert kein Benutzer. Sicher, dass Sie sich mit dieser Adresse angemeldet haben?"
#: contrib/auth/forms.py:107
#, python-format
@@ -1124,7 +1072,8 @@ msgstr "Die beiden neuen Passwörter sind nicht identisch."
msgid "Your old password was entered incorrectly. Please enter it again."
msgstr "Das alte Passwort war falsch. Bitte neu eingeben."
-#: contrib/auth/models.py:73 contrib/auth/models.py:93
+#: contrib/auth/models.py:73
+#: contrib/auth/models.py:93
msgid "name"
msgstr "Name"
@@ -1136,7 +1085,8 @@ msgstr "Codename"
msgid "permission"
msgstr "Berechtigung"
-#: contrib/auth/models.py:79 contrib/auth/models.py:94
+#: contrib/auth/models.py:79
+#: contrib/auth/models.py:94
msgid "permissions"
msgstr "Berechtigungen"
@@ -1144,133 +1094,113 @@ msgstr "Berechtigungen"
msgid "group"
msgstr "Gruppe"
-#: contrib/auth/models.py:98 contrib/auth/models.py:141
+#: contrib/auth/models.py:98
+#: contrib/auth/models.py:148
msgid "groups"
msgstr "Gruppen"
-#: contrib/auth/models.py:131
+#: contrib/auth/models.py:138
msgid "username"
msgstr "Benutzername"
-#: contrib/auth/models.py:131
-msgid ""
-"Required. 30 characters or fewer. Alphanumeric characters only (letters, "
-"digits and underscores)."
-msgstr ""
-"Erforderlich. 30 Zeichen oder weniger. Alphanumerische Zeichen (Buchstaben, "
-"Ziffern und Unterstriche sind erlaubt)."
+#: contrib/auth/models.py:138
+msgid "Required. 30 characters or fewer. Alphanumeric characters only (letters, digits and underscores)."
+msgstr "Erforderlich. 30 Zeichen oder weniger. Alphanumerische Zeichen (Buchstaben, Ziffern und Unterstriche sind erlaubt)."
-#: contrib/auth/models.py:132
+#: contrib/auth/models.py:139
msgid "first name"
msgstr "Vorname"
-#: contrib/auth/models.py:133
+#: contrib/auth/models.py:140
msgid "last name"
msgstr "Nachname"
-#: contrib/auth/models.py:134
+#: contrib/auth/models.py:141
msgid "e-mail address"
msgstr "E-Mail-Adresse"
-#: contrib/auth/models.py:135
+#: contrib/auth/models.py:142
msgid "password"
msgstr "Passwort"
-#: contrib/auth/models.py:135
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Die Form '[algo]$[salt]$[hexdigest]' verwenden, oder das <a href=\"password/"
-"\">Passwort ändern Formular</a> benutzen."
+#: contrib/auth/models.py:142
+msgid "Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change password form</a>."
+msgstr "Die Form '[algo]$[salt]$[hexdigest]' verwenden, oder das <a href=\"password/\">Passwort ändern Formular</a> benutzen."
-#: contrib/auth/models.py:136
+#: contrib/auth/models.py:143
msgid "staff status"
msgstr "Administrator"
-#: contrib/auth/models.py:136
+#: contrib/auth/models.py:143
msgid "Designates whether the user can log into this admin site."
-msgstr ""
-"Legt fest, ob sich der Benutzer an der Administrationsseite anmelden kann."
+msgstr "Legt fest, ob sich der Benutzer an der Administrationsseite anmelden kann."
-#: contrib/auth/models.py:137
+#: contrib/auth/models.py:144
msgid "active"
msgstr "Aktiv"
-#: contrib/auth/models.py:137
-msgid ""
-"Designates whether this user can log into the Django admin. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Legt fest, ob sich der Benutzer an der Administrationsseite anmelden kann. "
-"Anstatt einen Benutzer zu löschen, kann er hier auch einfach deaktiviert "
-"werden."
+#: contrib/auth/models.py:144
+msgid "Designates whether this user should be treated as active. Unselect this instead of deleting accounts."
+msgstr "Legt fest, ob dieser Benutzer aktiv ist. Kann deaktiviert werden, anstatt Benutzer zu löschen."
-#: contrib/auth/models.py:138
+#: contrib/auth/models.py:145
msgid "superuser status"
msgstr "Hauptadmin."
-#: contrib/auth/models.py:138
-msgid ""
-"Designates that this user has all permissions without explicitly assigning "
-"them."
-msgstr ""
-"Legt fest, dass der Benutzer alle Berechtigungen hat, ohne diese einzeln "
-"zuweisen zu müssen."
+#: contrib/auth/models.py:145
+msgid "Designates that this user has all permissions without explicitly assigning them."
+msgstr "Legt fest, dass der Benutzer alle Berechtigungen hat, ohne diese einzeln zuweisen zu müssen."
-#: contrib/auth/models.py:139
+#: contrib/auth/models.py:146
msgid "last login"
msgstr "Letzte Anmeldung"
-#: contrib/auth/models.py:140
+#: contrib/auth/models.py:147
msgid "date joined"
msgstr "Mitglied seit"
-#: contrib/auth/models.py:142
-msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
-msgstr ""
-"Zusätzlich zu den manuell angelegten Rechten erhält dieser Benutzer auch "
-"alle Rechte, die seine zugewiesenen Gruppen haben."
+#: contrib/auth/models.py:149
+msgid "In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in."
+msgstr "Zusätzlich zu den manuell angelegten Rechten erhält dieser Benutzer auch alle Rechte, die seine zugewiesenen Gruppen haben."
-#: contrib/auth/models.py:143
+#: contrib/auth/models.py:150
msgid "user permissions"
msgstr "Berechtigungen"
-#: contrib/auth/models.py:147
+#: contrib/auth/models.py:154
msgid "user"
msgstr "Benutzer"
-#: contrib/auth/models.py:148
+#: contrib/auth/models.py:155
msgid "users"
msgstr "Benutzer"
-#: contrib/auth/models.py:154
+#: contrib/auth/models.py:161
msgid "Personal info"
msgstr "Persönliche Infos"
-#: contrib/auth/models.py:155
+#: contrib/auth/models.py:162
msgid "Permissions"
msgstr "Berechtigungen"
-#: contrib/auth/models.py:156
+#: contrib/auth/models.py:163
msgid "Important dates"
msgstr "Wichtige Daten"
-#: contrib/auth/models.py:157
+#: contrib/auth/models.py:164
msgid "Groups"
msgstr "Gruppen"
-#: contrib/auth/models.py:316
+#: contrib/auth/models.py:323
msgid "message"
msgstr "Mitteilung"
-#: contrib/auth/views.py:47
+#: contrib/auth/views.py:48
msgid "Logged out"
msgstr "Abgemeldet"
-#: contrib/comments/models.py:71 contrib/comments/models.py:176
+#: contrib/comments/models.py:71
+#: contrib/comments/models.py:176
msgid "object ID"
msgstr "Objekt-ID"
@@ -1278,7 +1208,8 @@ msgstr "Objekt-ID"
msgid "headline"
msgstr "Überschrift"
-#: contrib/comments/models.py:73 contrib/comments/models.py:95
+#: contrib/comments/models.py:73
+#: contrib/comments/models.py:95
#: contrib/comments/models.py:177
msgid "comment"
msgstr "Kommentar"
@@ -1319,11 +1250,13 @@ msgstr "Bewertung #8"
msgid "is valid rating"
msgstr "ist eine Bewertung"
-#: contrib/comments/models.py:87 contrib/comments/models.py:179
+#: contrib/comments/models.py:87
+#: contrib/comments/models.py:179
msgid "date/time submitted"
msgstr "Datum/Zeit Erstellung"
-#: contrib/comments/models.py:88 contrib/comments/models.py:180
+#: contrib/comments/models.py:88
+#: contrib/comments/models.py:180
msgid "is public"
msgstr "ist öffentlich"
@@ -1332,18 +1265,15 @@ msgid "is removed"
msgstr "ist gelöscht"
#: contrib/comments/models.py:90
-msgid ""
-"Check this box if the comment is inappropriate. A \"This comment has been "
-"removed\" message will be displayed instead."
-msgstr ""
-"Hier einen Haken setzen, wenn der Kommentar unpassend ist. Stattdessen wird "
-"dann \"Dieser Kommentar wurde entfernt\" Meldung angezeigt."
+msgid "Check this box if the comment is inappropriate. A \"This comment has been removed\" message will be displayed instead."
+msgstr "Hier einen Haken setzen, wenn der Kommentar unpassend ist. Stattdessen wird dann \"Dieser Kommentar wurde entfernt\" Meldung angezeigt."
#: contrib/comments/models.py:96
msgid "comments"
msgstr "Kommentare"
-#: contrib/comments/models.py:140 contrib/comments/models.py:222
+#: contrib/comments/models.py:140
+#: contrib/comments/models.py:222
msgid "Content object"
msgstr "Inhaltsobjekt"
@@ -1485,32 +1415,25 @@ msgid "Your name:"
msgstr "Ihr Name:"
#: contrib/comments/views/comments.py:28
-msgid ""
-"This rating is required because you've entered at least one other rating."
-msgstr ""
-"Diese Abstimmung ist zwingend erforderlich, da Sie an mindestens einer "
-"weiteren Abstimmung teilnehmen."
+msgid "This rating is required because you've entered at least one other rating."
+msgstr "Diese Abstimmung ist zwingend erforderlich, da Sie an mindestens einer weiteren Abstimmung teilnehmen."
#: contrib/comments/views/comments.py:112
#, python-format
msgid ""
-"This comment was posted by a user who has posted fewer than %(count)s "
-"comment:\n"
+"This comment was posted by a user who has posted fewer than %(count)s comment:\n"
"\n"
"%(text)s"
msgid_plural ""
-"This comment was posted by a user who has posted fewer than %(count)s "
-"comments:\n"
+"This comment was posted by a user who has posted fewer than %(count)s comments:\n"
"\n"
"%(text)s"
msgstr[0] ""
-"Dieser Kommentar ist von einem Benutzer mit weniger als %(count)s "
-"Kommentar:\n"
+"Dieser Kommentar ist von einem Benutzer mit weniger als %(count)s Kommentar:\n"
"\n"
"%(text)s"
msgstr[1] ""
-"Dieser Kommentar ist von einem Benutzer mit weniger als %(count)s "
-"Kommentaren:\n"
+"Dieser Kommentar ist von einem Benutzer mit weniger als %(count)s Kommentaren:\n"
"\n"
"%(text)s"
@@ -1538,23 +1461,17 @@ msgstr "Eines oder mehrere der erforderlichen Felder fehlen"
#: contrib/comments/views/comments.py:198
#: contrib/comments/views/comments.py:289
msgid "Somebody tampered with the comment form (security violation)"
-msgstr ""
-"Jemand hat mit dem Kommentarformular herumgespielt (Sicherheitsverletzung)"
+msgstr "Jemand hat mit dem Kommentarformular herumgespielt (Sicherheitsverletzung)"
#: contrib/comments/views/comments.py:208
#: contrib/comments/views/comments.py:295
-msgid ""
-"The comment form had an invalid 'target' parameter -- the object ID was "
-"invalid"
-msgstr ""
-"Das Kommentarformular hatte einen falschen 'target' Parameter -- die Objekt-"
-"ID ist ungültig."
+msgid "The comment form had an invalid 'target' parameter -- the object ID was invalid"
+msgstr "Das Kommentarformular hatte einen falschen 'target' Parameter -- die Objekt-ID ist ungültig."
#: contrib/comments/views/comments.py:259
#: contrib/comments/views/comments.py:324
msgid "The comment form didn't provide either 'preview' or 'post'"
-msgstr ""
-"Das Kommentarformular wurde nicht mit 'preview' oder 'post' abgeschickt"
+msgstr "Das Kommentarformular wurde nicht mit 'preview' oder 'post' abgeschickt"
#: contrib/comments/views/karma.py:21
msgid "Anonymous users cannot vote"
@@ -1580,54 +1497,50 @@ msgstr "Inhaltstyp"
msgid "content types"
msgstr "Inhaltstypen"
-#: contrib/flatpages/models.py:8
-msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr ""
-"Beispiel: '/about/contact/'. Wichtig: Am Anfang und Ende muss ein / stehen."
-
#: contrib/flatpages/models.py:9
+msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr "Beispiel: '/about/contact/'. Wichtig: Am Anfang und Ende muss ein / stehen."
+
+#: contrib/flatpages/models.py:10
msgid "title"
msgstr "Titel"
-#: contrib/flatpages/models.py:10
+#: contrib/flatpages/models.py:11
msgid "content"
msgstr "Inhalt"
-#: contrib/flatpages/models.py:11
+#: contrib/flatpages/models.py:12
msgid "enable comments"
msgstr "Kommentare aktivieren"
-#: contrib/flatpages/models.py:12
+#: contrib/flatpages/models.py:13
msgid "template name"
msgstr "Name der Vorlage"
-#: contrib/flatpages/models.py:13
-msgid ""
-"Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
-"will use 'flatpages/default.html'."
-msgstr ""
-"Beispiel: 'flatpages/contact_page.html'. Wenn dieses Feld nicht gefüllt ist, "
-"wird 'flatpages/default.html' als Standard gewählt."
-
#: contrib/flatpages/models.py:14
+msgid "Example: 'flatpages/contact_page.html'. If this isn't provided, the system will use 'flatpages/default.html'."
+msgstr "Beispiel: 'flatpages/contact_page.html'. Wenn dieses Feld nicht gefüllt ist, wird 'flatpages/default.html' als Standard gewählt."
+
+#: contrib/flatpages/models.py:15
msgid "registration required"
msgstr "Registrierung erforderlich"
-#: contrib/flatpages/models.py:14
+#: contrib/flatpages/models.py:15
msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr ""
-"Wenn hier ein Haken gesetzt ist, können nur angemeldete Benutzer diese Seite "
-"sehen."
+msgstr "Wenn hier ein Haken gesetzt ist, können nur angemeldete Benutzer diese Seite sehen."
-#: contrib/flatpages/models.py:18
+#: contrib/flatpages/models.py:20
msgid "flat page"
msgstr "Webseite"
-#: contrib/flatpages/models.py:19
+#: contrib/flatpages/models.py:21
msgid "flat pages"
msgstr "Webseiten"
+#: contrib/flatpages/models.py:27
+msgid "Advanced options"
+msgstr "Erweiterte Optionen"
+
#: contrib/humanize/templatetags/humanize.py:19
msgid "th"
msgstr "."
@@ -1714,31 +1627,26 @@ msgid "yesterday"
msgstr "gestern"
#: contrib/localflavor/ar/forms.py:27
-#, fuzzy
msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr ""
-"Bitte eine gültige Postleitzahl im Format NNNN oder ANNNNAAA eingeben."
+msgstr "Bitte eine gültige Postleitzahl im Format NNNN oder ANNNNAAA eingeben."
-#: contrib/localflavor/ar/forms.py:49 contrib/localflavor/br/forms.py:96
-#: contrib/localflavor/br/forms.py:135 contrib/localflavor/pe/forms.py:23
+#: contrib/localflavor/ar/forms.py:49
+#: contrib/localflavor/br/forms.py:96
+#: contrib/localflavor/br/forms.py:135
+#: contrib/localflavor/pe/forms.py:23
#: contrib/localflavor/pe/forms.py:51
-#, fuzzy
msgid "This field requires only numbers."
msgstr "Dieses Feld darf nur Ziffern enthalten."
#: contrib/localflavor/ar/forms.py:50
-#, fuzzy
msgid "This field requires 7 or 8 digits."
msgstr "Dieses Feld benötigt 7 oder 8 Ziffern."
#: contrib/localflavor/ar/forms.py:79
-#, fuzzy
msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr ""
-"Bitte eine gültige CUIT im Format XX-XXXXXXXX-X oder XXXXXXXXXXXX eingeben."
+msgstr "Bitte eine gültige CUIT im Format XX-XXXXXXXX-X oder XXXXXXXXXXXX eingeben."
#: contrib/localflavor/ar/forms.py:80
-#, fuzzy
msgid "Invalid CUIT."
msgstr "Ungültige CUIT."
@@ -1755,10 +1663,7 @@ msgid "Phone numbers must be in XX-XXXX-XXXX format."
msgstr "Telefonnummern müssen das Format XX-XXXX-XXXX haben."
#: contrib/localflavor/br/forms.py:58
-#, fuzzy
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
+msgid "Select a valid brazilian state. That state is not one of the available states."
msgstr "Bitte einen gültigen brasilianischen Bundesstaat auswählen."
#: contrib/localflavor/br/forms.py:94
@@ -1766,7 +1671,6 @@ msgid "Invalid CPF number."
msgstr "Ungültige CPF-Nummer."
#: contrib/localflavor/br/forms.py:95
-#, fuzzy
msgid "This field requires at most 11 digits or 14 characters."
msgstr "Dieses Feld benötigt mindestens 11 Ziffern oder 14 Zeichen."
@@ -1775,21 +1679,16 @@ msgid "Invalid CNPJ number."
msgstr "Ungültige CNPJ-Nummer."
#: contrib/localflavor/br/forms.py:136
-#, fuzzy
msgid "This field requires at least 14 digits"
msgstr "Dieses Feld benötigt mindestens 14 Ziffern."
#: contrib/localflavor/ca/forms.py:17
-#, fuzzy
msgid "Enter a postal code in the format XXX XXX."
-msgstr "Bitte eine gültige Postleitzahl im Format XXXXX eingeben."
+msgstr "Bitte eine gültige Postleitzahl im Format XXX XXX eingeben."
#: contrib/localflavor/ca/forms.py:88
-#, fuzzy
msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-"Bitte eine gültige kanadische Sozialversicherungsnummer im Format XXX-"
-"XXX-XXX eingeben."
+msgstr "Bitte eine gültige kanadische Sozialversicherungsnummer im Format XXX-XXX-XXX eingeben."
#: contrib/localflavor/ch/ch_states.py:5
msgid "Aargau"
@@ -1812,7 +1711,6 @@ msgid "Basel-Land"
msgstr ""
#: contrib/localflavor/ch/ch_states.py:10
-#, fuzzy
msgid