Permalink
Browse files

[full-history]

* Merge from trunk revisions 4733-4812 (with svnmerge)



git-svn-id: http://code.djangoproject.com/svn/django/branches/full-history@4815 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 994b526 commit 77518506b5011b0fdd10606e014b300eb55e3215 Uroš Trebec committed Mar 24, 2007
Showing with 5,783 additions and 2,294 deletions.
  1. +1 −0 AUTHORS
  2. +1 −1 django/__init__.py
  3. +1 −0 django/conf/global_settings.py
  4. BIN django/conf/locale/it/LC_MESSAGES/django.mo
  5. +32 −32 django/conf/locale/it/LC_MESSAGES/django.po
  6. BIN django/conf/locale/pl/LC_MESSAGES/djangojs.mo
  7. +112 −0 django/conf/locale/pl/LC_MESSAGES/djangojs.po
  8. BIN django/conf/locale/pt/LC_MESSAGES/django.mo
  9. +2,125 −0 django/conf/locale/pt/LC_MESSAGES/django.po
  10. BIN django/conf/locale/pt/LC_MESSAGES/djangojs.mo
  11. +108 −0 django/conf/locale/pt/LC_MESSAGES/djangojs.po
  12. BIN django/conf/locale/ta/LC_MESSAGES/django.mo
  13. +606 −581 django/conf/locale/ta/LC_MESSAGES/django.po
  14. BIN django/conf/locale/ta/LC_MESSAGES/djangojs.mo
  15. +112 −0 django/conf/locale/ta/LC_MESSAGES/djangojs.po
  16. BIN django/conf/locale/tr/LC_MESSAGES/django.mo
  17. +1,707 −1,446 django/conf/locale/tr/LC_MESSAGES/django.po
  18. +1 −1 django/contrib/formtools/templates/formtools/form.html
  19. +2 −2 django/contrib/formtools/templates/formtools/preview.html
  20. +6 −1 django/contrib/sessions/middleware.py
  21. +18 −1 django/contrib/sessions/models.py
  22. +8 −2 django/core/management.py
  23. +10 −10 django/core/serializers/base.py
  24. +2 −2 django/core/serializers/pyyaml.py
  25. +9 −0 django/core/serializers/xml_serializer.py
  26. +10 −2 django/db/backends/mysql/base.py
  27. 0 django/db/backends/mysql_old/__init__.py
  28. +233 −0 django/db/backends/mysql_old/base.py
  29. +14 −0 django/db/backends/mysql_old/client.py
  30. +29 −0 django/db/backends/mysql_old/creation.py
  31. +95 −0 django/db/backends/mysql_old/introspection.py
  32. +2 −1 django/db/models/fields/__init__.py
  33. +1 −0 django/db/models/fields/generic.py
  34. +1 −0 django/db/models/options.py
  35. +3 −1 django/db/models/query.py
  36. +2 −2 django/shortcuts/__init__.py
  37. +4 −4 django/template/defaulttags.py
  38. +8 −0 django/test/client.py
  39. +1 −1 django/utils/datastructures.py
  40. +1 −1 django/utils/text.py
  41. +10 −10 docs/add_ons.txt
  42. +7 −7 docs/contributing.txt
  43. +61 −61 docs/databases.txt
  44. +1 −1 docs/distributions.txt
  45. +1 −35 docs/django-admin.txt
  46. +3 −4 docs/generic_views.txt
  47. +7 −7 docs/i18n.txt
  48. +4 −12 docs/install.txt
  49. +0 −2 docs/middleware.txt
  50. +7 −9 docs/model-api.txt
  51. +4 −3 docs/newforms.txt
  52. +264 −0 docs/release_notes_0.96.txt
  53. +0 −1 docs/request_response.txt
  54. +2 −1 docs/serialization.txt
  55. +0 −2 docs/sessions.txt
  56. +2 −9 docs/settings.txt
  57. +5 −13 docs/templates.txt
  58. +6 −2 docs/testing.txt
  59. +0 −4 docs/url_dispatch.txt
  60. +1 −1 tests/modeltests/empty/models.py
  61. +1 −1 tests/modeltests/field_defaults/models.py
  62. +1 −1 tests/modeltests/fixtures/models.py
  63. +1 −1 tests/modeltests/generic_relations/models.py
  64. +4 −4 tests/modeltests/get_object_or_404/models.py
  65. +1 −1 tests/modeltests/get_or_create/models.py
  66. +1 −1 tests/modeltests/m2m_and_m2o/models.py
  67. +1 −1 tests/modeltests/m2m_recursive/models.py
  68. +1 −1 tests/modeltests/manipulators/models.py
  69. +1 −1 tests/modeltests/model_forms/models.py
  70. +1 −1 tests/modeltests/pagination/models.py
  71. +1 −1 tests/modeltests/select_related/models.py
  72. +1 −1 tests/modeltests/serializers/models.py
  73. +38 −2 tests/modeltests/test_client/models.py
  74. +1 −0 tests/modeltests/test_client/urls.py
  75. +34 −0 tests/modeltests/test_client/views.py
  76. +1 −1 tests/modeltests/validation/models.py
  77. +6 −0 tests/regressiontests/defaultfilters/tests.py
  78. +18 −1 tests/regressiontests/serializers_regress/models.py
  79. +20 −0 tests/regressiontests/serializers_regress/tests.py
