Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[soc2009/admin-ui] Merging up to trunk svn:r11382 into my branch (thi…

…s time from the right directory)

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/admin-ui@11400 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit ba47aebc6d88f64249faec8bad6239ae2998db89 1 parent 98fc6a1
@zain zain authored
Showing with 21,697 additions and 10,466 deletions.
  1. +5 −1 AUTHORS
  2. +2 −3 django/__init__.py
  3. BIN  django/conf/locale/ar/LC_MESSAGES/django.mo
  4. +111 −68 django/conf/locale/ar/LC_MESSAGES/django.po
  5. BIN  django/conf/locale/bn/LC_MESSAGES/django.mo
  6. +3,494 −1,446 django/conf/locale/bn/LC_MESSAGES/django.po
  7. BIN  django/conf/locale/bn/LC_MESSAGES/djangojs.mo
  8. +38 −42 django/conf/locale/bn/LC_MESSAGES/djangojs.po
  9. BIN  django/conf/locale/ca/LC_MESSAGES/django.mo
  10. +321 −228 django/conf/locale/ca/LC_MESSAGES/django.po
  11. BIN  django/conf/locale/cs/LC_MESSAGES/django.mo
  12. +1,285 −914 django/conf/locale/cs/LC_MESSAGES/django.po
  13. BIN  django/conf/locale/da/LC_MESSAGES/django.mo
  14. +477 −662 django/conf/locale/da/LC_MESSAGES/django.po
  15. BIN  django/conf/locale/de/LC_MESSAGES/django.mo
  16. +135 −97 django/conf/locale/de/LC_MESSAGES/django.po
  17. BIN  django/conf/locale/es/LC_MESSAGES/django.mo
  18. +321 −235 django/conf/locale/es/LC_MESSAGES/django.po
  19. BIN  django/conf/locale/es_AR/LC_MESSAGES/django.mo
  20. +104 −99 django/conf/locale/es_AR/LC_MESSAGES/django.po
  21. BIN  django/conf/locale/et/LC_MESSAGES/django.mo
  22. +186 −143 django/conf/locale/et/LC_MESSAGES/django.po
  23. BIN  django/conf/locale/fi/LC_MESSAGES/django.mo
  24. +657 −305 django/conf/locale/fi/LC_MESSAGES/django.po
  25. BIN  django/conf/locale/he/LC_MESSAGES/django.mo
  26. +277 −684 django/conf/locale/he/LC_MESSAGES/django.po
  27. BIN  django/conf/locale/it/LC_MESSAGES/django.mo
  28. +223 −171 django/conf/locale/it/LC_MESSAGES/django.po
  29. BIN  django/conf/locale/it/LC_MESSAGES/djangojs.mo
  30. +5 −4 django/conf/locale/it/LC_MESSAGES/djangojs.po
  31. BIN  django/conf/locale/ja/LC_MESSAGES/django.mo
  32. +253 −173 django/conf/locale/ja/LC_MESSAGES/django.po
  33. BIN  django/conf/locale/ja/LC_MESSAGES/djangojs.mo
  34. +2 −2 django/conf/locale/ja/LC_MESSAGES/djangojs.po
  35. BIN  django/conf/locale/ko/LC_MESSAGES/django.mo
  36. +3,692 −2,109 django/conf/locale/ko/LC_MESSAGES/django.po
  37. BIN  django/conf/locale/ko/LC_MESSAGES/djangojs.mo
  38. +20 −21 django/conf/locale/ko/LC_MESSAGES/djangojs.po
  39. BIN  django/conf/locale/mk/LC_MESSAGES/django.mo
  40. +495 −269 django/conf/locale/mk/LC_MESSAGES/django.po
  41. BIN  django/conf/locale/nl/LC_MESSAGES/django.mo
  42. +644 −276 django/conf/locale/nl/LC_MESSAGES/django.po
  43. BIN  django/conf/locale/no/LC_MESSAGES/django.mo
  44. +149 −104 django/conf/locale/no/LC_MESSAGES/django.po
  45. BIN  django/conf/locale/pl/LC_MESSAGES/django.mo
  46. +87 −85 django/conf/locale/pl/LC_MESSAGES/django.po
  47. BIN  django/conf/locale/pt/LC_MESSAGES/django.mo
  48. +728 −332 django/conf/locale/pt/LC_MESSAGES/django.po
  49. BIN  django/conf/locale/pt_BR/LC_MESSAGES/django.mo
  50. +160 −107 django/conf/locale/pt_BR/LC_MESSAGES/django.po
  51. BIN  django/conf/locale/ru/LC_MESSAGES/django.mo
  52. +187 −140 django/conf/locale/ru/LC_MESSAGES/django.po
  53. BIN  django/conf/locale/sr/LC_MESSAGES/django.mo
  54. +925 −1,021 django/conf/locale/sr/LC_MESSAGES/django.po
  55. BIN  django/conf/locale/sr/LC_MESSAGES/djangojs.mo
  56. +18 −19 django/conf/locale/sr/LC_MESSAGES/djangojs.po
  57. BIN  django/conf/locale/sr_Latn/LC_MESSAGES/django.mo
  58. +4,436 −0 django/conf/locale/sr_Latn/LC_MESSAGES/django.po
  59. BIN  django/conf/locale/sr_Latn/LC_MESSAGES/djangojs.mo
  60. +120 −0 django/conf/locale/sr_Latn/LC_MESSAGES/djangojs.po
  61. BIN  django/conf/locale/th/LC_MESSAGES/django.mo
  62. +208 −211 django/conf/locale/th/LC_MESSAGES/django.po
  63. BIN  django/conf/locale/th/LC_MESSAGES/djangojs.mo
  64. +14 −13 django/conf/locale/th/LC_MESSAGES/djangojs.po
  65. BIN  django/conf/locale/zh_CN/LC_MESSAGES/django.mo
  66. +102 −17 django/conf/locale/zh_CN/LC_MESSAGES/django.po
  67. BIN  django/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo
  68. +2 −2 django/conf/locale/zh_CN/LC_MESSAGES/djangojs.po
  69. +13 −3 django/conf/urls/defaults.py
  70. +14 −10 django/contrib/admin/options.py
  71. +40 −30 django/contrib/admin/sites.py
  72. +24 −1 django/contrib/admin/templates/admin/base.html
  73. +9 −9 django/contrib/admin/widgets.py
  74. +1 −1  django/contrib/admindocs/templates/admin_doc/index.html
  75. +7 −4 django/contrib/admindocs/views.py
  76. +3 −0  django/contrib/gis/db/models/manager.py
  77. +21 −5 django/contrib/gis/db/models/query.py
  78. +9 −1 django/contrib/gis/db/models/sql/query.py
  79. +6 −3 django/contrib/gis/gdal/prototypes/generation.py
  80. +2 −0  django/contrib/gis/geos/prototypes/topology.py
  81. +26 −15 django/contrib/gis/tests/geoapp/tests.py
  82. +38 −9 django/contrib/gis/tests/relatedapp/tests.py
  83. +17 −2 django/contrib/gis/tests/test_spatialrefsys.py
  84. +2 −1  django/core/management/commands/dumpdata.py
  85. +1 −2  django/core/management/commands/runserver.py
  86. +26 −5 django/core/servers/basehttp.py
  87. +96 −21 django/core/urlresolvers.py
  88. +5 −5 django/db/backends/creation.py
  89. +10 −9 django/db/backends/oracle/base.py
  90. +9 −8 django/db/backends/postgresql/operations.py
  91. +24 −12 django/forms/models.py
  92. +16 −20 django/middleware/http.py
  93. +4 −3 django/template/context.py
  94. +13 −7 django/template/defaulttags.py
  95. +2 −2 django/views/debug.py
  96. +39 −14 docs/_ext/djangodocs.py
  97. +1 −1  docs/_templates/layout.html
  98. +9 −10 docs/faq/admin.txt
  99. +1 −1  docs/howto/custom-model-fields.txt
  100. +23 −2 docs/howto/deployment/modpython.txt
  101. +118 −69 docs/howto/deployment/modwsgi.txt
  102. +7 −3 docs/howto/error-reporting.txt
  103. +2 −1  docs/index.txt
  104. +36 −21 docs/internals/committers.txt
  105. +21 −0 docs/internals/deprecation.txt
  106. +2 −1  docs/internals/index.txt
  107. +16 −15 docs/internals/release-process.txt
  108. +3 −3 docs/intro/tutorial03.txt
  109. BIN  docs/ref/contrib/admin/_images/article_actions.png
  110. +70 −44 docs/ref/contrib/admin/index.txt
  111. +2 −2 docs/ref/contrib/contenttypes.txt
  112. +1 −1  docs/ref/databases.txt
  113. +22 −21 docs/ref/forms/fields.txt
  114. +4 −11 docs/ref/middleware.txt
  115. +41 −1 docs/ref/models/instances.txt
  116. +1 −1  docs/ref/models/querysets.txt
  117. +12 −5 docs/ref/templates/api.txt
  118. +32 −5 docs/ref/templates/builtins.txt
  119. +111 −0 docs/releases/1.1-rc-1.txt
  120. +459 −0 docs/releases/1.1.txt
  121. +3 −1 docs/releases/index.txt
  122. +36 −13 docs/topics/forms/formsets.txt
  123. +193 −10 docs/topics/http/urls.txt
  124. +79 −10 docs/topics/i18n.txt
  125. +30 −7 docs/topics/testing.txt
  126. +2 −2 setup.py
