Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #22 from willkg/django-update

Django update
  • Loading branch information...
commit 7040835e4bff630df108ce2d1acbabe6a5e156ba 2 parents 52acb58 + 8660316
Will Kahn-Greene willkg authored
Showing with 657 additions and 19,491 deletions.
  1. +1 −1  lib/python/django/__init__.py
  2. BIN  lib/python/django/conf/locale/no/LC_MESSAGES/django.mo
  3. +0 −1,134 lib/python/django/conf/locale/no/LC_MESSAGES/django.po
  4. 0  lib/python/django/conf/locale/no/__init__.py
  5. +0 −43 lib/python/django/conf/locale/no/formats.py
  6. 0  lib/python/django/conf/project_template/__init__.py
  7. +0 −145 lib/python/django/conf/project_template/settings.py
  8. +0 −17 lib/python/django/conf/project_template/urls.py
  9. +7 −4 lib/python/django/contrib/admin/filters.py
  10. +0 −279 lib/python/django/contrib/admin/filterspecs.py
  11. BIN  lib/python/django/contrib/admin/locale/no/LC_MESSAGES/django.mo
  12. +0 −807 lib/python/django/contrib/admin/locale/no/LC_MESSAGES/django.po
  13. BIN  lib/python/django/contrib/admin/locale/no/LC_MESSAGES/djangojs.mo
  14. +0 −154 lib/python/django/contrib/admin/locale/no/LC_MESSAGES/djangojs.po
  15. +0 −772 lib/python/django/contrib/admin/media/css/base.css
  16. +0 −289 lib/python/django/contrib/admin/media/css/changelists.css
  17. +0 −30 lib/python/django/contrib/admin/media/css/dashboard.css
  18. +0 −360 lib/python/django/contrib/admin/media/css/forms.css
  19. +0 −57 lib/python/django/contrib/admin/media/css/ie.css
  20. +0 −54 lib/python/django/contrib/admin/media/css/login.css
  21. +0 −244 lib/python/django/contrib/admin/media/css/rtl.css
  22. +0 −514 lib/python/django/contrib/admin/media/css/widgets.css
  23. BIN  lib/python/django/contrib/admin/media/img/admin/arrow-down.gif
  24. BIN  lib/python/django/contrib/admin/media/img/admin/arrow-up.gif
  25. BIN  lib/python/django/contrib/admin/media/img/admin/changelist-bg.gif
  26. BIN  lib/python/django/contrib/admin/media/img/admin/changelist-bg_rtl.gif
  27. BIN  lib/python/django/contrib/admin/media/img/admin/chooser-bg.gif
  28. BIN  lib/python/django/contrib/admin/media/img/admin/chooser_stacked-bg.gif
  29. BIN  lib/python/django/contrib/admin/media/img/admin/default-bg-reverse.gif
  30. BIN  lib/python/django/contrib/admin/media/img/admin/default-bg.gif
  31. BIN  lib/python/django/contrib/admin/media/img/admin/deleted-overlay.gif
  32. BIN  lib/python/django/contrib/admin/media/img/admin/icon-no.gif
  33. BIN  lib/python/django/contrib/admin/media/img/admin/icon-unknown.gif
  34. BIN  lib/python/django/contrib/admin/media/img/admin/icon-yes.gif
  35. BIN  lib/python/django/contrib/admin/media/img/admin/icon_addlink.gif
  36. BIN  lib/python/django/contrib/admin/media/img/admin/icon_alert.gif
  37. BIN  lib/python/django/contrib/admin/media/img/admin/icon_calendar.gif
  38. BIN  lib/python/django/contrib/admin/media/img/admin/icon_changelink.gif
  39. BIN  lib/python/django/contrib/admin/media/img/admin/icon_clock.gif
  40. BIN  lib/python/django/contrib/admin/media/img/admin/icon_deletelink.gif
  41. BIN  lib/python/django/contrib/admin/media/img/admin/icon_error.gif
  42. BIN  lib/python/django/contrib/admin/media/img/admin/icon_searchbox.png
  43. BIN  lib/python/django/contrib/admin/media/img/admin/icon_success.gif
  44. BIN  lib/python/django/contrib/admin/media/img/admin/inline-delete-8bit.png
  45. BIN  lib/python/django/contrib/admin/media/img/admin/inline-delete.png
  46. BIN  lib/python/django/contrib/admin/media/img/admin/inline-restore-8bit.png
  47. BIN  lib/python/django/contrib/admin/media/img/admin/inline-restore.png
  48. BIN  lib/python/django/contrib/admin/media/img/admin/inline-splitter-bg.gif
  49. BIN  lib/python/django/contrib/admin/media/img/admin/nav-bg-grabber.gif
  50. BIN  lib/python/django/contrib/admin/media/img/admin/nav-bg-reverse.gif
  51. BIN  lib/python/django/contrib/admin/media/img/admin/nav-bg.gif
  52. BIN  lib/python/django/contrib/admin/media/img/admin/selector-add.gif
  53. BIN  lib/python/django/contrib/admin/media/img/admin/selector-addall.gif
  54. BIN  lib/python/django/contrib/admin/media/img/admin/selector-remove.gif
  55. BIN  lib/python/django/contrib/admin/media/img/admin/selector-removeall.gif
  56. BIN  lib/python/django/contrib/admin/media/img/admin/selector-search.gif
  57. BIN  lib/python/django/contrib/admin/media/img/admin/selector_stacked-add.gif
  58. BIN  lib/python/django/contrib/admin/media/img/admin/selector_stacked-remove.gif
  59. BIN  lib/python/django/contrib/admin/media/img/admin/tool-left.gif
  60. BIN  lib/python/django/contrib/admin/media/img/admin/tool-left_over.gif
  61. BIN  lib/python/django/contrib/admin/media/img/admin/tool-right.gif
  62. BIN  lib/python/django/contrib/admin/media/img/admin/tool-right_over.gif
  63. BIN  lib/python/django/contrib/admin/media/img/admin/tooltag-add.gif
  64. BIN  lib/python/django/contrib/admin/media/img/admin/tooltag-add_over.gif
  65. BIN  lib/python/django/contrib/admin/media/img/admin/tooltag-arrowright.gif
  66. BIN  lib/python/django/contrib/admin/media/img/admin/tooltag-arrowright_over.gif
  67. BIN  lib/python/django/contrib/admin/media/img/gis/move_vertex_off.png
  68. BIN  lib/python/django/contrib/admin/media/img/gis/move_vertex_on.png
  69. +0 −20 lib/python/django/contrib/admin/media/js/LICENSE-JQUERY.txt
  70. +0 −111 lib/python/django/contrib/admin/media/js/SelectBox.js
  71. +0 −130 lib/python/django/contrib/admin/media/js/SelectFilter2.js
  72. +0 −139 lib/python/django/contrib/admin/media/js/actions.js
  73. +0 −7 lib/python/django/contrib/admin/media/js/actions.min.js
  74. +0 −274 lib/python/django/contrib/admin/media/js/admin/DateTimeShortcuts.js
  75. +0 −96 lib/python/django/contrib/admin/media/js/admin/RelatedObjectLookups.js
  76. +0 −137 lib/python/django/contrib/admin/media/js/admin/ordering.js
  77. +0 −156 lib/python/django/contrib/admin/media/js/calendar.js
  78. +0 −27 lib/python/django/contrib/admin/media/js/collapse.js
  79. +0 −2  lib/python/django/contrib/admin/media/js/collapse.min.js
  80. +0 −47 lib/python/django/contrib/admin/media/js/compress.py
  81. +0 −221 lib/python/django/contrib/admin/media/js/core.js
  82. +0 −239 lib/python/django/contrib/admin/media/js/dateparse.js
  83. +0 −167 lib/python/django/contrib/admin/media/js/getElementsBySelector.js
  84. +0 −136 lib/python/django/contrib/admin/media/js/inlines.js
  85. +0 −5 lib/python/django/contrib/admin/media/js/inlines.min.js
  86. +0 −4 lib/python/django/contrib/admin/media/js/jquery.init.js
  87. +0 −6,240 lib/python/django/contrib/admin/media/js/jquery.js
  88. +0 −154 lib/python/django/contrib/admin/media/js/jquery.min.js
  89. +0 −34 lib/python/django/contrib/admin/media/js/prepopulate.js
  90. +0 −1  lib/python/django/contrib/admin/media/js/prepopulate.min.js
  91. +0 −94 lib/python/django/contrib/admin/media/js/timeparse.js
  92. +0 −140 lib/python/django/contrib/admin/media/js/urlify.js
  93. +2 −2 lib/python/django/contrib/admin/tests.py
  94. BIN  lib/python/django/contrib/admindocs/locale/no/LC_MESSAGES/django.mo
  95. +0 −147 lib/python/django/contrib/admindocs/locale/no/LC_MESSAGES/django.po
  96. +5 −0 lib/python/django/contrib/auth/context_processors.py
  97. +0 −316 lib/python/django/contrib/auth/fixtures/permissionstestdata.json
  98. BIN  lib/python/django/contrib/auth/locale/no/LC_MESSAGES/django.mo
  99. +0 −256 lib/python/django/contrib/auth/locale/no/LC_MESSAGES/django.po
  100. +46 −0 lib/python/django/contrib/auth/tests/context_processors.py
  101. +0 −38 lib/python/django/contrib/auth/tests/permissions.py
  102. +1 −0  lib/python/django/contrib/auth/tests/urls.py
  103. +37 −0 lib/python/django/contrib/auth/tests/views.py
  104. +1 −1  lib/python/django/contrib/auth/views.py
  105. BIN  lib/python/django/contrib/comments/locale/no/LC_MESSAGES/django.mo
  106. +0 −301 lib/python/django/contrib/comments/locale/no/LC_MESSAGES/django.po
  107. BIN  lib/python/django/contrib/contenttypes/locale/no/LC_MESSAGES/django.mo
  108. +0 −27 lib/python/django/contrib/contenttypes/locale/no/LC_MESSAGES/django.po
  109. 0  lib/python/django/contrib/csrf/__init__.py
  110. +0 −7 lib/python/django/contrib/csrf/middleware.py
  111. BIN  lib/python/django/contrib/flatpages/locale/no/LC_MESSAGES/django.mo
  112. +0 −77 lib/python/django/contrib/flatpages/locale/no/LC_MESSAGES/django.po
  113. BIN  lib/python/django/contrib/formtools/locale/no/LC_MESSAGES/django.mo
  114. +0 −23 lib/python/django/contrib/formtools/locale/no/LC_MESSAGES/django.po
  115. +0 −9 lib/python/django/contrib/formtools/tests/templates/formwizard/wizard.html
  116. +0 −287 lib/python/django/contrib/formtools/wizard.py
  117. +0 −11 lib/python/django/contrib/gis/db/backend/__init__.py
  118. +0 −32 lib/python/django/contrib/gis/db/backends/spatialite/compiler.py
  119. +0 −28 lib/python/django/contrib/gis/gdal/LICENSE
  120. +0 −27 lib/python/django/contrib/gis/geos/LICENSE
  121. BIN  lib/python/django/contrib/gis/locale/no/LC_MESSAGES/django.mo
  122. +0 −66 lib/python/django/contrib/gis/locale/no/LC_MESSAGES/django.po
  123. +0 −15 lib/python/django/contrib/gis/management/base.py
  124. +0 −103 lib/python/django/contrib/gis/tests/test_geoip.py
  125. BIN  lib/python/django/contrib/humanize/locale/no/LC_MESSAGES/django.mo
  126. +0 −100 lib/python/django/contrib/humanize/locale/no/LC_MESSAGES/django.po
  127. BIN  lib/python/django/contrib/localflavor/locale/no/LC_MESSAGES/django.mo
  128. +0 −2,561 lib/python/django/contrib/localflavor/locale/no/LC_MESSAGES/django.po
  129. BIN  lib/python/django/contrib/messages/locale/no/LC_MESSAGES/django.mo
  130. +0 −19 lib/python/django/contrib/messages/locale/no/LC_MESSAGES/django.po
  131. +0 −64 lib/python/django/contrib/messages/storage/user_messages.py
  132. +0 −70 lib/python/django/contrib/messages/tests/user_messages.py
  133. BIN  lib/python/django/contrib/redirects/locale/no/LC_MESSAGES/django.mo
  134. +0 −47 lib/python/django/contrib/redirects/locale/no/LC_MESSAGES/django.po
  135. BIN  lib/python/django/contrib/sessions/locale/no/LC_MESSAGES/django.mo
  136. +0 −35 lib/python/django/contrib/sessions/locale/no/LC_MESSAGES/django.po
  137. +0 −173 lib/python/django/contrib/sitemaps/tests/basic.py
  138. +0 −37 lib/python/django/contrib/sitemaps/tests/urls.py
  139. BIN  lib/python/django/contrib/sites/locale/no/LC_MESSAGES/django.mo
  140. +0 −31 lib/python/django/contrib/sites/locale/no/LC_MESSAGES/django.po
  141. +0 −38 lib/python/django/contrib/syndication/feeds.py
  142. +0 −7 lib/python/django/core/template_loader.py
  143. +19 −11 lib/python/django/db/backends/__init__.py
  144. 0  lib/python/django/db/backends/postgresql/__init__.py
  145. +0 −183 lib/python/django/db/backends/postgresql/base.py
  146. +0 −23 lib/python/django/db/backends/postgresql/client.py
  147. +0 −76 lib/python/django/db/backends/postgresql/creation.py
  148. +0 −88 lib/python/django/db/backends/postgresql/introspection.py
  149. +0 −205 lib/python/django/db/backends/postgresql/operations.py
  150. +0 −31 lib/python/django/db/backends/postgresql/version.py
  151. +8 −1 lib/python/django/db/backends/sqlite3/base.py
  152. +3 −2 lib/python/django/db/models/fields/__init__.py
  153. +23 −6 lib/python/django/db/models/query.py
  154. +0 −36 lib/python/django/dispatch/license.txt
  155. +5 −0 lib/python/django/http/__init__.py
  156. +0 −240 lib/python/django/utils/_threading_local.py
  157. +12 −0 lib/python/django/utils/encoding.py
  158. +97 −86 lib/python/django/utils/html_parser.py
  159. +6 −0 lib/python/django/utils/safestring.py
  160. +0 −19 lib/python/django/utils/simplejson/LICENSE.txt
  161. +382 −0 lib/python/django/utils/six.py
  162. +0 −42 lib/python/django/utils/stopwords.py
  163. +2 −2 lib/python/django/utils/translation/trans_real.py
