Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

newforms-admin: Merged from trunk up to [7021].

git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7022 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit daa467d79ec7b40e376294eabc51222a67690181 1 parent c080e44
Joseph Kocherhans jkocherhans authored
Showing with 5,292 additions and 2,773 deletions.
  1. +2 −0  AUTHORS
  2. BIN  django/conf/locale/ca/LC_MESSAGES/django.mo
  3. +501 −80 django/conf/locale/ca/LC_MESSAGES/django.po
  4. BIN  django/conf/locale/hr/LC_MESSAGES/django.mo
  5. +2,967 −1,903 django/conf/locale/hr/LC_MESSAGES/django.po
  6. BIN  django/conf/locale/hr/LC_MESSAGES/djangojs.mo
  7. +31 −32 django/conf/locale/hr/LC_MESSAGES/djangojs.po
  8. BIN  django/conf/locale/ja/LC_MESSAGES/django.mo
  9. +1,299 −444 django/conf/locale/ja/LC_MESSAGES/django.po
  10. BIN  django/conf/locale/tr/LC_MESSAGES/django.mo
  11. +30 −32 django/conf/locale/tr/LC_MESSAGES/django.po
  12. +0 −3  django/conf/locale/tr/LC_MESSAGES/djangojs.po
  13. +1 −1  django/contrib/admin/media/js/urlify.js
  14. +4 −1 django/contrib/auth/create_superuser.py
  15. +2 −2 django/contrib/localflavor/ca/forms.py
  16. +1 −1  django/contrib/localflavor/it/it_province.py
  17. +9 −7 django/contrib/sessions/backends/db.py
  18. +11 −9 django/contrib/sessions/backends/file.py
  19. +28 −32 django/core/mail.py
  20. +1 −1  django/core/management/sql.py
  21. +18 −5 django/db/backends/oracle/base.py
  22. +5 −1 django/db/models/fields/__init__.py
  23. +6 −4 django/newforms/fields.py
  24. +6 −2 django/newforms/forms.py
  25. +34 −137 django/template/__init__.py
  26. +2 −4 django/template/context.py
  27. +97 −0 django/template/debug.py
  28. +10 −1 django/template/defaultfilters.py
  29. +21 −23 django/template/defaulttags.py
  30. +1 −1  django/views/debug.py
  31. +1 −1  docs/design_philosophies.txt
  32. +10 −10 docs/distributions.txt
  33. +2 −2 docs/django-admin.txt
  34. +3 −1 docs/localflavor.txt
  35. +11 −0 docs/middleware.txt
  36. +2 −2 docs/shortcuts.txt
  37. +3 −3 docs/sites.txt
  38. +1 −1  docs/syndication_feeds.txt
  39. +7 −2 docs/templates.txt
  40. +3 −3 docs/templates_python.txt
  41. +1 −1  tests/modeltests/m2o_recursive/models.py
  42. +81 −0 tests/modeltests/model_forms/models.py
  43. +28 −0 tests/regressiontests/backends/models.py
  44. +30 −3 tests/regressiontests/forms/fields.py
  45. +3 −3 tests/regressiontests/forms/localflavor/ca.py
  46. +1 −0  tests/regressiontests/middleware/models.py
  47. +13 −15 tests/regressiontests/middleware/tests.py
  48. +3 −0  tests/regressiontests/templates/filters.py
  49. +2 −0  tests/regressiontests/templates/tests.py
