Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

[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 Memon authored August 05, 2009

Showing 126 changed files with 21,697 additions and 10,466 deletions. Show diff stats Hide diff stats

  1. 6  AUTHORS
  2. 5  django/__init__.py
  3. BIN  django/conf/locale/ar/LC_MESSAGES/django.mo
  4. 179  django/conf/locale/ar/LC_MESSAGES/django.po
  5. BIN  django/conf/locale/bn/LC_MESSAGES/django.mo
  6. 4,940  django/conf/locale/bn/LC_MESSAGES/django.po
  7. BIN  django/conf/locale/bn/LC_MESSAGES/djangojs.mo
  8. 80  django/conf/locale/bn/LC_MESSAGES/djangojs.po
  9. BIN  django/conf/locale/ca/LC_MESSAGES/django.mo
  10. 549  django/conf/locale/ca/LC_MESSAGES/django.po
  11. BIN  django/conf/locale/cs/LC_MESSAGES/django.mo
  12. 2,199  django/conf/locale/cs/LC_MESSAGES/django.po
  13. BIN  django/conf/locale/da/LC_MESSAGES/django.mo
  14. 1,139  django/conf/locale/da/LC_MESSAGES/django.po
  15. BIN  django/conf/locale/de/LC_MESSAGES/django.mo
  16. 232  django/conf/locale/de/LC_MESSAGES/django.po
  17. BIN  django/conf/locale/es/LC_MESSAGES/django.mo
  18. 556  django/conf/locale/es/LC_MESSAGES/django.po
  19. BIN  django/conf/locale/es_AR/LC_MESSAGES/django.mo
  20. 203  django/conf/locale/es_AR/LC_MESSAGES/django.po
  21. BIN  django/conf/locale/et/LC_MESSAGES/django.mo
  22. 329  django/conf/locale/et/LC_MESSAGES/django.po
  23. BIN  django/conf/locale/fi/LC_MESSAGES/django.mo
  24. 962  django/conf/locale/fi/LC_MESSAGES/django.po
  25. BIN  django/conf/locale/he/LC_MESSAGES/django.mo
  26. 961  django/conf/locale/he/LC_MESSAGES/django.po
  27. BIN  django/conf/locale/it/LC_MESSAGES/django.mo
  28. 394  django/conf/locale/it/LC_MESSAGES/django.po
  29. BIN  django/conf/locale/it/LC_MESSAGES/djangojs.mo
  30. 9  django/conf/locale/it/LC_MESSAGES/djangojs.po
  31. BIN  django/conf/locale/ja/LC_MESSAGES/django.mo
  32. 426  django/conf/locale/ja/LC_MESSAGES/django.po
  33. BIN  django/conf/locale/ja/LC_MESSAGES/djangojs.mo
  34. 4  django/conf/locale/ja/LC_MESSAGES/djangojs.po
  35. BIN  django/conf/locale/ko/LC_MESSAGES/django.mo
  36. 5,801  django/conf/locale/ko/LC_MESSAGES/django.po
  37. BIN  django/conf/locale/ko/LC_MESSAGES/djangojs.mo
  38. 41  django/conf/locale/ko/LC_MESSAGES/djangojs.po
  39. BIN  django/conf/locale/mk/LC_MESSAGES/django.mo
  40. 764  django/conf/locale/mk/LC_MESSAGES/django.po
  41. BIN  django/conf/locale/nl/LC_MESSAGES/django.mo
  42. 920  django/conf/locale/nl/LC_MESSAGES/django.po
  43. BIN  django/conf/locale/no/LC_MESSAGES/django.mo
  44. 253  django/conf/locale/no/LC_MESSAGES/django.po
  45. BIN  django/conf/locale/pl/LC_MESSAGES/django.mo
  46. 172  django/conf/locale/pl/LC_MESSAGES/django.po
  47. BIN  django/conf/locale/pt/LC_MESSAGES/django.mo
  48. 1,060  django/conf/locale/pt/LC_MESSAGES/django.po
  49. BIN  django/conf/locale/pt_BR/LC_MESSAGES/django.mo
  50. 267  django/conf/locale/pt_BR/LC_MESSAGES/django.po
  51. BIN  django/conf/locale/ru/LC_MESSAGES/django.mo
  52. 327  django/conf/locale/ru/LC_MESSAGES/django.po
  53. BIN  django/conf/locale/sr/LC_MESSAGES/django.mo
  54. 1,946  django/conf/locale/sr/LC_MESSAGES/django.po
  55. BIN  django/conf/locale/sr/LC_MESSAGES/djangojs.mo
  56. 37  django/conf/locale/sr/LC_MESSAGES/djangojs.po
  57. BIN  django/conf/locale/sr_Latn/LC_MESSAGES/django.mo
  58. 4,436  django/conf/locale/sr_Latn/LC_MESSAGES/django.po
  59. BIN  django/conf/locale/sr_Latn/LC_MESSAGES/djangojs.mo
  60. 120  django/conf/locale/sr_Latn/LC_MESSAGES/djangojs.po
  61. BIN  django/conf/locale/th/LC_MESSAGES/django.mo
  62. 419  django/conf/locale/th/LC_MESSAGES/django.po
  63. BIN  django/conf/locale/th/LC_MESSAGES/djangojs.mo
  64. 27  django/conf/locale/th/LC_MESSAGES/djangojs.po
  65. BIN  django/conf/locale/zh_CN/LC_MESSAGES/django.mo
  66. 119  django/conf/locale/zh_CN/LC_MESSAGES/django.po
  67. BIN  django/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo
  68. 4  django/conf/locale/zh_CN/LC_MESSAGES/djangojs.po
  69. 16  django/conf/urls/defaults.py
  70. 24  django/contrib/admin/options.py
  71. 70  django/contrib/admin/sites.py
  72. 25  django/contrib/admin/templates/admin/base.html
  73. 18  django/contrib/admin/widgets.py
  74. 2  django/contrib/admindocs/templates/admin_doc/index.html
  75. 11  django/contrib/admindocs/views.py
  76. 3  django/contrib/gis/db/models/manager.py
  77. 26  django/contrib/gis/db/models/query.py
  78. 10  django/contrib/gis/db/models/sql/query.py
  79. 9  django/contrib/gis/gdal/prototypes/generation.py
  80. 2  django/contrib/gis/geos/prototypes/topology.py
  81. 41  django/contrib/gis/tests/geoapp/tests.py
  82. 47  django/contrib/gis/tests/relatedapp/tests.py
  83. 19  django/contrib/gis/tests/test_spatialrefsys.py
  84. 3  django/core/management/commands/dumpdata.py
  85. 3  django/core/management/commands/runserver.py
  86. 31  django/core/servers/basehttp.py
  87. 117  django/core/urlresolvers.py
  88. 10  django/db/backends/creation.py
  89. 19  django/db/backends/oracle/base.py
  90. 17  django/db/backends/postgresql/operations.py
  91. 36  django/forms/models.py
  92. 36  django/middleware/http.py
  93. 7  django/template/context.py
  94. 20  django/template/defaulttags.py
  95. 4  django/views/debug.py
  96. 53  docs/_ext/djangodocs.py
  97. 2  docs/_templates/layout.html
  98. 19  docs/faq/admin.txt
  99. 2  docs/howto/custom-model-fields.txt
  100. 25  docs/howto/deployment/modpython.txt
  101. 187  docs/howto/deployment/modwsgi.txt
  102. 10  docs/howto/error-reporting.txt
  103. 3  docs/index.txt
  104. 57  docs/internals/committers.txt
  105. 21  docs/internals/deprecation.txt
  106. 3  docs/internals/index.txt
  107. 31  docs/internals/release-process.txt
  108. 6  docs/intro/tutorial03.txt
  109. BIN  docs/ref/contrib/admin/_images/article_actions.png
  110. 114  docs/ref/contrib/admin/index.txt
  111. 4  docs/ref/contrib/contenttypes.txt
  112. 2  docs/ref/databases.txt
  113. 43  docs/ref/forms/fields.txt
  114. 15  docs/ref/middleware.txt
  115. 42  docs/ref/models/instances.txt
  116. 2  docs/ref/models/querysets.txt
  117. 17  docs/ref/templates/api.txt
  118. 37  docs/ref/templates/builtins.txt
  119. 111  docs/releases/1.1-rc-1.txt
  120. 459  docs/releases/1.1.txt
  121. 4  docs/releases/index.txt
  122. 49  docs/topics/forms/formsets.txt
  123. 203  docs/topics/http/urls.txt
  124. 89  docs/topics/i18n.txt
  125. 37  docs/topics/testing.txt
  126. 4  setup.py
6  AUTHORS
@@ -14,6 +14,7 @@ The PRIMARY AUTHORS are (and/or have been):
14 14
     * Robert Wittams
15 15
     * Gary Wilson
16 16
     * Brian Rosner
  17
+    * Justin Bronn
17 18
     * Karen Tracey
18 19
 
19 20
 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:
131 132
     Andrew Durdin <adurdin@gmail.com>
132 133
     dusk@woofle.net
133 134
     Andy Dustman <farcepest@gmail.com>
  135
+    J. Clifford Dyer <jcd@unc.edu>
134 136
     Clint Ecker
135 137
     Nick Efford <nick@efford.org>
136 138
     eibaan@gmail.com
@@ -199,6 +201,7 @@ answer newbie questions, and generally made Django that much better:
199 201
     Ian Holsman <http://feh.holsman.net/>
200 202
     Kieran Holland <http://www.kieranholland.com>
201 203
     Sung-Jin Hong <serialx.net@gmail.com>
  204
+    Leo "hylje" Honkanen <sealage@gmail.com>
202 205
     Richard House <Richard.House@i-logue.com>
203 206
     Robert Rock Howard <http://djangomojo.com/>
204 207
     John Huddleston <huddlej@wwu.edu>
@@ -217,7 +220,7 @@ answer newbie questions, and generally made Django that much better:
217 220
     Michael Josephson <http://www.sdjournal.com/>
218 221
     jpellerin@gmail.com
219 222
     junzhang.jn@gmail.com
220  
-    Antti Kaihola <http://akaihola.blogspot.com/>
  223
+    Antti Kaihola <http://djangopeople.net/akaihola/>
221 224
     Bahadır Kandemir <bahadir@pardus.org.tr>
222 225
     Karderio <karderio@gmail.com>
223 226
     Nagy Károly <charlie@rendszergazda.com>
@@ -436,6 +439,7 @@ answer newbie questions, and generally made Django that much better:
436 439
     viestards.lists@gmail.com
437 440
     George Vilches <gav@thataddress.com>
438 441
     Vlado <vlado@labath.org>
  442
+    Zachary Voase <zacharyvoase@gmail.com>
439 443
     Milton Waddams
440 444
     Chris Wagner <cw264701@ohio.edu>
441 445
     Rick Wagner <rwagner@physics.ucsd.edu>
5  django/__init__.py
... ...
@@ -1,4 +1,4 @@
1  
-VERSION = (1, 1, 0, 'beta', 1)
  1
+VERSION = (1, 2, 0, 'alpha', 0)
2 2
 
3 3
 def get_version():
4 4
     version = '%s.%s' % (VERSION[0], VERSION[1])
@@ -7,9 +7,8 @@ def get_version():
7 7
     if VERSION[3:] == ('alpha', 0):
8 8
         version = '%s pre-alpha' % version
9 9
     else:
10  
-        version = '%s %s' % (version, VERSION[3])
11 10
         if VERSION[3] != 'final':
12  
-            version = '%s %s' % (version, VERSION[4])
  11
+            version = '%s %s %s' % (version, VERSION[3], VERSION[4])
13 12
     from django.utils.version import get_svn_revision
14 13
     svn_rev = get_svn_revision()
15 14
     if svn_rev != u'SVN-unknown':
BIN  django/conf/locale/ar/LC_MESSAGES/django.mo
Binary file not shown
179  django/conf/locale/ar/LC_MESSAGES/django.po
... ...
@@ -1,19 +1,20 @@
1 1
 # translation of django.po to Arabic
2 2
 # This file is distributed under the same license as the django package.
3 3
 #
  4
+# Ossama M. Khayat <okhayat@yahoo.com>, 2009.
4 5
 msgid ""
5 6
 msgstr ""
6 7
 "Project-Id-Version: django\n"
7 8
 "Report-Msgid-Bugs-To: \n"
8  
-"POT-Creation-Date: 2009-04-12 07:33+0300\n"
9  
-"PO-Revision-Date: 2009-04-12 08:01+0300\n"
10  
-"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
  9
+"POT-Creation-Date: 2009-05-10 15:09+0300\n"
  10
+"PO-Revision-Date: 2009-05-10 15:18+0300\n"
11 11
 "Language-Team: Arabic <support@arabeyes.org>\n"
12 12
 "MIME-Version: 1.0\n"
13 13
 "Content-Type: text/plain; charset=UTF-8\n"
14 14
 "Content-Transfer-Encoding: 8bit\n"
15 15
 "X-Generator: KBabel 1.11.4\n"
16 16
 "Plural-Forms: nplurals=4; plural=(n == 1? 0 : (n == 2? 1 : (n <= 10? 2 : 3)))\n\n"
  17
+"\n"
17 18
 
18 19
 #: conf/global_settings.py:44
19 20
 msgid "Arabic"
@@ -219,16 +220,16 @@ msgstr "الصينيّة المبسطة"
219 220
 msgid "Traditional Chinese"
220 221
 msgstr "الصينيّة التقليدية"
221 222
 
222  
-#: contrib/admin/actions.py:56
  223
+#: contrib/admin/actions.py:60
223 224
 #, python-format
224 225
 msgid "Successfully deleted %(count)d %(items)s."
225 226
 msgstr "تم حذف %(count)d %(items)s بنجاح."
226 227
 
227  
-#: contrib/admin/actions.py:63 contrib/admin/options.py:1023
  228
+#: contrib/admin/actions.py:67 contrib/admin/options.py:1025
228 229
 msgid "Are you sure?"
229 230
 msgstr "هل أنت متأكد؟"
230 231
 
231  
-#: contrib/admin/actions.py:81
  232
+#: contrib/admin/actions.py:85
232 233
 #, python-format
233 234
 msgid "Delete selected %(verbose_name_plural)s"
234 235
 msgstr "حذف %(verbose_name_plural)s المحددون"
@@ -267,15 +268,15 @@ msgstr "هذا الشهر"
267 268
 msgid "This year"
268 269
 msgstr "هذه السنة"
269 270
 
270  
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
  271
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
271 272
 msgid "Yes"
272 273
 msgstr "نعم"
273 274
 
274  
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
  275
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
275 276
 msgid "No"
276 277
 msgstr "لا"
277 278
 
278  
-#: contrib/admin/filterspecs.py:154 forms/widgets.py:413
  279
+#: contrib/admin/filterspecs.py:154 forms/widgets.py:434
279 280
 msgid "Unknown"
280 281
 msgstr "مجهول"
281 282
 
@@ -315,80 +316,81 @@ msgstr "مُدخلات السجل"
315 316
 msgid "None"
316 317
 msgstr "لاشيء"
317 318
 
318  
-#: contrib/admin/options.py:517
  319
+#: contrib/admin/options.py:519
319 320
 #, python-format
320 321
 msgid "Changed %s."
321 322
 msgstr "عدّل %s."
322 323
 
323  
-#: contrib/admin/options.py:517 contrib/admin/options.py:527
324  
-#: contrib/comments/templates/comments/preview.html:16 forms/models.py:306
  324
+#: contrib/admin/options.py:519 contrib/admin/options.py:529
  325
+#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388
  326
+#: forms/models.py:587
325 327
 msgid "and"
326 328
 msgstr "و"
327 329
 
328  
-#: contrib/admin/options.py:522
  330
+#: contrib/admin/options.py:524
329 331
 #, python-format
330 332
 msgid "Added %(name)s \"%(object)s\"."
331 333
 msgstr "أضاف %(name)s \"%(object)s\"."
332 334
 
333  
-#: contrib/admin/options.py:526
  335
+#: contrib/admin/options.py:528
334 336
 #, python-format
335 337
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
336 338
 msgstr "غيّر %(list)s في %(name)s \"%(object)s\"."
337 339
 
338  
-#: contrib/admin/options.py:531
  340
+#: contrib/admin/options.py:533
339 341
 #, python-format
340 342
 msgid "Deleted %(name)s \"%(object)s\"."
341 343
 msgstr "حذف %(name)s \"%(object)s\"."
342 344
 
343  
-#: contrib/admin/options.py:535
  345
+#: contrib/admin/options.py:537
344 346
 msgid "No fields changed."
345 347
 msgstr "لم يتم تغيير أية حقول."
346 348
 
347  
-#: contrib/admin/options.py:596 contrib/auth/admin.py:67
  349
+#: contrib/admin/options.py:598 contrib/auth/admin.py:67
348 350
 #, python-format
349 351
 msgid "The %(name)s \"%(obj)s\" was added successfully."
350 352
 msgstr "تم اضافة %(name)s \"%(obj)s\" بنجاح."
351 353
 
352  
-#: contrib/admin/options.py:600 contrib/admin/options.py:633
  354
+#: contrib/admin/options.py:602 contrib/admin/options.py:635
353 355
 #: contrib/auth/admin.py:75
354 356
 msgid "You may edit it again below."
355 357
 msgstr "يمكنك تعديله مجددا في الأسفل."
356 358
 
357  
-#: contrib/admin/options.py:610 contrib/admin/options.py:643
  359
+#: contrib/admin/options.py:612 contrib/admin/options.py:645
358 360
 #, python-format
359 361
 msgid "You may add another %s below."
360 362
 msgstr "يمكنك إضافة %s آخر بالأسفل."
361 363
 
362  
-#: contrib/admin/options.py:631
  364
+#: contrib/admin/options.py:633
363 365
 #, python-format
364 366
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
365 367
 msgstr "تم تغيير %(name)s \"%(obj)s\" بنجاح."
366 368
 
367  
-#: contrib/admin/options.py:639
  369
+#: contrib/admin/options.py:641
368 370
 #, python-format
369 371
 msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
370 372
 msgstr "تمت إضافة %(name)s \"%(obj)s\" بنجاح، يمكنك تعديله مرة أخرى بالأسفل."
371 373
 
372  
-#: contrib/admin/options.py:770
  374
+#: contrib/admin/options.py:772
373 375
 #, python-format
374 376
 msgid "Add %s"
375 377
 msgstr "أضف %s"
376 378
 
377  
-#: contrib/admin/options.py:801 contrib/admin/options.py:1001
  379
+#: contrib/admin/options.py:803 contrib/admin/options.py:1003
378 380
 #, python-format
379 381
 msgid "%(name)s object with primary key %(key)r does not exist."
380 382
 msgstr "العنصر %(name)s الذي به الحقل الأساسي %(key)r غير موجود."
381 383
 
382  
-#: contrib/admin/options.py:858
  384
+#: contrib/admin/options.py:860
383 385
 #, python-format
384 386
 msgid "Change %s"
385 387
 msgstr "عدّل %s"
386 388
 
387  
-#: contrib/admin/options.py:902
  389
+#: contrib/admin/options.py:904
388 390
 msgid "Database error"
389 391
 msgstr "خطـأ في قاعدة البيانات"
390 392
 
391  
-#: contrib/admin/options.py:938
  393
+#: contrib/admin/options.py:940
392 394
 #, python-format
393 395
 msgid "%(count)s %(name)s was changed successfully."
394 396
 msgid_plural "%(count)s %(name)s were changed successfully."
@@ -397,12 +399,12 @@ msgstr[1] "تم تغيير عنصري %(name)s بنجاح."
397 399
 msgstr[2] "تم تغيير %(count)s %(name)s بنجاح."
398 400
 msgstr[3] "تم تغيير %(count)s %(name)s بنجاح."
399 401
 
400  
-#: contrib/admin/options.py:1016
  402
+#: contrib/admin/options.py:1018
401 403
 #, python-format
402 404
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
403 405
 msgstr "تم حذف %(name)s \"%(obj)s\" بنجاح."
404 406
 
405  
-#: contrib/admin/options.py:1052
  407
+#: contrib/admin/options.py:1054
406 408
 #, python-format
407 409
 msgid "Change history: %s"
408 410
 msgstr "تاريخ التغيير: %s"
@@ -498,7 +500,7 @@ msgstr "نحن آسفون، لكننا لم نعثر على الصفحة الم
498 500
 
499 501
 #: contrib/admin/templates/admin/500.html:4
500 502
 #: contrib/admin/templates/admin/app_index.html:8
501  
-#: contrib/admin/templates/admin/base.html:33
  503
+#: contrib/admin/templates/admin/base.html:31
502 504
 #: contrib/admin/templates/admin/change_form.html:17
503 505
 #: contrib/admin/templates/admin/change_list.html:25
504 506
 #: contrib/admin/templates/admin/delete_confirmation.html:6
@@ -542,7 +544,6 @@ msgid "Run the selected action"
542 544
 msgstr "نفذ العملية المحدّدة"
543 545
 
544 546
 #: contrib/admin/templates/admin/actions.html:4
545  
-#: contrib/admin/templates/admin/search_form.html:8
546 547
 msgid "Go"
547 548
 msgstr "نفّذ"
548 549
 
@@ -552,18 +553,18 @@ msgstr "نفّذ"
552 553
 msgid "%(name)s"
553 554
 msgstr "%(name)s"
554 555
 
555  
-#: contrib/admin/templates/admin/base.html:28
  556
+#: contrib/admin/templates/admin/base.html:26
556 557
 msgid "Welcome,"
557 558
 msgstr "أهلا، "
558 559
 
559  
-#: contrib/admin/templates/admin/base.html:28
  560
+#: contrib/admin/templates/admin/base.html:26
560 561
 #: contrib/admin/templates/registration/password_change_done.html:3
561 562
 #: contrib/admin/templates/registration/password_change_form.html:3
562 563
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
563 564
 msgid "Documentation"
564 565
 msgstr "الوثائق"
565 566
 
566  
-#: contrib/admin/templates/admin/base.html:28
  567
+#: contrib/admin/templates/admin/base.html:26
567 568
 #: contrib/admin/templates/admin/auth/user/change_password.html:14
568 569
 #: contrib/admin/templates/admin/auth/user/change_password.html:47
569 570
 #: contrib/admin/templates/registration/password_change_done.html:3
@@ -571,7 +572,7 @@ msgstr "الوثائق"
571 572
 msgid "Change password"
572 573
 msgstr "غيّر كلمة المرور"
573 574
 
574  
-#: contrib/admin/templates/admin/base.html:28
  575
+#: contrib/admin/templates/admin/base.html:26
575 576
 #: contrib/admin/templates/registration/password_change_done.html:3
576 577
 #: contrib/admin/templates/registration/password_change_form.html:3
577 578
 msgid "Log out"
@@ -702,6 +703,10 @@ msgstr "عملياتي"
702 703
 msgid "None available"
703 704
 msgstr "لا يوجد"
704 705
 
  706
+#: contrib/admin/templates/admin/index.html:72
  707
+msgid "Unknown content"
  708
+msgstr "مُحتوى مجهول"
  709
+
705 710
 #: contrib/admin/templates/admin/invalid_setup.html:7
706 711
 msgid ""
707 712
 "Something's wrong with your database installation. Make sure the appropriate "
@@ -749,6 +754,10 @@ msgstr ""
749 754
 msgid "Show all"
750 755
 msgstr "أظهر الكل"
751 756
 
  757
+#: contrib/admin/templates/admin/search_form.html:8
  758
+msgid "Search"
  759
+msgstr "ابحث"
  760
+
752 761
 #: contrib/admin/templates/admin/search_form.html:10
753 762
 #, python-format
754 763
 msgid "1 result"
@@ -1755,18 +1764,24 @@ msgid ""
1755 1764
 "form from this page."
1756 1765
 msgstr "نعتذر، لكنّ استمارتك انتهت صلاحيتها. رجاء أكمل تعبئة الاستمارة من هذه الصفحة."
1757 1766
 
1758  
-#: contrib/gis/forms/fields.py:14
  1767
+#: contrib/gis/forms/fields.py:17
1759 1768
 msgid "No geometry value provided."
1760 1769
 msgstr "لم تُدخل أي أحداثيات."
1761 1770
 
1762  
-#: contrib/gis/forms/fields.py:15
  1771
+#: contrib/gis/forms/fields.py:18
1763 1772
 msgid "Invalid geometry value."
1764 1773
 msgstr "الإحداثيات غير صحيحة."
1765 1774
 
1766  
-#: contrib/gis/forms/fields.py:16
  1775
+#: contrib/gis/forms/fields.py:19
1767 1776
 msgid "Invalid geometry type."
1768 1777
 msgstr "نوع الإحداثيات غير صحيح."
1769 1778
 
  1779
+#: contrib/gis/forms/fields.py:20
  1780
+msgid ""
  1781
+"An error occurred when transforming the geometry to the SRID of the geometry "
  1782
+"form field."
  1783
+msgstr "حدث خطأ أثناء تحويل geometry إلى حقل SRID."
  1784
+
1770 1785
 #: contrib/humanize/templatetags/humanize.py:19
1771 1786
 msgid "th"
1772 1787
 msgstr " "
@@ -3699,7 +3714,7 @@ msgstr "إنجلترا"
3699 3714
 
3700 3715
 #: contrib/localflavor/uk/uk_regions.py:91
3701 3716
 msgid "Northern Ireland"
3702  
-msgstr ""
  3717
+msgstr "شمال ايرلندا"
3703 3718
 
3704 3719
 #: contrib/localflavor/uk/uk_regions.py:92
3705 3720
 msgid "Scotland"
@@ -3727,7 +3742,7 @@ msgstr "أدخل رمز بريد جنوب إفريقي صحيح"
3727 3742
 
3728 3743
 #: contrib/localflavor/za/za_provinces.py:4
3729 3744
 msgid "Eastern Cape"
3730  
-msgstr ""
  3745
+msgstr "شرق كيب"
3731 3746
 
3732 3747
 #: contrib/localflavor/za/za_provinces.py:5
3733 3748
 msgid "Free State"
@@ -3751,15 +3766,15 @@ msgstr ""
3751 3766
 
3752 3767
 #: contrib/localflavor/za/za_provinces.py:10
3753 3768
 msgid "Northern Cape"
3754  
-msgstr ""
  3769
+msgstr "شمال كيب"
3755 3770
 
3756 3771
 #: contrib/localflavor/za/za_provinces.py:11
3757 3772
 msgid "North West"
3758  
-msgstr ""
  3773
+msgstr "شمال شرق"
3759 3774
 
3760 3775
 #: contrib/localflavor/za/za_provinces.py:12
3761 3776
 msgid "Western Cape"
3762  
-msgstr ""
  3777
+msgstr "غير كيب"
3763 3778
 
3764 3779
 #: contrib/redirects/models.py:7
3765 3780
 msgid "redirect from"
@@ -3823,7 +3838,7 @@ msgstr "اسم العرض"
3823 3838
 msgid "sites"
3824 3839
 msgstr "مواقع"
3825 3840
 
3826  
-#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:707
  3841
+#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:710
3827 3842
 msgid "This value must be an integer."
3828 3843
 msgstr "هذه القيمة يجب أن تكون رقما صحيحا."
3829 3844
 
@@ -3856,15 +3871,15 @@ msgstr "أدخل تاريخ/وقت صحيح بالنسق YYYY-MM-DD HH:MM[:ss[.u
3856 3871
 msgid "This value must be a decimal number."
3857 3872
 msgstr "يجب أن تكون هذه القيمة رقماً عشرياً."
3858 3873
 
3859  
-#: db/models/fields/__init__.py:683
  3874
+#: db/models/fields/__init__.py:686
3860 3875
 msgid "This value must be a float."
3861 3876
 msgstr "هذه القيمة يجب أن تكون عدد فاصلة عائمة."
3862 3877
 
3863  
-#: db/models/fields/__init__.py:743
  3878
+#: db/models/fields/__init__.py:746
3864 3879
 msgid "This value must be either None, True or False."
3865 3880
 msgstr "يجب أن تكون هذه القيمة None، أو True أو False."
3866 3881
 
3867  
-#: db/models/fields/__init__.py:846 db/models/fields/__init__.py:860
  3882
+#: db/models/fields/__init__.py:849 db/models/fields/__init__.py:863
3868 3883
 msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
3869 3884
 msgstr "أدخل توقيتاً صحيحاً بالنسق HH:MM[:ss[.uuuuuu]]."
3870 3885
 
@@ -3934,11 +3949,11 @@ msgstr "تحقق من أن تدخل %s خانات عشرية لا أكثر."
3934 3949
 msgid "Ensure that there are no more than %s digits before the decimal point."
3935 3950
 msgstr "تحقق من أن تدخل %s أرقام قبل الفاصل العشري لا أكثر."
3936 3951
 
3937  
-#: forms/fields.py:288 forms/fields.py:862
  3952
+#: forms/fields.py:288 forms/fields.py:863
3938 3953
 msgid "Enter a valid date."
3939 3954
 msgstr "أدخل تاريخاً صحيحاً."
3940 3955
 
3941  
-#: forms/fields.py:322 forms/fields.py:863
  3956
+#: forms/fields.py:322 forms/fields.py:864
3942 3957
 msgid "Enter a valid time."
3943 3958
 msgstr "أدخل وقتاً صحيحاً."
3944 3959
 
@@ -3981,20 +3996,20 @@ msgstr "أدخل رابطاً صحيحاً."
3981 3996
 msgid "This URL appears to be a broken link."
3982 3997
 msgstr "يبدو أن هذا الرابط غير متوفر."
3983 3998
 
3984  
-#: forms/fields.py:624 forms/fields.py:702
  3999
+#: forms/fields.py:625 forms/fields.py:703
3985 4000
 #, python-format
3986 4001
 msgid "Select a valid choice. %(value)s is not one of the available choices."
3987 4002
 msgstr "انتق خياراً صحيحاً. %(value)s ليس أحد الخيارات المتاحة."
3988 4003
 
3989  
-#: forms/fields.py:703 forms/fields.py:764 forms/models.py:776
  4004
+#: forms/fields.py:704 forms/fields.py:765 forms/models.py:965
3990 4005
 msgid "Enter a list of values."
3991 4006
 msgstr "أدخل قائمة من القيم."
3992 4007
 
3993  
-#: forms/fields.py:891
  4008
+#: forms/fields.py:892
3994 4009
 msgid "Enter a valid IPv4 address."
3995 4010
 msgstr "أدخل عنوان IPv4 صحيح."
3996 4011
 
3997  
-#: forms/fields.py:901
  4012
+#: forms/fields.py:902
3998 4013
 msgid "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
3999 4014
 msgstr "أدخل اختصار 'slug' صحيح يتكوّن من أحرف، أرقام، شرطات سفلية وعاديّة."
4000 4015
 
@@ -4002,34 +4017,62 @@ msgstr "أدخل اختصار 'slug' صحيح يتكوّن من أحرف، أر
4002 4017
 msgid "Order"
4003 4018
 msgstr "الترتيب"
4004 4019
 
4005  
-#: forms/models.py:299 forms/models.py:308
  4020
+#: forms/models.py:367
  4021
+#, python-format
  4022
+msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
  4023
+msgstr "%(field_name)s يجب أن يكون مُميّزاً مع %(date_field)s %(lookup)s."
  4024
+
  4025
+#: forms/models.py:381 forms/models.py:389
4006 4026
 #, python-format
4007 4027
 msgid "%(model_name)s with this %(field_label)s already exists."
4008 4028
 msgstr "النموذج %(model_name)s والحقل %(field_label)s موجود مسبقاً."
4009 4029
 
4010  
-#: forms/models.py:651
  4030
+#: forms/models.py:581
  4031
+#, python-format
  4032
+msgid "Please correct the duplicate data for %(field)s."
  4033
+msgstr "رجاء صحّح بيانات %(field)s المتكررة."
  4034
+
  4035
+#: forms/models.py:585
  4036
+#, python-format
  4037
+msgid "Please correct the duplicate data for %(field)s, which must be unique."
  4038
+msgstr "رجاء صحّح بيانات %(field)s المتكررة والتي يجب أن تكون مُميّزة."
  4039
+
  4040
+#: forms/models.py:591
  4041
+#, python-format
  4042
+msgid ""
  4043
+"Please correct the duplicate data for %(field_name)s which must be unique "
  4044
+"for the %(lookup)s in %(date_field)s."
  4045
+msgstr ""
  4046
+"رجاء صحّح بيانات %(field_name)s المتكررة والتي يجب أن تكون مُميّزة "
  4047
+"لـ%(lookup)s في %(date_field)s."
  4048
+
  4049
+#: forms/models.py:599
  4050
+msgid "Please correct the duplicate values below."
  4051
+msgstr "رجاءً صحّح القيم المُكرّرة أدناه."
  4052
+
  4053
+#: forms/models.py:837
4011 4054
 msgid "The inline foreign key did not match the parent instance primary key."
4012 4055
 msgstr "حقل foreign key المحدد لا يطابق الحقل الرئيسي له."
4013 4056
 
4014  
-#: forms/models.py:706
  4057
+#: forms/models.py:892
4015 4058
 msgid "Select a valid choice. That choice is not one of the available choices."
4016 4059
 msgstr "انتق خياراً صحيحاً. اختيارك ليس أحد الخيارات المتاحة."
4017 4060
 
4018  
-#: forms/models.py:777
  4061
+#: forms/models.py:966
4019 4062
 #, python-format
4020 4063
 msgid "Select a valid choice. %s is not one of the available choices."
4021 4064
 msgstr "انتق خياراً صحيحاً. %s ليس أحد الخيارات المتاحة."
4022 4065
 
4023  
-#: forms/models.py:779
  4066
+#: forms/models.py:968
4024 4067
 #, python-format
4025 4068
 msgid "\"%s\" is not a valid value for a primary key."
4026 4069
 msgstr "القيمة \"%s\" هي صحيحة للحقل المرجعي."
4027 4070
 
4028  
-#: template/defaultfilters.py:765
  4071
+#: template/defaultfilters.py:767
4029 4072
 msgid "yes,no,maybe"
4030 4073
 msgstr "نعم,لا,ربما"
4031 4074
 
4032  
-#: template/defaultfilters.py:796
  4075
+#: template/defaultfilters.py:798
4033 4076
 #, python-format
4034 4077
 msgid "%(size)d byte"
4035 4078
 msgid_plural "%(size)d bytes"
@@ -4038,42 +4081,42 @@ msgstr[1] "%(size)d بايت"
4038 4081
 msgstr[2] "%(size)d بايت"
4039 4082
 msgstr[3] "%(size)d بايت"
4040 4083
 
4041  
-#: template/defaultfilters.py:798
  4084
+#: template/defaultfilters.py:800
4042 4085
 #, python-format
4043 4086
 msgid "%.1f KB"
4044 4087
 msgstr "%.1f ك.ب"
4045 4088
 
4046  
-#: template/defaultfilters.py:800
  4089
+#: template/defaultfilters.py:802
4047 4090
 #, python-format
4048 4091
 msgid "%.1f MB"
4049 4092
 msgstr "%.1f م.ب"
4050 4093
 
4051  
-#: template/defaultfilters.py:801
  4094
+#: template/defaultfilters.py:803
4052 4095
 #, python-format
4053 4096
 msgid "%.1f GB"
4054 4097
 msgstr "%.1f ج.ب"
4055 4098
 
4056  
-#: utils/dateformat.py:41
  4099
+#: utils/dateformat.py:42
4057 4100
 msgid "p.m."
4058 4101
 msgstr "م"
4059 4102
 
4060  
-#: utils/dateformat.py:42
  4103
+#: utils/dateformat.py:43
4061 4104
 msgid "a.m."
4062 4105
 msgstr "ص"
4063 4106
 
4064  
-#: utils/dateformat.py:47
  4107
+#: utils/dateformat.py:48
4065 4108
 msgid "PM"
4066 4109
 msgstr "م"
4067 4110
 
4068  
-#: utils/dateformat.py:48
  4111
+#: utils/dateformat.py:49
4069 4112
 msgid "AM"
4070 4113
 msgstr "ص"
4071 4114
 
4072  
-#: utils/dateformat.py:97
  4115
+#: utils/dateformat.py:98
4073 4116
 msgid "midnight"
4074 4117
 msgstr "منتصف الليل"
4075 4118
 
4076  
-#: utils/dateformat.py:99
  4119
+#: utils/dateformat.py:100
4077 4120
 msgid "noon"
4078 4121
 msgstr "ظهراً"
4079 4122
 
BIN  django/conf/locale/bn/LC_MESSAGES/django.mo
Binary file not shown
4,940  django/conf/locale/bn/LC_MESSAGES/django.po
3494 additions, 1446 deletions not shown
BIN  django/conf/locale/bn/LC_MESSAGES/djangojs.mo
Binary file not shown
80  django/conf/locale/bn/LC_MESSAGES/djangojs.po
... ...
@@ -1,17 +1,13 @@
1  
-# SOME DESCRIPTIVE TITLE.
2  
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3  
-# This file is distributed under the same license as the PACKAGE package.
4  
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
  1
+# This file is distributed under the same license as the Django package.
5 2
 #
6  
-#, fuzzy
7 3
 msgid ""
8 4
 msgstr ""
9 5
 "Project-Id-Version: Django\n"
10 6
 "Report-Msgid-Bugs-To: \n"
11  
-"POT-Creation-Date: 2007-06-28 17:36+1000\n"
12  
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13  
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14  
-"Language-Team: LANGUAGE <LL@li.org>\n"
  7
+"POT-Creation-Date: 2008-09-02 22:36-0700\n"
  8
+"PO-Revision-Date: 2009-07-19 22:49+0000\n"
  9
+"Last-Translator: Nasimul Haque <nasim.haque@gmail.com>\n"
  10
+"Language-Team: Nasimul Haque <nasim.haque@gmail.com>\n"
15 11
 "MIME-Version: 1.0\n"
16 12
 "Content-Type: text/plain; charset=UTF-8\n"
17 13
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,100 +15,100 @@ msgstr ""
19 15
 #: contrib/admin/media/js/SelectFilter2.js:33
20 16
 #, perl-format
21 17
 msgid "Available %s"
22  
-msgstr ""
  18
+msgstr "%s বিদ্যমান"
23 19
 
24 20
 #: contrib/admin/media/js/SelectFilter2.js:41
25 21
 msgid "Choose all"
26  
-msgstr ""
  22
+msgstr "সব বাছাই করুন"
27 23
 
28 24
 #: contrib/admin/media/js/SelectFilter2.js:46
29 25
 msgid "Add"
30  
-msgstr ""
  26
+msgstr "যোগ করুন"
31 27
 
32 28
 #: contrib/admin/media/js/SelectFilter2.js:48
33 29
 msgid "Remove"
34  
-msgstr ""
  30
+msgstr "মুছে ফেলুন"
35 31
 
36 32
 #: contrib/admin/media/js/SelectFilter2.js:53
37 33
 #, perl-format
38 34
 msgid "Chosen %s"
39  
-msgstr ""
  35
+msgstr "%s বাছাই করা হয়েছে"
40 36
 
41 37
 #: contrib/admin/media/js/SelectFilter2.js:54
42 38
 msgid "Select your choice(s) and click "
43  
-msgstr ""
  39
+msgstr "আপনার পছন্দ বাছাই এবং ক্লিক করুন"
44 40
 
45 41
 #: contrib/admin/media/js/SelectFilter2.js:59
46 42
 msgid "Clear all"
47  
-msgstr ""
  43
+msgstr "সব পরিষ্কার করুন"
48 44
 
49  
-#: contrib/admin/media/js/dateparse.js:32
50 45
 #: contrib/admin/media/js/calendar.js:24
  46
+#: contrib/admin/media/js/dateparse.js:32
51 47
 msgid ""
52 48
 "January February March April May June July August September October November "
53 49
 "December"
54  
-msgstr ""
  50
+msgstr "জানুয়ারি ফেব্রুয়ারি মার্চ এপ্রিল মে জুন জুলাই অাগস্ট সেপ্টেম্বর অক্টোবর নভেম্বর ডিসেম্বর"
  51
+
  52
+#: contrib/admin/media/js/calendar.js:25
  53
+msgid "S M T W T F S"
  54
+msgstr "র স ম ব ব শ শ"
55 55
 
56 56
 #: contrib/admin/media/js/dateparse.js:33
57 57
 msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
58  
-msgstr ""
  58
+msgstr "রবিবার সোমবার মঙ্গলবার বুধবার বৃহস্পতিবার শুক্রবার শনিবার"
59 59
 
60  
-#: contrib/admin/media/js/calendar.js:25
61  
-msgid "S M T W T F S"
62  
-msgstr ""
  60
+#: contrib/admin/media/js/admin/CollapsedFieldsets.js:34
  61
+#: contrib/admin/media/js/admin/CollapsedFieldsets.js:72
  62
+msgid "Show"
  63
+msgstr "দেখান"
  64
+
  65
+#: contrib/admin/media/js/admin/CollapsedFieldsets.js:63
  66
+msgid "Hide"
  67
+msgstr "লুকান"
63 68
 
64 69
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:47
65 70
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
66 71
 msgid "Now"
67  
-msgstr ""
  72
+msgstr "এখন"
68 73
 
69 74
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:51
70 75
 msgid "Clock"
71  
-msgstr ""
  76
+msgstr "ঘড়ি"
72 77
 
73 78
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:78
74 79
 msgid "Choose a time"
75  
-msgstr ""
  80
+msgstr "সময় নির্বাচন করুন"
76 81
 
77 82
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
78 83
 msgid "Midnight"
79  
-msgstr ""
  84
+msgstr "মধ্যরাত"
80 85
 
81 86
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
82 87
 msgid "6 a.m."
83  
-msgstr ""
  88
+msgstr "৬ পূর্বাহ্ন"
84 89
 
85 90
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
86 91
 msgid "Noon"
87  
-msgstr ""
  92
+msgstr "দুপুর"
88 93
 
89 94
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:88
90 95
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:183
91 96
 msgid "Cancel"
92  
-msgstr ""
  97
+msgstr "বাতিল"
93 98
 
94 99
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:128
95 100
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:177
96 101
 msgid "Today"
97  
-msgstr ""
  102
+msgstr "আজ"
98 103
 
99 104
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:132
100 105
 msgid "Calendar"
101  
-msgstr ""
  106
+msgstr "দিনপঞ্জিকা"
102 107
 
103 108
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:175
104 109
 msgid "Yesterday"
105  
-msgstr ""
  110
+msgstr "গতকাল"
106 111
 
107 112
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:179
108 113
 msgid "Tomorrow"
109  
-msgstr ""
110  
-
111  
-#: contrib/admin/media/js/admin/CollapsedFieldsets.js:34
112  
-#: contrib/admin/media/js/admin/CollapsedFieldsets.js:72
113  
-msgid "Show"
114  
-msgstr ""
115  
-
116  
-#: contrib/admin/media/js/admin/CollapsedFieldsets.js:63
117  
-msgid "Hide"
118  
-msgstr ""
  114
+msgstr "আগামীকাল"
BIN  django/conf/locale/ca/LC_MESSAGES/django.mo
Binary file not shown
549  django/conf/locale/ca/LC_MESSAGES/django.po
@@ -5,7 +5,7 @@ msgid ""
5 5
 msgstr ""
6 6
 "Project-Id-Version: Django\n"
7 7
 "Report-Msgid-Bugs-To: \n"
8  
-"POT-Creation-Date: 2009-03-24 13:00+0100\n"
  8
+"POT-Creation-Date: 2009-07-07 15:04+0200\n"
9 9
 "PO-Revision-Date: 2009-03-24 13:28+0100\n"
10 10
 "Last-Translator: Django Catalan Group <django-cat@googlegroups.com>\n"
11 11
 "Language-Team: Catalan <ca@li.org>\n"
@@ -218,6 +218,20 @@ msgstr "xinès simplificat"
218 218
 msgid "Traditional Chinese"
219 219
 msgstr "xinès tradicional"
220 220
 
  221
+#: contrib/admin/actions.py:60
  222
+#, python-format
  223
+msgid "Successfully deleted %(count)d %(items)s."
  224
+msgstr "Eliminat/s %(count)d %(items)s satisfactòriament."
  225
+
  226
+#: contrib/admin/actions.py:67 contrib/admin/options.py:1025
  227
+msgid "Are you sure?"
  228
+msgstr "Esteu segurs?"
  229
+
  230
+#: contrib/admin/actions.py:85
  231
+#, python-format
  232
+msgid "Delete selected %(verbose_name_plural)s"
  233
+msgstr "Eliminar els %(verbose_name_plural)s seleccionats"
  234
+
221 235
 #: contrib/admin/filterspecs.py:44
222 236
 #, python-format
223 237
 msgid ""
@@ -252,15 +266,15 @@ msgstr "Aquest mes"
252 266
 msgid "This year"
253 267
 msgstr "Aquest any"
254 268
 
255  
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
  269
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
256 270
 msgid "Yes"
257 271
 msgstr "Si"
258 272
 
259  
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
  273
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
260 274
 msgid "No"
261 275
 msgstr "No"
262 276
 
263  
-#: contrib/admin/filterspecs.py:154 forms/widgets.py:413
  277
+#: contrib/admin/filterspecs.py:154 forms/widgets.py:434
264 278
 msgid "Unknown"
265 279
 msgstr "Desconegut"
266 280
 
@@ -296,74 +310,61 @@ msgstr "entrada del registre"
296 310
 msgid "log entries"
297 311
 msgstr "entrades del registre"
298 312
 
299  
-#: contrib/admin/options.py:131 contrib/admin/options.py:145
  313
+#: contrib/admin/options.py:133 contrib/admin/options.py:147
300 314
 msgid "None"
301 315
 msgstr "cap"
302 316
 
303  
-#: contrib/admin/options.py:498
304  
-#, python-format
305  
-msgid "Successfully deleted %(count)d %(items)s."
306  
-msgstr "Eliminat/s %(count)d %(items)s satisfactòriament."
307  
-
308  
-#: contrib/admin/options.py:505 contrib/admin/options.py:1012
309  
-msgid "Are you sure?"
310  
-msgstr "Esteu segurs?"
311  
-
312  
-#: contrib/admin/options.py:523
313  
-#, python-format
314  
-msgid "Delete selected %(verbose_name_plural)s"
315  
-msgstr "Eliminar els %(verbose_name_plural)s seleccionats"
316  
-
317  
-#: contrib/admin/options.py:531
  317
+#: contrib/admin/options.py:519
318 318
 #, python-format
319 319
 msgid "Changed %s."
320 320
 msgstr "Modificat %s."
321 321
 
322  
-#: contrib/admin/options.py:531 contrib/admin/options.py:541
323  
-#: contrib/comments/templates/comments/preview.html:15 forms/models.py:296
  322
+#: contrib/admin/options.py:519 contrib/admin/options.py:529
  323
+#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388
  324
+#: forms/models.py:600
324 325
 msgid "and"
325 326
 msgstr "i"
326 327
 
327  
-#: contrib/admin/options.py:536
  328
+#: contrib/admin/options.py:524
328 329
 #, python-format
329 330
 msgid "Added %(name)s \"%(object)s\"."
330 331
 msgstr "Afegit %(name)s \"%(object)s\""
331 332
 
332  
-#: contrib/admin/options.py:540
  333
+#: contrib/admin/options.py:528
333 334
 #, python-format
334 335
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
335 336
 msgstr "Modificat %(list)s per a %(name)s \"%(object)s\"."
336 337
 
337  
-#: contrib/admin/options.py:545
  338
+#: contrib/admin/options.py:533
338 339
 #, python-format
339 340
 msgid "Deleted %(name)s \"%(object)s\"."
340 341
 msgstr "Eliminat %(name)s \"%(object)s\"."
341 342
 
342  
-#: contrib/admin/options.py:549
  343
+#: contrib/admin/options.py:537
343 344
 msgid "No fields changed."
344 345
 msgstr "Cap camp canviat."
345 346
 
346  
-#: contrib/admin/options.py:610 contrib/auth/admin.py:67
  347
+#: contrib/admin/options.py:598 contrib/auth/admin.py:67
347 348
 #, python-format
348 349
 msgid "The %(name)s \"%(obj)s\" was added successfully."
349 350
 msgstr "El/la %(name)s \"%(obj)s\".ha estat afegit/da amb èxit."
350 351
 
351  
-#: contrib/admin/options.py:614 contrib/admin/options.py:647
  352
+#: contrib/admin/options.py:602 contrib/admin/options.py:635
352 353
 #: contrib/auth/admin.py:75
353 354
 msgid "You may edit it again below."
354 355
 msgstr "Podeu editar-lo de nou a baix."
355 356
 
356  
-#: contrib/admin/options.py:624 contrib/admin/options.py:657
  357
+#: contrib/admin/options.py:612 contrib/admin/options.py:645
357 358
 #, python-format
358 359
 msgid "You may add another %s below."
359 360
 msgstr "Podeu afegir un altre %s a baix."
360 361
 
361  
-#: contrib/admin/options.py:645
  362
+#: contrib/admin/options.py:633
362 363
 #, python-format
363 364
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
364 365
 msgstr "S'ha modificat amb èxit el/la %(name)s \"%(obj)s."
365 366
 
366  
-#: contrib/admin/options.py:653
  367
+#: contrib/admin/options.py:641
367 368
 #, python-format
368 369
 msgid ""
369 370
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -371,43 +372,43 @@ msgstr ""
371 372
 "S'ha afegit exitosament el/la %(name)s \"%(obj)s\". Pot editar-lo de nou "
372 373
 "abaix."
373 374
 
374  
-#: contrib/admin/options.py:774
  375
+#: contrib/admin/options.py:772
375 376
 #, python-format
376 377
 msgid "Add %s"
377 378
 msgstr "Afegir %s"
378 379
 
379  
-#: contrib/admin/options.py:805 contrib/admin/options.py:990
  380
+#: contrib/admin/options.py:803 contrib/admin/options.py:1003
380 381
 #, python-format
381 382
 msgid "%(name)s object with primary key %(key)r does not exist."
382 383
 msgstr "No existèix cap objecte %(name)s amb la clau primària %(key)r."
383 384
 
384  
-#: contrib/admin/options.py:862
  385
+#: contrib/admin/options.py:860
385 386
 #, python-format
386 387
 msgid "Change %s"
387 388
 msgstr "Modificar %s"
388 389
 
389  
-#: contrib/admin/options.py:894
  390
+#: contrib/admin/options.py:904
390 391
 msgid "Database error"
391 392
 msgstr "Error de base de dades"
392 393
 
393  
-#: contrib/admin/options.py:930
  394
+#: contrib/admin/options.py:940
394 395
 #, python-format
395 396
 msgid "%(count)s %(name)s was changed successfully."
396 397
 msgid_plural "%(count)s %(name)s were changed successfully."
397 398
 msgstr[0] "%(count)s %(name)s s'ha modificat amb èxit."
398 399
 msgstr[1] "%(count)s %(name)s s'han modificat amb èxit."
399 400
 
400  
-#: contrib/admin/options.py:1005
  401
+#: contrib/admin/options.py:1018
401 402
 #, python-format
402 403
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
403 404
 msgstr "El/la %(name)s \"%(obj)s\" ha estat eliminat amb èxit."
404 405
 
405  
-#: contrib/admin/options.py:1041
  406
+#: contrib/admin/options.py:1054
406 407
 #, python-format
407 408
 msgid "Change history: %s"
408 409
 msgstr "Modificar històric: %s"
409 410
 
410  
-#: contrib/admin/sites.py:15 contrib/admin/views/decorators.py:14
  411
+#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14
411 412
 #: contrib/auth/forms.py:80
412 413
 msgid ""
413 414
 "Please enter a correct username and password. Note that both fields are case-"
@@ -416,11 +417,11 @@ msgstr ""
416 417
 "Si us plau, introduïu un nom d'usuari i contrasenya vàlids. Tingueu en "
417 418
 "compte que tots dos camps son sensibles a majúscules i minúscules."
418 419
 
419  
-#: contrib/admin/sites.py:250 contrib/admin/views/decorators.py:40
  420
+#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40
420 421
 msgid "Please log in again, because your session has expired."
421 422
 msgstr "Si us plau, identifiqueu-vos de nou doncs la vostra sessió ha expirat."
422 423
 
423  
-#: contrib/admin/sites.py:257 contrib/admin/views/decorators.py:47
  424
+#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47
424 425
 msgid ""
425 426
 "Looks like your browser isn't configured to accept cookies. Please enable "
426 427
 "cookies, reload this page, and try again."
@@ -429,29 +430,29 @@ msgstr ""
429 430
 "'cookies' (galetes). Si us plau, habiliteu les 'cookies', recarregueu "
430 431
 "aquesta pàgina i proveu-ho de nou. "
431 432
 
432  
-#: contrib/admin/sites.py:273 contrib/admin/sites.py:279
  433
+#: contrib/admin/sites.py:301 contrib/admin/sites.py:307
433 434
 #: contrib/admin/views/decorators.py:66
434 435
 msgid "Usernames cannot contain the '@' character."
435 436
 msgstr "Els noms d'usuari no poden contenir el caracter '@'."
436 437
 
437  
-#: contrib/admin/sites.py:276 contrib/admin/views/decorators.py:62
  438
+#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62
438 439
 #, python-format
439 440
 msgid "Your e-mail address is not your username. Try '%s' instead."
440 441
 msgstr ""
441 442
 "La vostra adreça de correu no és el vostre nom d'usuari. Provi '%s' en tot "
442 443
 "cas."
443 444
 
444  
-#: contrib/admin/sites.py:336
  445
+#: contrib/admin/sites.py:360
445 446
 msgid "Site administration"
446 447
 msgstr "Lloc administratiu"
447 448
 
448  
-#: contrib/admin/sites.py:349 contrib/admin/templates/admin/login.html:26
  449
+#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26
449 450
 #: contrib/admin/templates/registration/password_reset_complete.html:14
450 451
 #: contrib/admin/views/decorators.py:20
451 452
 msgid "Log in"
452 453
 msgstr "Iniciar sessió"
453 454
 
454  
-#: contrib/admin/sites.py:396
  455
+#: contrib/admin/sites.py:417
455 456
 #, python-format
456 457
 msgid "%s administration"
457 458
 msgstr "Administració de %s"
@@ -466,34 +467,27 @@ msgstr "Un o més %(fieldname)s en %(name)s: %(obj)s"
466 467
 msgid "One or more %