View
6 AUTHORS
@@ -14,6 +14,7 @@ The PRIMARY AUTHORS are (and/or have been):
* Robert Wittams
* Gary Wilson
* Brian Rosner
+ * Justin Bronn
* Karen Tracey
More information on the main contributors to Django can be found in
@@ -131,6 +132,7 @@ answer newbie questions, and generally made Django that much better:
Andrew Durdin <adurdin@gmail.com>
dusk@woofle.net
Andy Dustman <farcepest@gmail.com>
+ J. Clifford Dyer <jcd@unc.edu>
Clint Ecker
Nick Efford <nick@efford.org>
eibaan@gmail.com
@@ -199,6 +201,7 @@ answer newbie questions, and generally made Django that much better:
Ian Holsman <http://feh.holsman.net/>
Kieran Holland <http://www.kieranholland.com>
Sung-Jin Hong <serialx.net@gmail.com>
+ Leo "hylje" Honkanen <sealage@gmail.com>
Richard House <Richard.House@i-logue.com>
Robert Rock Howard <http://djangomojo.com/>
John Huddleston <huddlej@wwu.edu>
@@ -217,7 +220,7 @@ answer newbie questions, and generally made Django that much better:
Michael Josephson <http://www.sdjournal.com/>
jpellerin@gmail.com
junzhang.jn@gmail.com
- Antti Kaihola <http://akaihola.blogspot.com/>
+ Antti Kaihola <http://djangopeople.net/akaihola/>
Bahadır Kandemir <bahadir@pardus.org.tr>
Karderio <karderio@gmail.com>
Nagy Károly <charlie@rendszergazda.com>
@@ -436,6 +439,7 @@ answer newbie questions, and generally made Django that much better:
viestards.lists@gmail.com
George Vilches <gav@thataddress.com>
Vlado <vlado@labath.org>
+ Zachary Voase <zacharyvoase@gmail.com>
Milton Waddams
Chris Wagner <cw264701@ohio.edu>
Rick Wagner <rwagner@physics.ucsd.edu>
View
5 django/__init__.py
@@ -1,4 +1,4 @@
-VERSION = (1, 1, 0, 'beta', 1)
+VERSION = (1, 2, 0, 'alpha', 0)
def get_version():
version = '%s.%s' % (VERSION[0], VERSION[1])
@@ -7,9 +7,8 @@ def get_version():
if VERSION[3:] == ('alpha', 0):
version = '%s pre-alpha' % version
else:
- version = '%s %s' % (version, VERSION[3])
if VERSION[3] != 'final':
- version = '%s %s' % (version, VERSION[4])
+ version = '%s %s %s' % (version, VERSION[3], VERSION[4])
from django.utils.version import get_svn_revision
svn_rev = get_svn_revision()
if svn_rev != u'SVN-unknown':
View
BIN  django/conf/locale/ar/LC_MESSAGES/django.mo
Binary file not shown
View
179 django/conf/locale/ar/LC_MESSAGES/django.po
@@ -1,19 +1,20 @@
# translation of django.po to Arabic
# This file is distributed under the same license as the django package.
#
+# Ossama M. Khayat <okhayat@yahoo.com>, 2009.
msgid ""
msgstr ""
"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-12 07:33+0300\n"
-"PO-Revision-Date: 2009-04-12 08:01+0300\n"
-"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
+"POT-Creation-Date: 2009-05-10 15:09+0300\n"
+"PO-Revision-Date: 2009-05-10 15:18+0300\n"
"Language-Team: Arabic <support@arabeyes.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=4; plural=(n == 1? 0 : (n == 2? 1 : (n <= 10? 2 : 3)))\n\n"
+"\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -219,16 +220,16 @@ msgstr "الصينيّة المبسطة"
msgid "Traditional Chinese"
msgstr "الصينيّة التقليدية"
-#: contrib/admin/actions.py:56
+#: contrib/admin/actions.py:60
#, python-format
msgid "Successfully deleted %(count)d %(items)s."
msgstr "تم حذف %(count)d %(items)s بنجاح."
-#: contrib/admin/actions.py:63 contrib/admin/options.py:1023
+#: contrib/admin/actions.py:67 contrib/admin/options.py:1025
msgid "Are you sure?"
msgstr "هل أنت متأكد؟"
-#: contrib/admin/actions.py:81
+#: contrib/admin/actions.py:85
#, python-format
msgid "Delete selected %(verbose_name_plural)s"
msgstr "حذف %(verbose_name_plural)s المحددون"
@@ -267,15 +268,15 @@ msgstr "هذا الشهر"
msgid "This year"
msgstr "هذه السنة"
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
msgid "Yes"
msgstr "نعم"
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
msgid "No"
msgstr "لا"
-#: contrib/admin/filterspecs.py:154 forms/widgets.py:413
+#: contrib/admin/filterspecs.py:154 forms/widgets.py:434
msgid "Unknown"
msgstr "مجهول"
@@ -315,80 +316,81 @@ msgstr "مُدخلات السجل"
msgid "None"
msgstr "لاشيء"
-#: contrib/admin/options.py:517
+#: contrib/admin/options.py:519
#, python-format
msgid "Changed %s."
msgstr "عدّل %s."
-#: contrib/admin/options.py:517 contrib/admin/options.py:527
-#: contrib/comments/templates/comments/preview.html:16 forms/models.py:306
+#: contrib/admin/options.py:519 contrib/admin/options.py:529
+#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388
+#: forms/models.py:587
msgid "and"
msgstr "و"
-#: contrib/admin/options.py:522
+#: contrib/admin/options.py:524
#, python-format
msgid "Added %(name)s \"%(object)s\"."
msgstr "أضاف %(name)s \"%(object)s\"."
-#: contrib/admin/options.py:526
+#: contrib/admin/options.py:528
#, python-format
msgid "Changed %(list)s for %(name)s \"%(object)s\"."
msgstr "غيّر %(list)s في %(name)s \"%(object)s\"."
-#: contrib/admin/options.py:531
+#: contrib/admin/options.py:533
#, python-format
msgid "Deleted %(name)s \"%(object)s\"."
msgstr "حذف %(name)s \"%(object)s\"."
-#: contrib/admin/options.py:535
+#: contrib/admin/options.py:537
msgid "No fields changed."
msgstr "لم يتم تغيير أية حقول."
-#: contrib/admin/options.py:596 contrib/auth/admin.py:67
+#: contrib/admin/options.py:598 contrib/auth/admin.py:67
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "تم اضافة %(name)s \"%(obj)s\" بنجاح."
-#: contrib/admin/options.py:600 contrib/admin/options.py:633
+#: contrib/admin/options.py:602 contrib/admin/options.py:635
#: contrib/auth/admin.py:75
msgid "You may edit it again below."
msgstr "يمكنك تعديله مجددا في الأسفل."
-#: contrib/admin/options.py:610 contrib/admin/options.py:643
+#: contrib/admin/options.py:612 contrib/admin/options.py:645
#, python-format
msgid "You may add another %s below."
msgstr "يمكنك إضافة %s آخر بالأسفل."
-#: contrib/admin/options.py:631
+#: contrib/admin/options.py:633
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "تم تغيير %(name)s \"%(obj)s\" بنجاح."
-#: contrib/admin/options.py:639
+#: contrib/admin/options.py:641
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr "تمت إضافة %(name)s \"%(obj)s\" بنجاح، يمكنك تعديله مرة أخرى بالأسفل."
-#: contrib/admin/options.py:770
+#: contrib/admin/options.py:772
#, python-format
msgid "Add %s"
msgstr "أضف %s"
-#: contrib/admin/options.py:801 contrib/admin/options.py:1001
+#: contrib/admin/options.py:803 contrib/admin/options.py:1003
#, python-format
msgid "%(name)s object with primary key %(key)r does not exist."
msgstr "العنصر %(name)s الذي به الحقل الأساسي %(key)r غير موجود."
-#: contrib/admin/options.py:858
+#: contrib/admin/options.py:860
#, python-format
msgid "Change %s"
msgstr "عدّل %s"
-#: contrib/admin/options.py:902
+#: contrib/admin/options.py:904
msgid "Database error"
msgstr "خطـأ في قاعدة البيانات"
-#: contrib/admin/options.py:938
+#: contrib/admin/options.py:940
#, python-format
msgid "%(count)s %(name)s was changed successfully."
msgid_plural "%(count)s %(name)s were changed successfully."
@@ -397,12 +399,12 @@ msgstr[1] "تم تغيير عنصري %(name)s بنجاح."
msgstr[2] "تم تغيير %(count)s %(name)s بنجاح."
msgstr[3] "تم تغيير %(count)s %(name)s بنجاح."
-#: contrib/admin/options.py:1016
+#: contrib/admin/options.py:1018
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "تم حذف %(name)s \"%(obj)s\" بنجاح."
-#: contrib/admin/options.py:1052
+#: contrib/admin/options.py:1054
#, python-format
msgid "Change history: %s"
msgstr "تاريخ التغيير: %s"
@@ -498,7 +500,7 @@ msgstr "نحن آسفون، لكننا لم نعثر على الصفحة الم
#: contrib/admin/templates/admin/500.html:4
#: contrib/admin/templates/admin/app_index.html:8
-#: contrib/admin/templates/admin/base.html:33
+#: contrib/admin/templates/admin/base.html:31
#: contrib/admin/templates/admin/change_form.html:17
#: contrib/admin/templates/admin/change_list.html:25
#: contrib/admin/templates/admin/delete_confirmation.html:6
@@ -542,7 +544,6 @@ msgid "Run the selected action"
msgstr "نفذ العملية المحدّدة"
#: contrib/admin/templates/admin/actions.html:4
-#: contrib/admin/templates/admin/search_form.html:8
msgid "Go"
msgstr "نفّذ"
@@ -552,18 +553,18 @@ msgstr "نفّذ"
msgid "%(name)s"
msgstr "%(name)s"
-#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin/base.html:26
msgid "Welcome,"
msgstr "أهلا، "
-#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin/base.html:26
#: contrib/admin/templates/registration/password_change_done.html:3
#: contrib/admin/templates/registration/password_change_form.html:3
#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
msgid "Documentation"
msgstr "الوثائق"
-#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin/base.html:26
#: contrib/admin/templates/admin/auth/user/change_password.html:14
#: contrib/admin/templates/admin/auth/user/change_password.html:47
#: contrib/admin/templates/registration/password_change_done.html:3
@@ -571,7 +572,7 @@ msgstr "الوثائق"
msgid "Change password"
msgstr "غيّر كلمة المرور"
-#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin/base.html:26
#: contrib/admin/templates/registration/password_change_done.html:3
#: contrib/admin/templates/registration/password_change_form.html:3
msgid "Log out"
@@ -702,6 +703,10 @@ msgstr "عملياتي"
msgid "None available"
msgstr "لا يوجد"
+#: contrib/admin/templates/admin/index.html:72
+msgid "Unknown content"
+msgstr "مُحتوى مجهول"
+
#: contrib/admin/templates/admin/invalid_setup.html:7
msgid ""
"Something's wrong with your database installation. Make sure the appropriate "
@@ -749,6 +754,10 @@ msgstr ""
msgid "Show all"
msgstr "أظهر الكل"
+#: contrib/admin/templates/admin/search_form.html:8
+msgid "Search"
+msgstr "ابحث"
+
#: contrib/admin/templates/admin/search_form.html:10
#, python-format
msgid "1 result"
@@ -1755,18 +1764,24 @@ msgid ""
"form from this page."
msgstr "نعتذر، لكنّ استمارتك انتهت صلاحيتها. رجاء أكمل تعبئة الاستمارة من هذه الصفحة."
-#: contrib/gis/forms/fields.py:14
+#: contrib/gis/forms/fields.py:17
msgid "No geometry value provided."
msgstr "لم تُدخل أي أحداثيات."
-#: contrib/gis/forms/fields.py:15
+#: contrib/gis/forms/fields.py:18
msgid "Invalid geometry value."
msgstr "الإحداثيات غير صحيحة."
-#: contrib/gis/forms/fields.py:16
+#: contrib/gis/forms/fields.py:19
msgid "Invalid geometry type."
msgstr "نوع الإحداثيات غير صحيح."
+#: contrib/gis/forms/fields.py:20
+msgid ""
+"An error occurred when transforming the geometry to the SRID of the geometry "
+"form field."
+msgstr "حدث خطأ أثناء تحويل geometry إلى حقل SRID."
+
#: contrib/humanize/templatetags/humanize.py:19
msgid "th"
msgstr " "
@@ -3699,7 +3714,7 @@ msgstr "إنجلترا"
#: contrib/localflavor/uk/uk_regions.py:91
msgid "Northern Ireland"
-msgstr ""
+msgstr "شمال ايرلندا"
#: contrib/localflavor/uk/uk_regions.py:92
msgid "Scotland"
@@ -3727,7 +3742,7 @@ msgstr "أدخل رمز بريد جنوب إفريقي صحيح"
#: contrib/localflavor/za/za_provinces.py:4
msgid "Eastern Cape"
-msgstr ""
+msgstr "شرق كيب"
#: contrib/localflavor/za/za_provinces.py:5
msgid "Free State"
@@ -3751,15 +3766,15 @@ msgstr ""
#: contrib/localflavor/za/za_provinces.py:10
msgid "Northern Cape"
-msgstr ""
+msgstr "شمال كيب"
#: contrib/localflavor/za/za_provinces.py:11
msgid "North West"
-msgstr ""
+msgstr "شمال شرق"
#: contrib/localflavor/za/za_provinces.py:12
msgid "Western Cape"
-msgstr ""
+msgstr "غير كيب"
#: contrib/redirects/models.py:7
msgid "redirect from"
@@ -3823,7 +3838,7 @@ msgstr "اسم العرض"
msgid "sites"
msgstr "مواقع"
-#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:707
+#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:710
msgid "This value must be an integer."
msgstr "هذه القيمة يجب أن تكون رقما صحيحا."
@@ -3856,15 +3871,15 @@ msgstr "أدخل تاريخ/وقت صحيح بالنسق YYYY-MM-DD HH:MM[:ss[.u
msgid "This value must be a decimal number."
msgstr "يجب أن تكون هذه القيمة رقماً عشرياً."
-#: db/models/fields/__init__.py:683
+#: db/models/fields/__init__.py:686
msgid "This value must be a float."
msgstr "هذه القيمة يجب أن تكون عدد فاصلة عائمة."
-#: db/models/fields/__init__.py:743
+#: db/models/fields/__init__.py:746
msgid "This value must be either None, True or False."
msgstr "يجب أن تكون هذه القيمة None، أو True أو False."
-#: db/models/fields/__init__.py:846 db/models/fields/__init__.py:860
+#: db/models/fields/__init__.py:849 db/models/fields/__init__.py:863
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
msgstr "أدخل توقيتاً صحيحاً بالنسق HH:MM[:ss[.uuuuuu]]."
@@ -3934,11 +3949,11 @@ msgstr "تحقق من أن تدخل %s خانات عشرية لا أكثر."
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "تحقق من أن تدخل %s أرقام قبل الفاصل العشري لا أكثر."
-#: forms/fields.py:288 forms/fields.py:862
+#: forms/fields.py:288 forms/fields.py:863
msgid "Enter a valid date."
msgstr "أدخل تاريخاً صحيحاً."
-#: forms/fields.py:322 forms/fields.py:863
+#: forms/fields.py:322 forms/fields.py:864
msgid "Enter a valid time."
msgstr "أدخل وقتاً صحيحاً."
@@ -3981,20 +3996,20 @@ msgstr "أدخل رابطاً صحيحاً."
msgid "This URL appears to be a broken link."
msgstr "يبدو أن هذا الرابط غير متوفر."
-#: forms/fields.py:624 forms/fields.py:702
+#: forms/fields.py:625 forms/fields.py:703
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "انتق خياراً صحيحاً. %(value)s ليس أحد الخيارات المتاحة."
-#: forms/fields.py:703 forms/fields.py:764 forms/models.py:776
+#: forms/fields.py:704 forms/fields.py:765 forms/models.py:965
msgid "Enter a list of values."
msgstr "أدخل قائمة من القيم."
-#: forms/fields.py:891
+#: forms/fields.py:892
msgid "Enter a valid IPv4 address."
msgstr "أدخل عنوان IPv4 صحيح."
-#: forms/fields.py:901
+#: forms/fields.py:902
msgid "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "أدخل اختصار 'slug' صحيح يتكوّن من أحرف، أرقام، شرطات سفلية وعاديّة."
@@ -4002,34 +4017,62 @@ msgstr "أدخل اختصار 'slug' صحيح يتكوّن من أحرف، أر
msgid "Order"
msgstr "الترتيب"
-#: forms/models.py:299 forms/models.py:308
+#: forms/models.py:367
+#, python-format
+msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
+msgstr "%(field_name)s يجب أن يكون مُميّزاً مع %(date_field)s %(lookup)s."
+
+#: forms/models.py:381 forms/models.py:389
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "النموذج %(model_name)s والحقل %(field_label)s موجود مسبقاً."
-#: forms/models.py:651
+#: forms/models.py:581
+#, python-format
+msgid "Please correct the duplicate data for %(field)s."
+msgstr "رجاء صحّح بيانات %(field)s المتكررة."
+
+#: forms/models.py:585
+#, python-format
+msgid "Please correct the duplicate data for %(field)s, which must be unique."
+msgstr "رجاء صحّح بيانات %(field)s المتكررة والتي يجب أن تكون مُميّزة."
+
+#: forms/models.py:591
+#, python-format
+msgid ""
+"Please correct the duplicate data for %(field_name)s which must be unique "
+"for the %(lookup)s in %(date_field)s."
+msgstr ""
+"رجاء صحّح بيانات %(field_name)s المتكررة والتي يجب أن تكون مُميّزة "
+"لـ%(lookup)s في %(date_field)s."
+
+#: forms/models.py:599
+msgid "Please correct the duplicate values below."
+msgstr "رجاءً صحّح القيم المُكرّرة أدناه."
+
+#: forms/models.py:837
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "حقل foreign key المحدد لا يطابق الحقل الرئيسي له."
-#: forms/models.py:706
+#: forms/models.py:892
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "انتق خياراً صحيحاً. اختيارك ليس أحد الخيارات المتاحة."
-#: forms/models.py:777
+#: forms/models.py:966
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "انتق خياراً صحيحاً. %s ليس أحد الخيارات المتاحة."
-#: forms/models.py:779
+#: forms/models.py:968
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "القيمة \"%s\" هي صحيحة للحقل المرجعي."
-#: template/defaultfilters.py:765
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "نعم,لا,ربما"
-#: template/defaultfilters.py:796
+#: template/defaultfilters.py:798
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
@@ -4038,42 +4081,42 @@ msgstr[1] "%(size)d بايت"
msgstr[2] "%(size)d بايت"
msgstr[3] "%(size)d بايت"
-#: template/defaultfilters.py:798
+#: template/defaultfilters.py:800
#, python-format
msgid "%.1f KB"
msgstr "%.1f ك.ب"
-#: template/defaultfilters.py:800
+#: template/defaultfilters.py:802
#, python-format
msgid "%.1f MB"
msgstr "%.1f م.ب"
-#: template/defaultfilters.py:801
+#: template/defaultfilters.py:803
#, python-format
msgid "%.1f GB"
msgstr "%.1f ج.ب"
-#: utils/dateformat.py:41
+#: utils/dateformat.py:42
msgid "p.m."
msgstr "م"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:43
msgid "a.m."
msgstr "ص"
-#: utils/dateformat.py:47
+#: utils/dateformat.py:48
msgid "PM"
msgstr "م"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:49
msgid "AM"
msgstr "ص"
-#: utils/dateformat.py:97
+#: utils/dateformat.py:98
msgid "midnight"
msgstr "منتصف الليل"
-#: utils/dateformat.py:99
+#: utils/dateformat.py:100
msgid "noon"
msgstr "ظهراً"
View
BIN  django/conf/locale/bn/LC_MESSAGES/django.mo
Binary file not shown
View
4,940 django/conf/locale/bn/LC_MESSAGES/django.po
3,494 additions, 1,446 deletions not shown
View
BIN  django/conf/locale/bn/LC_MESSAGES/djangojs.mo
Binary file not shown
View
80 django/conf/locale/bn/LC_MESSAGES/djangojs.po
@@ -1,17 +1,13 @@
-# 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.
+# This file is distributed under the same license as the Django package.
#
-#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-28 17:36+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"
+"POT-Creation-Date: 2008-09-02 22:36-0700\n"
+"PO-Revision-Date: 2009-07-19 22:49+0000\n"
+"Last-Translator: Nasimul Haque <nasim.haque@gmail.com>\n"
+"Language-Team: Nasimul Haque <nasim.haque@gmail.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -19,100 +15,100 @@ msgstr ""
#: contrib/admin/media/js/SelectFilter2.js:33
#, perl-format
msgid "Available %s"
-msgstr ""
+msgstr "%s বিদ্যমান"
#: contrib/admin/media/js/SelectFilter2.js:41
msgid "Choose all"
-msgstr ""
+msgstr "সব বাছাই করুন"
#: contrib/admin/media/js/SelectFilter2.js:46
msgid "Add"
-msgstr ""
+msgstr "যোগ করুন"
#: contrib/admin/media/js/SelectFilter2.js:48
msgid "Remove"
-msgstr ""
+msgstr "মুছে ফেলুন"
#: contrib/admin/media/js/SelectFilter2.js:53
#, perl-format
msgid "Chosen %s"
-msgstr ""
+msgstr "%s বাছাই করা হয়েছে"
#: contrib/admin/media/js/SelectFilter2.js:54
msgid "Select your choice(s) and click "
-msgstr ""
+msgstr "আপনার পছন্দ বাছাই এবং ক্লিক করুন"
#: contrib/admin/media/js/SelectFilter2.js:59
msgid "Clear all"
-msgstr ""
+msgstr "সব পরিষ্কার করুন"
-#: contrib/admin/media/js/dateparse.js:32
#: contrib/admin/media/js/calendar.js:24
+#: contrib/admin/media/js/dateparse.js:32
msgid ""
"January February March April May June July August September October November "
"December"
-msgstr ""
+msgstr "জানুয়ারি ফেব্রুয়ারি মার্চ এপ্রিল মে জুন জুলাই অাগস্ট সেপ্টেম্বর অক্টোবর নভেম্বর ডিসেম্বর"
+
+#: contrib/admin/media/js/calendar.js:25
+msgid "S M T W T F S"
+msgstr "র স ম ব ব শ শ"
#: contrib/admin/media/js/dateparse.js:33
msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
-msgstr ""
+msgstr "রবিবার সোমবার মঙ্গলবার বুধবার বৃহস্পতিবার শুক্রবার শনিবার"
-#: contrib/admin/media/js/calendar.js:25
-msgid "S M T W T F S"
-msgstr ""
+#: contrib/admin/media/js/admin/CollapsedFieldsets.js:34
+#: contrib/admin/media/js/admin/CollapsedFieldsets.js:72
+msgid "Show"
+msgstr "দেখান"
+
+#: contrib/admin/media/js/admin/CollapsedFieldsets.js:63
+msgid "Hide"
+msgstr "লুকান"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:47
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
msgid "Now"
-msgstr ""
+msgstr "এখন"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:51
msgid "Clock"
-msgstr ""
+msgstr "ঘড়ি"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:78
msgid "Choose a time"
-msgstr ""
+msgstr "সময় নির্বাচন করুন"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
msgid "Midnight"
-msgstr ""
+msgstr "মধ্যরাত"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
msgid "6 a.m."
-msgstr ""
+msgstr "৬ পূর্বাহ্ন"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
msgid "Noon"
-msgstr ""
+msgstr "দুপুর"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:88
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:183
msgid "Cancel"
-msgstr ""
+msgstr "বাতিল"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:128
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:177
msgid "Today"
-msgstr ""
+msgstr "আজ"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:132
msgid "Calendar"
-msgstr ""
+msgstr "দিনপঞ্জিকা"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:175
msgid "Yesterday"
-msgstr ""
+msgstr "গতকাল"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179
msgid "Tomorrow"
-msgstr ""
-
-#: contrib/admin/media/js/admin/CollapsedFieldsets.js:34
-#: contrib/admin/media/js/admin/CollapsedFieldsets.js:72
-msgid "Show"
-msgstr ""
-
-#: contrib/admin/media/js/admin/CollapsedFieldsets.js:63
-msgid "Hide"
-msgstr ""
+msgstr "আগামীকাল"
View
BIN  django/conf/locale/ca/LC_MESSAGES/django.mo
Binary file not shown
View
549 django/conf/locale/ca/LC_MESSAGES/django.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-24 13:00+0100\n"
+"POT-Creation-Date: 2009-07-07 15:04+0200\n"
"PO-Revision-Date: 2009-03-24 13:28+0100\n"
"Last-Translator: Django Catalan Group <django-cat@googlegroups.com>\n"
"Language-Team: Catalan <ca@li.org>\n"
@@ -218,6 +218,20 @@ msgstr "xinès simplificat"
msgid "Traditional Chinese"
msgstr "xinès tradicional"
+#: contrib/admin/actions.py:60
+#, python-format
+msgid "Successfully deleted %(count)d %(items)s."
+msgstr "Eliminat/s %(count)d %(items)s satisfactòriament."
+
+#: contrib/admin/actions.py:67 contrib/admin/options.py:1025
+msgid "Are you sure?"
+msgstr "Esteu segurs?"
+
+#: contrib/admin/actions.py:85
+#, python-format
+msgid "Delete selected %(verbose_name_plural)s"
+msgstr "Eliminar els %(verbose_name_plural)s seleccionats"
+
#: contrib/admin/filterspecs.py:44
#, python-format
msgid ""
@@ -252,15 +266,15 @@ msgstr "Aquest mes"
msgid "This year"
msgstr "Aquest any"
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
msgid "Yes"
msgstr "Si"
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
msgid "No"
msgstr "No"
-#: contrib/admin/filterspecs.py:154 forms/widgets.py:413
+#: contrib/admin/filterspecs.py:154 forms/widgets.py:434
msgid "Unknown"
msgstr "Desconegut"
@@ -296,74 +310,61 @@ msgstr "entrada del registre"
msgid "log entries"
msgstr "entrades del registre"
-#: contrib/admin/options.py:131 contrib/admin/options.py:145
+#: contrib/admin/options.py:133 contrib/admin/options.py:147
msgid "None"
msgstr "cap"
-#: contrib/admin/options.py:498
-#, python-format
-msgid "Successfully deleted %(count)d %(items)s."
-msgstr "Eliminat/s %(count)d %(items)s satisfactòriament."
-
-#: contrib/admin/options.py:505 contrib/admin/options.py:1012
-msgid "Are you sure?"
-msgstr "Esteu segurs?"
-
-#: contrib/admin/options.py:523
-#, python-format
-msgid "Delete selected %(verbose_name_plural)s"
-msgstr "Eliminar els %(verbose_name_plural)s seleccionats"
-
-#: contrib/admin/options.py:531
+#: contrib/admin/options.py:519
#, python-format
msgid "Changed %s."
msgstr "Modificat %s."
-#: contrib/admin/options.py:531 contrib/admin/options.py:541
-#: contrib/comments/templates/comments/preview.html:15 forms/models.py:296
+#: contrib/admin/options.py:519 contrib/admin/options.py:529
+#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388
+#: forms/models.py:600
msgid "and"
msgstr "i"
-#: contrib/admin/options.py:536
+#: contrib/admin/options.py:524
#, python-format
msgid "Added %(name)s \"%(object)s\"."
msgstr "Afegit %(name)s \"%(object)s\""
-#: contrib/admin/options.py:540
+#: contrib/admin/options.py:528
#, python-format
msgid "Changed %(list)s for %(name)s \"%(object)s\"."
msgstr "Modificat %(list)s per a %(name)s \"%(object)s\"."
-#: contrib/admin/options.py:545
+#: contrib/admin/options.py:533
#, python-format
msgid "Deleted %(name)s \"%(object)s\"."
msgstr "Eliminat %(name)s \"%(object)s\"."
-#: contrib/admin/options.py:549
+#: contrib/admin/options.py:537
msgid "No fields changed."
msgstr "Cap camp canviat."
-#: contrib/admin/options.py:610 contrib/auth/admin.py:67
+#: contrib/admin/options.py:598 contrib/auth/admin.py:67
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "El/la %(name)s \"%(obj)s\".ha estat afegit/da amb èxit."
-#: contrib/admin/options.py:614 contrib/admin/options.py:647
+#: contrib/admin/options.py:602 contrib/admin/options.py:635
#: contrib/auth/admin.py:75
msgid "You may edit it again below."
msgstr "Podeu editar-lo de nou a baix."
-#: contrib/admin/options.py:624 contrib/admin/options.py:657
+#: contrib/admin/options.py:612 contrib/admin/options.py:645
#, python-format
msgid "You may add another %s below."
msgstr "Podeu afegir un altre %s a baix."
-#: contrib/admin/options.py:645
+#: contrib/admin/options.py:633
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "S'ha modificat amb èxit el/la %(name)s \"%(obj)s."
-#: contrib/admin/options.py:653
+#: contrib/admin/options.py:641
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -371,43 +372,43 @@ msgstr ""
"S'ha afegit exitosament el/la %(name)s \"%(obj)s\". Pot editar-lo de nou "
"abaix."
-#: contrib/admin/options.py:774
+#: contrib/admin/options.py:772
#, python-format
msgid "Add %s"
msgstr "Afegir %s"
-#: contrib/admin/options.py:805 contrib/admin/options.py:990
+#: contrib/admin/options.py:803 contrib/admin/options.py:1003
#, python-format
msgid "%(name)s object with primary key %(key)r does not exist."
msgstr "No existèix cap objecte %(name)s amb la clau primària %(key)r."
-#: contrib/admin/options.py:862
+#: contrib/admin/options.py:860
#, python-format
msgid "Change %s"
msgstr "Modificar %s"
-#: contrib/admin/options.py:894
+#: contrib/admin/options.py:904
msgid "Database error"
msgstr "Error de base de dades"
-#: contrib/admin/options.py:930
+#: contrib/admin/options.py:940
#, python-format
msgid "%(count)s %(name)s was changed successfully."
msgid_plural "%(count)s %(name)s were changed successfully."
msgstr[0] "%(count)s %(name)s s'ha modificat amb èxit."
msgstr[1] "%(count)s %(name)s s'han modificat amb èxit."
-#: contrib/admin/options.py:1005
+#: contrib/admin/options.py:1018
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "El/la %(name)s \"%(obj)s\" ha estat eliminat amb èxit."
-#: contrib/admin/options.py:1041
+#: contrib/admin/options.py:1054
#, python-format
msgid "Change history: %s"
msgstr "Modificar històric: %s"
-#: contrib/admin/sites.py:15 contrib/admin/views/decorators.py:14
+#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14
#: contrib/auth/forms.py:80
msgid ""
"Please enter a correct username and password. Note that both fields are case-"
@@ -416,11 +417,11 @@ msgstr ""
"Si us plau, introduïu un nom d'usuari i contrasenya vàlids. Tingueu en "
"compte que tots dos camps son sensibles a majúscules i minúscules."
-#: contrib/admin/sites.py:250 contrib/admin/views/decorators.py:40
+#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40
msgid "Please log in again, because your session has expired."
msgstr "Si us plau, identifiqueu-vos de nou doncs la vostra sessió ha expirat."
-#: contrib/admin/sites.py:257 contrib/admin/views/decorators.py:47
+#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47
msgid ""
"Looks like your browser isn't configured to accept cookies. Please enable "
"cookies, reload this page, and try again."
@@ -429,29 +430,29 @@ msgstr ""
"'cookies' (galetes). Si us plau, habiliteu les 'cookies', recarregueu "
"aquesta pàgina i proveu-ho de nou. "
-#: contrib/admin/sites.py:273 contrib/admin/sites.py:279
+#: contrib/admin/sites.py:301 contrib/admin/sites.py:307
#: contrib/admin/views/decorators.py:66
msgid "Usernames cannot contain the '@' character."
msgstr "Els noms d'usuari no poden contenir el caracter '@'."
-#: contrib/admin/sites.py:276 contrib/admin/views/decorators.py:62
+#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
"La vostra adreça de correu no és el vostre nom d'usuari. Provi '%s' en tot "
"cas."
-#: contrib/admin/sites.py:336
+#: contrib/admin/sites.py:360
msgid "Site administration"
msgstr "Lloc administratiu"
-#: contrib/admin/sites.py:349 contrib/admin/templates/admin/login.html:26
+#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26
#: contrib/admin/templates/registration/password_reset_complete.html:14
#: contrib/admin/views/decorators.py:20
msgid "Log in"
msgstr "Iniciar sessió"
-#: contrib/admin/sites.py:396
+#: contrib/admin/sites.py:417
#, python-format
msgid "%s administration"
msgstr "Administració de %s"
@@ -466,34 +467,27 @@ msgstr "Un o més %(fieldname)s en %(name)s: %(obj)s"
msgid "One or more %(fieldname)s in %(name)s:"
msgstr "Un o més %(fieldname)s en %(name)s:"
-#: contrib/admin/util.py:222
-#, fuzzy
-msgid "verbose_name"
-msgid_plural "verbose_name_plural"
-msgstr[0] "verbose_name"
-msgstr[1] "verbose_name_plural"
-
-#: contrib/admin/widgets.py:70
+#: contrib/admin/widgets.py:71
msgid "Date:"
msgstr "Data:"
-#: contrib/admin/widgets.py:70
+#: contrib/admin/widgets.py:71
msgid "Time:"
msgstr "Hora:"
-#: contrib/admin/widgets.py:94
+#: contrib/admin/widgets.py:95
msgid "Currently:"
msgstr "Actualment:"
-#: contrib/admin/widgets.py:94
+#: contrib/admin/widgets.py:95
msgid "Change:"
msgstr "Modificar:"
-#: contrib/admin/widgets.py:123
+#: contrib/admin/widgets.py:124
msgid "Lookup"
msgstr "Cercar"
-#: contrib/admin/widgets.py:230
+#: contrib/admin/widgets.py:236
msgid "Add Another"
msgstr "Afegir un altre"
@@ -508,9 +502,9 @@ msgstr "Ho sentim, però no s'ha pogut trobar la pàgina sol·licitada"
#: contrib/admin/templates/admin/500.html:4
#: contrib/admin/templates/admin/app_index.html:8
-#: contrib/admin/templates/admin/base.html:33
+#: contrib/admin/templates/admin/base.html:31
#: contrib/admin/templates/admin/change_form.html:17
-#: contrib/admin/templates/admin/change_list.html:20
+#: contrib/admin/templates/admin/change_list.html:25
#: contrib/admin/templates/admin/delete_confirmation.html:6
#: contrib/admin/templates/admin/delete_selected_confirmation.html:6
#: contrib/admin/templates/admin/invalid_setup.html:4
@@ -552,7 +546,6 @@ msgid "Run the selected action"
msgstr "Executar la acció seleccionada"
#: contrib/admin/templates/admin/actions.html:4
-#: contrib/admin/templates/admin/search_form.html:8
msgid "Go"
msgstr "Anar"
@@ -562,26 +555,26 @@ msgstr "Anar"
msgid "%(name)s"
msgstr "%(name)s"
-#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin/base.html:26
msgid "Welcome,"
msgstr "Benvingut/da,"
-#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin/base.html:26
#: contrib/admin/templates/registration/password_change_done.html:3
#: contrib/admin/templates/registration/password_change_form.html:3
#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
msgid "Documentation"
msgstr "Documentació"
-#: contrib/admin/templates/admin/base.html:28
-#: contrib/admin/templates/admin/auth/user/change_password.html:13
-#: contrib/admin/templates/admin/auth/user/change_password.html:46
+#: contrib/admin/templates/admin/base.html:26
+#: contrib/admin/templates/admin/auth/user/change_password.html:14
+#: contrib/admin/templates/admin/auth/user/change_password.html:47
#: contrib/admin/templates/registration/password_change_done.html:3
#: contrib/admin/templates/registration/password_change_form.html:3
msgid "Change password"
msgstr "Canviar contrasenya"
-#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin/base.html:26
#: contrib/admin/templates/registration/password_change_done.html:3
#: contrib/admin/templates/registration/password_change_form.html:3
msgid "Log out"
@@ -612,24 +605,24 @@ msgid "View on site"
msgstr "Veure al lloc"
#: contrib/admin/templates/admin/change_form.html:38
-#: contrib/admin/templates/admin/change_list.html:49
-#: contrib/admin/templates/admin/auth/user/change_password.html:22
+#: contrib/admin/templates/admin/change_list.html:54
+#: 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] "Si us plau, corregiu l'error mostrat a baix."
msgstr[1] "Si us plau, corregiu els errors mostrats a baix."
-#: contrib/admin/templates/admin/change_list.html:41
+#: contrib/admin/templates/admin/change_list.html:46
#, python-format
msgid "Add %(name)s"
msgstr "Afegir %(name)s"
-#: contrib/admin/templates/admin/change_list.html:60
+#: contrib/admin/templates/admin/change_list.html:65
msgid "Filter"
msgstr "Filtre"
#: contrib/admin/templates/admin/delete_confirmation.html:10
-#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:251
+#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:275
msgid "Delete"
msgstr "Eliminar"
@@ -669,9 +662,9 @@ msgid ""
"your account doesn't have permission to delete the following types of "
"objects:"
msgstr ""
-"Eliminar el/la %(object_name)s provocaria l'eliminació "
-"d'objectes relacionats, però el vostre compte no te permissos per a esborrar "
-"els tipus d'objecte següents:"
+"Eliminar el/la %(object_name)s provocaria l'eliminació d'objectes "
+"relacionats, però el vostre compte no te permissos per a esborrar els tipus "
+"d'objecte següents:"
#: contrib/admin/templates/admin/delete_selected_confirmation.html:22
#, python-format
@@ -679,8 +672,8 @@ msgid ""
"Are you sure you want to delete the selected %(object_name)s objects? All of "
"the following objects and it's related items will be deleted:"
msgstr ""
-"Esteu segurs de voler esborrar els/les %(object_name)s seleccionats?"
-"Tots aquests objectes i els seus elements relacionats s'esborraran:"
+"Esteu segurs de voler esborrar els/les %(object_name)s seleccionats?Tots "
+"aquests objectes i els seus elements relacionats s'esborraran:"
#: contrib/admin/templates/admin/filter.html:2
#, python-format
@@ -712,6 +705,10 @@ msgstr "Les meves accions"
msgid "None available"
msgstr "Cap disponible"
+#: contrib/admin/templates/admin/index.html:72
+msgid "Unknown content"
+msgstr "Contingut desconegut"
+
#: contrib/admin/templates/admin/invalid_setup.html:7
msgid ""
"Something's wrong with your database installation. Make sure the appropriate "
@@ -760,6 +757,15 @@ msgstr ""
msgid "Show all"
msgstr "Mostrar tots"
+#: contrib/admin/templates/admin/pagination.html:11
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Save"
+msgstr "Desar"
+
+#: contrib/admin/templates/admin/search_form.html:8
+msgid "Search"
+msgstr "Cerca"
+
#: contrib/admin/templates/admin/search_form.html:10
#, python-format
msgid "1 result"
@@ -772,10 +778,6 @@ msgstr[1] "%(counter)s resultats"
msgid "%(full_result_count)s total"
msgstr "%(full_result_count)s en total"
-#: contrib/admin/templates/admin/submit_line.html:3
-msgid "Save"
-msgstr "Desar"
-
#: contrib/admin/templates/admin/submit_line.html:5
msgid "Save as new"
msgstr "Desar com a nou"
@@ -802,23 +804,23 @@ msgid "Username"
msgstr "Usuari"
#: contrib/admin/templates/admin/auth/user/add_form.html:20
-#: contrib/admin/templates/admin/auth/user/change_password.html:33
+#: contrib/admin/templates/admin/auth/user/change_password.html:34
#: contrib/auth/forms.py:17 contrib/auth/forms.py:60 contrib/auth/forms.py:185
msgid "Password"
msgstr "Contrasenya"
#: contrib/admin/templates/admin/auth/user/add_form.html:26
-#: contrib/admin/templates/admin/auth/user/change_password.html:39
+#: contrib/admin/templates/admin/auth/user/change_password.html:40
#: contrib/auth/forms.py:186
msgid "Password (again)"
msgstr "Contrasenya (de nou)"
#: contrib/admin/templates/admin/auth/user/add_form.html:27
-#: contrib/admin/templates/admin/auth/user/change_password.html:40
+#: contrib/admin/templates/admin/auth/user/change_password.html:41
msgid "Enter the same password as above, for verification."
msgstr "Introduïu la mateixa contrasenya de dalt, per fer-ne la verificació."
-#: contrib/admin/templates/admin/auth/user/change_password.html:26
+#: 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 "Introduïu una contrasenya per l'usuari <strong>%(username)s</strong>"
@@ -1035,114 +1037,115 @@ msgstr "El model %(model_name)r no s'ha trobat en l'aplicació %(app_label)r"
msgid "the related `%(app_label)s.%(data_type)s` object"
msgstr "l'objecte relacionat `%(app_label)s.%(data_type)s`"
-#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228
-#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247
+#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:225
+#: contrib/admindocs/views.py:230 contrib/admindocs/views.py:244
+#: contrib/admindocs/views.py:258 contrib/admindocs/views.py:263
msgid "model:"
msgstr "model:"
-#: contrib/admindocs/views.py:237
+#: contrib/admindocs/views.py:221 contrib/admindocs/views.py:253
#, python-format
msgid "related `%(app_label)s.%(object_name)s` objects"
msgstr "objectes relacionats `%(app_label)s.%(object_name)s`"
-#: contrib/admindocs/views.py:242
+#: contrib/admindocs/views.py:225 contrib/admindocs/views.py:258
#, python-format
msgid "all %s"
msgstr "tots %s"
-#: contrib/admindocs/views.py:247
+#: contrib/admindocs/views.py:230 contrib/admindocs/views.py:263
#, python-format
msgid "number of %s"
msgstr "nombre de %s"
-#: contrib/admindocs/views.py:252
+#: contrib/admindocs/views.py:268
#, python-format
msgid "Fields on %s objects"
msgstr "Camps en objectes %s"
-#: contrib/admindocs/views.py:315 contrib/admindocs/views.py:326
-#: contrib/admindocs/views.py:328 contrib/admindocs/views.py:334
-#: contrib/admindocs/views.py:335 contrib/admindocs/views.py:337
+#: contrib/admindocs/views.py:331 contrib/admindocs/views.py:342
+#: contrib/admindocs/views.py:344 contrib/admindocs/views.py:350
+#: contrib/admindocs/views.py:351 contrib/admindocs/views.py:353
msgid "Integer"
msgstr "Enter"
-#: contrib/admindocs/views.py:316
+#: contrib/admindocs/views.py:332
msgid "Boolean (Either True or False)"
msgstr "Booleà (Verdader o Fals)"
-#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336
+#: contrib/admindocs/views.py:333 contrib/admindocs/views.py:352
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Cadena (de fins a %(max_length)s)"
-#: contrib/admindocs/views.py:318
+#: contrib/admindocs/views.py:334
msgid "Comma-separated integers"
msgstr "Enters separats per comes"
-#: contrib/admindocs/views.py:319
+#: contrib/admindocs/views.py:335
msgid "Date (without time)"
msgstr "Data (sense hora)"
-#: contrib/admindocs/views.py:320
+#: contrib/admindocs/views.py:336
msgid "Date (with time)"
msgstr "Data (amb hora)"
-#: contrib/admindocs/views.py:321
+#: contrib/admindocs/views.py:337
msgid "Decimal number"
msgstr "Número decimal"
-#: contrib/admindocs/views.py:322
+#: contrib/admindocs/views.py:338
msgid "E-mail address"
msgstr "Adreça de correu electrònic"
-#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324
-#: contrib/admindocs/views.py:327
+#: contrib/admindocs/views.py:339 contrib/admindocs/views.py:340
+#: contrib/admindocs/views.py:343
msgid "File path"
msgstr "Ruta del fitxer"
-#: contrib/admindocs/views.py:325
+#: contrib/admindocs/views.py:341
msgid "Floating point number"
msgstr "Número amb punt de coma flotant"
-#: contrib/admindocs/views.py:329 contrib/comments/models.py:58
+#: contrib/admindocs/views.py:345 contrib/comments/models.py:60
msgid "IP address"
msgstr "Adreça IP"
-#: contrib/admindocs/views.py:331
+#: contrib/admindocs/views.py:347
msgid "Boolean (Either True, False or None)"
msgstr "Booleà (Verdader, Fals o 'None' (cap))"
-#: contrib/admindocs/views.py:332
+#: contrib/admindocs/views.py:348
msgid "Relation to parent model"
msgstr "Relació amb el model pare"
-#: contrib/admindocs/views.py:333
+#: contrib/admindocs/views.py:349
msgid "Phone number"
msgstr "Número de telèfon"
-#: contrib/admindocs/views.py:338
+#: contrib/admindocs/views.py:354
msgid "Text"
msgstr "Text"
-#: contrib/admindocs/views.py:339
+#: contrib/admindocs/views.py:355
msgid "Time"
msgstr "Hora"
-#: contrib/admindocs/views.py:340 contrib/comments/forms.py:95
+#: contrib/admindocs/views.py:356 contrib/comments/forms.py:95
#: contrib/comments/templates/comments/moderation_queue.html:37
#: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
msgid "URL"
msgstr "URL"
-#: contrib/admindocs/views.py:341
+#: contrib/admindocs/views.py:357
msgid "U.S. state (two uppercase letters)"
msgstr "Estat dels E.U.A. (dues lletres majúscules)"
-#: contrib/admindocs/views.py:342
+#: contrib/admindocs/views.py:358
msgid "XML text"
msgstr "Text XML"
-#: contrib/admindocs/views.py:368
+#: contrib/admindocs/views.py:384
#, python-format
msgid "%s does not appear to be a urlpattern object"
msgstr "%s no sembla ser un objecte 'urlpattern'"
@@ -1247,7 +1250,7 @@ msgid "Change password: %s"
msgstr "Canviar contrasenya: %s"
#: contrib/auth/forms.py:15 contrib/auth/forms.py:48
-#: contrib/auth/models.py:127
+#: contrib/auth/models.py:128
msgid ""
"Required. 30 characters or fewer. Alphanumeric characters only (letters, "
"digits and underscores)."
@@ -1338,31 +1341,31 @@ msgstr "permisos"
msgid "group"
msgstr "grup"
-#: contrib/auth/models.py:91 contrib/auth/models.py:137
+#: contrib/auth/models.py:91 contrib/auth/models.py:138
msgid "groups"
msgstr "grups"
-#: contrib/auth/models.py:127
+#: contrib/auth/models.py:128
msgid "username"
msgstr "nom d'usuari"
-#: contrib/auth/models.py:128
+#: contrib/auth/models.py:129
msgid "first name"
msgstr "nom propi"
-#: contrib/auth/models.py:129
+#: contrib/auth/models.py:130
msgid "last name"
msgstr "cognoms"
-#: contrib/auth/models.py:130
+#: contrib/auth/models.py:131
msgid "e-mail address"
msgstr "adreça de correu electrònic"
-#: contrib/auth/models.py:131
+#: contrib/auth/models.py:132
msgid "password"
msgstr "contrasenya"
-#: contrib/auth/models.py:131
+#: contrib/auth/models.py:132
msgid ""
"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
"password form</a>."
@@ -1370,19 +1373,19 @@ msgstr ""
"Utilitzeu '[algo]$[salt]$[hexdigest]' o el <a href=\"password/\">formulari "
"de canvi de contrasenya</a>."
-#: contrib/auth/models.py:132
+#: contrib/auth/models.py:133
msgid "staff status"
msgstr "membre del personal"
-#: contrib/auth/models.py:132
+#: contrib/auth/models.py:133
msgid "Designates whether the user can log into this admin site."
msgstr "Indica si l'usuari pot entrar en el lloc administratiu."
-#: contrib/auth/models.py:133
+#: contrib/auth/models.py:134
msgid "active"
msgstr "actiu"
-#: contrib/auth/models.py:133
+#: contrib/auth/models.py:134
msgid ""
"Designates whether this user should be treated as active. Unselect this "
"instead of deleting accounts."
@@ -1390,11 +1393,11 @@ msgstr ""
"Designa si aquest usuari ha de ser tractat com a actiu. Deseleccioneu-ho "
"enlloc d'esborrar comptes d'usuari."
-#: contrib/auth/models.py:134
+#: contrib/auth/models.py:135
msgid "superuser status"
msgstr "estat de superusuari"
-#: contrib/auth/models.py:134
+#: contrib/auth/models.py:135
msgid ""
"Designates that this user has all permissions without explicitly assigning "
"them."
@@ -1402,15 +1405,15 @@ msgstr ""
"Designa que aquest usuari té tots els permissos sense assignar-los "
"explícitament."
-#: contrib/auth/models.py:135
+#: contrib/auth/models.py:136
msgid "last login"
msgstr "últim inici de sessió"
-#: contrib/auth/models.py:136
+#: contrib/auth/models.py:137
msgid "date joined"
msgstr "data de creació"
-#: contrib/auth/models.py:138
+#: contrib/auth/models.py:139
msgid ""
"In addition to the permissions manually assigned, this user will also get "
"all permissions granted to each group he/she is in."
@@ -1418,23 +1421,24 @@ msgstr ""
"Junt amb els permissos asignats manualment, aquest usuari tindrà, també, els "
"permissos dels grups dels que sigui membre."
-#: contrib/auth/models.py:139
+#: contrib/auth/models.py:140
msgid "user permissions"
msgstr "permissos de l'usuari"
-#: contrib/auth/models.py:143
+#: contrib/auth/models.py:144 contrib/comments/models.py:50
+#: contrib/comments/models.py:168
msgid "user"
msgstr "usuari"
-#: contrib/auth/models.py:144
+#: contrib/auth/models.py:145
msgid "users"
msgstr "usuaris"
-#: contrib/auth/models.py:300
+#: contrib/auth/models.py:301
msgid "message"
msgstr "missatge"
-#: contrib/auth/views.py:50
+#: contrib/auth/views.py:56
msgid "Logged out"
msgstr "Sessió finalitzada"
@@ -1450,6 +1454,16 @@ msgstr "contingut"
msgid "Metadata"
msgstr "metadades"
+#: contrib/comments/feeds.py:13
+#, python-format
+msgid "%(site_name)s comments"
+msgstr "comentaris de %(site_name)s"
+
+#: contrib/comments/feeds.py:23
+#, python-format
+msgid "Latest comments on %(site_name)s"
+msgstr "Últims comentaris a %(site_name)s."
+
#: contrib/comments/forms.py:93
#: contrib/comments/templates/comments/moderation_queue.html:34
msgid "Name"
@@ -1479,46 +1493,51 @@ msgstr ""
"Si entreu cualsevol cosa en aquest camp el vostre comentari es tractarà com "
"a spam"
-#: contrib/comments/models.py:23
+#: contrib/comments/models.py:22 contrib/contenttypes/models.py:74
+msgid "content type"
+msgstr "tipus de contingut"
+
+#: contrib/comments/models.py:24
msgid "object ID"
msgstr "ID de l'objecte"
-#: contrib/comments/models.py:50
+#: contrib/comments/models.py:52
msgid "user's name"
msgstr "nom d'usuari"
-#: contrib/comments/models.py:51
+#: contrib/comments/models.py:53
msgid "user's email address"
msgstr "adreça de correu electrònic del usuari"
-#: contrib/comments/models.py:52
+#: contrib/comments/models.py:54
msgid "user's URL"
msgstr "URL del usuari"
-#: contrib/comments/models.py:54
+#: contrib/comments/models.py:56 contrib/comments/models.py:76
+#: contrib/comments/models.py:169
msgid "comment"
msgstr "comentari"
-#: contrib/comments/models.py:57
+#: contrib/comments/models.py:59
msgid "date/time submitted"
msgstr "data/hora d'enviament"
-#: contrib/comments/models.py:59
+#: contrib/comments/models.py:61
msgid "is public"
msgstr "és públic"
-#: contrib/comments/models.py:60
+#: contrib/comments/models.py:62
msgid ""
"Uncheck this box to make the comment effectively disappear from the site."
msgstr ""
"Desmarqui aquesta casella per fer desaparèixar aquest comentari del lloc web "
"de forma efectiva."
-#: contrib/comments/models.py:62
+#: contrib/comments/models.py:64
msgid "is removed"
msgstr "està eliminat"
-#: contrib/comments/models.py:63
+#: contrib/comments/models.py:65
msgid ""
"Check this box if the comment is inappropriate. A \"This comment has been "
"removed\" message will be displayed instead."
@@ -1526,7 +1545,11 @@ msgstr ""
"Marqueu aquesta caixa si el comentari no és apropiat. En lloc seu es "
"mostrarà \"Aquest comentari ha estat eliminat\" "
-#: contrib/comments/models.py:115
+#: contrib/comments/models.py:77
+msgid "comments"
+msgstr "comentaris"
+
+#: contrib/comments/models.py:119
msgid ""
"This comment was posted by an authenticated user and thus the name is read-"
"only."
@@ -1534,7 +1557,7 @@ msgstr ""
"Aquest comentari va ser publicat per un usuari autentificat, per això el seu "
"nom no es modificable."
-#: contrib/comments/models.py:124
+#: contrib/comments/models.py:128
msgid ""
"This comment was posted by an authenticated user and thus the email is read-"
"only."
@@ -1542,7 +1565,7 @@ msgstr ""
"Aquest comentari va ser publicat per un usuari autentificat, per això la "
"seva adreça de correu electrònic no es pot modificar."
-#: contrib/comments/models.py:149
+#: contrib/comments/models.py:153
#, python-format
msgid ""
"Posted by %(user)s at %(date)s\n"
@@ -1557,9 +1580,26 @@ msgstr ""
"\n"
"http://%(domain)s%(url)s"
+# Context problem... waitting for comments from django-i18n
+#: contrib/comments/models.py:170
+msgid "flag"
+msgstr "marcar"
+
+#: contrib/comments/models.py:171
+msgid "date"
+msgstr "data"
+
+#: contrib/comments/models.py:181
+msgid "comment flag"
+msgstr "marca del comentari"
+
+#: contrib/comments/models.py:182
+msgid "comment flags"
+msgstr "marques de comentari"
+
#: contrib/comments/templates/comments/approve.html:4
msgid "Approve a comment"
-msgstr "aprovar un comentari"
+msgstr "Aprovar un comentari"
#: contrib/comments/templates/comments/approve.html:7
msgid "Really make this comment public?"
@@ -1616,13 +1656,13 @@ msgstr "Marcar"
msgid "Thanks for flagging"
msgstr "Gràcies per marcar"
-#: contrib/comments/templates/comments/form.html:16
-#: contrib/comments/templates/comments/preview.html:31
+#: contrib/comments/templates/comments/form.html:17
+#: contrib/comments/templates/comments/preview.html:32
msgid "Post"
msgstr "Publicar"
-#: contrib/comments/templates/comments/form.html:17
-#: contrib/comments/templates/comments/preview.html:32
+#: contrib/comments/templates/comments/form.html:18
+#: contrib/comments/templates/comments/preview.html:33
msgid "Preview"
msgstr "Vista prèvia"
@@ -1668,33 +1708,29 @@ msgid "Thank you for your comment"
msgstr "Gràcies pel seu comentari"
#: contrib/comments/templates/comments/preview.html:4
-#: contrib/comments/templates/comments/preview.html:12
+#: contrib/comments/templates/comments/preview.html:13
msgid "Preview your comment"
msgstr "Previsualitzar el seu comentari"
-#: contrib/comments/templates/comments/preview.html:10
+#: contrib/comments/templates/comments/preview.html:11
msgid "Please correct the error below"
msgid_plural "Please correct the errors below"
msgstr[0] "Si us plau, corregiu l'error mostrat a baix."
msgstr[1] "Si us plau, corregiu els errors mostrats a baix."
-#: contrib/comments/templates/comments/preview.html:15
+#: contrib/comments/templates/comments/preview.html:16
msgid "Post your comment"
msgstr "Enviar el seu comentari"
-#: contrib/comments/templates/comments/preview.html:15
+#: contrib/comments/templates/comments/preview.html:16
msgid "or make changes"
msgstr "o faci canvis."
-#: contrib/contenttypes/models.py:67
+#: contrib/contenttypes/models.py:70
msgid "python model class name"
msgstr "nom de la classe del model en python"
-#: contrib/contenttypes/models.py:71
-msgid "content type"
-msgstr "tipus de contingut"
-
-#: contrib/contenttypes/models.py:72
+#: contrib/contenttypes/models.py:75
msgid "content types"
msgstr "tipus de continguts"
@@ -1765,18 +1801,26 @@ msgstr ""
"Ho sentim, pero el seu formulari ha expirat. Per favor, continui omplint el "
"formulari en aquesta pàgina."
-#: contrib/gis/forms/fields.py:14
+#: contrib/gis/forms/fields.py:17
msgid "No geometry value provided."
msgstr "No s'ha indicat cap valor de geometria."
-#: contrib/gis/forms/fields.py:15
+#: contrib/gis/forms/fields.py:18
msgid "Invalid geometry value."
msgstr "Valor de geometria invàlid."
-#: contrib/gis/forms/fields.py:16
+#: contrib/gis/forms/fields.py:19
msgid "Invalid geometry type."
msgstr "Tipus de geometria invàlid."
+#: contrib/gis/forms/fields.py:20
+msgid ""
+"An error occurred when transforming the geometry to the SRID of the geometry "
+"form field."
+msgstr ""
+"Ha ocurregut un error al transformar la geometria al SRID de la geometria "
+"del camp de formulari."
+
#: contrib/humanize/templatetags/humanize.py:19
msgid "th"
msgstr "rt"
@@ -2112,51 +2156,51 @@ msgstr "Regió Bohèmia Central"
#: contrib/localflavor/cz/cz_regions.py:10
msgid "South Bohemian Region"
-msgstr "Regió Bohemia Sur"
+msgstr "Regió Bohèmia Sur"
#: contrib/localflavor/cz/cz_regions.py:11
msgid "Pilsen Region"
-msgstr ""
+msgstr "Regió Pilsen"
#: contrib/localflavor/cz/cz_regions.py:12
msgid "Carlsbad Region"
-msgstr ""
+msgstr "Regió Carlsbad"
#: contrib/localflavor/cz/cz_regions.py:13
msgid "Usti Region"
-msgstr ""
+msgstr "Regió Usti"
#: contrib/localflavor/cz/cz_regions.py:14
msgid "Liberec Region"
-msgstr ""
+msgstr "Regió Liberec"
#: contrib/localflavor/cz/cz_regions.py:15
msgid "Hradec Region"
-msgstr ""
+msgstr "Regió Hradec"
#: contrib/localflavor/cz/cz_regions.py:16
msgid "Pardubice Region"
-msgstr ""
+msgstr "Regió Pardubice"
#: contrib/localflavor/cz/cz_regions.py:17
msgid "Vysocina Region"
-msgstr ""
+msgstr "Regió Vysocina"
#: contrib/localflavor/cz/cz_regions.py:18
msgid "South Moravian Region"
-msgstr ""
+msgstr "Regió Moràvia Sur"
#: contrib/localflavor/cz/cz_regions.py:19
msgid "Olomouc Region"
-msgstr ""
+msgstr "Regió Olomouc"
#: contrib/localflavor/cz/cz_regions.py:20
msgid "Zlin Region"
-msgstr ""
+msgstr "Regió Zlin"
#: contrib/localflavor/cz/cz_regions.py:21
msgid "Moravian-Silesian Region"
-msgstr ""
+msgstr "Regió Moràvia-Silesiana"
#: contrib/localflavor/cz/forms.py:27 contrib/localflavor/sk/forms.py:30
msgid "Enter a postal code in the format XXXXX or XXX XX."
@@ -2164,11 +2208,13 @@ msgstr "Introduïu un codi postal en el format XXXXX or XXX XX."
#: contrib/localflavor/cz/forms.py:47
msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "Introduïu un número de naixement en el format XXXXXX/XXXX o XXXXXXXXXX."
+msgstr ""
+"Introduïu un número de naixement en el format XXXXXX/XXXX o XXXXXXXXXX."
#: contrib/localflavor/cz/forms.py:48
msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr "El paràmetre opcional 'Gènere' és invàlid, els valors vàlids son 'f' i 'm'."
+msgstr ""
+"El paràmetre opcional 'Gènere' és invàlid, els valors vàlids son 'f' i 'm'."
#: contrib/localflavor/cz/forms.py:49
msgid "Enter a valid birth number."
@@ -3004,16 +3050,16 @@ msgstr "Introduïu un número NIP en el format XXX-XXX-XX-XX o XX-XX-XXX-XXX."
msgid "Wrong checksum for the Tax Number (NIP)."
msgstr "Validació invàlida del número tributari (NIP)."
-#: contrib/localflavor/pl/forms.py:111
-msgid "National Business Register Number (REGON) consists of 7 or 9 digits."
+#: contrib/localflavor/pl/forms.py:109
+msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
msgstr ""
-"El número nacional de registre de negocis (REGON) consisteix en 7 o 9 dígits."
+"El número nacional de registre de negocis (REGON) consisteix en 9 o 14 dígits."
-#: contrib/localflavor/pl/forms.py:112
+#: contrib/localflavor/pl/forms.py:110
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:155
+#: contrib/localflavor/pl/forms.py:148
msgid "Enter a postal code in the format XX-XXX."
msgstr "Introduïu un codi postal en el format XX-XXX."
@@ -3851,60 +3897,60 @@ msgstr "nom per mostrar"
msgid "sites"
msgstr "llocs"
-#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:700
+#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:710
msgid "This value must be an integer."
msgstr "Aquest valor ha de ser un enter."
-#: db/models/fields/__init__.py:387
+#: db/models/fields/__init__.py:388
msgid "This value must be either True or False."
msgstr "Aquest valor ha de ser True (Veritat) o False (Fals)"
-#: db/models/fields/__init__.py:420
+#: db/models/fields/__init__.py:427
msgid "This field cannot be null."
msgstr "Aquest camp no pot ser nul."
-#: db/models/fields/__init__.py:436
+#: db/models/fields/__init__.py:443
msgid "Enter only digits separated by commas."
msgstr "Introduïu només dígits separats per comes."
-#: db/models/fields/__init__.py:467
+#: db/models/fields/__init__.py:474
msgid "Enter a valid date in YYYY-MM-DD format."
msgstr "Introduïu una data vàlida en el forma AAAA-MM-DD."
-#: db/models/fields/__init__.py:476
+#: db/models/fields/__init__.py:483
#, python-format
msgid "Invalid date: %s"
msgstr "Data invàlida: %s"
-#: db/models/fields/__init__.py:540 db/models/fields/__init__.py:558
+#: db/models/fields/__init__.py:547 db/models/fields/__init__.py:565
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
msgstr ""
"Introduïu un data/hora vàlida en format YYYY-MM-DD HH:MM[:ss[.uuuuuu]]."
-#: db/models/fields/__init__.py:594
+#: db/models/fields/__init__.py:601
msgid "This value must be a decimal number."
msgstr "Aquest valor ha de ser un número decimal."
-#: db/models/fields/__init__.py:676
+#: db/models/fields/__init__.py:686
msgid "This value must be a float."
msgstr "Aquest valor ha de ser un número amb punt de coma flotant."
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:746
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/__init__.py:839 db/models/fields/__init__.py:853
+#: db/models/fields/__init__.py:849 db/models/fields/__init__.py:863
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
msgstr "Introduïu una hora vàlida en el format HH:MM[:ss[.uuuuuu]]."
-#: db/models/fields/related.py:779
+#: db/models/fields/related.py:816
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Premeu la tecla \"Control\" -o \"Command\" en un Mac- per seleccionar més "
"d'un valor."
-#: db/models/fields/related.py:857
+#: db/models/fields/related.py:894
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
@@ -3971,11 +4017,11 @@ msgstr "Assegureu-vos de que no hi ha més de %s decimals."
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Assegureu-vos de que no hi ha més de %s dígits decimals."
-#: forms/fields.py:288 forms/fields.py:850
+#: forms/fields.py:288 forms/fields.py:863
msgid "Enter a valid date."
msgstr "Introduïu una data vàlida."
-#: forms/fields.py:322 forms/fields.py:851
+#: forms/fields.py:322 forms/fields.py:864
msgid "Enter a valid time."
msgstr "Introduïu una hora vàlida."
@@ -3996,7 +4042,15 @@ msgstr "No s'ha enviat cap fitxer."
msgid "The submitted file is empty."
msgstr "El fitxer enviat està buit."
-#: forms/fields.py:478
+#: forms/fields.py:450
+#, python-format
+msgid ""
+"Ensure this filename has at most %(max)d characters (it has %(length)d)."
+msgstr ""
+"Assegureu-vos de que el valor té com a màxim %(max)d caràcters "
+"(en té %(length)d)."
+
+#: forms/fields.py:483
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -4004,106 +4058,139 @@ msgstr ""
"Envieu una imatge vàlida. El fitxer que heu enviat no era una imatge o "
"estava corrupte."
-#: forms/fields.py:539
+#: forms/fields.py:544
msgid "Enter a valid URL."
msgstr "Introduïu una URL vàlida."
-#: forms/fields.py:540
+#: forms/fields.py:545
msgid "This URL appears to be a broken link."
msgstr "Aquesta URL sembla ser un enllaç trencat."
-#: forms/fields.py:619 forms/fields.py:697
+#: forms/fields.py:625 forms/fields.py:703
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Esculliu una opció vàlida. %(value)s no és una de les opcions vàlides."
-#: forms/fields.py:698 forms/fields.py:759 forms/models.py:729
+#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003
msgid "Enter a list of values."