2  AUTHORS
View
@@ -70,6 +70,7 @@ answer newbie questions, and generally made Django that much better:
Andrew Brehaut <http://brehaut.net/blog>
brut.alll@gmail.com
Jonathan Buchanan <jonathan.buchanan@gmail.com>
+ Can Burak Çilingir <canburak@cs.bilgi.edu.tr>
Trevor Caira <trevor@caira.com>
Ricardo Javier Cárdenes Medina <ricardo.cardenes@gmail.com>
Graham Carlyle <graham.carlyle@maplecroft.net>
@@ -175,6 +176,7 @@ answer newbie questions, and generally made Django that much better:
jpellerin@gmail.com
junzhang.jn@gmail.com
Antti Kaihola <http://akaihola.blogspot.com/>
+ Bahadır Kandemir <bahadir@pardus.org.tr>
Nagy Károly <charlie@rendszergazda.com>
Erik Karulf <erik@karulf.com>
Ben Dean Kawamura <ben.dean.kawamura@gmail.com>
BIN  django/conf/locale/ca/LC_MESSAGES/django.mo
View
Binary file not shown
581 django/conf/locale/ca/LC_MESSAGES/django.po
View
@@ -5,8 +5,8 @@ msgid ""
msgstr ""
"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-02 22:26+0100\n"
-"PO-Revision-Date: 2007-12-02 22:32+0100\n"
+"POT-Creation-Date: 2007-12-29 21:28+0100\n"
+"PO-Revision-Date: 2007-12-30 11:38+0100\n"
"Last-Translator: Marc Fargas <telenieko@telenieko.com>\n"
"Language-Team: <es@li.org>\n"
"MIME-Version: 1.0\n"
@@ -1691,41 +1691,42 @@ msgstr "demà"
msgid "yesterday"
msgstr "ahir"
-#: contrib/localflavor/ar/forms.py:30 contrib/localflavor/ar/forms.py:38
+#: contrib/localflavor/ar/forms.py:28
msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Introdueixi un codi postal en el format NNNN or ANNNNAAA."
+msgstr "Introdueixi un codi postal en el format NNNN o ANNNNAAA."
-#: contrib/localflavor/ar/forms.py:61 contrib/localflavor/br/forms.py:103
-#: contrib/localflavor/pe/forms.py:34 contrib/localflavor/pe/forms.py:57
+#: contrib/localflavor/ar/forms.py:50 contrib/localflavor/br/forms.py:96
+#: contrib/localflavor/br/forms.py:135 contrib/localflavor/pe/forms.py:23
+#: contrib/localflavor/pe/forms.py:51
msgid "This field requires only numbers."
msgstr "Aquest camps requereix només números."
-#: contrib/localflavor/ar/forms.py:64
+#: contrib/localflavor/ar/forms.py:51
msgid "This field requires 7 or 8 digits."
msgstr "Aquest camp requereix 7 o 8 dígits."
-#: contrib/localflavor/ar/forms.py:75
+#: contrib/localflavor/ar/forms.py:80
msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
msgstr ""
"Introdueixi un número CUIT vàlid en el format XX-XXXXXXXX-X o XXXXXXXXXXXX."
-#: contrib/localflavor/ar/forms.py:88
+#: contrib/localflavor/ar/forms.py:81
msgid "Invalid CUIT."
msgstr "Invàlid CUIT."
-#: contrib/localflavor/au/forms.py:18
+#: contrib/localflavor/au/forms.py:16
msgid "Enter a 4 digit post code."
msgstr "Introdueixi un codi postal de 4 dígits."
-#: contrib/localflavor/br/forms.py:23
+#: contrib/localflavor/br/forms.py:21
msgid "Enter a zip code in the format XXXXX-XXX."
msgstr "Introdueixi un codi zip en el format XXXXX-XXX."
-#: contrib/localflavor/br/forms.py:35
+#: contrib/localflavor/br/forms.py:30
msgid "Phone numbers must be in XX-XXXX-XXXX format."
msgstr "El número de telèfon ha de ser en el format XX-XXXX-XXXX."
-#: contrib/localflavor/br/forms.py:68
+#: contrib/localflavor/br/forms.py:58
msgid ""
"Select a valid brazilian state. That state is not one of the available "
"states."
@@ -1733,30 +1734,30 @@ msgstr ""
"Seleccioni un estat brasiler vàlid. Aquest estat no és un dels estats "
"disponibles."
-#: contrib/localflavor/br/forms.py:105
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Aquest camp requereix com a màxim 11 dígits o 14 caracters."
-
-#: contrib/localflavor/br/forms.py:115
+#: contrib/localflavor/br/forms.py:94
msgid "Invalid CPF number."
msgstr "Número CPF invàlid."
-#: contrib/localflavor/br/forms.py:137
-msgid "This field requires at least 14 digits"
-msgstr "Aquest camp requereix almenys 14 dígits."
+#: contrib/localflavor/br/forms.py:95
+msgid "This field requires at most 11 digits or 14 characters."
+msgstr "Aquest camp requereix com a màxim 11 dígits o 14 caracters."
-#: contrib/localflavor/br/forms.py:147
+#: contrib/localflavor/br/forms.py:134
msgid "Invalid CNPJ number."
msgstr "Número CNPJ invàlid."
-#: contrib/localflavor/ca/forms.py:19
+#: contrib/localflavor/br/forms.py:136
+msgid "This field requires at least 14 digits"
+msgstr "Aquest camp requereix almenys 14 dígits."
+
+#: contrib/localflavor/ca/forms.py:17
msgid "Enter a postal code in the format XXX XXX."
msgstr "Introdueixi un codi postal en el format XXX XXX."
-#: contrib/localflavor/ca/forms.py:81
+#: contrib/localflavor/ca/forms.py:88
msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXXX format."
msgstr ""
-"Introdueixi un número vàlid de la Seguretat Social de Canada en el format "
+"Introdueixi un número vàlid de la Seguretat Social de Canadà en el format "
"XXX-XXX-XXXX."
#: contrib/localflavor/ch/ch_states.py:5
@@ -1863,11 +1864,11 @@ msgstr "Zug"
msgid "Zurich"
msgstr "Zurich"
-#: contrib/localflavor/ch/forms.py:18 contrib/localflavor/no/forms.py:14
+#: contrib/localflavor/ch/forms.py:16 contrib/localflavor/no/forms.py:12
msgid "Enter a zip code in the format XXXX."
msgstr "Introdueixi un codi zip en el format XXXX."
-#: contrib/localflavor/ch/forms.py:90
+#: contrib/localflavor/ch/forms.py:64
msgid ""
"Enter a valid Swiss identity or passport card number in X1234567<0 or "
"1234567890 format."
@@ -1875,13 +1876,17 @@ msgstr ""
"Introdueixi un número de identificació o de passaport Suïssos en els formats "
"1234567890 o X1234567<0."
-#: contrib/localflavor/cl/forms.py:32
-msgid "Enter valid a Chilean RUT. The format is XX.XXX.XXX-X."
+#: contrib/localflavor/cl/forms.py:29
+msgid "Enter a valid Chilean RUT."
+msgstr "Introdueixi un RUT Xilè vàlid."
+
+#: contrib/localflavor/cl/forms.py:30
+msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
msgstr "Introdueixi un RUT Xilè vàlid. El format és XX.XXX.XXX-X"
-#: contrib/localflavor/cl/forms.py:37
-msgid "Enter valid a Chilean RUT"
-msgstr "Introdueixi un RUT Xilè vàlid."
+#: contrib/localflavor/cl/forms.py:31
+msgid "The Chilean RUT is not valid."
+msgstr "El RUT Xilè no és vàlid."
#: contrib/localflavor/de/de_states.py:5
msgid "Baden-Wuerttemberg"
@@ -1947,12 +1952,12 @@ msgstr "Schleswig-Holstein"
msgid "Thuringia"
msgstr "Thuringia"
-#: contrib/localflavor/de/forms.py:16 contrib/localflavor/fi/forms.py:14
-#: contrib/localflavor/fr/forms.py:17
+#: contrib/localflavor/de/forms.py:14 contrib/localflavor/fi/forms.py:12
+#: contrib/localflavor/fr/forms.py:15
msgid "Enter a zip code in the format XXXXX."
msgstr "Introdueixi un codi zip en el format XXXXX."
-#: contrib/localflavor/de/forms.py:60
+#: contrib/localflavor/de/forms.py:41
msgid ""
"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
"format."
@@ -2227,7 +2232,7 @@ msgstr "Comunitat Foral de Navarra"
msgid "Valencian Community"
msgstr "Comunitat Valenciana"
-#: contrib/localflavor/es/forms.py:22
+#: contrib/localflavor/es/forms.py:19
msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
msgstr "Introdueixi un codi postal en rang i format 01XXX - 52XXX."
@@ -2239,40 +2244,42 @@ msgstr ""
"Introdueixi un número de telèfon vàlid en un dels formats 6XXXXXXXX, "
"8XXXXXXXX o 9XXXXXXXX."
-#: contrib/localflavor/es/forms.py:73 contrib/localflavor/es/forms.py:108
-#: db/models/fields/related.py:55
-#, python-format
-msgid "Please enter a valid %s."
-msgstr "Si us plau, introdueixi un %s vàlid."
+#: contrib/localflavor/es/forms.py:66
+msgid "Please enter a valid NIF, NIE, or CIF."
+msgstr "Si us plau, introdueixi un NIF, NIE o CIF vàlid."
-#: contrib/localflavor/es/forms.py:91
+#: contrib/localflavor/es/forms.py:67
+msgid "Please enter a valid NIF or NIE."
+msgstr "Si us plau, introdueixi un NIF o NIE vàlid."
+
+#: contrib/localflavor/es/forms.py:68
msgid "Invalid checksum for NIF."
msgstr "Validació invàlida del NIF."
-#: contrib/localflavor/es/forms.py:97
+#: contrib/localflavor/es/forms.py:69
msgid "Invalid checksum for NIE."
msgstr "Validació invàlida del NIE."
-#: contrib/localflavor/es/forms.py:106
+#: contrib/localflavor/es/forms.py:70
msgid "Invalid checksum for CIF."
msgstr "Validació invàlida del CIF."
-#: contrib/localflavor/es/forms.py:136
+#: contrib/localflavor/es/forms.py:142
msgid ""
"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
msgstr ""
"Introdueixi un número de compte bancari vàlid en el format XXXX-XXXX-XX-"
"XXXXXXXXXX."
-#: contrib/localflavor/es/forms.py:150
+#: contrib/localflavor/es/forms.py:143
msgid "Invalid checksum for bank account number."
msgstr "Validació invàlida del número de compte bancari."
-#: contrib/localflavor/fi/forms.py:40 contrib/localflavor/fi/forms.py:45
+#: contrib/localflavor/fi/forms.py:28
msgid "Enter a valid Finnish social security number."
msgstr "Introdueixi un número vàlid de la seguretat social finlandesa."
-#: contrib/localflavor/in_/forms.py:16
+#: contrib/localflavor/in_/forms.py:14
msgid "Enter a zip code in the format XXXXXXX."
msgstr "Introdueixi un codi zip en el format XXXXXXX."
@@ -2282,15 +2289,15 @@ msgid ""
msgstr ""
"Introdueixi un número de identificació d'Islàndia. El format és XXXXXX-XXXX."
-#: contrib/localflavor/is_/forms.py:31
+#: contrib/localflavor/is_/forms.py:18
msgid "The Icelandic identification number is not valid."
msgstr "El número de identificació d'Islàndia no és vàlid."
-#: contrib/localflavor/it/forms.py:16
+#: contrib/localflavor/it/forms.py:14
msgid "Enter a valid zip code."
msgstr "Introdueixi un codi zip vàlid."
-#: contrib/localflavor/it/forms.py:41
+#: contrib/localflavor/it/forms.py:43
msgid "Enter a valid Social Security number."
msgstr "Introdueixi un número valid de la Seguretat Social."
@@ -2298,7 +2305,7 @@ msgstr "Introdueixi un número valid de la Seguretat Social."
msgid "Enter a valid VAT number."
msgstr "Introdueixi un número de IVA (VAT) vàlid."
-#: contrib/localflavor/jp/forms.py:21
+#: contrib/localflavor/jp/forms.py:19
msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
msgstr "Introdueixi un codi postal en el format XXXXXXX o XX-XXXX."
@@ -2490,15 +2497,143 @@ msgstr "Kagoshima"
msgid "Okinawa"
msgstr "Okinawa"
-#: contrib/localflavor/nl/forms.py:25
+#: contrib/localflavor/mx/mx_states.py:12
+msgid "Aguascalientes"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:13
+msgid "Baja California"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:14
+msgid "Baja California Sur"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:15
+msgid "Campeche"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:16
+msgid "Chihuahua"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:17
+msgid "Chiapas"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:18
+msgid "Coahuila"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:19
+msgid "Colima"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:20
+msgid "Distrito Federal"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:21
+msgid "Durango"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:22
+msgid "Guerrero"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:23
+msgid "Guanajuato"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:24
+msgid "Hidalgo"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:25
+msgid "Jalisco"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:26
+msgid "Estado de México"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:27
+msgid "Michoacán"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:28
+msgid "Morelos"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:29
+msgid "Nayarit"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:30
+msgid "Nuevo León"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:31
+msgid "Oaxaca"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:32
+msgid "Puebla"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:33
+msgid "Querétaro"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:34
+msgid "Quintana Roo"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:35
+msgid "Sinaloa"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:36
+msgid "San Luis Potosí"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:37
+msgid "Sonora"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:38
+msgid "Tabasco"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:39
+msgid "Tamaulipas"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:40
+msgid "Tlaxcala"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:41
+msgid "Veracruz"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:42
+msgid "Yucatán"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:43
+msgid "Zacatecas"
+msgstr ""
+
+#: contrib/localflavor/nl/forms.py:21
msgid "Enter a valid postal code"
msgstr "Introdueixi un codi postal vàlid."
-#: contrib/localflavor/nl/forms.py:53
+#: contrib/localflavor/nl/forms.py:52
msgid "Enter a valid phone number"
msgstr "Introdueixi un número de telèfon vàlid."
-#: contrib/localflavor/nl/forms.py:76
+#: contrib/localflavor/nl/forms.py:78
msgid "Enter a valid SoFi number"
msgstr "Introdueixi un número SoFi vàlid."
@@ -2550,23 +2685,23 @@ msgstr "Zeeland"
msgid "Zuid-Holland"
msgstr "Zuid-Holland"
-#: contrib/localflavor/no/forms.py:35
+#: contrib/localflavor/no/forms.py:33
msgid "Enter a valid Norwegian social security number."
msgstr "Introdueixi un número de la seguretat social Noruega vàlid."
-#: contrib/localflavor/pe/forms.py:36
+#: contrib/localflavor/pe/forms.py:24
msgid "This field requires 8 digits."
msgstr "Aquest camp requereix 8 dígits."
-#: contrib/localflavor/pe/forms.py:59
+#: contrib/localflavor/pe/forms.py:52
msgid "This field requires 11 digits."
msgstr "Aquest camp requereix 11 dígits."
-#: contrib/localflavor/pl/forms.py:41
+#: contrib/localflavor/pl/forms.py:39
msgid "National Identification Number consists of 11 digits."
msgstr "El número d'identidicació nacional està compost de 11 digits."
-#: contrib/localflavor/pl/forms.py:47
+#: contrib/localflavor/pl/forms.py:40
msgid "Wrong checksum for the National Identification Number."
msgstr "Validació invàlida del número d'identificació nacional."
@@ -2575,11 +2710,11 @@ msgid ""
"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX or XX-XX-XXX-XXX."
msgstr "Introdueixi un número NIP en el format XXX-XXX-XX-XX o XX-XX-XXX-XXX."
-#: contrib/localflavor/pl/forms.py:78
+#: contrib/localflavor/pl/forms.py:73
msgid "Wrong checksum for the Tax Number (NIP)."
msgstr "Validació invàlida del número tributari (NIP)."
-#: contrib/localflavor/pl/forms.py:107
+#: contrib/localflavor/pl/forms.py:112
msgid "National Business Register Number (REGON) consists of 7 or 9 digits."
msgstr ""
"El número nacional de registre de negocis (REGON) consisteix en 7 o 9 dígits."
@@ -2588,7 +2723,7 @@ msgstr ""
msgid "Wrong checksum for the National Business Register Number (REGON)."
msgstr "Validació invàlida del número nacional de registre de negocis."
-#: contrib/localflavor/pl/forms.py:148
+#: contrib/localflavor/pl/forms.py:156
msgid "Enter a postal code in the format XX-XXX."
msgstr "Introdueixi un codi postal en el format XX-XXX."
@@ -2656,7 +2791,7 @@ msgstr "Greater Poland"
msgid "West Pomerania"
msgstr "West Pomerania"
-#: contrib/localflavor/sk/forms.py:32
+#: contrib/localflavor/sk/forms.py:30
msgid "Enter a postal code in the format XXXXX or XXX XX."
msgstr "Introdueixi un codi postal en el format XXXXX or XXX XX."
@@ -3008,27 +3143,302 @@ msgstr "Regió de Trnava"
msgid "Zilina region"
msgstr "Regió de Zilina"
-#: contrib/localflavor/uk/forms.py:18
-msgid "Enter a postcode. A space is required between the two postcode parts."
+#: contrib/localflavor/uk/forms.py:21
+msgid "Enter a valid postcode."
+msgstr "Introdueixi un codi postal vàlid."
+
+#: contrib/localflavor/uk/uk_regions.py:11
+msgid "Bedfordshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:12
+msgid "Buckinghamshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:14
+msgid "Cheshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:15
+msgid "Cornwall and Isles of Scilly"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:16
+msgid "Cumbria"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:17
+msgid "Derbyshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:18
+msgid "Devon"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:19
+msgid "Dorset"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:20
+msgid "Durham"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:21
+msgid "East Sussex"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:22
+msgid "Essex"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:23
+msgid "Gloucestershire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:24
+msgid "Greater London"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:25
+msgid "Greater Manchester"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:26
+msgid "Hampshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:27
+msgid "Hertfordshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:28
+msgid "Kent"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:29
+msgid "Lancashire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:30
+msgid "Leicestershire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:31
+msgid "Lincolnshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:32
+msgid "Merseyside"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:33
+msgid "Norfolk"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:34
+msgid "North Yorkshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:35
+msgid "Northamptonshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:36
+msgid "Northumberland"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:37
+msgid "Nottinghamshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:38
+msgid "Oxfordshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:39
+msgid "Shropshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:40
+msgid "Somerset"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:41
+msgid "South Yorkshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:42
+msgid "Staffordshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:43
+msgid "Suffolk"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:44
+msgid "Surrey"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:45
+msgid "Tyne and Wear"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:46
+msgid "Warwickshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:47
+msgid "West Midlands"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:48
+msgid "West Sussex"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:49
+msgid "West Yorkshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:50
+msgid "Wiltshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:51
+msgid "Worcestershire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:55
+msgid "County Antrim"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:56
+msgid "County Armagh"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:57
+#: contrib/localflavor/uk/uk_regions.py:58
+msgid "County Down"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:59
+msgid "County Londonderry"
msgstr ""
-"Introdueixi un codi postal. És necessari un espai entre les dues parts del "
-"codi postal."
-#: contrib/localflavor/us/forms.py:18
+#: contrib/localflavor/uk/uk_regions.py:60
+msgid "County Tyrone"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:64
+msgid "Clwyd"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:65
+msgid "Dyfed"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:66
+msgid "Gwent"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:67
+msgid "Gwynedd"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:68
+msgid "Mid Glamorgan"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:69
+msgid "Powys"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:70
+msgid "South Glamorgan"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:71
+msgid "West Glamorgan"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:75
+msgid "Borders"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:76
+msgid "Central Scotland"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:77
+msgid "Dumfries and Galloway"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:78
+msgid "Fife"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:79
+msgid "Grampian"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:80
+msgid "Highland"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:81
+msgid "Lothian"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:82
+msgid "Orkney Islands"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:83
+msgid "Shetland Islands"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:84
+msgid "Strathclyde"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:85
+msgid "Tayside"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:86
+msgid "Western Isles"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:90
+msgid "England"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:91
+msgid "Northern Ireland"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:92
+msgid "Scotland"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:93
+msgid "Wales"
+msgstr ""
+
+#: contrib/localflavor/us/forms.py:16
msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
msgstr "Introdueixi un codi zip en el format XXXXX o XXXXX-XXXX."
-#: contrib/localflavor/us/forms.py:51
+#: contrib/localflavor/us/forms.py:54
msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
msgstr ""
"Introdueixi un número vàlid de la Seguretat Social dels E.U.A. en el format "
"XXX-XX-XXXX."
-#: contrib/localflavor/za/forms.py:22
+#: contrib/localflavor/za/forms.py:20
msgid "Enter a valid South African ID number"
msgstr "Introdueixi un número d'Identitat Sud Africà valid"
-#: contrib/localflavor/za/forms.py:57
+#: contrib/localflavor/za/forms.py:54
msgid "Enter a valid South African postal code"
msgstr "Introdueixi un codi postal Sud Africà vàlid."
@@ -3503,6 +3913,11 @@ msgstr "Introdueixi un nom de fitxer vàlid."
msgid "This value must be either None, True or False."
msgstr "Aquest valor ha de ser None (Cap), True (Veritat) o False (Fals)"
+#: db/models/fields/related.py:55
+#, python-format
+msgid "Please enter a valid %s."
+msgstr "Si us plau, introdueixi un %s vàlid."
+
#: db/models/fields/related.py:658
msgid "Separate multiple IDs with commas."
msgstr "Separi múltiples IDs amb comes."
@@ -3599,7 +4014,7 @@ msgstr "Introdueixi una URL vàlida."
msgid "This URL appears to be a broken link."
msgstr "Aquesta URL sembla ser un enllaç trencat."
-#: newforms/fields.py:555 newforms/models.py:155
+#: newforms/fields.py:555 newforms/models.py:317
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Esculli una opció vàlida; Aquesta opció no és una de les opcions disponibles."
@@ -3609,7 +4024,7 @@ msgstr ""
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Esculli una opció vàlida. %(value)s no és una de les opcions vàlides."
-#: newforms/fields.py:595 newforms/fields.py:657 newforms/models.py:215
+#: newforms/fields.py:595 newforms/fields.py:657 newforms/models.py:377
msgid "Enter a list of values."
msgstr "Introdueixi una llista de valors."
@@ -3617,7 +4032,7 @@ msgstr "Introdueixi una llista de valors."
msgid "Enter a valid IPv4 address."
msgstr "Introdueixi una adreça IPv4 vàlida."
-#: newforms/models.py:216
+#: newforms/models.py:378
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Esculli una opció vàlida; %s' no és una de les opcions vàlides."
@@ -3650,28 +4065,28 @@ msgstr "Introdueixi un número positiu."
msgid "Enter a whole number between 0 and 32,767."
msgstr "Introdueixi un número entre 0 i 32,767."
-#: template/defaultfilters.py:658
+#: template/defaultfilters.py:683
msgid "yes,no,maybe"
msgstr "si,no,potser"
-#: template/defaultfilters.py:689
+#: template/defaultfilters.py:714
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:691
+#: template/defaultfilters.py:716
#, python-format
msgid "%.1f KB"
msgstr "%.1f KB"
-#: template/defaultfilters.py:693
+#: template/defaultfilters.py:718
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
-#: template/defaultfilters.py:694
+#: template/defaultfilters.py:719
#, python-format
msgid "%.1f GB"
msgstr "%.1f GB"
@@ -3968,3 +4383,9 @@ msgstr "El/La %(verbose_name)s s'ha actualtzat amb èxit."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "El %(verbose_name)s s'ha eliminat."
+
+#~ msgid ""
+#~ "Enter a postcode. A space is required between the two postcode parts."
+#~ msgstr ""
+#~ "Introdueixi un codi postal. És necessari un espai entre les dues parts "
+#~ "del codi postal."
BIN  django/conf/locale/hr/LC_MESSAGES/django.mo
View
Binary file not shown
4,870 django/conf/locale/hr/LC_MESSAGES/django.po
View
2,967 additions, 1,903 deletions not shown
BIN  django/conf/locale/hr/LC_MESSAGES/djangojs.mo
View
Binary file not shown
63 django/conf/locale/hr/LC_MESSAGES/djangojs.po
View
@@ -1,118 +1,117 @@
-# 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.
+# translation of djangojs.po to Hrvatski jezik
+# This file is distributed under the same license as the Django package.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: djangojs\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-08-13 11:13+1000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2008-01-05 01:45+0100\n"
+"Last-Translator: Aljosa Mohorovic <aljosa.mohorovic@gmail.com>\n"
+"Language-Team: Hrvatski jezik\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 ""
+msgstr "Dostupno %s"
#: contrib/admin/media/js/SelectFilter2.js:41
msgid "Choose all"
-msgstr ""
+msgstr "Odaberi sve"
#: contrib/admin/media/js/SelectFilter2.js:46
msgid "Add"
-msgstr ""
+msgstr "Dodaj"
#: contrib/admin/media/js/SelectFilter2.js:48
msgid "Remove"
-msgstr ""
+msgstr "Ukloni"
#: contrib/admin/media/js/SelectFilter2.js:53
#, perl-format
msgid "Chosen %s"
-msgstr ""
+msgstr "Odabrano %s"
#: contrib/admin/media/js/SelectFilter2.js:54
msgid "Select your choice(s) and click "
-msgstr ""
+msgstr "Odaberi iz izbora i klikni "
#: contrib/admin/media/js/SelectFilter2.js:59
msgid "Clear all"
-msgstr ""
+msgstr "Očisti sve"
#: contrib/admin/media/js/dateparse.js:32
#: contrib/admin/media/js/calendar.js:24
msgid ""
"January February March April May June July August September October November "
"December"
-msgstr ""
+msgstr "Siječanj Veljača Ožujak Travanj Svibanj Lipanj Srpanj Kolovoz Rujan Listopad Studeni Prosinac"
#: contrib/admin/media/js/dateparse.js:33
msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
-msgstr ""
+msgstr "Nedjelja Ponedjeljak Utorak Srijeda Četvrtak Petak Subota"
#: contrib/admin/media/js/calendar.js:25
msgid "S M T W T F S"
-msgstr ""
+msgstr "N P U S Č P S"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:47
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
msgid "Now"
-msgstr ""
+msgstr "Sada"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:51
msgid "Clock"
-msgstr ""
+msgstr "Sat"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:78
msgid "Choose a time"
-msgstr ""
+msgstr "Izaberite vrijeme"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
msgid "Midnight"
-msgstr ""
+msgstr "Ponoć"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
msgid "6 a.m."
-msgstr ""
+msgstr "6 ujutro"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
msgid "Noon"
-msgstr ""
+msgstr "Podne"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:88
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:183
msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:128
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:177
msgid "Today"
-msgstr ""
+msgstr "Danas"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:132
msgid "Calendar"
-msgstr ""
+msgstr "Kalendar"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:175
msgid "Yesterday"
-msgstr ""
+msgstr "Jučer"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179
msgid "Tomorrow"
-msgstr ""
+msgstr "Sutra"
#: contrib/admin/media/js/admin/CollapsedFieldsets.js:34
#: contrib/admin/media/js/admin/CollapsedFieldsets.js:72
msgid "Show"
-msgstr ""
+msgstr "Prikaži"
#: contrib/admin/media/js/admin/CollapsedFieldsets.js:63
msgid "Hide"
-msgstr ""
+msgstr "Sakri"
+
BIN  django/conf/locale/ja/LC_MESSAGES/django.mo
View
Binary file not shown
1,743 django/conf/locale/ja/LC_MESSAGES/django.po
View
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Django 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-27 13:00+0900\n"
+"POT-Creation-Date: 2007-12-31 21:26+0900\n"
"PO-Revision-Date: 2006-05-18 00:28+0900\n"
"Last-Translator: makoto tsuyuki <mtsuyuki@gmail.com>\n"
"Language-Team: Japanese <django-ja@googlegroups.com>\n"
@@ -75,118 +75,126 @@ msgid "French"
msgstr "フランス語"
#: conf/global_settings.py:54
+msgid "Gaeilge"
+msgstr "アイルランド語"
+
+#: conf/global_settings.py:55
msgid "Galician"
msgstr "ガリシア語"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:56
msgid "Hungarian"
msgstr "ハンガリー語"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:57
msgid "Hebrew"
msgstr "ヘブライ語"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:58
msgid "Croatian"
msgstr "クロアチア語"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:59
msgid "Icelandic"
msgstr "アイスランド語"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Italian"
msgstr "イタリア語"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Japanese"
msgstr "日本語"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Korean"
msgstr "韓国語"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
+msgid "Khmer"
+msgstr "クメール語"
+
+#: conf/global_settings.py:64
msgid "Kannada"
msgstr "カンナダ語"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:65
msgid "Latvian"
msgstr "ラトビア語"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:66
msgid "Macedonian"
msgstr "マケドニア語"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:67
msgid "Dutch"
msgstr "オランダ語"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:68
msgid "Norwegian"
msgstr "ノルウェー語"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:69
msgid "Polish"
msgstr "ポーランド語"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:70
msgid "Portugese"
msgstr "ポルトガル語"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:71
msgid "Brazilian"
msgstr "ブラジル語"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:72
msgid "Romanian"
msgstr "ルーマニア語"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:73
msgid "Russian"
msgstr "ロシア語"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:74
msgid "Slovak"
msgstr "スロバキア語"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:75
msgid "Slovenian"
msgstr "スロヴェニア語"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:76
msgid "Serbian"
msgstr "セルビア語"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:77
msgid "Swedish"
msgstr "スウェーデン語"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:78
msgid "Tamil"
msgstr "タミル語"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:79
msgid "Telugu"
msgstr "テルグ語"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:80
msgid "Turkish"
msgstr "トルコ語"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:81
msgid "Ukrainian"
msgstr "ウクライナ語"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:82
msgid "Simplified Chinese"
msgstr "簡体字中国語"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:83
msgid "Traditional Chinese"
msgstr "繁体字中国語"
-#: contrib/admin/filterspecs.py:42
+#: contrib/admin/filterspecs.py:44
#, python-format
msgid ""
"<h3>By %s:</h3>\n"
@@ -195,71 +203,71 @@ msgstr ""
"<h3>%s で絞り込む</h3>\n"
"<ul>\n"
-#: contrib/admin/filterspecs.py:72 contrib/admin/filterspecs.py:90
-#: contrib/admin/filterspecs.py:145 contrib/admin/filterspecs.py:171
+#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:92
+#: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173
msgid "All"
msgstr "全て"
-#: contrib/admin/filterspecs.py:111
+#: contrib/admin/filterspecs.py:113
msgid "Any date"
msgstr "いつでも"
-#: contrib/admin/filterspecs.py:112
+#: contrib/admin/filterspecs.py:114
msgid "Today"
msgstr "今日"
-#: contrib/admin/filterspecs.py:115
+#: contrib/admin/filterspecs.py:117
msgid "Past 7 days"
msgstr "過去 7 日間"
-#: contrib/admin/filterspecs.py:117
+#: contrib/admin/filterspecs.py:119
msgid "This month"
msgstr "今月"
-#: contrib/admin/filterspecs.py:119
+#: contrib/admin/filterspecs.py:121
msgid "This year"
msgstr "今年"
-#: contrib/admin/filterspecs.py:145 newforms/widgets.py:188
-#: oldforms/__init__.py:591
+#: contrib/admin/filterspecs.py:147 newforms/widgets.py:231
+#: oldforms/__init__.py:592
msgid "Yes"
msgstr "はい"
-#: contrib/admin/filterspecs.py:145 newforms/widgets.py:188
-#: oldforms/__init__.py:591
+#: contrib/admin/filterspecs.py:147 newforms/widgets.py:231
+#: oldforms/__init__.py:592
msgid "No"
msgstr "いいえ"
-#: contrib/admin/filterspecs.py:152 newforms/widgets.py:188
-#: oldforms/__init__.py:591
+#: contrib/admin/filterspecs.py:154 newforms/widgets.py:231
+#: oldforms/__init__.py:592
msgid "Unknown"
msgstr "不明"
-#: contrib/admin/models.py:17
+#: contrib/admin/models.py:18
msgid "action time"
msgstr "操作時刻"
-#: contrib/admin/models.py:20
+#: contrib/admin/models.py:21
msgid "object id"
msgstr "オブジェクト ID"
-#: contrib/admin/models.py:21
+#: contrib/admin/models.py:22
msgid "object repr"
msgstr "オブジェクトの文字列表現"
-#: contrib/admin/models.py:22
+#: contrib/admin/models.py:23
msgid "action flag"
msgstr "操作種別"
-#: contrib/admin/models.py:23
+#: contrib/admin/models.py:24
msgid "change message"
msgstr "変更メッセージ"
-#: contrib/admin/models.py:26
+#: contrib/admin/models.py:27
msgid "log entry"
msgstr "ログエントリ"
-#: contrib/admin/models.py:27
+#: contrib/admin/models.py:28
msgid "log entries"
msgstr "ログエントリ"
@@ -273,17 +281,17 @@ msgid "We're sorry, but the requested page could not be found."
msgstr "申し訳ありませんが、お探しのページは見つかりませんでした。"
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/base.html:30
-#: contrib/admin/templates/admin/change_form.html:13
-#: contrib/admin/templates/admin/change_list.html:6
-#: contrib/admin/templates/admin/delete_confirmation.html:6
+#: contrib/admin/templates/admin/base.html:37
+#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/delete_confirmation.html:5
#: contrib/admin/templates/admin/invalid_setup.html:4
-#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/auth/user/change_password.html:12
+#: contrib/admin/templates/admin/object_history.html:4
+#: contrib/admin/templates/admin/auth/user/change_password.html:11
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
#: contrib/admin/templates/registration/logged_out.html:4
-#: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
#: contrib/admin/templates/registration/password_reset_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
msgid "Home"
@@ -309,63 +317,22 @@ msgstr ""
"エラーが発生しました。エラーをサイトの管理者にメールで報告しましたので、近い"
"うちに修正されるはずです。しばらくお待ちください。"
-#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/base.html:26
msgid "Welcome,"
msgstr "ようこそ"
-#: contrib/admin/templates/admin/base.html:25
-#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/auth/user/change_password.html:9
+#: contrib/admin/templates/admin/base.html:28
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
msgid "Documentation"
msgstr "ドキュメント"
-#: contrib/admin/templates/admin/base.html:25
-#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/auth/user/change_password.html:9
-#: contrib/admin/templates/admin/auth/user/change_password.html:15
-#: contrib/admin/templates/admin/auth/user/change_password.html:46
-#: contrib/admin/templates/admin_doc/bookmarklets.html:4
-#: contrib/admin/templates/admin_doc/index.html:4
-#: contrib/admin/templates/admin_doc/missing_docutils.html:4
-#: contrib/admin/templates/admin_doc/model_detail.html:3
-#: contrib/admin/templates/admin_doc/model_index.html:5
-#: contrib/admin/templates/admin_doc/template_detail.html:4
-#: contrib/admin/templates/admin_doc/template_filter_index.html:5
-#: contrib/admin/templates/admin_doc/template_tag_index.html:5
-#: contrib/admin/templates/admin_doc/view_detail.html:4
-#: contrib/admin/templates/admin_doc/view_index.html:5
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/auth/user/change_password.html:14
+#: contrib/admin/templates/admin/auth/user/change_password.html:45
msgid "Change password"
msgstr "パスワードの変更"
-#: contrib/admin/templates/admin/base.html:25
-#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/auth/user/change_password.html:9
-#: contrib/admin/templates/admin_doc/bookmarklets.html:4
-#: contrib/admin/templates/admin_doc/index.html:4
-#: contrib/admin/templates/admin_doc/missing_docutils.html:4
-#: contrib/admin/templates/admin_doc/model_detail.html:3
-#: contrib/admin/templates/admin_doc/model_index.html:5
-#: contrib/admin/templates/admin_doc/template_detail.html:4
-#: contrib/admin/templates/admin_doc/template_filter_index.html:5
-#: contrib/admin/templates/admin_doc/template_tag_index.html:5
-#: contrib/admin/templates/admin_doc/view_detail.html:4
-#: contrib/admin/templates/admin_doc/view_index.html:5
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/admin/base.html:30
#: contrib/comments/templates/comments/form.html:6
msgid "Log out"
msgstr "ログアウト"
@@ -378,46 +345,46 @@ msgstr "Django サイト管理"
msgid "Django administration"
msgstr "Django 管理サイト"
-#: contrib/admin/templates/admin/change_form.html:15
+#: contrib/admin/templates/admin/change_form.html:14
#: contrib/admin/templates/admin/index.html:28
msgid "Add"
msgstr "追加"
-#: contrib/admin/templates/admin/change_form.html:21
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:20
+#: contrib/admin/templates/admin/object_history.html:4
msgid "History"
msgstr "履歴"
-#: contrib/admin/templates/admin/change_form.html:22
+#: contrib/admin/templates/admin/change_form.html:21
msgid "View on site"
msgstr "サイト上で表示"
-#: contrib/admin/templates/admin/change_form.html:32
-#: contrib/admin/templates/admin/auth/user/change_password.html:24
+#: contrib/admin/templates/admin/change_form.html:31
+#: contrib/admin/templates/admin/auth/user/change_password.html:23
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] "下記のエラーを修正してください。"
msgstr[1] "下記のエラーを修正してください。"
-#: contrib/admin/templates/admin/change_form.html:50
+#: contrib/admin/templates/admin/change_form.html:49
msgid "Ordering"
msgstr "順序"
-#: contrib/admin/templates/admin/change_form.html:53
+#: contrib/admin/templates/admin/change_form.html:52
msgid "Order:"
msgstr "並び変え:"
-#: contrib/admin/templates/admin/change_list.html:12
+#: contrib/admin/templates/admin/change_list.html:11
#, python-format
msgid "Add %(name)s"
msgstr "%(name)s を追加"
-#: contrib/admin/templates/admin/delete_confirmation.html:9
+#: contrib/admin/templates/admin/delete_confirmation.html:8
#: contrib/admin/templates/admin/submit_line.html:3
msgid "Delete"
msgstr "削除"
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/delete_confirmation.html:13
#, python-format
msgid ""
"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -428,7 +395,7 @@ msgstr ""
"除しようとしましたが、あなたのアカウントには以下のタイプのオブジェクトを削除"
"するパーミッションがありません:"
-#: contrib/admin/templates/admin/delete_confirmation.html:21
+#: contrib/admin/templates/admin/delete_confirmation.html:20
#, python-format
msgid ""
"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -437,7 +404,7 @@ msgstr ""
"%(object_name)s \"%(escaped_object)s\"を削除しますか? 関連づけられている以下"
"のオブジェクトも全て削除されます:"
-#: contrib/admin/templates/admin/delete_confirmation.html:26
+#: contrib/admin/templates/admin/delete_confirmation.html:25
msgid "Yes, I'm sure"
msgstr "はい。"
@@ -501,27 +468,27 @@ msgid "Password:"
msgstr "パスワード:"
#: contrib/admin/templates/admin/login.html:25
-#: contrib/admin/views/decorators.py:24
+#: contrib/admin/views/decorators.py:25
msgid "Log in"
msgstr "ログイン"
-#: contrib/admin/templates/admin/object_history.html:18
+#: contrib/admin/templates/admin/object_history.html:17
msgid "Date/time"
msgstr "日付/時刻"
-#: contrib/admin/templates/admin/object_history.html:19
+#: contrib/admin/templates/admin/object_history.html:18
msgid "User"
msgstr "ユーザ"
-#: contrib/admin/templates/admin/object_history.html:20
+#: contrib/admin/templates/admin/object_history.html:19
msgid "Action"
msgstr "操作"
-#: contrib/admin/templates/admin/object_history.html:26
+#: contrib/admin/templates/admin/object_history.html:25
msgid "DATE_WITH_TIME_FULL"
msgstr "Y/m/d H:i:s"
-#: contrib/admin/templates/admin/object_history.html:36
+#: contrib/admin/templates/admin/object_history.html:35
msgid ""
"This object doesn't have a change history. It probably wasn't added via this "
"admin site."
@@ -578,21 +545,21 @@ msgid "Username"
msgstr "ユーザ名"
#: contrib/admin/templates/admin/auth/user/add_form.html:18
-#: contrib/admin/templates/admin/auth/user/change_password.html:34
+#: contrib/admin/templates/admin/auth/user/change_password.html:33
msgid "Password"
msgstr "パスワード"
#: contrib/admin/templates/admin/auth/user/add_form.html:23
-#: contrib/admin/templates/admin/auth/user/change_password.html:39
+#: contrib/admin/templates/admin/auth/user/change_password.html:38
msgid "Password (again)"
msgstr "パスワード(確認用)"
#: contrib/admin/templates/admin/auth/user/add_form.html:24
-#: contrib/admin/templates/admin/auth/user/change_password.html:40
+#: contrib/admin/templates/admin/auth/user/change_password.html:39
msgid "Enter the same password as above, for verification."
msgstr "確認のため、再度パスワードを入力してください。"
-#: contrib/admin/templates/admin/auth/user/change_password.html:28
+#: contrib/admin/templates/admin/auth/user/change_password.html:27
#, python-format
msgid "Enter a new password for the user <strong>%(username)s</strong>."
msgstr ""
@@ -602,11 +569,11 @@ msgstr ""
msgid "Bookmarklets"
msgstr "ブックマークレット"
-#: contrib/admin/templates/admin_doc/bookmarklets.html:5
+#: contrib/admin/templates/admin_doc/bookmarklets.html:4
msgid "Documentation bookmarklets"
msgstr "ドキュメントへのブックマークレット"
-#: contrib/admin/templates/admin_doc/bookmarklets.html:9
+#: contrib/admin/templates/admin_doc/bookmarklets.html:8
msgid ""
"\n"
"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -626,40 +593,40 @@ msgstr ""
"参照していなければならないことがあります。内部ネットワークにあるかどうか不明"
"な場合は、システム管理者に確認してください。</p>\n"
-#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+#: contrib/admin/templates/admin_doc/bookmarklets.html:18
msgid "Documentation for this page"
msgstr "このページのドキュメント"
-#: contrib/admin/templates/admin_doc/bookmarklets.html:20
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
msgid ""
"Jumps you from any page to the documentation for the view that generates "
"that page."
msgstr "各ページから、ページを生成したビューのドキュメントにジャンプします。"
-#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+#: contrib/admin/templates/admin_doc/bookmarklets.html:21
msgid "Show object ID"
msgstr "オブジェクト ID を表示"
-#: contrib/admin/templates/admin_doc/bookmarklets.html:23
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
msgid ""
"Shows the content-type and unique ID for pages that represent a single "
"object."
msgstr ""
"単一のオブジェクトを表示するページのコンテンツタイプと一意な IDを表示します。"
-#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+#: contrib/admin/templates/admin_doc/bookmarklets.html:24
msgid "Edit this object (current window)"
msgstr "オブジェクトを (現在のウィンドウで) 編集"
-#: contrib/admin/templates/admin_doc/bookmarklets.html:26
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
msgid "Jumps to the admin page for pages that represent a single object."
msgstr "単一のオブジェクトを表示するページの管理ページへジャンプします。"
-#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+#: contrib/admin/templates/admin_doc/bookmarklets.html:27
msgid "Edit this object (new window)"
msgstr "オブジェクトを (新しいウィンドウで) 編集"
-#: contrib/admin/templates/admin_doc/bookmarklets.html:29
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
msgid "As above, but opens the admin page in a new window."
msgstr "上と同じですが、新しいウィンドウで管理ページを開きます。"
@@ -671,23 +638,23 @@ msgstr "ご利用ありがとうございました。"
msgid "Log in again"
msgstr "もう一度ログイン"
-#: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/registration/password_change_form.html:6
-#: contrib/admin/templates/registration/password_change_form.html:10
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/registration/password_change_form.html:5
+#: contrib/admin/templates/registration/password_change_form.html:9
msgid "Password change"
msgstr "パスワードの変更"
-#: contrib/admin/templates/registration/password_change_done.html:6
-#: contrib/admin/templates/registration/password_change_done.html:10
+#: contrib/admin/templates/registration/password_change_done.html:5
+#: contrib/admin/templates/registration/password_change_done.html:9
msgid "Password change successful"
msgstr "パスワードを変更しました"
-#: contrib/admin/templates/registration/password_change_done.html:12
+#: contrib/admin/templates/registration/password_change_done.html:11
msgid "Your password was changed."
msgstr "あなたのパスワードは変更されました"
-#: contrib/admin/templates/registration/password_change_form.html:12
+#: contrib/admin/templates/registration/password_change_form.html:11
msgid ""
"Please enter your old password, for security's sake, and then enter your new "
"password twice so we can verify you typed it in correctly."
@@ -695,19 +662,19 @@ msgstr ""
"セキュリティ上の理由から元のパスワードの入力が必要です。新しいパスワードは正"
"しく入力したか確認できるように二度入力してください。"
-#: contrib/admin/templates/registration/password_change_form.html:17
+#: contrib/admin/templates/registration/password_change_form.html:16
msgid "Old password:"
msgstr "元のパスワード:"
-#: contrib/admin/templates/registration/password_change_form.html:19
+#: contrib/admin/templates/registration/password_change_form.html:18
msgid "New password:"
msgstr "新しいパスワード:"
-#: contrib/admin/templates/registration/password_change_form.html:21
+#: contrib/admin/templates/registration/password_change_form.html:20
msgid "Confirm password:"
msgstr "新しいパスワード (確認用) :"
-#: contrib/admin/templates/registration/password_change_form.html:23
+#: contrib/admin/templates/registration/password_change_form.html:22
msgid "Change my password"
msgstr "パスワードの変更"
@@ -796,17 +763,17 @@ msgstr "現在:"
msgid "Change:"
msgstr "変更:"
-#: contrib/admin/templatetags/admin_list.py:254
+#: contrib/admin/templatetags/admin_list.py:257
msgid "All dates"
msgstr "いつでも"
-#: contrib/admin/views/auth.py:20 contrib/admin/views/main.py:264
+#: contrib/admin/views/auth.py:20 contrib/admin/views/main.py:267
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "%(name)s \"%(obj)s\" を追加しました。"
-#: contrib/admin/views/auth.py:25 contrib/admin/views/main.py:268
-#: contrib/admin/views/main.py:354
+#: contrib/admin/views/auth.py:25 contrib/admin/views/main.py:271
+#: contrib/admin/views/main.py:356
msgid "You may edit it again below."
msgstr "続けて編集できます。"
@@ -823,14 +790,14 @@ msgstr "パスワードを変更しました"
msgid "Change password: %s"
msgstr "パスワードの変更: %s"
-#: contrib/admin/views/decorators.py:10 contrib/auth/forms.py:60
+#: contrib/admin/views/decorators.py:11 contrib/auth/forms.py:60
msgid ""
"Please enter a correct username and password. Note that both fields are case-"
"sensitive."
msgstr ""
"正しいユーザ名とパスワードを入力してください (大文字小文字は区別します) 。"
-#: contrib/admin/views/decorators.py:62
+#: contrib/admin/views/decorators.py:63
msgid ""
"Please log in again, because your session has expired. Don't worry: Your "
"submission has been saved."
@@ -838,7 +805,7 @@ msgstr ""
"再ログインしてください。ログインセッションが有効期間切れしてしまいました。入"
"力データは失われておりませんのでご安心ください。"
-#: contrib/admin/views/decorators.py:69
+#: contrib/admin/views/decorators.py:70
msgid ""
"Looks like your browser isn't configured to accept cookies. Please enable "
"cookies, reload this page, and try again."
@@ -846,245 +813,245 @@ msgstr ""
"ブラウザがクッキーの使用を許可していないようです。クッキーの使用を許可して、"
"もう一度このページを表示してください。"
-#: contrib/admin/views/decorators.py:83
+#: contrib/admin/views/decorators.py:84
msgid "Usernames cannot contain the '@' character."
msgstr "ユーザ名には '@' を含められません。"
-#: contrib/admin/views/decorators.py:85
+#: contrib/admin/views/decorators.py:86
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr "メールアドレスはユーザ名ではありません。 '%s' を試してみてください。"
-#: contrib/admin/views/doc.py:47 contrib/admin/views/doc.py:49
-#: contrib/admin/views/doc.py:51
+#: contrib/admin/views/doc.py:48 contrib/admin/views/doc.py:50
+#: contrib/admin/views/doc.py:52
msgid "tag:"
msgstr "タグ"
-#: contrib/admin/views/doc.py:78 contrib/admin/views/doc.py:80
-#: contrib/admin/views/doc.py:82
+#: contrib/admin/views/doc.py:79 contrib/admin/views/doc.py:81
+#: contrib/admin/views/doc.py:83
msgid "filter:"
msgstr "フィルタ"
-#: contrib/admin/views/doc.py:136 contrib/admin/views/doc.py:138
-#: contrib/admin/views/doc.py:140
+#: contrib/admin/views/doc.py:137 contrib/admin/views/doc.py:139
+#: contrib/admin/views/doc.py:141
msgid "view:"
msgstr "ビュー"
-#: contrib/admin/views/doc.py:165
+#: contrib/admin/views/doc.py:166
#, python-format
msgid "App %r not found"
msgstr "アプリケーション %r が見つかりません"
-#: contrib/admin/views/doc.py:172
+#: contrib/admin/views/doc.py:173
#, python-format
msgid "Model %(name)r not found in app %(label)r"
msgstr "モデル %(name)r が %(label)r アプリケーションに見つかりません"
-#: contrib/admin/views/doc.py:184
+#: contrib/admin/views/doc.py:185
#, python-format
msgid "the related `%(label)s.%(type)s` object"
msgstr "`%(label)s.%(type)s` (関連オブジェクト)"
-#: contrib/admin/views/doc.py:184 contrib/admin/views/doc.py:206
-#: contrib/admin/views/doc.py:220 contrib/admin/views/doc.py:225
+#: contrib/admin/views/doc.py:185 contrib/admin/views/doc.py:207
+#: contrib/admin/views/doc.py:221 contrib/admin/views/doc.py:226
msgid "model:"
msgstr "モデル :"
-#: contrib/admin/views/doc.py:215
+#: contrib/admin/views/doc.py:216
#, python-format
msgid "related `%(label)s.%(name)s` objects"
msgstr "`%(label)s.%(name)s` (関連オブジェクト)"
-#: contrib/admin/views/doc.py:220
+#: contrib/admin/views/doc.py:221
#, python-format
msgid "all %s"
msgstr "全ての %s"
-#: contrib/admin/views/doc.py:225
+#: contrib/admin/views/doc.py:226
#, python-format
msgid "number of %s"
msgstr "%s の数"
-#: contrib/admin/views/doc.py:230
+#: contrib/admin/views/doc.py:231
#, python-format
msgid "Fields on %s objects"
msgstr "%s のフィールド"
-#: contrib/admin/views/doc.py:292 contrib/admin/views/doc.py:303
-#: contrib/admin/views/doc.py:305 contrib/admin/views/doc.py:311
-#: contrib/admin/views/doc.py:312 contrib/admin/views/doc.py:314
+#: contrib/admin/views/doc.py:293 contrib/admin/views/doc.py:304
+#: contrib/admin/views/doc.py:306 contrib/admin/views/doc.py:312
+#: contrib/admin/views/doc.py:313 contrib/admin/views/doc.py:315
msgid "Integer"
msgstr "整数"
-#: contrib/admin/views/doc.py:293
+#: contrib/admin/views/doc.py:294
msgid "Boolean (Either True or False)"
msgstr "ブール値 (真: True または偽: False)"
-#: contrib/admin/views/doc.py:294 contrib/admin/views/doc.py:313
+#: contrib/admin/views/doc.py:295 contrib/admin/views/doc.py:314
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "文字列 ( %(max_length)s 字まで )"
-#: contrib/admin/views/doc.py:295
+#: contrib/admin/views/doc.py:296
msgid "Comma-separated integers"
msgstr "カンマ区切りの整数"
-#: contrib/admin/views/doc.py:296
+#: contrib/admin/views/doc.py:297
msgid "Date (without time)"
msgstr "日付"
-#: contrib/admin/views/doc.py:297
+#: contrib/admin/views/doc.py:298
msgid "Date (with time)"
msgstr "日時"
-#: contrib/admin/views/doc.py:298
+#: contrib/admin/views/doc.py:299
msgid "Decimal number"
msgstr "10 進数 (小数可)"
-#: contrib/admin/views/doc.py:299
+#: contrib/admin/views/doc.py:300
msgid "E-mail address"
msgstr "メールアドレス"
-#: contrib/admin/views/doc.py:300 contrib/admin/views/doc.py:301
-#: contrib/admin/views/doc.py:304
+#: contrib/admin/views/doc.py:301 contrib/admin/views/doc.py:302
+#: contrib/admin/views/doc.py:305
msgid "File path"
msgstr "ファイルの場所"
-#: contrib/admin/views/doc.py:302
+#: contrib/admin/views/doc.py:303
msgid "Floating point number"
msgstr "浮動小数点"
-#: contrib/admin/views/doc.py:306 contrib/comments/models.py:85
+#: contrib/admin/views/doc.py:307 contrib/comments/models.py:85
msgid "IP address"
msgstr "IP アドレス"
-#: contrib/admin/views/doc.py:308
+#: contrib/admin/views/doc.py:309
msgid "Boolean (Either True, False or None)"
msgstr "ブール値 (真: True 、偽: False または None)"
-#: contrib/admin/views/doc.py:309
+#: contrib/admin/views/doc.py:310
msgid "Relation to parent model"
msgstr "親モデルへのリレーション"
-#: contrib/admin/views/doc.py:310
+#: contrib/admin/views/doc.py:311
msgid "Phone number"
msgstr "電話番号"
-#: contrib/admin/views/doc.py:315
+#: contrib/admin/views/doc.py:316
msgid "Text"
msgstr "テキスト"
-#: contrib/admin/views/doc.py:316
+#: contrib/admin/views/doc.py:317
msgid "Time"
msgstr "時刻"
-#: contrib/admin/views/doc.py:317 contrib/flatpages/models.py:7
+#: contrib/admin/views/doc.py:318 contrib/flatpages/models.py:7
msgid "URL"
msgstr "URL"
-#: contrib/admin/views/doc.py:318
+#: contrib/admin/views/doc.py:319
msgid "U.S. state (two uppercase letters)"
msgstr "アメリカの州 (大文字二文字で)"
-#: contrib/admin/views/doc.py:319
+#: contrib/admin/views/doc.py:320
msgid "XML text"
msgstr "XMLテキスト"
-#: contrib/admin/views/doc.py:345
+#: contrib/admin/views/doc.py:346
#, python-format
msgid "%s does not appear to be a urlpattern object"
msgstr "%s はurlpatternオブジェクトでは無いようです"
-#: contrib/admin/views/main.py:230
+#: contrib/admin/views/main.py:233
msgid "Site administration"
msgstr "サイト管理"
-#: contrib/admin/views/main.py:278 contrib/admin/views/main.py:363
+#: contrib/admin/views/main.py:280 contrib/admin/views/main.py:365
#, python-format
msgid "You may add another %s below."
msgstr "続けて別の %s を追加できます。"
-#: contrib/admin/views/main.py:296
+#: contrib/admin/views/main.py:298
#, python-format
msgid "Add %s"
msgstr "%s を追加"
-#: contrib/admin/views/main.py:342
+#: contrib/admin/views/main.py:344
#, python-format
msgid "Added %s."
msgstr "%s を追加しました。"
-#: contrib/admin/views/main.py:342 contrib/admin/views/main.py:344
-#: contrib/admin/views/main.py:346 core/validators.py:275
-#: db/models/manipulators.py:310
+#: contrib/admin/views/main.py:344 contrib/admin/views/main.py:346
+#: contrib/admin/views/main.py:348 core/validators.py:283
+#: db/models/manipulators.py:309
msgid "and"
msgstr "と"
-#: contrib/admin/views/main.py:344
+#: contrib/admin/views/main.py:346
#, python-format
msgid "Changed %s."
msgstr "%s を変更しました。"
-#: contrib/admin/views/main.py:346
+#: contrib/admin/views/main.py:348
#, python-format
msgid "Deleted %s."
msgstr "%s を削除しました。"
-#: contrib/admin/views/main.py:349
+#: contrib/admin/views/main.py:351
msgid "No fields changed."
msgstr "変更はありませんでした。"
-#: contrib/admin/views/main.py:352
+#: contrib/admin/views/main.py:354
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "%(name)s \"%(obj)s\" を変更しました。"
-#: contrib/admin/views/main.py:360
+#: contrib/admin/views/main.py:362
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr "%(name)s \"%(obj)s\" を追加しました。続けて編集できます。"
-#: contrib/admin/views/main.py:398
+#: contrib/admin/views/main.py:400
#, python-format
msgid "Change %s"
msgstr "%s を変更"
-#: contrib/admin/views/main.py:483
+#: contrib/admin/views/main.py:487
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr "%(name)s に %(fieldname)s が一つ以上あります: %(obj)s"
-#: contrib/admin/views/main.py:488
+#: contrib/admin/views/main.py:492
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr "%(name)s に %(fieldname)s が一つ以上あります:"
-#: contrib/admin/views/main.py:520
+#: contrib/admin/views/main.py:524
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "%(name)s \"%(obj)s\" を削除しました。"
-#: contrib/admin/views/main.py:523
+#: contrib/admin/views/main.py:527
msgid "Are you sure?"
msgstr "よろしいですか?"
-#: contrib/admin/views/main.py:545
+#: contrib/admin/views/main.py:549
#, python-format
msgid "Change history: %s"
msgstr "変更履歴: %s"
-#: contrib/admin/views/main.py:579
+#: contrib/admin/views/main.py:583
#, python-format
msgid "Select %s"
msgstr "%s を選択"
-#: contrib/admin/views/main.py:579
+#: contrib/admin/views/main.py:583
#, python-format
msgid "Select %s to change"
msgstr "変更する %s を選択"
-#: contrib/admin/views/main.py:780
+#: contrib/admin/views/main.py:784
msgid "Database error"
msgstr "データベースエラー"
@@ -1114,6 +1081,11 @@ msgid ""
"you've registered?"
msgstr "メールアドレスの一致するユーザはいません。本当に登録しましたか?"
+#: contrib/auth/forms.py:107
+#, python-format
+msgid "Password reset on %s"
+msgstr "%s にパスワードをリセット"
+
#: contrib/auth/forms.py:117
msgid "The two 'new password' fields didn't match."
msgstr "新しいパスワード(確認用)が一致しません。"
@@ -1122,35 +1094,35 @@ msgstr "新しいパスワード(確認用)が一致しません。"
msgid "Your old password was entered incorrectly. Please enter it again."
msgstr "元のパスワードが間違っています。もう一度入力してください。"
-#: contrib/auth/models.py:53 contrib/auth/models.py:73
+#: contrib/auth/models.py:73 contrib/auth/models.py:93
msgid "name"
msgstr "名前"
-#: contrib/auth/models.py:55
+#: contrib/auth/models.py:75
msgid "codename"
msgstr "コード名"
-#: contrib/auth/models.py:58
+#: contrib/auth/models.py:78
msgid "permission"
msgstr "パーミッション"
-#: contrib/auth/models.py:59 contrib/auth/models.py:74
+#: contrib/auth/models.py:79 contrib/auth/models.py:94
msgid "permissions"
msgstr "パーミッション"
-#: contrib/auth/models.py:77
+#: contrib/auth/models.py:97
msgid "group"
msgstr "グループ"
-#: contrib/auth/models.py:78 contrib/auth/models.py:121
+#: contrib/auth/models.py:98 contrib/auth/models.py:141
msgid "groups"
msgstr "グループ"
-#: contrib/auth/models.py:111
+#: contrib/auth/models.py:131
msgid "username"
msgstr "ユーザ名"
-#: contrib/auth/models.py:111
+#: contrib/auth/models.py:131
msgid ""
"Required. 30 characters or fewer. Alphanumeric characters only (letters, "
"digits and underscores)."
@@ -1158,23 +1130,23 @@ msgstr ""
"この項目は必須です。半角アルファベット、半角数字、半角アンダーバーで30文字以"
"下にしてください。"
-#: contrib/auth/models.py:112
+#: contrib/auth/models.py:132
msgid "first name"
msgstr "名"
-#: contrib/auth/models.py:113
+#: contrib/auth/models.py:133
msgid "last name"
msgstr "姓"
-#: contrib/auth/models.py:114
+#: contrib/auth/models.py:134
msgid "e-mail address"
msgstr "メールアドレス"
-#: contrib/auth/models.py:115
+#: contrib/auth/models.py:135
msgid "password"
msgstr "パスワード"
-#: contrib/auth/models.py:115
+#: contrib/auth/models.py:135
msgid ""
"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
"password form</a>."
@@ -1182,43 +1154,43 @@ msgstr ""
"'[algo]$[salt]$[hexdigest]'形式か、<a href=\"password/\">パスワード変更フォー"
"ム</a>を使ってください。"
-#: contrib/auth/models.py:116
+#: contrib/auth/models.py:136
msgid "staff status"
msgstr "スタッフ権限"
-#: contrib/auth/models.py:116
+#: contrib/auth/models.py:136
msgid "Designates whether the user can log into this admin site."
msgstr "ユーザが管理サイトにログイン可能かどうかを示します。"
-#: contrib/auth/models.py:117
+#: contrib/auth/models.py:137
msgid "active"
msgstr "有効"
-#: contrib/auth/models.py:117
+#: contrib/auth/models.py:137
msgid ""
"Designates whether this user can log into the Django admin. Unselect this "
"instead of deleting accounts."
msgstr "ユーザが管理サイトにログイン可能かどうかを示します。"
-#: contrib/auth/models.py:118
+#: contrib/auth/models.py:138
msgid "superuser status"
msgstr "スーパーユーザ権限"
-#: contrib/auth/models.py:118
+#: contrib/auth/models.py:138
msgid ""
"Designates that this user has all permissions without explicitly assigning "
"them."
msgstr "全ての権限を持っているとみなされます。"
-#: contrib/auth/models.py:119
+#: contrib/auth/models.py:139
msgid "last login"
msgstr "最終ログイン"
-#: contrib/auth/models.py:120
+#: contrib/auth/models.py:140
msgid "date joined"
msgstr "登録日"
-#: contrib/auth/models.py:122
+#: contrib/auth/models.py:142
msgid ""
"In addition to the permissions manually assigned, this user will also get "
"all permissions granted to each group he/she is in."
@@ -1226,35 +1198,35 @@ msgstr ""
"手動で付与したパーミッションに加え、所属しているグループに付与された全ての"
"パーミッションを獲得します。"
-#: contrib/auth/models.py:123
+#: contrib/auth/models.py:143
msgid "user permissions"
msgstr "ユーザパーミッション"
-#: contrib/auth/models.py:127
+#: contrib/auth/models.py:147
msgid "user"
msgstr "ユーザ"
-#: contrib/auth/models.py:128
+#: contrib/auth/models.py:148
msgid "users"
msgstr "ユーザ"
-#: contrib/auth/models.py:134
+#: contrib/auth/models.py:154
msgid "Personal info"
msgstr "個人情報"
-#: contrib/auth/models.py:135
+#: contrib/auth/models.py:155
msgid "Permissions"
msgstr "パーミッション"
-#: contrib/auth/models.py:136
+#: contrib/auth/models.py:156
msgid "Important dates"
msgstr "重要な日程"
-#: contrib/auth/models.py:137
+#: contrib/auth/models.py:157
msgid "Groups"
msgstr "グループ"
-#: contrib/auth/models.py:288
+#: contrib/auth/models.py:316
msgid "message"
msgstr "メッセージ"
@@ -1508,23 +1480,23 @@ msgstr ""
"\n"
"%(text)s"
-#: contrib/comments/views/comments.py:189
-#: contrib/comments/views/comments.py:281
+#: contrib/comments/views/comments.py:190
+#: contrib/comments/views/comments.py:283
msgid "Only POSTs are allowed"
msgstr "POST メソッドのみ有効です。"
-#: contrib/comments/views/comments.py:193
-#: contrib/comments/views/comments.py:285
+#: contrib/comments/views/comments.py:194
+#: contrib/comments/views/comments.py:287
msgid "One or more of the required fields wasn't submitted"
msgstr "必須項目がいくつか入力されていません。"
-#: contrib/comments/views/comments.py:197
-#: contrib/comments/views/comments.py:287
+#: contrib/comments/views/comments.py:198
+#: contrib/comments/views/comments.py:289
msgid "Somebody tampered with the comment form (security violation)"
msgstr "だれかがコメントフォームを改竄しています (セキュリティ侵害です)"
-#: contrib/comments/views/comments.py:207
-#: contrib/comments/views/comments.py:293
+#: contrib/comments/views/comments.py:208
+#: contrib/comments/views/comments.py:295
msgid ""
"The comment form had an invalid 'target' parameter -- the object ID was "
"invalid"
@@ -1532,20 +1504,20 @@ msgstr ""
"コメントフォームの 'target' パラメータが不正です。 -- オブジェクト IDが不正な"
"値でした"
-#: contrib/comments/views/comments.py:258
-#: contrib/comments/views/comments.py:322
+#: contrib/comments/views/comments.py:259
+#: contrib/comments/views/comments.py:324
msgid "The comment form didn't provide either 'preview' or 'post'"
msgstr "コメントの「プレビュー」「投稿」種別が不明です。"
-#: contrib/comments/views/karma.py:20
+#: contrib/comments/views/karma.py:21
msgid "Anonymous users cannot vote"
msgstr "非ログインユーザは投票できません。"
-#: contrib/comments/views/karma.py:24
+#: contrib/comments/views/karma.py:25
msgid "Invalid comment ID"
msgstr "コメント ID が不正です"
-#: contrib/comments/views/karma.py:26
+#: contrib/comments/views/karma.py:27
msgid "No voting for yourself"
msgstr "自分には投票できません。"
@@ -1623,80 +1595,103 @@ msgstr "番目"