queryset-refactor: Merged to [6140]

git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@6331 bcc190cf-cafb-0310-a4f2-bffc1f526a37

AUTHORS

@@ -75,6 +75,7 @@ answer newbie questions, and generally made Django that much better:
     Chris Chamberlin <dja@cdc.msbx.net>
     Amit Chakradeo <http://amit.chakradeo.net/>
     ChaosKCW
+    Sengtha Chay <sengtha@e-khmer.com>
     ivan.chelubeev@gmail.com
     Bryan Chow <bryan at verdjn dot com>
     Michal Chruszcz <troll@pld-linux.org>
@@ -112,6 +113,7 @@ answer newbie questions, and generally made Django that much better:
     Ludvig Ericson <ludvig.ericson@gmail.com>
     Dirk Eschler <dirk.eschler@gmx.net>
     Marc Fargas <telenieko@telenieko.com>
+    Szilveszter Farkas <szilveszter.farkas@gmail.com>
     favo@exoweb.net
     Bill Fenner <fenner@gmail.com>
     Stefane Fermgier <sf@fermigier.com>
@@ -157,6 +159,7 @@ answer newbie questions, and generally made Django that much better:
     jpellerin@gmail.com
     junzhang.jn@gmail.com
     Antti Kaihola <http://akaihola.blogspot.com/>
+    Nagy Károly <charlie@rendszergazda.com>
     Ben Dean Kawamura <ben.dean.kawamura@gmail.com>
     Ian G. Kelly <ian.g.kelly@gmail.com>
     Ben Khoo <khoobks@westnet.com.au>
@@ -234,8 +237,9 @@ answer newbie questions, and generally made Django that much better:
     polpak@yahoo.com
     Jyrki Pulliainen <jyrki.pulliainen@gmail.com>
     Johann Queuniet <johann.queuniet@adh.naellia.eu>
-    J. Rademaker
+    Jan Rademaker
     Michael Radziej <mir@noris.de>
+    Amit Ramon <amit.ramon@gmail.com>
     Massimiliano Ravelli <massimiliano.ravelli@gmail.com>
     Brian Ray <http://brianray.chipy.org/>
     remco@diji.biz

django/conf/global_settings.py