View
@@ -133,6 +133,7 @@ answer newbie questions, and generally made Django that much better:
masonsimon+django@gmail.com
Manuzhai
Petar Marić <http://www.petarmaric.com/>
+ Nuno Mariz <nmariz@gmail.com>
mark@junklight.com
Yasushi Masuda <whosaysni@gmail.com>
mattycakes@gmail.com
View
@@ -1 +1 @@
-VERSION = (0, 96, 'pre')
+VERSION = (0, 96, None)
@@ -61,6 +61,7 @@
('nl', gettext_noop('Dutch')),
('no', gettext_noop('Norwegian')),
('pl', gettext_noop('Polish')),
+ ('pt', gettext_noop('Portugese')),
('pt-br', gettext_noop('Brazilian')),
('ro', gettext_noop('Romanian')),
('ru', gettext_noop('Russian')),
Binary file not shown.
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-02-26 20:44+0100\n"
-"PO-Revision-Date: 2007-02-27 20:06+0100\n"
+"PO-Revision-Date: 2007-03-14 19:29+0100\n"
"Last-Translator: Nicola Larosa <nico@tekNico.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -523,7 +523,7 @@ msgstr ""
#: contrib/auth/forms.py:17 contrib/auth/forms.py:138
msgid "The two password fields didn't match."
-msgstr "I due campi parola chiave non corrispondono."
+msgstr "I due campi password non corrispondono."
#: contrib/auth/forms.py:25
msgid "A user with that username already exists."
@@ -555,7 +555,7 @@ msgstr "Questo indirizzo email non è associato ad alcun account utente. Sei sic
#: contrib/auth/forms.py:117
msgid "The two 'new password' fields didn't match."
-msgstr "I due campi 'nuova parola chiave' non corrispondono."
+msgstr "I due campi 'nuova password' non corrispondono."
#: contrib/auth/forms.py:124
msgid "Your old password was entered incorrectly. Please enter it again."
@@ -609,13 +609,13 @@ msgstr "indirizzo e-mail"
#: contrib/auth/models.py:94
msgid "password"
-msgstr "parola chiave"
+msgstr "password"
#: contrib/auth/models.py:94
msgid ""
"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
"password form</a>."
-msgstr "Usare '[algo]$[salt]$[hexdigest]' oppure la maschera di <a href=\"password/\">cambio parola chiave</a>."
+msgstr "Usare '[algo]$[salt]$[hexdigest]' oppure la maschera di <a href=\"password/\">cambio password</a>."
#: contrib/auth/models.py:95
msgid "staff status"
@@ -1040,12 +1040,12 @@ msgstr "Aggiungi utente"
#: contrib/admin/views/auth.py:57
msgid "Password changed successfully."
-msgstr "La parola chiave è stata cambiata correttamente."
+msgstr "La password è stata cambiata correttamente."
#: contrib/admin/views/auth.py:64
#, python-format
msgid "Change password: %s"
-msgstr "Cambia la parola chiave: %s"
+msgstr "Cambia la password: %s"
#: contrib/admin/templatetags/admin_list.py:247
msgid "All dates"
@@ -1088,7 +1088,7 @@ msgstr "Documentazione"
#: contrib/admin/templates/registration/password_change_form.html:3
#: contrib/admin/templates/registration/password_change_done.html:3
msgid "Change password"
-msgstr "Cambia la parola chiave"
+msgstr "Cambia la password"
#: contrib/admin/templates/admin/delete_confirmation.html:3
#: contrib/admin/templates/admin/change_form.html:10
@@ -1335,11 +1335,11 @@ msgstr "Nome utente:"
#: contrib/admin/templates/admin/login.html:20
#: contrib/comments/templates/comments/form.html:8
msgid "Password:"
-msgstr "Parola chiave:"
+msgstr "Password:"
#: contrib/admin/templates/admin/login.html:22
msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
-msgstr "Hai <a href=\"/password_reset/\">dimenticato la parola chiave</a>?"
+msgstr "Hai <a href=\"/password_reset/\">dimenticato la password</a>?"
#: contrib/admin/templates/admin/base.html:25
msgid "Welcome,"
@@ -1349,7 +1349,7 @@ msgstr "Benvenuto,"
msgid ""
"First, enter a username and password. Then, you'll be able to edit more user "
"options."
-msgstr "Inserire innanzitutto nome utente e parola chiave. Si potrà quindi modificare le altre impostazioni dell'utente."
+msgstr "Inserire innanzitutto nome utente e password. Si potrà quindi modificare le altre impostazioni dell'utente."
#: contrib/admin/templates/admin/auth/user/add_form.html:12
msgid "Username"
@@ -1358,22 +1358,22 @@ msgstr "Nome utente"
#: contrib/admin/templates/admin/auth/user/add_form.html:18
#: contrib/admin/templates/admin/auth/user/change_password.html:34
msgid "Password"
-msgstr "Parola chiave"
+msgstr "Password"
#: contrib/admin/templates/admin/auth/user/add_form.html:23
#: contrib/admin/templates/admin/auth/user/change_password.html:39
msgid "Password (again)"
-msgstr "Parola chiave (di nuovo)"
+msgstr "Password (di nuovo)"
#: contrib/admin/templates/admin/auth/user/add_form.html:24
#: contrib/admin/templates/admin/auth/user/change_password.html:40
msgid "Enter the same password as above, for verification."
-msgstr "Inserire la stessa parola chiave inserita sopra, come verifica."
+msgstr "Inserire la stessa password inserita sopra, come verifica."
#: contrib/admin/templates/admin/auth/user/change_password.html:28
#, python-format
msgid "Enter a new password for the user <strong>%(username)s</strong>."
-msgstr "Inserire una nuova parola chiave per l'utente <strong>%(username)s</strong>."
+msgstr "Inserire una nuova password per l'utente <strong>%(username)s</strong>."
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
msgid "Bookmarklets"
@@ -1460,25 +1460,25 @@ msgstr "Modifica:"
#: contrib/admin/templates/registration/password_reset_form.html:10
#: contrib/admin/templates/registration/password_reset_done.html:4
msgid "Password reset"
-msgstr "Reimposta la parola chiave"
+msgstr "Reimposta la password"
#: contrib/admin/templates/registration/password_reset_form.html:12
msgid ""
"Forgotten your password? Enter your e-mail address below, and we'll reset "
"your password and e-mail the new one to you."
-msgstr "Dimenticata la parola chiave? Inserire il proprio indirizzo e-mail qui sotto: la parola chiave sarà reimpostata, e la nuova ti verrà inviata per e-mail."
+msgstr "Dimenticata la password? Inserire il proprio indirizzo e-mail qui sotto: la password sarà reimpostata, e la nuova ti verrà inviata per e-mail."
#: contrib/admin/templates/registration/password_reset_form.html:16
msgid "E-mail address:"
msgstr "Indirizzo e-mail:"
#: contrib/admin/templates/registration/password_reset_form.html:16
msgid "Reset my password"
-msgstr "Reimposta la mia parola chiave"
+msgstr "Reimposta la mia password"
#: contrib/admin/templates/registration/password_reset_email.html:2
msgid "You're receiving this e-mail because you requested a password reset"
-msgstr "Hai ricevuto questa e-mail perché hai chiesto di reimpostare la parola chiave"
+msgstr "Hai ricevuto questa e-mail perché hai chiesto di reimpostare la password"
#: contrib/admin/templates/registration/password_reset_email.html:3
#, python-format
@@ -1488,11 +1488,11 @@ msgstr "per il tuo account utente su %(site_name)s"
#: contrib/admin/templates/registration/password_reset_email.html:5
#, python-format
msgid "Your new password is: %(new_password)s"
-msgstr "La tua nuova parola chiave è: %(new_password)s"
+msgstr "La tua nuova password è: %(new_password)s"
#: contrib/admin/templates/registration/password_reset_email.html:7
msgid "Feel free to change this password by going to this page:"
-msgstr "Puoi liberamente cambiare la tua parola chiave tramite questa pagina:"
+msgstr "Puoi liberamente cambiare la tua password tramite questa pagina:"
#: contrib/admin/templates/registration/password_reset_email.html:11
msgid "Your username, in case you've forgotten:"
@@ -1518,51 +1518,51 @@ msgstr "Accedi di nuovo"
#: contrib/admin/templates/registration/password_reset_done.html:6
#: contrib/admin/templates/registration/password_reset_done.html:10
msgid "Password reset successful"
-msgstr "Parola chiave reimpostata correttamente"
+msgstr "Password reimpostata correttamente"
#: contrib/admin/templates/registration/password_reset_done.html:12
msgid ""
"We've e-mailed a new password to the e-mail address you submitted. You "
"should be receiving it shortly."
-msgstr "La nuova parola chiave è stata inviata all'indirizzo e-mail inserito. Arriverà a breve."
+msgstr "La nuova password è stata inviata all'indirizzo e-mail inserito. Arriverà a breve."
#: 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:4
msgid "Password change"
-msgstr "Cambio di parola chiave"
+msgstr "Cambio password"
#: contrib/admin/templates/registration/password_change_form.html:12
msgid ""
"Please enter your old password, for security's sake, and then enter your new "
"password twice so we can verify you typed it in correctly."
-msgstr "Inserire l'attuale parola chiave, per ragioni di sicurezza, e poi la nuova parola chiave due volte, per verificare di averla scritta correttamente."
+msgstr "Inserire l'attuale password, per ragioni di sicurezza, e poi la nuova password due volte, per verificare di averla scritta correttamente."
#: contrib/admin/templates/registration/password_change_form.html:17
msgid "Old password:"
-msgstr "Parola chiave attuale:"
+msgstr "Password attuale:"
#: contrib/admin/templates/registration/password_change_form.html:19
msgid "New password:"
-msgstr "Nuova parola chiave:"
+msgstr "Nuova password:"
#: contrib/admin/templates/registration/password_change_form.html:21
msgid "Confirm password:"
-msgstr "Confermare la parola chiave:"
+msgstr "Confermare la password:"
#: contrib/admin/templates/registration/password_change_form.html:23
msgid "Change my password"
-msgstr "Modifica la mia parola chiave"
+msgstr "Modifica la mia password"
#: contrib/admin/templates/registration/password_change_done.html:6
#: contrib/admin/templates/registration/password_change_done.html:10
msgid "Password change successful"
-msgstr "Cambio di parola chiave avvenuto correttamente"
+msgstr "Cambio di password avvenuto correttamente"
#: contrib/admin/templates/registration/password_change_done.html:12
msgid "Your password was changed."
-msgstr "La parola chiave è stata cambiata."
+msgstr "La password è stata cambiata."
#: contrib/sites/models.py:10
msgid "domain name"
@@ -1905,7 +1905,7 @@ msgstr "Il modulo di commento non fornisce né 'anteprima' né 'invia'"
#: contrib/comments/templates/comments/form.html:8
msgid "Forgotten your password?"
-msgstr "Hai dimenticato la parola chiave?"
+msgstr "Hai dimenticato la password?"
#: contrib/comments/templates/comments/form.html:12
msgid "Ratings"
Binary file not shown.
@@ -0,0 +1,112 @@
+# translation of djangojs.po to Polish
+# Copyright (C) 2007 Michal Chruszcz
+# This file is distributed under the same license as the django package.
+#
+# Michal Chruszcz <troll@pld-linux.org>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: 0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-12-09 11:51+0100\n"
+"PO-Revision-Date: 2007-03-12 11:42+0100\n"
+"Last-Translator: Michal Chruszcz <troll@pld-linux.org>\n"
+"Language-Team: Polish <pl@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"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: contrib/admin/media/js/SelectFilter2.js:33
+#, perl-format
+msgid "Available %s"
+msgstr "Dostępne %s"
+
+#: contrib/admin/media/js/SelectFilter2.js:41
+msgid "Choose all"
+msgstr "Wybierz wszystko"
+
+#: contrib/admin/media/js/SelectFilter2.js:46
+msgid "Add"
+msgstr "Dodaj"
+
+#: contrib/admin/media/js/SelectFilter2.js:48
+msgid "Remove"
+msgstr "Usuń"
+
+#: contrib/admin/media/js/SelectFilter2.js:53
+#, perl-format
+msgid "Chosen %s"
+msgstr "Wybrano %s"
+
+#: contrib/admin/media/js/SelectFilter2.js:54
+#, fuzzy
+msgid "Select your choice(s) and click "
+msgstr "Zaznacz swój wybór i kliknij "
+
+#: contrib/admin/media/js/SelectFilter2.js:59
+msgid "Clear all"
+msgstr "Wyczyść wszystko"
+
+#: 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 "Styczeń Luty Marzec Kwiecień Maj Czerwiec Lipiec Sierpień Wrzesień Październik Listopad Grudzień"
+
+#: contrib/admin/media/js/dateparse.js:27
+msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
+msgstr "Niedziela Poniedziałek Wtorek Środa Czwartek Piątek Sobota"
+
+#: contrib/admin/media/js/calendar.js:25
+msgid "S M T W T F S"
+msgstr "N Pn Wt Śr Cz Pt So"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:45
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:80
+msgid "Now"
+msgstr "Teraz"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:48
+msgid "Clock"
+msgstr "Zegar"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:77
+msgid "Choose a time"
+msgstr "Wybierz czas"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
+msgid "Midnight"
+msgstr "Północ"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
+msgid "6 a.m."
+msgstr "6 rano"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
+msgid "Noon"
+msgstr "Południe"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:87
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:168
+msgid "Cancel"
+msgstr "Anuluj"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:111
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:162
+msgid "Today"
+msgstr "Dzisiaj"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:114
+msgid "Calendar"
+msgstr "Kalendarz"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:160
+msgid "Yesterday"
+msgstr "Wczoraj"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:164
+msgid "Tomorrow"
+msgstr "Jutro"
+
Binary file not shown.
Oops, something went wrong.

0 comments on commit 7751850

Please sign in to comment.