2  lib/python/django/__init__.py
View
@@ -1,4 +1,4 @@
-VERSION = (1, 4, 1, 'final', 0)
+VERSION = (1, 4, 2, 'final', 0)
def get_version(version=None):
"""Derives a PEP386-compliant version number from VERSION."""
BIN  lib/python/django/conf/locale/no/LC_MESSAGES/django.mo
View
Binary file not shown
1,134 lib/python/django/conf/locale/no/LC_MESSAGES/django.po
View
@@ -1,1134 +0,0 @@
-# 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: 2011-03-15 13:10-0400\n"
-"PO-Revision-Date: 2011-03-04 18:40+0000\n"
-"Last-Translator: jonklo <jonklo@gmail.com>\n"
-"Language-Team: Norwegian <>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: no\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#: conf/global_settings.py:44
-msgid "Arabic"
-msgstr "Arabisk"
-
-#: conf/global_settings.py:45
-msgid "Azerbaijani"
-msgstr "Aserbajdsjansk"
-
-#: conf/global_settings.py:46
-msgid "Bulgarian"
-msgstr "Bulgarsk"
-
-#: conf/global_settings.py:47
-msgid "Bengali"
-msgstr "Bengalsk"
-
-#: conf/global_settings.py:48
-msgid "Bosnian"
-msgstr "Bosnisk"
-
-#: conf/global_settings.py:49
-msgid "Catalan"
-msgstr "Katalansk"
-
-#: conf/global_settings.py:50
-msgid "Czech"
-msgstr "Tsjekkisk"
-
-#: conf/global_settings.py:51
-msgid "Welsh"
-msgstr "Walisisk"
-
-#: conf/global_settings.py:52
-msgid "Danish"
-msgstr "Dansk"
-
-#: conf/global_settings.py:53
-msgid "German"
-msgstr "Tysk"
-
-#: conf/global_settings.py:54
-msgid "Greek"
-msgstr "Gresk"
-
-#: conf/global_settings.py:55
-msgid "English"
-msgstr "Engelsk"
-
-#: conf/global_settings.py:56
-msgid "British English"
-msgstr "Engelsk (britisk)"
-
-#: conf/global_settings.py:57
-msgid "Spanish"
-msgstr "Spansk"
-
-#: conf/global_settings.py:58
-msgid "Argentinian Spanish"
-msgstr "Argentinsk spansk"
-
-#: conf/global_settings.py:59
-msgid "Mexican Spanish"
-msgstr "Meksikansk spansk"
-
-#: conf/global_settings.py:60
-msgid "Estonian"
-msgstr "Estisk"
-
-#: conf/global_settings.py:61
-msgid "Basque"
-msgstr "Baskisk"
-
-#: conf/global_settings.py:62
-msgid "Persian"
-msgstr "Persisk"
-
-#: conf/global_settings.py:63
-msgid "Finnish"
-msgstr "Finsk"
-
-#: conf/global_settings.py:64
-msgid "French"
-msgstr "Fransk"
-
-#: conf/global_settings.py:65
-msgid "Frisian"
-msgstr "Frisisk"
-
-#: conf/global_settings.py:66
-msgid "Irish"
-msgstr "Irsk"
-
-#: conf/global_settings.py:67
-msgid "Galician"
-msgstr "Galisisk"
-
-#: conf/global_settings.py:68
-msgid "Hebrew"
-msgstr "Hebraisk"
-
-#: conf/global_settings.py:69
-msgid "Hindi"
-msgstr "Hindi"
-
-#: conf/global_settings.py:70
-msgid "Croatian"
-msgstr "Kroatisk"
-
-#: conf/global_settings.py:71
-msgid "Hungarian"
-msgstr "Ungarsk"
-
-#: conf/global_settings.py:72
-msgid "Indonesian"
-msgstr "Indonesisk"
-
-#: conf/global_settings.py:73
-msgid "Icelandic"
-msgstr "Islandsk"
-
-#: conf/global_settings.py:74
-msgid "Italian"
-msgstr "Italiensk"
-
-#: conf/global_settings.py:75
-msgid "Japanese"
-msgstr "Japansk"
-
-#: conf/global_settings.py:76
-msgid "Georgian"
-msgstr "Georgisk"
-
-#: conf/global_settings.py:77
-msgid "Khmer"
-msgstr "Khmer"
-
-#: conf/global_settings.py:78
-msgid "Kannada"
-msgstr "Kannada"
-
-#: conf/global_settings.py:79
-msgid "Korean"
-msgstr "Koreansk"
-
-#: conf/global_settings.py:80
-msgid "Lithuanian"
-msgstr "Litauisk"
-
-#: conf/global_settings.py:81
-msgid "Latvian"
-msgstr "Latvisk"
-
-#: conf/global_settings.py:82
-msgid "Macedonian"
-msgstr "Makedonsk"
-
-#: conf/global_settings.py:83
-msgid "Malayalam"
-msgstr "Malayalam"
-
-#: conf/global_settings.py:84
-msgid "Mongolian"
-msgstr "Mongolsk"
-
-#: conf/global_settings.py:85
-msgid "Dutch"
-msgstr "Nederlandsk"
-
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "Norsk"
-
-#: conf/global_settings.py:87
-msgid "Norwegian Bokmal"
-msgstr "Norsk (bokmål)"
-
-#: conf/global_settings.py:88
-msgid "Norwegian Nynorsk"
-msgstr "Norsk (nynorsk)"
-
-#: conf/global_settings.py:89
-msgid "Punjabi"
-msgstr "Panjabi"
-
-#: conf/global_settings.py:90
-msgid "Polish"
-msgstr "Polsk"
-
-#: conf/global_settings.py:91
-msgid "Portuguese"
-msgstr "Portugisisk"
-
-#: conf/global_settings.py:92
-msgid "Brazilian Portuguese"
-msgstr "Brasiliansk portugisisk"
-
-#: conf/global_settings.py:93
-msgid "Romanian"
-msgstr "Rumensk"
-
-#: conf/global_settings.py:94
-msgid "Russian"
-msgstr "Russisk"
-
-#: conf/global_settings.py:95
-msgid "Slovak"
-msgstr "Slovakisk"
-
-#: conf/global_settings.py:96
-msgid "Slovenian"
-msgstr "Slovensk"
-
-#: conf/global_settings.py:97
-msgid "Albanian"
-msgstr "Albansk"
-
-#: conf/global_settings.py:98
-msgid "Serbian"
-msgstr "Serbisk"
-
-#: conf/global_settings.py:99
-msgid "Serbian Latin"
-msgstr "Serbisk latin"
-
-#: conf/global_settings.py:100
-msgid "Swedish"
-msgstr "Svensk"
-
-#: conf/global_settings.py:101
-msgid "Tamil"
-msgstr "Tamil"
-
-#: conf/global_settings.py:102
-msgid "Telugu"
-msgstr "Telugu"
-
-#: conf/global_settings.py:103
-msgid "Thai"
-msgstr "Thai"
-
-#: conf/global_settings.py:104
-msgid "Turkish"
-msgstr "Tyrkisk"
-
-#: conf/global_settings.py:105
-msgid "Ukrainian"
-msgstr "Ukrainsk"
-
-#: conf/global_settings.py:106
-msgid "Urdu"
-msgstr "Urdu"
-
-#: conf/global_settings.py:107
-msgid "Vietnamese"
-msgstr "Vietnamesisk"
-
-#: conf/global_settings.py:108
-msgid "Simplified Chinese"
-msgstr "Forenklet kinesisk"
-
-#: conf/global_settings.py:109
-msgid "Traditional Chinese"
-msgstr "Tradisjonell kinesisk"
-
-#: core/validators.py:21 forms/fields.py:67
-msgid "Enter a valid value."
-msgstr "Oppgi en gyldig verdi."
-
-#: core/validators.py:89 forms/fields.py:575
-msgid "This URL appears to be a broken link."
-msgstr "Nettadressen fører til en side som ikke eksisterer."
-
-#: core/validators.py:94 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Oppgi en gyldig nettadresse."
-
-#: core/validators.py:138 forms/fields.py:449
-msgid "Enter a valid e-mail address."
-msgstr "Oppgi en gyldig e-postadresse."
-
-#: core/validators.py:141 forms/fields.py:958
-msgid ""
-"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
-msgstr ""
-"Oppgi en gyldig 'slug' bestående av bokstaver, nummer, understreker eller "
-"bindestreker."
-
-#: core/validators.py:144 forms/fields.py:951
-msgid "Enter a valid IPv4 address."
-msgstr "Oppgi en gyldig IPv4-adresse."
-
-#: core/validators.py:147 db/models/fields/__init__.py:575
-msgid "Enter only digits separated by commas."
-msgstr "Oppgi kun tall adskilt med komma."
-
-#: core/validators.py:153
-#, python-format
-msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
-msgstr "Verdien må være %(limit_value)s (den er %(show_value)s)."
-
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
-#, python-format
-msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr "Verdien må være mindre enn eller lik som %(limit_value)s."
-
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
-#, python-format
-msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr "Verdien må være større enn eller lik som %(limit_value)s."
-
-#: core/validators.py:182
-#, python-format
-msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
-msgstr "Verdien må minimum ha %(limit_value)d tegn (den har %(show_value)d)."
-
-#: core/validators.py:188
-#, python-format
-msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
-msgstr "Verdien kan maksimalt ha %(limit_value)d tegn (den er %(show_value)d)."
-
-#: db/models/base.py:769
-#, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "%(field_name)s må være unik for %(date_field)s %(lookup)s."
-
-#: db/models/base.py:784 db/models/base.py:792
-#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "%(model_name)s med %(field_label)s finnes allerede."
-
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
-msgstr "og"
-
-#: db/models/fields/__init__.py:63
-#, python-format
-msgid "Value %r is not a valid choice."
-msgstr "Verdien %r er ikke et gyldig valg."
-
-#: db/models/fields/__init__.py:64
-msgid "This field cannot be null."
-msgstr "Feltet kan ikke være tomt."
-
-#: db/models/fields/__init__.py:65
-msgid "This field cannot be blank."
-msgstr "Feltet kan ikke være blankt."
-
-#: db/models/fields/__init__.py:70
-#, python-format
-msgid "Field of type: %(field_type)s"
-msgstr "Felt av typen: %(field_type)s"
-
-#: db/models/fields/__init__.py:451 db/models/fields/__init__.py:871
-#: db/models/fields/__init__.py:980 db/models/fields/__init__.py:991
-#: db/models/fields/__init__.py:1018
-msgid "Integer"
-msgstr "Heltall"
-
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Verdien må være et heltall."
-
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Verdien må være True eller False."
-
-#: db/models/fields/__init__.py:495
-msgid "Boolean (Either True or False)"
-msgstr "Boolsk (True eller False)"
-
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
-#, python-format
-msgid "String (up to %(max_length)s)"
-msgstr "Tekst (opp til %(max_length)s tegn)"
-
-#: db/models/fields/__init__.py:570
-msgid "Comma-separated integers"
-msgstr "Heltall adskilt med komma"
-
-#: db/models/fields/__init__.py:584
-msgid "Date (without time)"
-msgstr "Dato (uten tid)"
-
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Oppgi en gyldig dato på formen ÅÅÅÅ-MM-DD."
-
-#: db/models/fields/__init__.py:589
-#, python-format
-msgid "Invalid date: %s"
-msgstr "Ugyldig dato: %s"
-
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
-msgstr "Oppgi dato og tid på formen ÅÅÅÅ-MM-DD TT:MM[:ss[.uuuuuu]]."
-
-#: db/models/fields/__init__.py:672
-msgid "Date (with time)"
-msgstr "Dato (med tid)"
-
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Verdien må være et desimaltall."
-
-#: db/models/fields/__init__.py:748
-msgid "Decimal number"
-msgstr "Desimaltall"
-
-#: db/models/fields/__init__.py:803
-msgid "E-mail address"
-msgstr "E-postadresse"
-
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
-msgid "File path"
-msgstr "Filsti"
-
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Verdien må være et flyttall."
-
-#: db/models/fields/__init__.py:843
-msgid "Floating point number"
-msgstr "Flyttall"
-
-#: db/models/fields/__init__.py:902
-msgid "Big (8 byte) integer"
-msgstr "Stort (8 byte) heltall"
-
-#: db/models/fields/__init__.py:915
-msgid "IP address"
-msgstr "IP-adresse"
-
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Verdien må være None, True eller False."
-
-#: db/models/fields/__init__.py:933
-msgid "Boolean (Either True, False or None)"
-msgstr "Boolsk (True, False eller None)"
-
-#: db/models/fields/__init__.py:1024
-msgid "Text"
-msgstr "Tekst"
-
-#: db/models/fields/__init__.py:1040
-msgid "Time"
-msgstr "Tid"
-
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Oppgi tiden på formen TT:MM[:ss[.uuuuuu]]."
-
-#: db/models/fields/__init__.py:1120
-msgid "URL"
-msgstr "Nettadresse"
-
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML-tekst"
-
-#: db/models/fields/related.py:815
-#, python-format
-msgid "Model %(model)s with pk %(pk)r does not exist."
-msgstr "Modell %(model)s med primærnøkkelen %(pk)r finnes ikke."
-
-#: db/models/fields/related.py:817
-msgid "Foreign Key (type determined by related field)"
-msgstr "Fremmednøkkel (type bestemmes av relatert felt)"
-
-#: db/models/fields/related.py:941
-msgid "One-to-one relationship"
-msgstr "En-til-en-relasjon"
-
-#: db/models/fields/related.py:1003
-msgid "Many-to-many relationship"
-msgstr "Mange-til-mange-relasjon"
-
-#: db/models/fields/related.py:1023
-msgid ""
-"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
-msgstr ""
-"Hold nede \"Control\", eller \"Command\" på en Mac, for å velge mer enn en."
-
-#: forms/fields.py:66
-msgid "This field is required."
-msgstr "Feltet er påkrevet."
-
-#: forms/fields.py:221
-msgid "Enter a whole number."
-msgstr "Oppgi et heltall."
-
-#: forms/fields.py:253 forms/fields.py:274
-msgid "Enter a number."
-msgstr "Oppgi et tall."
-
-#: forms/fields.py:277
-#, python-format
-msgid "Ensure that there are no more than %s digits in total."
-msgstr "Verdien kan ikke ha mer enn %s siffer totalt."
-
-#: forms/fields.py:278
-#, python-format
-msgid "Ensure that there are no more than %s decimal places."
-msgstr "Verdien kan ikke ha mer enn %s desimaler."
-
-#: forms/fields.py:279
-#, python-format
-msgid "Ensure that there are no more than %s digits before the decimal point."
-msgstr "Verdien kan ikke ha mer enn %s siffer foran komma."
-
-#: forms/fields.py:342 forms/fields.py:918
-msgid "Enter a valid date."
-msgstr "Oppgi en gyldig dato."
-
-#: forms/fields.py:370 forms/fields.py:919
-msgid "Enter a valid time."
-msgstr "Oppgi et gyldig tidspunkt."
-
-#: forms/fields.py:396
-msgid "Enter a valid date/time."
-msgstr "Oppgi gyldig dato og tidspunkt."
-
-#: forms/fields.py:460
-msgid "No file was submitted. Check the encoding type on the form."
-msgstr "Ingen fil ble sendt. Sjekk \"encoding\"-typen på skjemaet."
-
-#: forms/fields.py:461
-msgid "No file was submitted."
-msgstr "Ingen fil ble sendt."
-
-#: forms/fields.py:462
-msgid "The submitted file is empty."
-msgstr "Filen er tom."
-
-#: forms/fields.py:463
-#, python-format
-msgid ""
-"Ensure this filename has at most %(max)d characters (it has %(length)d)."
-msgstr "Filnavnet kan maksimalt ha %(max)d tegn (det har %(length)d)."
-
-#: forms/fields.py:464
-msgid "Please either submit a file or check the clear checkbox, not both."
-msgstr "Vennligst last opp en ny fil eller marker fjern-boksen, ikke begge."
-
-#: forms/fields.py:518
-msgid ""
-"Upload a valid image. The file you uploaded was either not an image or a "
-"corrupted image."
-msgstr ""
-"Last opp et gyldig bilde. Filen du lastet opp var ødelagt eller ikke et "
-"bilde."
-
-#: forms/fields.py:650 forms/fields.py:725
-#, python-format
-msgid "Select a valid choice. %(value)s is not one of the available choices."
-msgstr "Velg et gyldig valg. %(value)s er ikke et av de tilgjengelige valgene."
-
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:985
-msgid "Enter a list of values."
-msgstr "Oppgi en liste med verdier."
-
-#: forms/formsets.py:305 forms/formsets.py:307
-msgid "Order"
-msgstr "Rekkefølge"
-
-#: forms/formsets.py:309
-msgid "Delete"
-msgstr "Slett"
-
-#: forms/models.py:556
-#, python-format
-msgid "Please correct the duplicate data for %(field)s."
-msgstr "Vennligst korriger duplisert data for %(field)s."
-
-#: forms/models.py:560
-#, python-format
-msgid "Please correct the duplicate data for %(field)s, which must be unique."
-msgstr "Vennligst korriger duplisert data for %(field)s, som må være unik."
-
-#: forms/models.py:566
-#, python-format
-msgid ""
-"Please correct the duplicate data for %(field_name)s which must be unique "
-"for the %(lookup)s in %(date_field)s."
-msgstr ""
-"Vennligst korriger duplisert data for %(field_name)s, som må være unik for %"
-"(lookup)s i %(date_field)s."
-
-#: forms/models.py:574
-msgid "Please correct the duplicate values below."
-msgstr "Vennligst korriger de dupliserte verdiene nedenfor."
-
-#: forms/models.py:835
-msgid "The inline foreign key did not match the parent instance primary key."
-msgstr "Primærnøkkelen er ikke den samme som foreldreinstansens primærnøkkel."
-
-#: forms/models.py:896
-msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr "Velg et gyldig valg. Valget er ikke et av de tilgjengelige valgene."
-
-#: forms/models.py:986
-#, python-format
-msgid "Select a valid choice. %s is not one of the available choices."
-msgstr "Velg et gyldig valg. %s er ikke et av de tilgjengelige valgene."
-
-#: forms/models.py:988
-#, python-format
-msgid "\"%s\" is not a valid value for a primary key."
-msgstr "\"%s\" er ikke en gyldig verdi for en primærnøkkel."
-
-#: forms/widgets.py:299
-msgid "Currently"
-msgstr "Nå"
-
-#: forms/widgets.py:300
-msgid "Change"
-msgstr "Endre"
-
-#: forms/widgets.py:301
-msgid "Clear"
-msgstr "Fjern"
-
-#: forms/widgets.py:548
-msgid "Unknown"
-msgstr "Ukjent"
-
-#: forms/widgets.py:548
-msgid "Yes"
-msgstr "Ja"
-
-#: forms/widgets.py:548
-msgid "No"
-msgstr "Nei"
-
-#: template/defaultfilters.py:777
-msgid "yes,no,maybe"
-msgstr "ja,nei,kanskje"
-
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
-#, python-format
-msgid "%(size)d byte"
-msgid_plural "%(size)d bytes"
-msgstr[0] "%(size)d byte"
-msgstr[1] "%(size)d bytes"
-
-#: template/defaultfilters.py:812
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: template/defaultfilters.py:814
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
-
-#: template/defaultfilters.py:816
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
-
-#: template/defaultfilters.py:818
-#, python-format
-msgid "%s TB"
-msgstr "%s TB"
-
-#: template/defaultfilters.py:819
-#, python-format
-msgid "%s PB"
-msgstr "%s PB"
-
-#: utils/dateformat.py:42
-msgid "p.m."
-msgstr "p.m."
-
-#: utils/dateformat.py:43
-msgid "a.m."
-msgstr "a.m."
-
-#: utils/dateformat.py:48
-msgid "PM"
-msgstr "PM"
-
-#: utils/dateformat.py:49
-msgid "AM"
-msgstr "AM"
-
-#: utils/dateformat.py:98
-msgid "midnight"
-msgstr "midnatt"
-
-#: utils/dateformat.py:100
-msgid "noon"
-msgstr "12:00"
-
-#: utils/dates.py:6
-msgid "Monday"
-msgstr "mandag"
-
-#: utils/dates.py:6
-msgid "Tuesday"
-msgstr "tirsdag"
-
-#: utils/dates.py:6
-msgid "Wednesday"
-msgstr "onsdag"
-
-#: utils/dates.py:6
-msgid "Thursday"
-msgstr "torsdag"
-
-#: utils/dates.py:6
-msgid "Friday"
-msgstr "fredag"
-
-#: utils/dates.py:7
-msgid "Saturday"
-msgstr "lørdag"
-
-#: utils/dates.py:7
-msgid "Sunday"
-msgstr "søndag"
-
-#: utils/dates.py:10
-msgid "Mon"
-msgstr "man"
-
-#: utils/dates.py:10
-msgid "Tue"
-msgstr "tirs"
-
-#: utils/dates.py:10
-msgid "Wed"
-msgstr "ons"
-
-#: utils/dates.py:10
-msgid "Thu"
-msgstr "tors"
-
-#: utils/dates.py:10
-msgid "Fri"
-msgstr "fre"
-
-#: utils/dates.py:11
-msgid "Sat"
-msgstr "lør"
-
-#: utils/dates.py:11
-msgid "Sun"
-msgstr "søn"
-
-#: utils/dates.py:18
-msgid "January"
-msgstr "Januar"
-
-#: utils/dates.py:18
-msgid "February"
-msgstr "februar"
-
-#: utils/dates.py:18
-msgid "March"
-msgstr "mars"
-
-#: utils/dates.py:18
-msgid "April"
-msgstr "april"
-
-#: utils/dates.py:18
-msgid "May"
-msgstr "mai"
-
-#: utils/dates.py:18
-msgid "June"
-msgstr "juni"
-
-#: utils/dates.py:19
-msgid "July"
-msgstr "juli"
-
-#: utils/dates.py:19
-msgid "August"
-msgstr "august"
-
-#: utils/dates.py:19
-msgid "September"
-msgstr "september"
-
-#: utils/dates.py:19
-msgid "October"
-msgstr "oktober"
-
-#: utils/dates.py:19
-msgid "November"
-msgstr "november"
-
-#: utils/dates.py:20
-msgid "December"
-msgstr "desember"
-
-#: utils/dates.py:23
-msgid "jan"
-msgstr "jan"
-
-#: utils/dates.py:23
-msgid "feb"
-msgstr "feb"
-
-#: utils/dates.py:23
-msgid "mar"
-msgstr "mar"
-
-#: utils/dates.py:23
-msgid "apr"
-msgstr "apr"
-
-#: utils/dates.py:23
-msgid "may"
-msgstr "mai"
-
-#: utils/dates.py:23
-msgid "jun"
-msgstr "jun"
-
-#: utils/dates.py:24
-msgid "jul"
-msgstr "jul"
-
-#: utils/dates.py:24
-msgid "aug"
-msgstr "aug"
-
-#: utils/dates.py:24
-msgid "sep"
-msgstr "sep"
-
-#: utils/dates.py:24
-msgid "oct"
-msgstr "okt"
-
-#: utils/dates.py:24
-msgid "nov"
-msgstr "nov"
-
-#: utils/dates.py:24
-msgid "dec"
-msgstr "des"
-
-#: utils/dates.py:31
-msgctxt "abbrev. month"
-msgid "Jan."
-msgstr "jan."
-
-#: utils/dates.py:32
-msgctxt "abbrev. month"
-msgid "Feb."
-msgstr "feb."
-
-#: utils/dates.py:33
-msgctxt "abbrev. month"
-msgid "March"
-msgstr "mar."
-
-#: utils/dates.py:34
-msgctxt "abbrev. month"
-msgid "April"
-msgstr "apr."
-
-#: utils/dates.py:35
-msgctxt "abbrev. month"
-msgid "May"
-msgstr "mai"
-
-#: utils/dates.py:36
-msgctxt "abbrev. month"
-msgid "June"
-msgstr "jun."
-
-#: utils/dates.py:37
-msgctxt "abbrev. month"
-msgid "July"
-msgstr "jul."
-
-#: utils/dates.py:38
-msgctxt "abbrev. month"
-msgid "Aug."
-msgstr "aug."
-
-#: utils/dates.py:39
-msgctxt "abbrev. month"
-msgid "Sept."
-msgstr "sept."
-
-#: utils/dates.py:40
-msgctxt "abbrev. month"
-msgid "Oct."
-msgstr "okt."
-
-#: utils/dates.py:41
-msgctxt "abbrev. month"
-msgid "Nov."
-msgstr "nov."
-
-#: utils/dates.py:42
-msgctxt "abbrev. month"
-msgid "Dec."
-msgstr "des."
-
-#: utils/dates.py:45
-msgctxt "alt. month"
-msgid "January"
-msgstr "Januar"
-
-#: utils/dates.py:46
-msgctxt "alt. month"
-msgid "February"
-msgstr "Februar"
-
-#: utils/dates.py:47
-msgctxt "alt. month"
-msgid "March"
-msgstr "Mars"
-
-#: utils/dates.py:48
-msgctxt "alt. month"
-msgid "April"
-msgstr "April"
-
-#: utils/dates.py:49
-msgctxt "alt. month"
-msgid "May"
-msgstr "Mai"
-
-#: utils/dates.py:50
-msgctxt "alt. month"
-msgid "June"
-msgstr "Juni"
-
-#: utils/dates.py:51
-msgctxt "alt. month"
-msgid "July"
-msgstr "Juli"
-
-#: utils/dates.py:52
-msgctxt "alt. month"
-msgid "August"
-msgstr "August"
-
-#: utils/dates.py:53
-msgctxt "alt. month"
-msgid "September"
-msgstr "September"
-
-#: utils/dates.py:54
-msgctxt "alt. month"
-msgid "October"
-msgstr "Oktober"
-
-#: utils/dates.py:55
-msgctxt "alt. month"
-msgid "November"
-msgstr "November"
-
-#: utils/dates.py:56
-msgctxt "alt. month"
-msgid "December"
-msgstr "Desember"
-
-#: utils/text.py:136
-msgid "or"
-msgstr "eller"
-
-#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
-msgid ", "
-msgstr ","
-
-#: utils/timesince.py:21
-msgid "year"
-msgid_plural "years"
-msgstr[0] "år"
-msgstr[1] "år"
-
-#: utils/timesince.py:22
-msgid "month"
-msgid_plural "months"
-msgstr[0] "måned"
-msgstr[1] "måneder"
-
-#: utils/timesince.py:23
-msgid "week"
-msgid_plural "weeks"
-msgstr[0] "uke"
-msgstr[1] "uker"
-
-#: utils/timesince.py:24
-msgid "day"
-msgid_plural "days"
-msgstr[0] "dag"
-msgstr[1] "dager"
-
-#: utils/timesince.py:25
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "time"
-msgstr[1] "timer"
-
-#: utils/timesince.py:26
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minutt"
-msgstr[1] "minutter"
-
-#: utils/timesince.py:45
-msgid "minutes"
-msgstr "minutter"
-
-#: utils/timesince.py:50
-#, python-format
-msgid "%(number)d %(type)s"
-msgstr "%(number)d %(type)s"
-
-#: utils/timesince.py:56
-#, python-format
-msgid ", %(number)d %(type)s"
-msgstr ", %(number)d %(type)s"
-
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "j. F Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "j. F Y H:i"
-
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "H:i"
-
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
-
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "j. F"
-
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s ble opprettet."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s ble oppdatert."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s ble slettet."
-
-#: views/generic/dates.py:33
-msgid "No year specified"
-msgstr "År ikke spesifisert"
-
-#: views/generic/dates.py:58
-msgid "No month specified"
-msgstr "Måned ikke spesifisert"
-
-#: views/generic/dates.py:99
-msgid "No day specified"
-msgstr "Dag ikke spesifisert"
-
-#: views/generic/dates.py:138
-msgid "No week specified"
-msgstr "Uke ikke spesifisert"
-
-#: views/generic/dates.py:198 views/generic/dates.py:214
-#, python-format
-msgid "No %(verbose_name_plural)s available"
-msgstr "Ingen %(verbose_name_plural)s tilgjengelig"
-
-#: views/generic/dates.py:466
-#, python-format
-msgid ""
-"Future %(verbose_name_plural)s not available because %(class_name)s."
-"allow_future is False."
-msgstr ""
-"Fremtidig %(verbose_name_plural)s ikke tilgjengelig fordi %(class_name)s."
-"allow_future er False."
-
-#: views/generic/dates.py:500
-#, python-format
-msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
-msgstr "Ugyldig datostreng '%(datestr)s' gitt formatet '%(format)s'"
-
-#: views/generic/detail.py:51
-#, python-format
-msgid "No %(verbose_name)s found matching the query"
-msgstr "Fant ingen %(verbose_name)s fra spørringen"
-
-#: views/generic/list.py:47
-msgid "Page is not 'last', nor can it be converted to an int."
-msgstr "Siden er ikke 'last', og kan heller ikke konverteres til et tall."
-
-#: views/generic/list.py:52
-#, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Ugyldig side (%(page_number)s)"
-
-#: views/generic/list.py:119
-#, python-format
-msgid "Empty list and '%(class_name)s.allow_empty' is False."
-msgstr "Tom liste og '%(class_name)s.allow_empty' er False."
0  lib/python/django/conf/locale/no/__init__.py
View
No changes.
43 lib/python/django/conf/locale/no/formats.py
View
@@ -1,43 +0,0 @@
-# -*- encoding: utf-8 -*-
-# This file is distributed under the same license as the Django package.
-#
-
-# The *_FORMAT strings use the Django date format syntax,
-# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
-DATE_FORMAT = 'j. F Y'
-TIME_FORMAT = 'H:i'
-DATETIME_FORMAT = 'j. F Y H:i'
-YEAR_MONTH_FORMAT = 'F Y'
-MONTH_DAY_FORMAT = 'j. F'
-SHORT_DATE_FORMAT = 'd.m.Y'
-SHORT_DATETIME_FORMAT = 'd.m.Y H:i'
-FIRST_DAY_OF_WEEK = 1 # Monday
-
-# The *_INPUT_FORMATS strings use the Python strftime format syntax,
-# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-DATE_INPUT_FORMATS = (
- '%Y-%m-%d', '%d.%m.%Y', '%d.%m.%y', # '2006-10-25', '25.10.2006', '25.10.06'
- '%Y-%m-%d', # '2006-10-25',
- # '%d. %b %Y', '%d %b %Y', # '25. okt 2006', '25 okt 2006'
- # '%d. %b. %Y', '%d %b. %Y', # '25. okt. 2006', '25 okt. 2006'
- # '%d. %B %Y', '%d %B %Y', # '25. oktober 2006', '25 oktober 2006'
-)
-TIME_INPUT_FORMATS = (
- '%H:%M:%S', # '14:30:59'
- '%H:%M', # '14:30'
-)
-DATETIME_INPUT_FORMATS = (
- '%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59'
- '%Y-%m-%d %H:%M', # '2006-10-25 14:30'
- '%Y-%m-%d', # '2006-10-25'
- '%Y-%m-%d', # '2006-10-25'
- '%d.%m.%Y %H:%M:%S', # '25.10.2006 14:30:59'
- '%d.%m.%Y %H:%M', # '25.10.2006 14:30'
- '%d.%m.%Y', # '25.10.2006'
- '%d.%m.%y %H:%M:%S', # '25.10.06 14:30:59'
- '%d.%m.%y %H:%M', # '25.10.06 14:30'
- '%d.%m.%y', # '25.10.06'
-)
-DECIMAL_SEPARATOR = ','
-THOUSAND_SEPARATOR = ' '
-NUMBER_GROUPING = 3
0  lib/python/django/conf/project_template/__init__.py
View
No changes.
145 lib/python/django/conf/project_template/settings.py
View
@@ -1,145 +0,0 @@
-# Django settings for {{ project_name }} project.
-
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-
-ADMINS = (
- # ('Your Name', 'your_email@example.com'),
-)
-
-MANAGERS = ADMINS
-
-DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
- 'NAME': '', # Or path to database file if using sqlite3.
- 'USER': '', # Not used with sqlite3.
- 'PASSWORD': '', # Not used with sqlite3.
- 'HOST': '', # Set to empty string for localhost. Not used with sqlite3.
- 'PORT': '', # Set to empty string for default. Not used with sqlite3.
- }
-}
-
-# Local time zone for this installation. Choices can be found here:
-# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
-# although not all choices may be available on all operating systems.
-# On Unix systems, a value of None will cause Django to use the same
-# timezone as the operating system.
-# If running in a Windows environment this must be set to the same as your
-# system time zone.
-TIME_ZONE = 'America/Chicago'
-
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'en-us'
-
-SITE_ID = 1
-
-# If you set this to False, Django will make some optimizations so as not
-# to load the internationalization machinery.
-USE_I18N = True
-
-# If you set this to False, Django will not format dates, numbers and
-# calendars according to the current locale
-USE_L10N = True
-
-# Absolute filesystem path to the directory that will hold user-uploaded files.
-# Example: "/home/media/media.lawrence.com/media/"
-MEDIA_ROOT = ''
-
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash.
-# Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
-MEDIA_URL = ''
-
-# Absolute path to the directory static files should be collected to.
-# Don't put anything in this directory yourself; store your static files
-# in apps' "static/" subdirectories and in STATICFILES_DIRS.
-# Example: "/home/media/media.lawrence.com/static/"
-STATIC_ROOT = ''
-
-# URL prefix for static files.
-# Example: "http://media.lawrence.com/static/"
-STATIC_URL = '/static/'
-
-# URL prefix for admin static files -- CSS, JavaScript and images.
-# Make sure to use a trailing slash.
-# Examples: "http://foo.com/static/admin/", "/static/admin/".
-ADMIN_MEDIA_PREFIX = '/static/admin/'
-
-# Additional locations of static files
-STATICFILES_DIRS = (
- # Put strings here, like "/home/html/static" or "C:/www/django/static".
- # Always use forward slashes, even on Windows.
- # Don't forget to use absolute paths, not relative paths.
-)
-
-# List of finder classes that know how to find static files in
-# various locations.
-STATICFILES_FINDERS = (
- 'django.contrib.staticfiles.finders.FileSystemFinder',
- 'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-# 'django.contrib.staticfiles.finders.DefaultStorageFinder',
-)
-
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = ''
-
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
- 'django.template.loaders.filesystem.Loader',
- 'django.template.loaders.app_directories.Loader',
-# 'django.template.loaders.eggs.Loader',
-)
-
-MIDDLEWARE_CLASSES = (
- 'django.middleware.common.CommonMiddleware',
- 'django.contrib.sessions.middleware.SessionMiddleware',
- 'django.middleware.csrf.CsrfViewMiddleware',
- 'django.contrib.auth.middleware.AuthenticationMiddleware',
- 'django.contrib.messages.middleware.MessageMiddleware',
-)
-
-ROOT_URLCONF = '{{ project_name }}.urls'
-
-TEMPLATE_DIRS = (
- # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
- # Always use forward slashes, even on Windows.
- # Don't forget to use absolute paths, not relative paths.
-)
-
-INSTALLED_APPS = (
- 'django.contrib.auth',
- 'django.contrib.contenttypes',
- 'django.contrib.sessions',
- 'django.contrib.sites',
- 'django.contrib.messages',
- 'django.contrib.staticfiles',
- # Uncomment the next line to enable the admin:
- # 'django.contrib.admin',
- # Uncomment the next line to enable admin documentation:
- # 'django.contrib.admindocs',
-)
-
-# A sample logging configuration. The only tangible logging
-# performed by this configuration is to send an email to
-# the site admins on every HTTP 500 error.
-# See http://docs.djangoproject.com/en/dev/topics/logging for
-# more details on how to customize your logging configuration.
-LOGGING = {
- 'version': 1,
- 'disable_existing_loggers': False,
- 'handlers': {
- 'mail_admins': {
- 'level': 'ERROR',
- 'class': 'django.utils.log.AdminEmailHandler'
- }
- },
- 'loggers': {
- 'django.request': {
- 'handlers': ['mail_admins'],
- 'level': 'ERROR',
- 'propagate': True,
- },
- }
-}
17 lib/python/django/conf/project_template/urls.py
View
@@ -1,17 +0,0 @@
-from django.conf.urls.defaults import patterns, include, url
-
-# Uncomment the next two lines to enable the admin:
-# from django.contrib import admin
-# admin.autodiscover()
-
-urlpatterns = patterns('',
- # Examples:
- # url(r'^$', '{{ project_name }}.views.home', name='home'),
- # url(r'^{{ project_name }}/', include('{{ project_name }}.foo.urls')),
-
- # Uncomment the admin/doc line below to enable admin documentation:
- # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-
- # Uncomment the next line to enable the admin:
- # url(r'^admin/', include(admin.site.urls)),
-)
11 lib/python/django/contrib/admin/filters.py
View
@@ -8,13 +8,13 @@
import datetime
from django.db import models
-from django.core.exceptions import ImproperlyConfigured
+from django.core.exceptions import ImproperlyConfigured, ValidationError
from django.utils.encoding import smart_unicode
from django.utils.translation import ugettext_lazy as _
from django.utils import timezone
-
from django.contrib.admin.util import (get_model_from_relation,
reverse_field_path, get_limit_choices_to_from_path, prepare_lookup_value)
+from django.contrib.admin.options import IncorrectLookupParameters
class ListFilter(object):
title = None # Human-readable title to appear in the right sidebar.
@@ -129,7 +129,10 @@ def has_output(self):
return True
def queryset(self, request, queryset):
- return queryset.filter(**self.used_parameters)
+ try:
+ return queryset.filter(**self.used_parameters)
+ except ValidationError, e:
+ raise IncorrectLookupParameters(e)
@classmethod
def register(cls, test, list_filter_class, take_priority=False):
@@ -302,7 +305,7 @@ def __init__(self, field, request, params, model, model_admin, field_path):
else: # field is a models.DateField
today = now.date()
tomorrow = today + datetime.timedelta(days=1)
-
+
self.lookup_kwarg_since = '%s__gte' % field_path
self.lookup_kwarg_until = '%s__lt' % field_path
self.links = (
279 lib/python/django/contrib/admin/filterspecs.py
View
@@ -1,279 +0,0 @@
-"""
-FilterSpec encapsulates the logic for displaying filters in the Django admin.
-Filters are specified in models with the "list_filter" option.
-
-Each filter subclass knows how to display a filter for a field that passes a
-certain test -- e.g. being a DateField or ForeignKey.
-"""
-
-from django.db import models
-from django.utils.encoding import smart_unicode, iri_to_uri
-from django.utils.translation import ugettext as _
-from django.utils.html import escape
-from django.utils.safestring import mark_safe
-from django.contrib.admin.util import get_model_from_relation, \
- reverse_field_path, get_limit_choices_to_from_path
-import datetime
-
-class FilterSpec(object):
- filter_specs = []
- def __init__(self, f, request, params, model, model_admin,
- field_path=None):
- self.field = f
- self.params = params
- self.field_path = field_path
- if field_path is None:
- if isinstance(f, models.related.RelatedObject):
- self.field_path = f.var_name
- else:
- self.field_path = f.name
-
- def register(cls, test, factory):
- cls.filter_specs.append((test, factory))
- register = classmethod(register)
-
- def create(cls, f, request, params, model, model_admin, field_path=None):
- for test, factory in cls.filter_specs:
- if test(f):
- return factory(f, request, params, model, model_admin,
- field_path=field_path)
- create = classmethod(create)
-
- def has_output(self):
- return True
-
- def choices(self, cl):
- raise NotImplementedError()
-
- def title(self):
- return self.field.verbose_name
-
- def output(self, cl):
- t = []
- if self.has_output():
- t.append(_(u'<h3>By %s:</h3>\n<ul>\n') % escape(self.title()))
-
- for choice in self.choices(cl):
- t.append(u'<li%s><a href="%s">%s</a></li>\n' % \
- ((choice['selected'] and ' class="selected"' or ''),
- iri_to_uri(choice['query_string']),
- choice['display']))
- t.append('</ul>\n\n')
- return mark_safe("".join(t))
-
-class RelatedFilterSpec(FilterSpec):
- def __init__(self, f, request, params, model, model_admin,
- field_path=None):
- super(RelatedFilterSpec, self).__init__(
- f, request, params, model, model_admin, field_path=field_path)
-
- other_model = get_model_from_relation(f)
- if isinstance(f, (models.ManyToManyField,
- models.related.RelatedObject)):
- # no direct field on this model, get name from other model
- self.lookup_title = other_model._meta.verbose_name
- else:
- self.lookup_title = f.verbose_name # use field name
- rel_name = other_model._meta.pk.name
- self.lookup_kwarg = '%s__%s__exact' % (self.field_path, rel_name)
- self.lookup_kwarg_isnull = '%s__isnull' % (self.field_path)
- self.lookup_val = request.GET.get(self.lookup_kwarg, None)
- self.lookup_val_isnull = request.GET.get(
- self.lookup_kwarg_isnull, None)
- self.lookup_choices = f.get_choices(include_blank=False)
-
- def has_output(self):
- if isinstance(self.field, models.related.RelatedObject) \
- and self.field.field.null or hasattr(self.field, 'rel') \
- and self.field.null:
- extra = 1
- else:
- extra = 0
- return len(self.lookup_choices) + extra > 1
-
- def title(self):
- return self.lookup_title
-
- def choices(self, cl):
- from django.contrib.admin.views.main import EMPTY_CHANGELIST_VALUE
- yield {'selected': self.lookup_val is None
- and not self.lookup_val_isnull,
- 'query_string': cl.get_query_string(
- {},
- [self.lookup_kwarg, self.lookup_kwarg_isnull]),
- 'display': _('All')}
- for pk_val, val in self.lookup_choices:
- yield {'selected': self.lookup_val == smart_unicode(pk_val),
- 'query_string': cl.get_query_string(
- {self.lookup_kwarg: pk_val},
- [self.lookup_kwarg_isnull]),
- 'display': val}
- if isinstance(self.field, models.related.RelatedObject) \
- and self.field.field.null or hasattr(self.field, 'rel') \
- and self.field.null:
- yield {'selected': bool(self.lookup_val_isnull),
- 'query_string': cl.get_query_string(
- {self.lookup_kwarg_isnull: 'True'},
- [self.lookup_kwarg]),
- 'display': EMPTY_CHANGELIST_VALUE}
-
-FilterSpec.register(lambda f: (
- hasattr(f, 'rel') and bool(f.rel) or
- isinstance(f, models.related.RelatedObject)), RelatedFilterSpec)
-
-class BooleanFieldFilterSpec(FilterSpec):
- def __init__(self, f, request, params, model, model_admin,
- field_path=None):
- super(BooleanFieldFilterSpec, self).__init__(f, request, params, model,
- model_admin,
- field_path=field_path)
- self.lookup_kwarg = '%s__exact' % self.field_path
- self.lookup_kwarg2 = '%s__isnull' % self.field_path
- self.lookup_val = request.GET.get(self.lookup_kwarg, None)
- self.lookup_val2 = request.GET.get(self.lookup_kwarg2, None)
-
- def title(self):
- return self.field.verbose_name
-
- def choices(self, cl):
- for k, v in ((_('All'), None), (_('Yes'), '1'), (_('No'), '0')):
- yield {'selected': self.lookup_val == v and not self.lookup_val2,
- 'query_string': cl.get_query_string(
- {self.lookup_kwarg: v},
- [self.lookup_kwarg2]),
- 'display': k}
- if isinstance(self.field, models.NullBooleanField):
- yield {'selected': self.lookup_val2 == 'True',
- 'query_string': cl.get_query_string(
- {self.lookup_kwarg2: 'True'},
- [self.lookup_kwarg]),
- 'display': _('Unknown')}
-
-FilterSpec.register(lambda f: isinstance(f, models.BooleanField)
- or isinstance(f, models.NullBooleanField),
- BooleanFieldFilterSpec)
-
-class ChoicesFilterSpec(FilterSpec):
- def __init__(self, f, request, params, model, model_admin,
- field_path=None):
- super(ChoicesFilterSpec, self).__init__(f, request, params, model,
- model_admin,
- field_path=field_path)
- self.lookup_kwarg = '%s__exact' % self.field_path
- self.lookup_val = request.GET.get(self.lookup_kwarg, None)
-
- def choices(self, cl):
- yield {'selected': self.lookup_val is None,
- 'query_string': cl.get_query_string({}, [self.lookup_kwarg]),
- 'display': _('All')}
- for k, v in self.field.flatchoices:
- yield {'selected': smart_unicode(k) == self.lookup_val,
- 'query_string': cl.get_query_string(
- {self.lookup_kwarg: k}),
- 'display': v}
-
-FilterSpec.register(lambda f: bool(f.choices), ChoicesFilterSpec)
-
-class DateFieldFilterSpec(FilterSpec):
- def __init__(self, f, request, params, model, model_admin,
- field_path=None):
- super(DateFieldFilterSpec, self).__init__(f, request, params, model,
- model_admin,
- field_path=field_path)
-
- self.field_generic = '%s__' % self.field_path
-
- self.date_params = dict([(k, v) for k, v in params.items()
- if k.startswith(self.field_generic)])
-
- today = datetime.date.today()
- one_week_ago = today - datetime.timedelta(days=7)
- today_str = isinstance(self.field, models.DateTimeField) \
- and today.strftime('%Y-%m-%d 23:59:59') \
- or today.strftime('%Y-%m-%d')
-
- self.links = (
- (_('Any date'), {}),
- (_('Today'), {'%s__year' % self.field_path: str(today.year),
- '%s__month' % self.field_path: str(today.month),
- '%s__day' % self.field_path: str(today.day)}),
- (_('Past 7 days'), {'%s__gte' % self.field_path:
- one_week_ago.strftime('%Y-%m-%d'),
- '%s__lte' % self.field_path: today_str}),
- (_('This month'), {'%s__year' % self.field_path: str(today.year),
- '%s__month' % self.field_path: str(today.month)}),
- (_('This year'), {'%s__year' % self.field_path: str(today.year)})
- )
-
- def title(self):
- return self.field.verbose_name
-
- def choices(self, cl):
- for title, param_dict in self.links:
- yield {'selected': self.date_params == param_dict,
- 'query_string': cl.get_query_string(
- param_dict,
- [self.field_generic]),
- 'display': title}
-
-FilterSpec.register(lambda f: isinstance(f, models.DateField),
- DateFieldFilterSpec)
-
-
-# This should be registered last, because it's a last resort. For example,
-# if a field is eligible to use the BooleanFieldFilterSpec, that'd be much
-# more appropriate, and the AllValuesFilterSpec won't get used for it.
-class AllValuesFilterSpec(FilterSpec):
- def __init__(self, f, request, params, model, model_admin,
- field_path=None):
- super(AllValuesFilterSpec, self).__init__(f, request, params, model,
- model_admin,
- field_path=field_path)
- self.lookup_kwarg = self.field_path
- self.lookup_kwarg_isnull = '%s__isnull' % self.field_path
- self.lookup_val = request.GET.get(self.lookup_kwarg, None)
- self.lookup_val_isnull = request.GET.get(self.lookup_kwarg_isnull,
- None)
- parent_model, reverse_path = reverse_field_path(model, self.field_path)
- queryset = parent_model._default_manager.all()
- # optional feature: limit choices base on existing relationships
- # queryset = queryset.complex_filter(
- # {'%s__isnull' % reverse_path: False})
- limit_choices_to = get_limit_choices_to_from_path(model, field_path)
- queryset = queryset.filter(limit_choices_to)
-
- self.lookup_choices = \
- queryset.distinct().order_by(f.name).values_list(f.name, flat=True)
-
- def title(self):
- return self.field.verbose_name
-
- def choices(self, cl):
- from django.contrib.admin.views.main import EMPTY_CHANGELIST_VALUE
- yield {'selected': self.lookup_val is None
- and self.lookup_val_isnull is None,
- 'query_string': cl.get_query_string(
- {},
- [self.lookup_kwarg, self.lookup_kwarg_isnull]),
- 'display': _('All')}
- include_none = False
-
- for val in self.lookup_choices:
- if val is None:
- include_none = True
- continue
- val = smart_unicode(val)
-
- yield {'selected': self.lookup_val == val,
- 'query_string': cl.get_query_string(
- {self.lookup_kwarg: val},
- [self.lookup_kwarg_isnull]),
- 'display': val}
- if include_none:
- yield {'selected': bool(self.lookup_val_isnull),
- 'query_string': cl.get_query_string(
- {self.lookup_kwarg_isnull: 'True'},
- [self.lookup_kwarg]),
- 'display': EMPTY_CHANGELIST_VALUE}
-
-FilterSpec.register(lambda f: True, AllValuesFilterSpec)
BIN  lib/python/django/contrib/admin/locale/no/LC_MESSAGES/django.mo
View
Binary file not shown
807 lib/python/django/contrib/admin/locale/no/LC_MESSAGES/django.po
View
@@ -1,807 +0,0 @@
-# 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: 2011-03-20 21:03+0100\n"
-"PO-Revision-Date: 2011-03-04 18:44+0000\n"
-"Last-Translator: jonklo <jonklo@gmail.com>\n"
-"Language-Team: Norwegian <>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: no\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#: actions.py:49
-#, python-format
-msgid "Successfully deleted %(count)d %(items)s."
-msgstr "Slettet %(count)d %(items)s."
-
-#: actions.py:61 options.py:1219
-#, python-format
-msgid "Cannot delete %(name)s"
-msgstr "Kan ikke slette %(name)s"
-
-#: actions.py:63 options.py:1221
-msgid "Are you sure?"
-msgstr "Er du sikker?"
-
-#: actions.py:85
-#, python-format
-msgid "Delete selected %(verbose_name_plural)s"
-msgstr "Slett valgte %(verbose_name_plural)s"
-
-#: filterspecs.py:54
-#, python-format
-msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
-msgstr ""
-"<h3>Etter %s:</h3>\n"
-"<ul>\n"
-
-#: filterspecs.py:104 filterspecs.py:139 filterspecs.py:168 filterspecs.py:258
-msgid "All"
-msgstr "Alle"
-
-#: filterspecs.py:139
-msgid "Yes"
-msgstr "Ja"
-
-#: filterspecs.py:139
-msgid "No"
-msgstr "Nei"
-
-#: filterspecs.py:150
-msgid "Unknown"
-msgstr "Ukjent"
-
-#: filterspecs.py:196
-msgid "Any date"
-msgstr "Når som helst"
-
-#: filterspecs.py:197
-msgid "Today"
-msgstr "I dag"
-
-#: filterspecs.py:200
-msgid "Past 7 days"
-msgstr "Siste syv dager"
-
-#: filterspecs.py:203
-msgid "This month"
-msgstr "Denne måneden"
-
-#: filterspecs.py:205
-msgid "This year"
-msgstr "I år"
-
-#: forms.py:9
-msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
-msgstr ""
-"Vennligst angi korrekt brukernavn og passord. Merk at det er forskjell på "
-"små og store bokstaver."
-
-#: forms.py:18
-msgid "Please log in again, because your session has expired."
-msgstr "Økten din har tidsavbrutt, vennligst logg inn igjen."
-
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "E-postadressen er ikke brukernavnet ditt, prøv '%s' isteden."
-
-#: helpers.py:19
-msgid "Action:"
-msgstr "Handling:"
-
-#: models.py:19
-msgid "action time"
-msgstr "tid for handling"
-
-#: models.py:22
-msgid "object id"
-msgstr "objekt-ID"
-
-#: models.py:23
-msgid "object repr"
-msgstr "objekt repr"
-
-#: models.py:24
-msgid "action flag"
-msgstr "handlingsflagg"
-
-#: models.py:25
-msgid "change message"
-msgstr "endre melding"
-
-#: models.py:28
-msgid "log entry"
-msgstr "logginnlegg"
-
-#: models.py:29
-msgid "log entries"
-msgstr "logginnlegg"
-
-#: options.py:147 options.py:162
-msgid "None"
-msgstr "Ingen"
-
-#: options.py:627
-#, python-format
-msgid "Changed %s."
-msgstr "Endret %s."
-
-#: options.py:627 options.py:637
-msgid "and"
-msgstr "og"
-
-#: options.py:632
-#, python-format
-msgid "Added %(name)s \"%(object)s\"."
-msgstr "Opprettet %(name)s \"%(object)s\"."
-
-#: options.py:636
-#, python-format
-msgid "Changed %(list)s for %(name)s \"%(object)s\"."
-msgstr "Endret %(list)s for %(name)s \"%(object)s\"."
-
-#: options.py:641
-#, python-format
-msgid "Deleted %(name)s \"%(object)s\"."
-msgstr "Slettet %(name)s \"%(object)s\"."
-
-#: options.py:645
-msgid "No fields changed."
-msgstr "Ingen felt endret."
-
-#: options.py:717
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" ble opprettet."
-
-#: options.py:721 options.py:761
-msgid "You may edit it again below."
-msgstr "Du kan redigere videre nedenfor."
-
-#: options.py:731 options.py:771
-#, python-format
-msgid "You may add another %s below."
-msgstr "Du kan opprette ny %s nedenfor."
-
-#: options.py:759
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" ble endret."
-
-#: options.py:767
-#, python-format
-msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-msgstr "%(name)s \"%(obj)s\" ble endret. Du kan redigere videre nedenfor."
-
-#: options.py:827 options.py:1085
-msgid ""
-"Items must be selected in order to perform actions on them. No items have "
-"been changed."
-msgstr ""
-"Du må velge objekter for å utføre handlinger på dem. Ingen objekter har "
-"blitt endret."
-
-#: options.py:846
-msgid "No action selected."
-msgstr "Ingen handling valgt."
-
-#: options.py:927
-#, python-format
-msgid "Add %s"
-msgstr "Opprett %s"
-
-#: options.py:953 options.py:1194
-#, python-format
-msgid "%(name)s object with primary key %(key)r does not exist."
-msgstr "%(name)s-objekt med primærnøkkelen %(key)r finnes ikke."
-
-#: options.py:1018
-#, python-format
-msgid "Change %s"
-msgstr "Endre %s"
-
-#: options.py:1065
-msgid "Database error"
-msgstr "Databasefeil"
-
-#: options.py:1127
-#, python-format
-msgid "%(count)s %(name)s was changed successfully."
-msgid_plural "%(count)s %(name)s were changed successfully."
-msgstr[0] "%(count)s %(name)s ble endret."
-msgstr[1] "%(count)s %(name)s ble endret."
-
-#: options.py:1154
-#, python-format
-msgid "%(total_count)s selected"
-msgid_plural "All %(total_count)s selected"
-msgstr[0] "%(total_count)s valgt"
-msgstr[1] "Alle %(total_count)s valgt"
-
-#: options.py:1159
-#, python-format
-msgid "0 of %(cnt)s selected"
-msgstr "0 av %(cnt)s valgt"
-
-#: options.py:1210
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr "%(name)s \"%(obj)s\" ble slettet."
-
-#: options.py:1255
-#, python-format
-msgid "Change history: %s"
-msgstr "Endringshistorikk: %s"
-
-#: sites.py:319 templates/admin/login.html:42
-#: templates/registration/password_reset_complete.html:14
-#: views/decorators.py:26
-msgid "Log in"
-msgstr "Logg inn"
-
-#: sites.py:375
-msgid "Site administration"
-msgstr "Nettstedsadministrasjon"
-
-#: sites.py:419
-#, python-format
-msgid "%s administration"
-msgstr "%s-administrasjon"
-
-#: widgets.py:75
-msgid "Date:"
-msgstr "Dato:"
-
-#: widgets.py:75
-msgid "Time:"
-msgstr "Tid:"
-
-#: widgets.py:140
-msgid "Lookup"
-msgstr "Oppslag"
-
-#: widgets.py:246
-msgid "Add Another"
-msgstr "Legg til ny"
-
-#: templates/admin/404.html:4 templates/admin/404.html.py:8
-msgid "Page not found"
-msgstr "Fant ikke siden"
-
-#: templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Beklager, men siden du spør etter finnes ikke."
-
-#: templates/admin/500.html:4 templates/admin/app_index.html:8
-#: templates/admin/base.html:55 templates/admin/change_form.html:19
-#: templates/admin/change_list.html:42
-#: templates/admin/delete_confirmation.html:6
-#: templates/admin/delete_selected_confirmation.html:6
-#: templates/admin/invalid_setup.html:4 templates/admin/object_history.html:6
-#: templates/admin/auth/user/change_password.html:12
-#: templates/registration/logged_out.html:4
-#: templates/registration/password_change_done.html:5
-#: templates/registration/password_change_form.html:6
-#: templates/registration/password_reset_complete.html:4
-#: templates/registration/password_reset_confirm.html:4
-#: templates/registration/password_reset_done.html:4
-#: templates/registration/password_reset_form.html:4
-msgid "Home"
-msgstr "Hjem"
-
-#: templates/admin/500.html:4
-msgid "Server error"
-msgstr "Tjenerfeil"
-
-#: templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Tjenerfeil (500)"
-
-#: templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Tjenerfeil <em>(500)</em>"
-
-#: 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 ""
-"Det har oppstått en feil. Feilen er blitt rapportert til administrator via e-"
-"post, og vil bli fikset snart. Takk for din tålmodighet."
-
-#: templates/admin/actions.html:4
-msgid "Run the selected action"
-msgstr "Utfør den valgte handlingen"
-
-#: templates/admin/actions.html:4
-msgid "Go"
-msgstr "Gå"
-
-#: templates/admin/actions.html:11
-msgid "Click here to select the objects across all pages"
-msgstr "Trykk her for å velge samtlige objekter fra alle sider"
-
-#: templates/admin/actions.html:11
-#, python-format
-msgid "Select all %(total_count)s %(module_name)s"
-msgstr "Velg alle %(total_count)s %(module_name)s"
-
-#: templates/admin/actions.html:13
-msgid "Clear selection"
-msgstr "Nullstill valg"
-
-#: templates/admin/app_index.html:10 templates/admin/index.html:19
-#, python-format
-msgid "%(name)s"
-msgstr "%(name)s"
-
-#: templates/admin/base.html:28
-msgid "Welcome,"
-msgstr "Velkommen,"
-
-#: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
-msgid "Documentation"
-msgstr "Dokumentasjon"
-
-#: templates/admin/base.html:41
-#: templates/admin/auth/user/change_password.html:16
-#: templates/admin/auth/user/change_password.html:49
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
-msgid "Change password"
-msgstr "Endre passord"
-
-#: templates/admin/base.html:48
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
-msgid "Log out"
-msgstr "Logg ut"
-
-#: templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Django administrasjonsside"
-
-#: templates/admin/base_site.html:7
-msgid "Django administration"
-msgstr "Django-administrasjon"
-
-#: templates/admin/change_form.html:22 templates/admin/index.html:29
-msgid "Add"
-msgstr "Opprett"
-
-#: templates/admin/change_form.html:31 templates/admin/object_history.html:10
-msgid "History"
-msgstr "Historikk"
-
-#: templates/admin/change_form.html:32
-#: templates/admin/edit_inline/stacked.html:9
-#: templates/admin/edit_inline/tabular.html:28
-msgid "View on site"
-msgstr "Vis på nettsted"
-
-#: templates/admin/change_form.html:43 templates/admin/change_list.html:73
-#: templates/admin/login.html:17
-#: templates/admin/auth/user/change_password.html:25
-#: templates/registration/password_change_form.html:16
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] "Vennligst korriger feilen under."
-msgstr[1] "Vennligst korriger feilene under."
-
-#: templates/admin/change_list.html:64
-#, python-format
-msgid "Add %(name)s"
-msgstr "Opprett %(name)s"
-
-#: templates/admin/change_list.html:84
-msgid "Filter"
-msgstr "Filtrering"
-
-#: templates/admin/delete_confirmation.html:10
-#: templates/admin/submit_line.html:4
-msgid "Delete"
-msgstr "Slett"
-
-#: templates/admin/delete_confirmation.html:17
-#, 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 ""
-"Hvis du sletter %(object_name)s '%(escaped_object)s', vil også slette "
-"relaterte objekter, men du har ikke tillatelse til å slette følgende "
-"objekttyper:"
-
-#: templates/admin/delete_confirmation.html:25
-#, python-format
-msgid ""
-"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
-"following protected related objects:"
-msgstr ""
-"Sletting av %(object_name)s '%(escaped_object)s' krever sletting av følgende "
-"beskyttede relaterte objekter:"
-
-#: templates/admin/delete_confirmation.html:33
-#, 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 ""
-"Er du sikker på at du vil slette %(object_name)s \"%(escaped_object)s\"? "
-"Alle de følgende relaterte objektene vil bli slettet:"
-
-#: templates/admin/delete_confirmation.html:38
-#: templates/admin/delete_selected_confirmation.html:43
-msgid "Yes, I'm sure"
-msgstr "Ja, jeg er sikker"
-
-#: templates/admin/delete_selected_confirmation.html:9
-msgid "Delete multiple objects"
-msgstr "Slett flere objekter"
-
-#: templates/admin/delete_selected_confirmation.html:16
-#, python-format
-msgid ""
-"Deleting the selected %(objects_name)s would result in deleting related "
-"objects, but your account doesn't have permission to delete the following "
-"types of objects:"
-msgstr ""
-"Sletting av det valgte %(objects_name)s ville resultere i sletting av "
-"relaterte objekter, men kontoen din har ikke tillatelse til å slette "
-"følgende objekttyper:"
-
-#: templates/admin/delete_selected_confirmation.html:24
-#, python-format
-msgid ""
-"Deleting the selected %(objects_name)s would require deleting the following "
-"protected related objects:"
-msgstr ""
-"Sletting av det valgte %(objects_name)s ville kreve sletting av følgende "
-"beskyttede relaterte objekter:"
-
-#: templates/admin/delete_selected_confirmation.html:32
-#, python-format
-msgid ""
-"Are you sure you want to delete the selected %(objects_name)s? All of the "
-"following objects and their related items will be deleted:"
-msgstr ""
-"Er du sikker på vil slette det valgte %(objects_name)s? De følgende "
-"objektene og deres relaterte objekter vil bli slettet:"
-
-#: templates/admin/filter.html:2
-#, python-format
-msgid " By %(filter_title)s "
-msgstr "Etter %(filter_title)s "
-
-#: templates/admin/index.html:18
-#, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Modeller tilgjengelig i %(name)s-applikasjonen."
-
-#: templates/admin/index.html:35
-msgid "Change"
-msgstr "Endre"
-
-#: templates/admin/index.html:45
-msgid "You don't have permission to edit anything."
-msgstr "Du har ikke rettigheter til å redigere noe."
-
-#: templates/admin/index.html:53
-msgid "Recent Actions"
-msgstr "Siste handlinger"
-
-#: templates/admin/index.html:54
-msgid "My Actions"
-msgstr "Mine handlinger"
-
-#: templates/admin/index.html:58
-msgid "None available"
-msgstr "Ingen tilgjengelige"
-
-#: templates/admin/index.html:72
-msgid "Unknown content"
-msgstr "Ukjent innhold"
-
-#: templates/admin/invalid_setup.html:7
-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 ""
-"Noe er galt med databaseinstallasjonen din. Sørg for at databasetabellene er "
-"opprettet og at brukeren har de nødvendige rettigheter."
-
-#: templates/admin/login.html:33
-msgid "Username:"
-msgstr "Brukernavn:"
-
-#: templates/admin/login.html:37
-msgid "Password:"
-msgstr "Passord:"
-
-#: templates/admin/object_history.html:22
-msgid "Date/time"
-msgstr "Dato/tid"
-
-#: templates/admin/object_history.html:23
-msgid "User"
-msgstr "Bruker"
-
-#: templates/admin/object_history.html:24
-msgid "Action"
-msgstr "Handling"
-
-#: templates/admin/object_history.html:38
-msgid ""
-"This object doesn't have a change history. It probably wasn't added via this "
-"admin site."
-msgstr ""
-"Dette objektet har ingen endringshistorikk. Det var sannsynligvis ikke "
-"opprettet med administrasjonssiden."
-
-#: templates/admin/pagination.html:10
-msgid "Show all"
-msgstr "Vis alle"
-
-#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3
-msgid "Save"
-msgstr "Lagre"
-
-#: templates/admin/search_form.html:8
-msgid "Search"
-msgstr "Søk"
-
-#: templates/admin/search_form.html:10
-#, python-format
-msgid "%(counter)s result"
-msgid_plural "%(counter)s results"
-msgstr[0] "%(counter)s resultat"
-msgstr[1] "%(counter)s resultater"
-
-#: templates/admin/search_form.html:10
-#, python-format
-msgid "%(full_result_count)s total"
-msgstr "%(full_result_count)s totalt"
-
-#: templates/admin/submit_line.html:5
-msgid "Save as new"
-msgstr "Lagre som ny"
-
-#: templates/admin/submit_line.html:6
-msgid "Save and add another"
-msgstr "Lagre og opprett ny"
-
-#: templates/admin/submit_line.html:7
-msgid "Save and continue editing"
-msgstr "Lagre og fortsett å redigere"
-
-#: 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 ""
-"Skriv først inn brukernavn og passord. Deretter vil du få mulighet til å "
-"endre flere brukerinnstillinger."
-
-#: templates/admin/auth/user/add_form.html:8
-msgid "Enter a username and password."
-msgstr "Oppgi brukernavn og passord."
-
-#: templates/admin/auth/user/change_password.html:29
-#, python-format
-msgid "Enter a new password for the user <strong>%(username)s</strong>."
-msgstr "Skriv inn et nytt passord for brukeren <strong>%(username)s</strong>."
-
-#: templates/admin/auth/user/change_password.html:36
-msgid "Password"
-msgstr "Passord"
-
-#: templates/admin/auth/user/change_password.html:42
-#: templates/registration/password_change_form.html:38
-msgid "Password (again)"
-msgstr "Passord (gjenta)"
-
-#: templates/admin/auth/user/change_password.html:43
-msgid "Enter the same password as above, for verification."
-msgstr "Skriv inn det samme passordet som ovenfor, for verifisering."
-
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:113
-#, python-format
-msgid "Add another %(verbose_name)s"
-msgstr "Legg til ny %(verbose_name)s"
-
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:116
-msgid "Remove"
-msgstr "Fjern"
-
-#: templates/admin/edit_inline/tabular.html:15
-msgid "Delete?"
-msgstr "Slette?"
-
-#: templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Takk for at du valgte å bruke kvalitetstid på nettstedet i dag."
-
-#: templates/registration/logged_out.html:10
-msgid "Log in again"
-msgstr "Logg inn igjen"
-
-#: templates/registration/password_change_done.html:5
-#: templates/registration/password_change_form.html:6
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_change_form.html:20
-msgid "Password change"
-msgstr "Endre passord"
-
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_done.html:11
-msgid "Password change successful"
-msgstr "Passord endret"
-
-#: templates/registration/password_change_done.html:13
-msgid "Your password was changed."
-msgstr "Ditt passord ble endret."
-
-#: templates/registration/password_change_form.html:22
-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 ""
-"Venligst oppgi ditt gamle passord av sikkerhetsgrunner. Oppgi deretter ditt "
-"nye passord to ganger, slik at vi kan kontrollere at det er korrekt."
-
-#: templates/registration/password_change_form.html:28
-msgid "Old password"
-msgstr "Gammelt passord"
-
-#: templates/registration/password_change_form.html:33
-msgid "New password"
-msgstr "Nytt passord"
-
-#: templates/registration/password_change_form.html:44
-#: templates/registration/password_reset_confirm.html:21
-msgid "Change my password"
-msgstr "Endre passord"
-
-#: templates/registration/password_reset_complete.html:4
-#: templates/registration/password_reset_confirm.html:6
-#: templates/registration/password_reset_done.html:4
-#: templates/registration/password_reset_form.html:4
-#: templates/registration/password_reset_form.html:6
-#: templates/r