@@ -59,6 +59,7 @@ LANGUAGES = (
     ('it', gettext_noop('Italian')),
     ('ja', gettext_noop('Japanese')),
     ('ko', gettext_noop('Korean')),
+    ('km', gettext_noop('Khmer')),
     ('kn', gettext_noop('Kannada')),
     ('lv', gettext_noop('Latvian')),
     ('mk', gettext_noop('Macedonian')),

django/conf/locale/es/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 15:35-0400\n"
+"POT-Creation-Date: 2007-08-30 23:46-0400\n"
 "PO-Revision-Date: 2007-07-14 13:00-0500\n"
 "Last-Translator: Mario Gonzalez <gonzalemario @t gmail.com>\n"
 "Language-Team: Castellano <Django-I18N@googlegroups.com>\n"
@@ -75,18 +75,18 @@ msgstr "Este valor debe ser Verdadero o Falso."
 msgid "Please enter a valid %s."
 msgstr "Por favor, introduzca un %s válido."
 
-#: db/models/fields/related.py:661
+#: db/models/fields/related.py:658
 msgid "Separate multiple IDs with commas."
 msgstr "Separe múltiples IDs con comas."
 
-#: db/models/fields/related.py:663
+#: db/models/fields/related.py:660
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Mantenga presionado \"Control\", o \"Command\" en un Mac, para seleccionar "
 "más de uno."
 
-#: db/models/fields/related.py:710
+#: db/models/fields/related.py:707
 #, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
 msgid_plural ""
@@ -98,175 +98,175 @@ msgstr[1] ""
 "Por favor, introduzca IDs de %(self)s válidos. Los valores %(value)r no son "
 "válidos."
 
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
 msgid "Arabic"
 msgstr "Árabe"
 
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
 msgid "Bengali"
 msgstr "Bengalí"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "Catalan"
 msgstr "Catalán"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "Czech"
 msgstr "Checo"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Welsh"
 msgstr "Galés"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Danish"
 msgstr "Danés"
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "German"
 msgstr "Alemán"
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Greek"
 msgstr "Griego"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "English"
 msgstr "Inglés"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Spanish"
 msgstr "Español"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Argentinean Spanish"
 msgstr "Español Argentino"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Persian"
 msgstr "Persa"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
 msgid "Finnish"
 msgstr "Finés"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
 msgid "French"
 msgstr "Francés"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
 msgid "Galician"
 msgstr "Gallego"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
 msgid "Hungarian"
 msgstr "Húngaro"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:56
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:57
 msgid "Croatian"
 msgstr "Croata"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:58
 msgid "Icelandic"
 msgstr "Islandés"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:59
 msgid "Italian"
 msgstr "Italiano"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
 msgid "Japanese"
 msgstr "Japonés"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
 msgid "Korean"
 msgstr "Koreano"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
 msgid "Kannada"
 msgstr "Kannada"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
 msgid "Latvian"
 msgstr "Latvio"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
 msgid "Macedonian"
 msgstr "Macedonio"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
 msgid "Dutch"
 msgstr "Alemán"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
 msgid "Norwegian"
 msgstr "Noruego"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
 msgid "Polish"
 msgstr "Polaco"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
 msgid "Portugese"
 msgstr "Portugés"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
 msgid "Brazilian"
 msgstr "Brasileño"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
 msgid "Romanian"
 msgstr "Rumano"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
 msgid "Russian"
 msgstr "Ruso"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
 msgid "Serbian"
 msgstr "Serbio"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
 msgid "Swedish"
 msgstr "Sueco"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
 msgid "Tamil"
 msgstr "Tamil"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
 msgid "Telugu"
 msgstr "Telugu"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
 msgid "Turkish"
 msgstr "Turco"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
 msgid "Ukrainian"
 msgstr "Ucraniano"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
 msgid "Simplified Chinese"
 msgstr "Chino simplificado"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
 msgid "Traditional Chinese"
 msgstr "Chino tradicional"
 
@@ -697,79 +697,91 @@ msgstr "tipo de contenido"
 msgid "content types"
 msgstr "tipos de contenido"
 
-#: contrib/humanize/templatetags/humanize.py:17
+#: contrib/humanize/templatetags/humanize.py:20
 msgid "th"
 msgstr "th"
 
-#: contrib/humanize/templatetags/humanize.py:17
+#: contrib/humanize/templatetags/humanize.py:20
 msgid "st"
 msgstr "st"
 
-#: contrib/humanize/templatetags/humanize.py:17
+#: contrib/humanize/templatetags/humanize.py:20
 msgid "nd"
 msgstr "nd"
 
-#: contrib/humanize/templatetags/humanize.py:17
+#: contrib/humanize/templatetags/humanize.py:20
 msgid "rd"
 msgstr "rd"
 
-#: contrib/humanize/templatetags/humanize.py:47
+#: contrib/humanize/templatetags/humanize.py:50
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f millón"
 msgstr[1] "%(value).1f millión"
 
-#: contrib/humanize/templatetags/humanize.py:50
+#: contrib/humanize/templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f billión"
 msgstr[1] "%(value).1f billión"
 
-#: contrib/humanize/templatetags/humanize.py:53
+#: contrib/humanize/templatetags/humanize.py:56
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f trillión"
 msgstr[1] "%(value).1f trillión"
 
-#: contrib/humanize/templatetags/humanize.py:68
+#: contrib/humanize/templatetags/humanize.py:71
 msgid "one"
 msgstr "uno"
 
-#: contrib/humanize/templatetags/humanize.py:68
+#: contrib/humanize/templatetags/humanize.py:71
 msgid "two"
 msgstr "dos"
 
-#: contrib/humanize/templatetags/humanize.py:68
+#: contrib/humanize/templatetags/humanize.py:71
 msgid "three"
 msgstr "tres"
 
-#: contrib/humanize/templatetags/humanize.py:68
+#: contrib/humanize/templatetags/humanize.py:71
 msgid "four"
 msgstr "cuatro"
 
-#: contrib/humanize/templatetags/humanize.py:68
+#: contrib/humanize/templatetags/humanize.py:71
 msgid "five"
 msgstr "cinco"
 
-#: contrib/humanize/templatetags/humanize.py:68
+#: contrib/humanize/templatetags/humanize.py:71
 msgid "six"
 msgstr "seis"
 
-#: contrib/humanize/templatetags/humanize.py:68
+#: contrib/humanize/templatetags/humanize.py:71
 msgid "seven"
 msgstr "siete"
 
-#: contrib/humanize/templatetags/humanize.py:68
+#: contrib/humanize/templatetags/humanize.py:71
 msgid "eight"
 msgstr "ocho"
 
-#: contrib/humanize/templatetags/humanize.py:68
+#: contrib/humanize/templatetags/humanize.py:71
 msgid "nine"
 msgstr "nueve"
 
+#: contrib/humanize/templatetags/humanize.py:90
+msgid "today"
+msgstr "hoy"
+
+#: contrib/humanize/templatetags/humanize.py:92
+msgid "tomorrow"
+msgstr "mañana"
+
+#: contrib/humanize/templatetags/humanize.py:94
+msgid "yesterday"
+msgstr "ayer"
+
 #: contrib/auth/views.py:47
 msgid "Logged out"
 msgstr "Sesión terminada"
@@ -910,7 +922,7 @@ msgstr "Fechas importantes"
 msgid "Groups"
 msgstr "Grupos"
 
-#: contrib/auth/models.py:287
+#: contrib/auth/models.py:288
 msgid "message"
 msgstr "mensaje"
 
@@ -3082,28 +3094,110 @@ msgstr "Introduzca un código postal en el formato XXXXX o XXX XX."
 msgid "Enter a zip code in the format XXXXXXX."
 msgstr "Introduzca un código postal en el formato XXXXXXX."
 
-#: template/defaultfilters.py:485
+#: contrib/localflavor/pl/pl_voivodeships.py:8
+msgid "Lower Silesia"
+msgstr "Lower Silesia"
+
+#: contrib/localflavor/pl/pl_voivodeships.py:9
+msgid "Kuyavia-Pomerania"
+msgstr "Kuyavia-Pomerania"
+
+#: contrib/localflavor/pl/pl_voivodeships.py:10
+msgid "Lublin"
+msgstr "Lublin"
+
+#: contrib/localflavor/pl/pl_voivodeships.py:11
+msgid "Lubusz"
+msgstr "Lubusz"
+
+#: contrib/localflavor/pl/pl_voivodeships.py:12
+msgid "Lodz"
+msgstr "Lodz"
+
+#: contrib/localflavor/pl/pl_voivodeships.py:13
+msgid "Lesser Poland"
+msgstr "Lesser Poland"
+
+#: contrib/localflavor/pl/pl_voivodeships.py:14
+msgid "Masovia"
+msgstr "Masovia"
+
+#: contrib/localflavor/pl/pl_voivodeships.py:15
+msgid "Opole"
+msgstr "Opole"
+
+#: contrib/localflavor/pl/pl_voivodeships.py:16
+msgid "Subcarpatia"
+msgstr "Subcarpatia"
+
+#: contrib/localflavor/pl/pl_voivodeships.py:17
+msgid "Podlasie"
+msgstr "Podlasie"
+
+#: contrib/localflavor/pl/pl_voivodeships.py:18
+msgid "Pomerania"
+msgstr "Pomerania"
+
+#: contrib/localflavor/pl/pl_voivodeships.py:19
+msgid "Silesia"
+msgstr "Silesia"
+
+#: contrib/localflavor/pl/pl_voivodeships.py:20
+msgid "Swietokrzyskie"
+msgstr "Swietokrzyskie"
+
+#: contrib/localflavor/pl/pl_voivodeships.py:21
+msgid "Warmia-Masuria"
+msgstr "Warmia-Masuria"
+
+#: contrib/localflavor/pl/pl_voivodeships.py:22
+msgid "Greater Poland"
+msgstr "Greater Poland"
+
+#: contrib/localflavor/pl/pl_voivodeships.py:23
+msgid "West Pomerania"
+msgstr "West Pomerania"
+
+#: contrib/localflavor/pl/forms.py:53
+msgid "National Identification Number consists of 11 digits."
+msgstr "Número de Identificación Nacional consiste en 11 dígitos"
+
+#: contrib/localflavor/pl/forms.py:59
+msgid "Wrong checksum for the National Identification Number."
+msgstr "El Número de Identificación Nacional es incorrecto."
+
+#: contrib/localflavor/pl/forms.py:71
+#, fuzzy
+msgid ""
+"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX or XX-XX-XXX-XXX."
+msgstr "Introduzca un número de impuesto (NIP) en el formato XX-XXX-XX-XX o XX-XX-XXX-XXX."
+
+#: contrib/localflavor/pl/forms.py:82
+msgid "Enter a postal code in the format XX-XXX."
+msgstr "Introduzca un código postal en el formato XX-XXX."
+
+#: template/defaultfilters.py:532
 msgid "yes,no,maybe"
 msgstr "sí,no,tal vez"
 
-#: template/defaultfilters.py:514
+#: template/defaultfilters.py:561
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d byte"
 msgstr[1] "%(size)d bytes"
 
-#: template/defaultfilters.py:516
+#: template/defaultfilters.py:563
 #, python-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
-#: template/defaultfilters.py:518
+#: template/defaultfilters.py:565
 #, python-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: template/defaultfilters.py:519
+#: template/defaultfilters.py:566
 #, python-format
 msgid "%.1f GB"
 msgstr "%.1f GB"

django/conf/locale/fi/LC_MESSAGES/django.po

@@ -1151,7 +1151,7 @@ msgstr "Suodatin"
 #: contrib/comments/templates/comments/form.html:6
 #: contrib/comments/templates/comments/form.html:8
 msgid "Username:"
-msgstr "Käyttäjätunnus"
+msgstr "Käyttäjätunnus:"
 
 #: contrib/admin/templates/admin/login.html:20
 #: contrib/comments/templates/comments/form.html:8
@@ -1178,7 +1178,7 @@ msgstr "Käyttäjätunnus"
 
 #: contrib/admin/templates/admin/auth/user/add_form.html:18
 msgid "Password"
-msgstr "Salasana:"
+msgstr "Salasana"
 
 #: contrib/admin/templates/admin/auth/user/add_form.html:23
 msgid "Password (again)"

django/conf/locale/he/LC_MESSAGES/django.po

@@ -205,7 +205,7 @@ msgstr "פברואר"
 
 #: utils/dates.py:14 utils/dates.py:27
 msgid "March"
-msgstr "מרץ"
+msgstr "מרס"
 
 #: utils/dates.py:14 utils/dates.py:27
 msgid "April"
@@ -241,11 +241,11 @@ msgstr "נובמבר"
 
 #: utils/dates.py:16
 msgid "December"
-msgstr "תצבר"
+msgstr "דצמבר"
 
 #: utils/dates.py:19
 msgid "jan"
-msgstr "יאנ"
+msgstr "ינו"
 
 #: utils/dates.py:19
 msgid "feb"
@@ -253,7 +253,7 @@ msgstr "פבר"
 
 #: utils/dates.py:19
 msgid "mar"
-msgstr "מרץ"
+msgstr "מרס"
 
 #: utils/dates.py:19
 msgid "apr"
@@ -293,7 +293,7 @@ msgstr "דצמ"
 
 #: utils/dates.py:27
 msgid "Jan."
-msgstr "יאנ'"
+msgstr "ינו'"
 
 #: utils/dates.py:27
 msgid "Feb."

django/conf/locale/hu/LC_MESSAGES/djangojs.po

@@ -1,20 +1,21 @@
+# translation of djangojs.po to Hungarian
 # translation of djangojs.po to
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-# Nagy Károly <charlie@rendszergazda.com>, 2006.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: djangojs\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-12-09 11:51+0100\n"
-"PO-Revision-Date: 2006-05-10 11:59+0200\n"
+"PO-Revision-Date: 2007-09-13 13:30+0200\n"
-"Last-Translator: Nagy Károly <charlie@rendszergazda.com>\n"
+"Last-Translator: Szilveszter Farkas <szilveszter.farkas@gmail.com>\n"
-"Language-Team:  <hu@li.org>\n"
+"Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: contrib/admin/media/js/SelectFilter2.js:33
 #, perl-format
@@ -23,15 +24,15 @@ msgstr "Elérhető %s"
 
 #: contrib/admin/media/js/SelectFilter2.js:41
 msgid "Choose all"
-msgstr "Mindent kijelöl"
+msgstr "Mindet kijelölni"
 
 #: contrib/admin/media/js/SelectFilter2.js:46
 msgid "Add"
-msgstr "Hozzáad"
+msgstr "Hozzáadás"
 
 #: contrib/admin/media/js/SelectFilter2.js:48
 msgid "Remove"
-msgstr "Eltávolít"
+msgstr "Eltávolítás"
 
 #: contrib/admin/media/js/SelectFilter2.js:53
 #, perl-format
@@ -40,7 +41,7 @@ msgstr "%s kiválasztva"
 
 #: contrib/admin/media/js/SelectFilter2.js:54
 msgid "Select your choice(s) and click "
-msgstr "Válaszd ki a kért elemeket és kattints"
+msgstr "Válassza ki a kért elemeket és kattintson"
 
 #: contrib/admin/media/js/SelectFilter2.js:59
 msgid "Clear all"
@@ -51,11 +52,11 @@ msgstr "Összes törlése"
 msgid ""
 "January February March April May June July August September October November "
 "December"
-msgstr "Január Február Március Április Május Június Július Szeptember Október November December"
+msgstr "január február március április május június július augusztus szeptember október november december"
 
 #: contrib/admin/media/js/dateparse.js:27
 msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
-msgstr "Vasárnap Hétfő Kedd Szerda Csütörtök Péntek Szombat"
+msgstr "vasárnap hétfő kedd szerda csütörtök péntek szombat"
 
 #: contrib/admin/media/js/calendar.js:25
 msgid "S M T W T F S"
@@ -72,7 +73,7 @@ msgstr "Óra"
 
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:77
 msgid "Choose a time"
-msgstr "Válaszd ki az időt"
+msgstr "Válassza ki az időt"
 
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
 msgid "Midnight"

django/conf/locale/km/LC_MESSAGES/djangojs.po

@@ -0,0 +1,108 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 01\n"
+"Report-Msgid-Bugs-To: sengtha@e-khmer.com\n"
+"POT-Creation-Date: 2007-01-15 15:43+0200\n"
+"PO-Revision-Date: 2007-01-21 01:25+0900\n"
+"Last-Translator: Chay Sengtha <sengtha@e-khmer.com>\n"
+"Language-Team: Chay Sengtha <sengtha@e-khmer.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: contrib/admin/media/js/SelectFilter2.js:33
+#, perl-format
+msgid "Available %s"
+msgstr "%s ដែលអាច​ជ្រើសរើសបាន"
+
+#: contrib/admin/media/js/SelectFilter2.js:41
+msgid "Choose all"
+msgstr "ជ្រើសរើសទាំងអស់"
+
+#: contrib/admin/media/js/SelectFilter2.js:46
+msgid "Add"
+msgstr "បន្ថែម"
+
+#: contrib/admin/media/js/SelectFilter2.js:48
+msgid "Remove"
+msgstr "លប់ចេញ"
+
+#: contrib/admin/media/js/SelectFilter2.js:53
+#, perl-format
+msgid "Chosen %s"
+msgstr "%s ដែលបានជ្រើសរើស"
+
+#: contrib/admin/media/js/SelectFilter2.js:54
+msgid "Select your choice(s) and click "
+msgstr "សូមជ្រើសរើសយក"
+
+#: contrib/admin/media/js/SelectFilter2.js:59
+msgid "Clear all"
+msgstr "លប់ចេញទាំងអស់"
+
+#: contrib/admin/media/js/dateparse.js:26
+#: contrib/admin/media/js/calendar.js:24
+msgid "January February March April May June July August September October November December"
+msgstr "January February March April May June July August September October November December"
+
+#: contrib/admin/media/js/dateparse.js:27
+msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
+msgstr "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
+
+#: contrib/admin/media/js/calendar.js:25
+msgid "S M T W T F S"
+msgstr "S M T W T F S"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:45
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:80
+msgid "Now"
+msgstr "ឥឡូវនេះ"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:48
+msgid "Clock"
+msgstr "នាឡិការ"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:77
+msgid "Choose a time"
+msgstr "ជ្រើសរើសម៉ោង"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
+msgid "Midnight"
+msgstr "អធ្រាត្រ"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
+msgid "6 a.m."
+msgstr "ម៉ោង ៦ ព្រឹក"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
+msgid "Noon"
+msgstr "ពេលថ្ងែត្រង់"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:87
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:168
+msgid "Cancel"
+msgstr "លប់ចោល"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:111
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:162
+msgid "Today"
+msgstr "ថ្ងៃនេះ"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:114
+msgid "Calendar"
+msgstr "ប្រក្រតិទិន"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:160
+msgid "Yesterday"
+msgstr "ម្សិលមិញ"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:164
+msgid "Tomorrow"
+msgstr "ថ្ងៃស្អែក"
+

django/conf/locale/no/LC_MESSAGES/djangojs.po

@@ -1,6 +1,6 @@
-# translation of djangojs.po to
+# translation of djangojs.po to norwegian
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright (C) 2005 and beyond
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the Django package.
 # Espen Grindhaug <espen.grindhaug@mail.com>, 2006.
 #
 msgid ""
@@ -8,16 +8,14 @@ msgstr ""
 "Project-Id-Version: djangojs\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-12-09 11:51+0100\n"
-"PO-Revision-Date: 2007-04-27 06:51+0200\n"
+"PO-Revision-Date: 2007-08-29 18:22+0200\n"
-"Last-Translator: \n"
+"Last-Translator: jonklo\n"
-"Language-Team:  <en@li.org>\n"
+"Language-Team: Norsk <no@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
 
 #: contrib/admin/media/js/SelectFilter2.js:33
-#, perl-format
 msgid "Available %s"
 msgstr "%s er tilgjengelige"
 
@@ -34,13 +32,12 @@ msgid "Remove"
 msgstr "Slett"
 
 #: contrib/admin/media/js/SelectFilter2.js:53
-#, perl-format
 msgid "Chosen %s"
 msgstr "%s er valgt"
 
 #: contrib/admin/media/js/SelectFilter2.js:54
 msgid "Select your choice(s) and click "
-msgstr "Velg ditt svaralternativ(er) og klikk"
+msgstr "Velg ditt svaralternativ(er) og klikk "
 
 #: contrib/admin/media/js/SelectFilter2.js:59
 msgid "Clear all"
@@ -85,15 +82,15 @@ msgstr "Velg et klokkeslett"
 
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
 msgid "Midnight"
-msgstr "24.00"
+msgstr "Midnatt"
 
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
 msgid "6 a.m."
-msgstr "06.00"
+msgstr "06:00"
 
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
 msgid "Noon"
-msgstr "12.00"
+msgstr "12:00"
 
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:87
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:168

django/conf/locale/tr/LC_MESSAGES/djangojs.po

@@ -107,3 +107,9 @@ msgstr "Dün"
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:164
 msgid "Tomorrow"
 msgstr "Yarın"
+
+msgid "Show"
+msgstr "Göster"
+
+msgid "Hide"
+msgstr "Gizle"

django/contrib/localflavor/nl/forms.py

@@ -0,0 +1,92 @@
+"""
+NL-specific Form helpers
+"""
+
+import re
+
+from django.newforms import ValidationError
+from django.newforms.fields import Field, Select, EMPTY_VALUES
+from django.utils.translation import ugettext as _
+from django.utils.encoding import smart_unicode
+
+pc_re = re.compile('^\d{4}[A-Z]{2}$')
+sofi_re = re.compile('^\d{9}$')
+numeric_re = re.compile('^\d+$')
+
+class NLZipCodeField(Field):
+    """
+    A Dutch postal code field.
+    """
+    def clean(self, value):
+        super(NLZipCodeField, self).clean(value)
+        if value in EMPTY_VALUES:
+            return u''
+        
+        msg = _('Enter a valid postal code')
+        value = value.strip().upper().replace(' ', '')
+        if not pc_re.search(value):
+            raise ValidationError(msg)
+        
+        if int(value[:4]) < 1000:
+            raise ValidationError(msg)
+        
+        return u'%s %s' % (value[:4], value[4:])
+
+class NLProvinceSelect(Select):
+    """
+    A Select widget that uses a list of provinces of the Netherlands as its 
+    choices.
+    """
+    def __init__(self, attrs=None):
+        from nl_provinces import PROVINCE_CHOICES
+        super(NLProvinceSelect, self).__init__(attrs, choices=PROVINCE_CHOICES)
+
+class NLPhoneNumberField(Field):
+    """
+    A Dutch telephone number field.
+    """
+    def clean(self, value):
+        super(NLPhoneNumberField, self).clean(value)
+        if value in EMPTY_VALUES:
+            return u''
+        
+        msg = _('Enter a valid phone number')
+        phone_nr = re.sub('[\-\s\(\)]', '', smart_unicode(value))
+        
+        if len(phone_nr) == 10 and numeric_re.search(phone_nr):
+            return value
+        
+        if phone_nr[:3] == '+31' and len(phone_nr) == 12 and \
+           numeric_re.search(phone_nr[3:]):
+            return value
+        
+        raise ValidationError(msg)
+
+class NLSoFiNumberField(Field):
+    """
+    A Dutch social security number (SoFi/BSN) field.
+ 
+    http://nl.wikipedia.org/wiki/Sofinummer
+    """
+    def clean(self, value):
+        super(NLSoFiNumberField, self).clean(value)
+        if value in EMPTY_VALUES:
+            return u''
+        
+        msg = _('Enter a valid SoFi number')
+        
+        if not sofi_re.search(value):
+            raise ValidationError(msg)
+        
+        if int(value) == 0:
+            raise ValidationError(msg)
+        
+        checksum = 0
+        for i in range(9, 1, -1):
+            checksum += int(value[9-i]) * i
+        checksum -= int(value[-1])
+        
+        if checksum % 11 != 0:
+            raise ValidationError(msg)
+        
+        return value

django/contrib/localflavor/nl/nl_provinces.py

@@ -0,0 +1,16 @@
+from django.utils.translation import ugettext_lazy as _
+
+PROVINCE_CHOICES = (
+    ('DR', _('Drente')),
+    ('FL', _('Flevoland')),
+    ('FR', _('Friesland')),
+    ('GL', _('Gelderland')),
+    ('GR', _('Groningen')),
+    ('LB', _('Limburg')),
+    ('NB', _('Noord-Brabant')),
+    ('NH', _('Noord-Holland')),
+    ('OV', _('Overijssel')),
+    ('UT', _('Utrecht')),
+    ('ZE', _('Zeeland')),
+    ('ZH', _('Zuid-Holland')),
+)

django/newforms/util.py

@@ -1,5 +1,6 @@
 from django.utils.html import escape
 from django.utils.encoding import smart_unicode, StrAndUnicode
+from django.utils.functional import Promise
 
 def flatatt(attrs):
     """
@@ -47,7 +48,7 @@ class ValidationError(Exception):
         if isinstance(message, list):
             self.messages = ErrorList([smart_unicode(msg) for msg in message])
         else:
-            assert isinstance(message, basestring), ("%s should be a basestring" % repr(message))
+            assert isinstance(message, (basestring, Promise)), ("%s should be a basestring or lazy translation" % repr(message))
             message = smart_unicode(message)
             self.messages = ErrorList([message])
 

tests/regressiontests/forms/localflavor.py

@@ -1446,4 +1446,72 @@ ValidationError: [u'National Identification Number consists of 11 digits.']
 Traceback (most recent call last):
 ...
 ValidationError: [u'National Identification Number consists of 11 digits.']
+
+# NLPhoneNumberField ########################################################
+
+>>> from django.contrib.localflavor.nl.forms import NLPhoneNumberField
+>>> f = NLPhoneNumberField(required=False)
+>>> f.clean('')
+u''
+>>> f.clean('012-3456789')
+'012-3456789'
+>>> f.clean('0123456789')
+'0123456789'
+>>> f.clean('+31-12-3456789')
+'+31-12-3456789'
+>>> f.clean('(0123) 456789')
+'(0123) 456789'
+>>> f.clean('foo')
+Traceback (most recent call last):
+    ...
+ValidationError: [u'Enter a valid phone number']
+
+# NLZipCodeField ############################################################
+
+>>> from django.contrib.localflavor.nl.forms import NLZipCodeField
+>>> f = NLZipCodeField(required=False)
+>>> f.clean('')
+u''
+>>> f.clean('1234ab')
+u'1234 AB'
+>>> f.clean('1234 ab')
+u'1234 AB'
+>>> f.clean('1234 AB')
+u'1234 AB'
+>>> f.clean('0123AB')
+Traceback (most recent call last):
+    ...
+ValidationError: [u'Enter a valid postal code']
+>>> f.clean('foo')
+Traceback (most recent call last):
+    ...
+ValidationError: [u'Enter a valid postal code']
+
+# NLSoFiNumberField #########################################################
+
+>>> from django.contrib.localflavor.nl.forms import NLSoFiNumberField
+>>> f = NLSoFiNumberField(required=False)
+>>> f.clean('')
+u''
+>>> f.clean('123456782')
+'123456782'
+>>> f.clean('000000000')
+Traceback (most recent call last):
+    ...
+ValidationError: [u'Enter a valid SoFi number']
+>>> f.clean('123456789')
+Traceback (most recent call last):
+    ...
+ValidationError: [u'Enter a valid SoFi number']
+>>> f.clean('foo')
+Traceback (most recent call last):
+    ...
+ValidationError: [u'Enter a valid SoFi number']
+
+# NLProvinceSelect ##########################################################
+
+>>> from django.contrib.localflavor.nl.forms import NLProvinceSelect
+>>> s = NLProvinceSelect()
+>>> s.render('provinces', 'OV')
+u'<select name="provinces">\n<option value="DR">Drente</option>\n<option value="FL">Flevoland</option>\n<option value="FR">Friesland</option>\n<option value="GL">Gelderland</option>\n<option value="GR">Groningen</option>\n<option value="LB">Limburg</option>\n<option value="NB">Noord-Brabant</option>\n<option value="NH">Noord-Holland</option>\n<option value="OV" selected="selected">Overijssel</option>\n<option value="UT">Utrecht</option>\n<option value="ZE">Zeeland</option>\n<option value="ZH">Zuid-Holland</option>\n</select>'
 """