diff --git a/AUTHORS b/AUTHORS
index 8ed9286a77..247e81c14c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -457,6 +457,7 @@ answer newbie questions, and generally made Django that much better:
     ymasuda@ethercube.com
     Jesse Young <adunar@gmail.com>
     Mykola Zamkovoi <nickzam@gmail.com>
+    Gasper Zejn <zejn@kiberpipa.org>
     Jarek Zgoda <jarek.zgoda@gmail.com>
     Cheng Zhang
 
diff --git a/django/conf/locale/sl/LC_MESSAGES/django.mo b/django/conf/locale/sl/LC_MESSAGES/django.mo
index 72d3898945..5d0a05c936 100644
Binary files a/django/conf/locale/sl/LC_MESSAGES/django.mo and b/django/conf/locale/sl/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/sl/LC_MESSAGES/django.po b/django/conf/locale/sl/LC_MESSAGES/django.po
index ef4eb49324..c4227996f1 100644
--- a/django/conf/locale/sl/LC_MESSAGES/django.po
+++ b/django/conf/locale/sl/LC_MESSAGES/django.po
@@ -1,13 +1,12 @@
 # translation of django.po to
-# Gasper Zejn <zejn@kiberpipa.org>, 2008.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the Django package.
+
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-03 10:02+0200\n"
-"PO-Revision-Date: 2009-02-13 12:01+0100\n"
+"POT-Creation-Date: 2009-03-28 21:56+0100\n"
+"PO-Revision-Date: 2009-03-29 13:24+0200\n"
 "Last-Translator: Gasper Zejn <zejn@kiberpipa.org>\n"
 "Language-Team:  <sl@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -101,114 +100,122 @@ msgid "Hebrew"
 msgstr "Hebrejski jezik"
 
 #: conf/global_settings.py:65
+msgid "Hindi"
+msgstr "Hindujščina"
+
+#: conf/global_settings.py:66
 msgid "Croatian"
 msgstr "Hrvaščina"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
 msgid "Icelandic"
 msgstr "Islandski jezik"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
 msgid "Italian"
 msgstr "Italijanščina"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
 msgid "Japanese"
 msgstr "Japonščina"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
 msgid "Georgian"
 msgstr "Gruzijščina"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
 msgid "Korean"
 msgstr "Korejščina"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
 msgid "Khmer"
 msgstr "Kmerščina"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
 msgid "Kannada"
 msgstr "Kanareščina"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
 msgid "Latvian"
 msgstr "Latvijščina"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
 msgid "Lithuanian"
 msgstr "Litvanščina"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
 msgid "Macedonian"
 msgstr "Makedonščina"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
 msgid "Dutch"
 msgstr "Nizozemščina"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
 msgid "Norwegian"
 msgstr "Norveščina"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
 msgid "Polish"
 msgstr "Poljščina"
 
-#: conf/global_settings.py:79
-msgid "Portugese"
+#: conf/global_settings.py:80
+msgid "Portuguese"
 msgstr "Portugalščina"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
 msgid "Brazilian Portuguese"
 msgstr "Brazilska portugalščina"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
 msgid "Romanian"
 msgstr "Romunščina"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
 msgid "Russian"
 msgstr "Ruščina"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
 msgid "Slovak"
 msgstr "Slovaščina"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
 msgid "Serbian"
 msgstr "Srbščina"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
 msgid "Swedish"
 msgstr "Švedščina"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
 msgid "Tamil"
 msgstr "Tamilščina"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
 msgid "Telugu"
 msgstr "Teluščina"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
+msgid "Thai"
+msgstr "Tajski jezik"
+
+#: conf/global_settings.py:91
 msgid "Turkish"
 msgstr "Turščina"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:92
 msgid "Ukrainian"
 msgstr "Ukrajinščina"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:93
 msgid "Simplified Chinese"
 msgstr "Poenostavljena kitajščina"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:94
 msgid "Traditional Chinese"
 msgstr "Tradicionalna kitajščina"
 
@@ -221,7 +228,7 @@ msgstr ""
 "<h3>Avtor: %s</h3>\n"
 "<ul>\n"
 
-#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:92
+#: contrib/admin/filterspecs.py:75 contrib/admin/filterspecs.py:92
 #: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173
 msgid "All"
 msgstr "Vse"
@@ -246,18 +253,22 @@ msgstr "Ta mesec"
 msgid "This year"
 msgstr "Letos"
 
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:391
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
 msgid "Yes"
 msgstr "Da"
 
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:391
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
 msgid "No"
 msgstr "Ne"
 
-#: contrib/admin/filterspecs.py:154 forms/widgets.py:391
+#: contrib/admin/filterspecs.py:154 forms/widgets.py:413
 msgid "Unknown"
 msgstr "Neznano"
 
+#: contrib/admin/helpers.py:14
+msgid "Action:"
+msgstr "Dejanje:"
+
 #: contrib/admin/models.py:19
 msgid "action time"
 msgstr "čas dejanja"
@@ -286,93 +297,117 @@ msgstr "dnevniški vnos"
 msgid "log entries"
 msgstr "dnevniški vnosi"
 
-#: contrib/admin/options.py:60 contrib/admin/options.py:121
+#: contrib/admin/options.py:131 contrib/admin/options.py:145
 msgid "None"
 msgstr "Brez vrednosti"
 
-#: contrib/admin/options.py:338
+#: contrib/admin/options.py:498
+#, python-format
+msgid "Successfully deleted %(count)d %(items)s."
+msgstr "Uspešno izbrisano %(count)d %(items)s"
+
+#: contrib/admin/options.py:505 contrib/admin/options.py:1012
+msgid "Are you sure?"
+msgstr "Ste prepričani?"
+
+#: contrib/admin/options.py:523
+#, python-format
+msgid "Delete selected %(verbose_name_plural)s"
+msgstr "Izbriši izbrano: %(verbose_name_plural)s"
+
+#: contrib/admin/options.py:531
 #, python-format
 msgid "Changed %s."
 msgstr "Spremenjen %s."
 
-#: contrib/admin/options.py:338 contrib/admin/options.py:348
-#: forms/models.py:275
+#: contrib/admin/options.py:531 contrib/admin/options.py:541
+#: contrib/comments/templates/comments/preview.html:15 forms/models.py:296
 msgid "and"
 msgstr "in"
 
-#: contrib/admin/options.py:343
+#: contrib/admin/options.py:536
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Dodal %(name)s \"%(object)s\"."
 
-#: contrib/admin/options.py:347
+#: contrib/admin/options.py:540
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Spremenjeno %(list)s za %(name)s \"%(object)s\"."
 
-#: contrib/admin/options.py:352
+#: contrib/admin/options.py:545
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Izbrisan %(name)s \"%(object)s\"."
 
-#: contrib/admin/options.py:356
+#: contrib/admin/options.py:549
 msgid "No fields changed."
 msgstr "Nobeno polje ni bilo spremenjeno."
 
-#: contrib/admin/options.py:417 contrib/auth/admin.py:51
+#: contrib/admin/options.py:610 contrib/auth/admin.py:67
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr "%(name)s \"%(obj)s\" je bil uspešno dodan."
 
-#: contrib/admin/options.py:421 contrib/admin/options.py:454
-#: contrib/auth/admin.py:59
+#: contrib/admin/options.py:614 contrib/admin/options.py:647
+#: contrib/auth/admin.py:75
 msgid "You may edit it again below."
 msgstr "Vsebino lahko znova uredite spodaj."
 
-#: contrib/admin/options.py:431 contrib/admin/options.py:464
+#: contrib/admin/options.py:624 contrib/admin/options.py:657
 #, python-format
 msgid "You may add another %s below."
 msgstr "Spodaj lahko dodate še en %s."
 
-#: contrib/admin/options.py:452
+#: contrib/admin/options.py:645
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr "%(name)s \"%(obj)s\" je bil uspešno spremenjen."
 
-#: contrib/admin/options.py:460
+#: contrib/admin/options.py:653
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr "%(name)s \"%(obj)s\" je bil uspešno dodan. Ponovno ga lahko uredite spodaj."
 
-#: contrib/admin/options.py:536
+#: contrib/admin/options.py:774
 #, python-format
 msgid "Add %s"
 msgstr "Dodaj %s"
 
-#: contrib/admin/options.py:614
+#: contrib/admin/options.py:805 contrib/admin/options.py:990
+#, python-format
+msgid "%(name)s object with primary key %(key)r does not exist."
+msgstr "Objekt %(name)s z glavnim ključem %(key)r ne obstaja."
+
+#: contrib/admin/options.py:862
 #, python-format
 msgid "Change %s"
 msgstr "Spremeni %s"
 
-#: contrib/admin/options.py:646
+#: contrib/admin/options.py:894
 msgid "Database error"
 msgstr "Napaka v podatkovni bazi"
 
-#: contrib/admin/options.py:696
+#: contrib/admin/options.py:930
+#, 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 je bil uspešno spremenjen."
+msgstr[1] "%(count)s %(name)s sta bila uspešno spremenjena."
+msgstr[2] "%(count)s %(name)s so bili uspešno spremenjeni."
+msgstr[3] "%(count)s %(name)s je bilo uspešno spremenjenih."
+
+#: contrib/admin/options.py:1005
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" je bil uspešno izbrisan."
 
-#: contrib/admin/options.py:703
-msgid "Are you sure?"
-msgstr "Ste prepričani?"
-
-#: contrib/admin/options.py:732
+#: contrib/admin/options.py:1041
 #, python-format
 msgid "Change history: %s"
 msgstr "Zgodovina sprememb: %s"
 
-#: contrib/admin/sites.py:16 contrib/admin/views/decorators.py:14
+#: contrib/admin/sites.py:15 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-"
@@ -381,11 +416,11 @@ msgstr ""
 "Prosimo, vnesite veljavno uporabniško ime in geslo. Opomba: obe polji "
 "upoštevata velikost črk."
 
-#: contrib/admin/sites.py:227 contrib/admin/views/decorators.py:40
+#: contrib/admin/sites.py:250 contrib/admin/views/decorators.py:40
 msgid "Please log in again, because your session has expired."
 msgstr "Vaša seja je pretekla; prosimo da se ponovno prijavite."
 
-#: contrib/admin/sites.py:234 contrib/admin/views/decorators.py:47
+#: contrib/admin/sites.py:257 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."
@@ -393,37 +428,37 @@ msgstr ""
 "Izgleda, da vaš brskalnik nima podpore za piškotke. Prosimo, vključite "
 "piškotke, osvežite stran in poskusite ponovno."
 
-#: contrib/admin/sites.py:250 contrib/admin/sites.py:256
+#: contrib/admin/sites.py:273 contrib/admin/sites.py:279
 #: contrib/admin/views/decorators.py:66
 msgid "Usernames cannot contain the '@' character."
 msgstr "Uporabniška imena ne smejo vsebovati znaka '@'."
 
-#: contrib/admin/sites.py:253 contrib/admin/views/decorators.py:62
+#: contrib/admin/sites.py:276 contrib/admin/views/decorators.py:62
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr "Vaš e-main naslov ni vaše uporabniško ime. Poskusite uporabiti '%s'."
 
-#: contrib/admin/sites.py:313
+#: contrib/admin/sites.py:336
 msgid "Site administration"
 msgstr "Administracija strani"
 
-#: contrib/admin/sites.py:326 contrib/admin/templates/admin/login.html:26
+#: contrib/admin/sites.py:349 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 "Prijavite se"
 
-#: contrib/admin/sites.py:373
+#: contrib/admin/sites.py:396
 #, python-format
 msgid "%s administration"
 msgstr "Administracija %s"
 
-#: contrib/admin/util.py:138
+#: contrib/admin/util.py:168
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr "Eden ali več %(fieldname)s v %(name)s: %(obj)s"
 
-#: contrib/admin/util.py:143
+#: contrib/admin/util.py:173
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr "Eden ali več %(fieldname)s v %(name)s:"
@@ -444,11 +479,11 @@ msgstr "Trenutno:"
 msgid "Change:"
 msgstr "Sprememba:"
 
-#: contrib/admin/widgets.py:121
+#: contrib/admin/widgets.py:123
 msgid "Lookup"
 msgstr "Poizvedba"
 
-#: contrib/admin/widgets.py:228
+#: contrib/admin/widgets.py:230
 msgid "Add Another"
 msgstr "Dodaj še enega"
 
@@ -463,10 +498,11 @@ msgstr "Opravičujemo se, a zahtevane strani ni mogoče najti."
 
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/app_index.html:8
-#: contrib/admin/templates/admin/base.html:30
+#: contrib/admin/templates/admin/base.html:33
 #: contrib/admin/templates/admin/change_form.html:17
-#: contrib/admin/templates/admin/change_list.html:8
+#: contrib/admin/templates/admin/change_list.html:20
 #: 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
 #: contrib/admin/templates/admin/object_history.html:6
 #: contrib/admin/templates/admin/auth/user/change_password.html:10
@@ -502,24 +538,33 @@ msgstr ""
 "administratorjem spletne strani in naj bi jo v kratkem odpravili. Hvala za "
 "potrpljenje."
 
+#: contrib/admin/templates/admin/actions.html:4
+msgid "Run the selected action"
+msgstr "Izvedi izbrano dejanje"
+
+#: contrib/admin/templates/admin/actions.html:4
+#: contrib/admin/templates/admin/search_form.html:8
+msgid "Go"
+msgstr "Pojdi"
+
 #: contrib/admin/templates/admin/app_index.html:10
 #: contrib/admin/templates/admin/index.html:19
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
 
-#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/base.html:28
 msgid "Welcome,"
 msgstr "Dobrodošli,"
 
-#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/base.html:28
 #: 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 "Dokumentacija"
 
-#: contrib/admin/templates/admin/base.html:25
+#: 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/registration/password_change_done.html:3
@@ -527,7 +572,7 @@ msgstr "Dokumentacija"
 msgid "Change password"
 msgstr "Spremeni geslo"
 
-#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/base.html:28
 #: contrib/admin/templates/registration/password_change_done.html:3
 #: contrib/admin/templates/registration/password_change_form.html:3
 msgid "Log out"
@@ -553,11 +598,12 @@ msgstr "Zgodovina"
 
 #: contrib/admin/templates/admin/change_form.html:28
 #: contrib/admin/templates/admin/edit_inline/stacked.html:13
-#: contrib/admin/templates/admin/edit_inline/tabular.html:25
+#: contrib/admin/templates/admin/edit_inline/tabular.html:27
 msgid "View on site"
 msgstr "Poglej na strani"
 
 #: 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
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
@@ -566,17 +612,17 @@ msgstr[1] "Prosimo, odpravite sledeči napaki."
 msgstr[2] "Prosimo, odpravite sledeče napake."
 msgstr[3] "Prosimo, odpravite sledeče napake."
 
-#: contrib/admin/templates/admin/change_list.html:16
+#: contrib/admin/templates/admin/change_list.html:41
 #, python-format
 msgid "Add %(name)s"
 msgstr "Dodaj %(name)s"
 
-#: contrib/admin/templates/admin/change_list.html:26
+#: contrib/admin/templates/admin/change_list.html:60
 msgid "Filter"
 msgstr "Filter"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:10
-#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:246
+#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:251
 msgid "Delete"
 msgstr "Izbriši"
 
@@ -600,9 +646,33 @@ msgstr ""
 "Vsi naslednji povezani elementi bodo izbrisani:"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:28
+#: contrib/admin/templates/admin/delete_selected_confirmation.html:33
 msgid "Yes, I'm sure"
 msgstr "Ja, prepričan sem"
 
+#: contrib/admin/templates/admin/delete_selected_confirmation.html:9
+msgid "Delete multiple objects"
+msgstr "Izbriši več objektov."
+
+#: contrib/admin/templates/admin/delete_selected_confirmation.html:15
+#, python-format
+msgid ""
+"Deleting the %(object_name)s would result in deleting related objects, but "
+"your account doesn't have permission to delete the following types of "
+"objects:"
+msgstr ""
+"Izbris %(object_name)s bi pomenil izbris povezanih "
+"objektov, vendar nimate dovoljenja za izbris naslednjih tipov objektov:"
+
+#: contrib/admin/templates/admin/delete_selected_confirmation.html:22
+#, python-format
+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 ""
+"Ste prepričani, da želite izbrisati izbrane objekte %(object_name)s? "
+"Vsi naslednji vnosi in povezani vnosi bodo izbrisani:"
+
 #: contrib/admin/templates/admin/filter.html:2
 #, python-format
 msgid " By %(filter_title)s "
@@ -660,11 +730,12 @@ msgid "User"
 msgstr "Uporabnik"
 
 #: contrib/admin/templates/admin/object_history.html:24
+#: contrib/comments/templates/comments/moderation_queue.html:33
 msgid "Action"
 msgstr "Dejanje"
 
 #: contrib/admin/templates/admin/object_history.html:30
-#: utils/translation/trans_real.py:404
+#: utils/translation/trans_real.py:400
 msgid "DATETIME_FORMAT"
 msgstr "j. F Y, H:i:s"
 
@@ -680,10 +751,6 @@ msgstr ""
 msgid "Show all"
 msgstr "Prikaži vse"
 
-#: contrib/admin/templates/admin/search_form.html:8
-msgid "Go"
-msgstr "Pojdi"
-
 #: contrib/admin/templates/admin/search_form.html:10
 #, python-format
 msgid "1 result"
@@ -729,13 +796,13 @@ msgstr "Uporabniško ime"
 
 #: contrib/admin/templates/admin/auth/user/add_form.html:20
 #: contrib/admin/templates/admin/auth/user/change_password.html:33
-#: contrib/auth/forms.py:17 contrib/auth/forms.py:60 contrib/auth/forms.py:184
+#: contrib/auth/forms.py:17 contrib/auth/forms.py:60 contrib/auth/forms.py:185
 msgid "Password"
 msgstr "Geslo"
 
 #: contrib/admin/templates/admin/auth/user/add_form.html:26
 #: contrib/admin/templates/admin/auth/user/change_password.html:39
-#: contrib/auth/forms.py:185
+#: contrib/auth/forms.py:186
 msgid "Password (again)"
 msgstr "Geslo (ponovno)"
 
@@ -844,7 +911,9 @@ msgstr "Ponastavitev gesla ni uspela"
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
-msgstr "Povezava za ponastavitev gesla ni bila veljavna, morda je bila že uporabljena. Prosimo zahtevajte novo ponastavitev gesla."
+msgstr ""
+"Povezava za ponastavitev gesla ni bila veljavna, morda je bila že "
+"uporabljena. Prosimo zahtevajte novo ponastavitev gesla."
 
 #: contrib/admin/templates/registration/password_reset_done.html:6
 #: contrib/admin/templates/registration/password_reset_done.html:10
@@ -855,7 +924,9 @@ msgstr "Ponastavitev gesla je uspela"
 msgid ""
 "We've e-mailed you instructions for setting your password to the e-mail "
 "address you submitted. You should be receiving it shortly."
-msgstr "Na e-poštni naslov, ki ste ga navedli, smo vam poslali navodila za ponastavitev gesla. Morali bi ga prejeti v kratkem."
+msgstr ""
+"Na e-poštni naslov, ki ste ga navedli, smo vam poslali navodila za "
+"ponastavitev gesla. Morali bi ga prejeti v kratkem."
 
 #: contrib/admin/templates/registration/password_reset_email.html:2
 msgid "You're receiving this e-mail because you requested a password reset"
@@ -887,7 +958,9 @@ msgstr "Ekipa strani %(site_name)s"
 msgid ""
 "Forgotten your password? Enter your e-mail address below, and we'll e-mail "
 "instructions for setting a new one."
-msgstr "Ste pozabili geslo? Vnesite vaš e-mail naslov in poslali vam bomo navodila za ponastavitev gesla."
+msgstr ""
+"Ste pozabili geslo? Vnesite vaš e-mail naslov in poslali vam bomo navodila "
+"za ponastavitev gesla."
 
 #: contrib/admin/templates/registration/password_reset_form.html:16
 msgid "E-mail address:"
@@ -897,165 +970,166 @@ msgstr "Naslov e-pošte:"
 msgid "Reset my password"
 msgstr "Ponastavi moje geslo"
 
-#: contrib/admin/templatetags/admin_list.py:288
+#: contrib/admin/templatetags/admin_list.py:299
 msgid "All dates"
 msgstr "Vsi datumi"
 
-#: contrib/admin/views/main.py:69
+#: contrib/admin/views/main.py:70
 #, python-format
 msgid "Select %s"
 msgstr "Izberite %s"
 
-#: contrib/admin/views/main.py:69
+#: contrib/admin/views/main.py:70
 #, python-format
 msgid "Select %s to change"
 msgstr "Izberite %s, ki ga želite spremeniti"
 
-#: contrib/admin/views/template.py:36 contrib/sites/models.py:38
+#: contrib/admin/views/template.py:37 contrib/sites/models.py:38
 msgid "site"
 msgstr "stran"
 
-#: contrib/admin/views/template.py:38
+#: contrib/admin/views/template.py:39
 msgid "template"
 msgstr "predloga"
 
-#: contrib/admindocs/views.py:57 contrib/admindocs/views.py:59
-#: contrib/admindocs/views.py:61
+#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60
+#: contrib/admindocs/views.py:62
 msgid "tag:"
 msgstr "značka:"
 
-#: contrib/admindocs/views.py:90 contrib/admindocs/views.py:92
-#: contrib/admindocs/views.py:94
+#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93
+#: contrib/admindocs/views.py:95
 msgid "filter:"
 msgstr "filter:"
 
-#: contrib/admindocs/views.py:154 contrib/admindocs/views.py:156
-#: contrib/admindocs/views.py:158
+#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157
+#: contrib/admindocs/views.py:159
 msgid "view:"
 msgstr "pogled:"
 
-#: contrib/admindocs/views.py:186
+#: contrib/admindocs/views.py:187
 #, python-format
 msgid "App %r not found"
 msgstr "Aplikacije %r ni mogoče najti"
 
-#: contrib/admindocs/views.py:193
+#: contrib/admindocs/views.py:194
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Modela %(model_name)r ni v aplikaciji %(app_label)r"
 
-#: contrib/admindocs/views.py:205
+#: contrib/admindocs/views.py:206
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "povezani `%(app_label)s.%(data_type)s` objekt"
 
-#: contrib/admindocs/views.py:205 contrib/admindocs/views.py:227
-#: contrib/admindocs/views.py:241 contrib/admindocs/views.py:246
+#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228
+#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247
 msgid "model:"
 msgstr "model:"
 
-#: contrib/admindocs/views.py:236
+#: contrib/admindocs/views.py:237
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "povezani `%(app_label)s.%(object_name)s` objekti"
 
-#: contrib/admindocs/views.py:241
+#: contrib/admindocs/views.py:242
 #, python-format
 msgid "all %s"
 msgstr "vse %s"
 
-#: contrib/admindocs/views.py:246
+#: contrib/admindocs/views.py:247
 #, python-format
 msgid "number of %s"
 msgstr "število %s"
 
-#: contrib/admindocs/views.py:251
+#: contrib/admindocs/views.py:252
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Polja na %s objektih"
 
-#: contrib/admindocs/views.py:314 contrib/admindocs/views.py:325
-#: contrib/admindocs/views.py:327 contrib/admindocs/views.py:333
-#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:336
+#: 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
 msgid "Integer"
 msgstr "Celo število (integer)"
 
-#: contrib/admindocs/views.py:315
+#: contrib/admindocs/views.py:316
 msgid "Boolean (Either True or False)"
 msgstr "Boolova vrednost (True ali False)"
 
-#: contrib/admindocs/views.py:316 contrib/admindocs/views.py:335
+#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Niz znakov (vse do %(max_length)s)"
 
-#: contrib/admindocs/views.py:317
+#: contrib/admindocs/views.py:318
 msgid "Comma-separated integers"
 msgstr "Z vejico ločena cela števila (integer)"
 
-#: contrib/admindocs/views.py:318
+#: contrib/admindocs/views.py:319
 msgid "Date (without time)"
 msgstr "Datum (brez ure)"
 
-#: contrib/admindocs/views.py:319
+#: contrib/admindocs/views.py:320
 msgid "Date (with time)"
 msgstr "Datum (z uro)"
 
-#: contrib/admindocs/views.py:320
+#: contrib/admindocs/views.py:321
 msgid "Decimal number"
 msgstr "Decimalno število"
 
-#: contrib/admindocs/views.py:321
+#: contrib/admindocs/views.py:322
 msgid "E-mail address"
 msgstr "E-mail naslov"
 
-#: contrib/admindocs/views.py:322 contrib/admindocs/views.py:323
-#: contrib/admindocs/views.py:326
+#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324
+#: contrib/admindocs/views.py:327
 msgid "File path"
 msgstr "Pot do datoteke"
 
-#: contrib/admindocs/views.py:324
+#: contrib/admindocs/views.py:325
 msgid "Floating point number"
 msgstr "Število s plavajočo vejico"
 
-#: contrib/admindocs/views.py:328 contrib/comments/models.py:58
+#: contrib/admindocs/views.py:329 contrib/comments/models.py:58
 msgid "IP address"
 msgstr "IP naslov"
 
-#: contrib/admindocs/views.py:330
+#: contrib/admindocs/views.py:331
 msgid "Boolean (Either True, False or None)"
 msgstr "Boolova vrednost (True, False ali None)"
 
-#: contrib/admindocs/views.py:331
+#: contrib/admindocs/views.py:332
 msgid "Relation to parent model"
 msgstr "Razmerje s starševskim modelom"
 
-#: contrib/admindocs/views.py:332
+#: contrib/admindocs/views.py:333
 msgid "Phone number"
 msgstr "Telefonska številka"
 
-#: contrib/admindocs/views.py:337
+#: contrib/admindocs/views.py:338
 msgid "Text"
 msgstr "Besedilo"
 
-#: contrib/admindocs/views.py:338
+#: contrib/admindocs/views.py:339
 msgid "Time"
 msgstr "Čas"
 
-#: contrib/admindocs/views.py:339 contrib/comments/forms.py:22
+#: contrib/admindocs/views.py:340 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 (spletni naslov)"
 
-#: contrib/admindocs/views.py:340
+#: contrib/admindocs/views.py:341
 msgid "U.S. state (two uppercase letters)"
 msgstr "Koda ameriške zvezne države (dve veliki črki)"
 
-#: contrib/admindocs/views.py:341
+#: contrib/admindocs/views.py:342
 msgid "XML text"
 msgstr "XML besedilo"
 
-#: contrib/admindocs/views.py:367
+#: contrib/admindocs/views.py:368
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s ne izgleda veljaven urlpattern objekt"
@@ -1140,21 +1214,21 @@ msgstr "Pomembni datumi"
 msgid "Groups"
 msgstr "Skupine"
 
-#: contrib/auth/admin.py:64
+#: contrib/auth/admin.py:80
 msgid "Add user"
 msgstr "Dodaj uporabnika"
 
-#: contrib/auth/admin.py:90
+#: contrib/auth/admin.py:106
 msgid "Password changed successfully."
 msgstr "Geslo je bilo uspešno spremenjeno."
 
-#: contrib/auth/admin.py:96
+#: contrib/auth/admin.py:112
 #, python-format
 msgid "Change password: %s"
 msgstr "Spremeni geslo: %s"
 
 #: contrib/auth/forms.py:15 contrib/auth/forms.py:48
-#: contrib/auth/models.py:136
+#: contrib/auth/models.py:127
 msgid ""
 "Required. 30 characters or fewer. Alphanumeric characters only (letters, "
 "digits and underscores)."
@@ -1174,8 +1248,8 @@ msgstr "Potrditev gesla"
 msgid "A user with that username already exists."
 msgstr "Uporabnik s tem uporabniškim imenom že obstaja."
 
-#: contrib/auth/forms.py:36 contrib/auth/forms.py:154
-#: contrib/auth/forms.py:196
+#: contrib/auth/forms.py:36 contrib/auth/forms.py:155
+#: contrib/auth/forms.py:197
 msgid "The two password fields didn't match."
 msgstr "Gesli se ne ujemata."
 
@@ -1203,72 +1277,72 @@ msgstr ""
 "Tega e-mail naslova ni mogoče pripisati nobenemu uporabniku. Ali ste "
 "prepričani, da ste registrirani?"
 
-#: contrib/auth/forms.py:134
+#: contrib/auth/forms.py:135
 #, python-format
 msgid "Password reset on %s"
 msgstr "Ponastavitev gesla za %s"
 
-#: contrib/auth/forms.py:142
+#: contrib/auth/forms.py:143
 msgid "New password"
 msgstr "Novo geslo"
 
-#: contrib/auth/forms.py:143
+#: contrib/auth/forms.py:144
 msgid "New password confirmation"
 msgstr "Potrditev novega gesla"
 
-#: contrib/auth/forms.py:168
+#: contrib/auth/forms.py:169
 msgid "Old password"
 msgstr "Staro geslo"
 
-#: contrib/auth/forms.py:176
+#: contrib/auth/forms.py:177
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Vaše staro geslo ni pravilno. Prosim, poskusite ponovno."
 
-#: contrib/auth/models.py:72 contrib/auth/models.py:95
+#: contrib/auth/models.py:63 contrib/auth/models.py:86
 msgid "name"
 msgstr "ime"
 
-#: contrib/auth/models.py:74
+#: contrib/auth/models.py:65
 msgid "codename"
 msgstr "kodno ime"
 
-#: contrib/auth/models.py:77
+#: contrib/auth/models.py:68
 msgid "permission"
 msgstr "dovoljenje"
 
-#: contrib/auth/models.py:78 contrib/auth/models.py:96
+#: contrib/auth/models.py:69 contrib/auth/models.py:87
 msgid "permissions"
 msgstr "dovoljenja"
 
-#: contrib/auth/models.py:99
+#: contrib/auth/models.py:90
 msgid "group"
 msgstr "skupina"
 
-#: contrib/auth/models.py:100 contrib/auth/models.py:146
+#: contrib/auth/models.py:91 contrib/auth/models.py:137
 msgid "groups"
 msgstr "skupine"
 
-#: contrib/auth/models.py:136
+#: contrib/auth/models.py:127
 msgid "username"
 msgstr "uporabniško ime"
 
-#: contrib/auth/models.py:137
+#: contrib/auth/models.py:128
 msgid "first name"
 msgstr "ime"
 
-#: contrib/auth/models.py:138
+#: contrib/auth/models.py:129
 msgid "last name"
 msgstr "priimek"
 
-#: contrib/auth/models.py:139
+#: contrib/auth/models.py:130
 msgid "e-mail address"
 msgstr "e-mail naslov"
 
-#: contrib/auth/models.py:140
+#: contrib/auth/models.py:131
 msgid "password"
 msgstr "geslo"
 
-#: contrib/auth/models.py:140
+#: contrib/auth/models.py:131
 msgid ""
 "Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
 "password form</a>."
@@ -1276,43 +1350,45 @@ msgstr ""
 "Uporabite '[algo]$[salt]$[hexdigest]' ali <a href=\"password/\">obrazec za "
 "spremembo gesla</a>."
 
-#: contrib/auth/models.py:141
+#: contrib/auth/models.py:132
 msgid "staff status"
 msgstr "status osebja"
 
-#: contrib/auth/models.py:141
+#: contrib/auth/models.py:132
 msgid "Designates whether the user can log into this admin site."
 msgstr "Določi, če se sme uporabnik prijaviti v to administracijsko stran."
 
-#: contrib/auth/models.py:142
+#: contrib/auth/models.py:133
 msgid "active"
 msgstr "aktiven"
 
-#: contrib/auth/models.py:142
+#: contrib/auth/models.py:133
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
-msgstr "Določi, če se uporabnik smatra za aktivega. Odstranite to možnost namesto da brišete račune."
+msgstr ""
+"Določi, če se uporabnik smatra za aktivega. Odstranite to možnost namesto da "
+"brišete račune."
 
-#: contrib/auth/models.py:143
+#: contrib/auth/models.py:134
 msgid "superuser status"
 msgstr "status superuporabnika"
 
-#: contrib/auth/models.py:143
+#: contrib/auth/models.py:134
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "Uporabnik bo imel vse pravice brez posamičnega dodeljevanja pravic."
 
-#: contrib/auth/models.py:144
+#: contrib/auth/models.py:135
 msgid "last login"
 msgstr "zadnja prijava"
 
-#: contrib/auth/models.py:145
+#: contrib/auth/models.py:136
 msgid "date joined"
 msgstr "registriran od"
 
-#: contrib/auth/models.py:147
+#: contrib/auth/models.py:138
 msgid ""
 "In addition to the permissions manually assigned, this user will also get "
 "all permissions granted to each group he/she is in."
@@ -1320,19 +1396,19 @@ msgstr ""
 "Poleg ročno določenih dovoljenj bo ta uporabnik dobil tudi vsa dovoljenja, "
 "ki pripadajo skupinam, katerih član je."
 
-#: contrib/auth/models.py:148
+#: contrib/auth/models.py:139
 msgid "user permissions"
 msgstr "uporabniška dovoljenja"
 
-#: contrib/auth/models.py:152
+#: contrib/auth/models.py:143
 msgid "user"
 msgstr "uporabnik"
 
-#: contrib/auth/models.py:153
+#: contrib/auth/models.py:144
 msgid "users"
 msgstr "uporabniki"
 
-#: contrib/auth/models.py:308
+#: contrib/auth/models.py:300
 msgid "message"
 msgstr "sporočilo"
 
@@ -1340,7 +1416,7 @@ msgstr "sporočilo"
 msgid "Logged out"
 msgstr "Odjavljen"
 
-#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:428
+#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:429
 msgid "Enter a valid e-mail address."
 msgstr "Vnesite veljaven e-mail."
 
@@ -1352,23 +1428,21 @@ msgstr "Vsebina"
 msgid "Metadata"
 msgstr "Metapodatki"
 
-#: contrib/comments/forms.py:20
+#: contrib/comments/forms.py:93
+#: contrib/comments/templates/comments/moderation_queue.html:34
 msgid "Name"
 msgstr "Ime"
 
-#: contrib/comments/forms.py:21
+#: contrib/comments/forms.py:94
 msgid "Email address"
 msgstr "E-poštni naslov"
 
-#: contrib/comments/forms.py:23
+#: contrib/comments/forms.py:96
+#: contrib/comments/templates/comments/moderation_queue.html:35
 msgid "Comment"
 msgstr "Komentar"
 
-#: contrib/comments/forms.py:26
-msgid "If you enter anything in this field your comment will be treated as spam"
-msgstr "Če v to polje vnesete karkoli, bo vaš komentar označen kot nezaželen"
-
-#: contrib/comments/forms.py:126
+#: contrib/comments/forms.py:173
 #, python-format
 msgid "Watch your mouth! The word %s is not allowed here."
 msgid_plural "Watch your mouth! The words %s are not allowed here."
@@ -1377,6 +1451,10 @@ msgstr[1] "Pazite na jezik! Besedi %s tu nista dovoljeni."
 msgstr[2] "Pazite na jezik! Besede %s tu niso dovoljene."
 msgstr[3] "Pazite na jezik! Besede %s tu niso dovoljene."
 
+#: contrib/comments/forms.py:180
+msgid "If you enter anything in this field your comment will be treated as spam"
+msgstr "Če v to polje vnesete karkoli, bo vaš komentar označen kot nezaželen"
+
 #: contrib/comments/models.py:23
 msgid "object ID"
 msgstr "ID objekta"
@@ -1425,13 +1503,17 @@ msgstr ""
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
-msgstr "Ta komentar je poslal prijavljen uporabnik, zato je ime na voljo samo za branje."
+msgstr ""
+"Ta komentar je poslal prijavljen uporabnik, zato je ime na voljo samo za "
+"branje."
 
 #: contrib/comments/models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
-msgstr "Ta komentar je poslal prijavljen uporabnik, zato je e-poštni naslov samo za branje."
+msgstr ""
+"Ta komentar je poslal prijavljen uporabnik, zato je e-poštni naslov samo za "
+"branje."
 
 #: contrib/comments/models.py:149
 #, python-format
@@ -1448,6 +1530,134 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
+#: contrib/comments/templates/comments/approve.html:4
+msgid "Approve a comment"
+msgstr "Odobritev komentarja"
+
+#: contrib/comments/templates/comments/approve.html:7
+msgid "Really make this comment public?"
+msgstr "Ste prepričani, da želite ta komentar objaviti?"
+
+#: contrib/comments/templates/comments/approve.html:12
+#: contrib/comments/templates/comments/moderation_queue.html:49
+msgid "Approve"
+msgstr "Odobritev"
+
+#: contrib/comments/templates/comments/approved.html:4
+msgid "Thanks for approving"
+msgstr "Hvala za odobritev komentarja"
+
+#: contrib/comments/templates/comments/approved.html:7
+#: contrib/comments/templates/comments/deleted.html:7
+#: contrib/comments/templates/comments/flagged.html:7
+msgid "Thanks for taking the time to improve the quality of discussion on our site"
+msgstr "Hvala, da ste si vzeli čas in pomagali izboljšati kvaliteto dialoga na naši strani"
+
+#: contrib/comments/templates/comments/delete.html:4
+msgid "Remove a comment"
+msgstr "Odstrani komentar"
+
+#: contrib/comments/templates/comments/delete.html:7
+msgid "Really remove this comment?"
+msgstr "Zares želite odstraniti ta komentar?"
+
+#: contrib/comments/templates/comments/delete.html:12
+#: contrib/comments/templates/comments/moderation_queue.html:53
+msgid "Remove"
+msgstr "Odstrani"
+
+#: contrib/comments/templates/comments/deleted.html:4
+msgid "Thanks for removing"
+msgstr "Hvala, ker ste odstranili"
+
+#: contrib/comments/templates/comments/flag.html:4
+msgid "Flag this comment"
+msgstr "Prijavi ta komentar"
+
+#: contrib/comments/templates/comments/flag.html:7
+msgid "Really flag this comment?"
+msgstr "Zares želite prijaviti ta komentar?"
+
+#: contrib/comments/templates/comments/flag.html:12
+msgid "Flag"
+msgstr "Prijavi"
+
+#: contrib/comments/templates/comments/flagged.html:4
+msgid "Thanks for flagging"
+msgstr "Hvala, ker ste prijavili komentar"
+
+#: contrib/comments/templates/comments/form.html:16
+#: contrib/comments/templates/comments/preview.html:31
+msgid "Post"
+msgstr "Pošlji"
+
+#: contrib/comments/templates/comments/form.html:17
+#: contrib/comments/templates/comments/preview.html:32
+msgid "Preview"
+msgstr "Predogled"
+
+#: contrib/comments/templates/comments/moderation_queue.html:4
+#: contrib/comments/templates/comments/moderation_queue.html:19
+msgid "Comment moderation queue"
+msgstr "Vrsta za moderiranje komentarjev"
+
+#: contrib/comments/templates/comments/moderation_queue.html:26
+msgid "No comments to moderate"
+msgstr "Ni komentarjev ki bi potrebovali moderiranje"
+
+#: contrib/comments/templates/comments/moderation_queue.html:36
+msgid "Email"
+msgstr "E-poštni naslov"
+
+#: contrib/comments/templates/comments/moderation_queue.html:38
+msgid "Authenticated?"
+msgstr "Overovljeno?"
+
+#: contrib/comments/templates/comments/moderation_queue.html:39
+msgid "IP Address"
+msgstr "IP naslov"
+
+#: contrib/comments/templates/comments/moderation_queue.html:40
+msgid "Date posted"
+msgstr "Datum objave"
+
+#: contrib/comments/templates/comments/moderation_queue.html:63
+msgid "yes"
+msgstr "Da"
+
+#: contrib/comments/templates/comments/moderation_queue.html:63
+msgid "no"
+msgstr "Ne"
+
+#: contrib/comments/templates/comments/posted.html:4
+msgid "Thanks for commenting"
+msgstr "Hvala za komentiranje"
+
+#: contrib/comments/templates/comments/posted.html:7
+msgid "Thank you for your comment"
+msgstr "Hvala za vaš komentar"
+
+#: contrib/comments/templates/comments/preview.html:4
+#: contrib/comments/templates/comments/preview.html:12
+msgid "Preview your comment"
+msgstr "Predogled vašega komentarja"
+
+#: contrib/comments/templates/comments/preview.html:10
+msgid "Please correct the error below"
+msgid_plural "Please correct the errors below"
+msgstr[0] "Prosimo, odpravite sledečo napako"
+msgstr[1] "Prosimo, odpravite sledeči napaki"
+msgstr[2] "Prosimo, odpravite sledeče napake"
+msgstr[3] "Prosimo, odpravite sledeče napake"
+
+#: contrib/comments/templates/comments/preview.html:15
+msgid "Post your comment"
+msgstr "Pošlji svoj komentar"
+
+#: contrib/comments/templates/comments/preview.html:15
+msgid "or make changes"
+msgstr "ali naredite spremembe"
+
 #: contrib/contenttypes/models.py:67
 msgid "python model class name"
 msgstr "python ime razreda modela"
@@ -1524,7 +1734,9 @@ msgstr "enostavne strani"
 msgid ""
 "We apologize, but your form has expired. Please continue filling out the "
 "form from this page."
-msgstr "Se opravičujemo, ampak vaš obrazec je potekel. Prosimo, da nadaljujete z izpolnjevanjem obrazca na tej strani."
+msgstr ""
+"Se opravičujemo, ampak vaš obrazec je potekel. Prosimo, da nadaljujete z "
+"izpolnjevanjem obrazca na tej strani."
 
 #: contrib/gis/forms/fields.py:14
 msgid "No geometry value provided."
@@ -1694,7 +1906,9 @@ msgstr "Vnesite veljavno poštno številko v obliki XXXX."
 
 #: contrib/localflavor/at/forms.py:48
 msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr "Vpišite veljavno številko avstrijskega socialnega zavarovanja v zapisu XXXX XXXXXX."
+msgstr ""
+"Vpišite veljavno številko avstrijskega socialnega zavarovanja v zapisu XXXX "
+"XXXXXX."
 
 #: contrib/localflavor/au/forms.py:16
 msgid "Enter a 4 digit post code."
@@ -1736,7 +1950,9 @@ msgstr "Vnesite veljavno poštno številko v obliki XXX XXX."
 
 #: contrib/localflavor/ca/forms.py:88
 msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr "Vpišite veljavno številko kanadskega socialnega zavarovanja v zapisu XXX-XXX-XXX."
+msgstr ""
+"Vpišite veljavno številko kanadskega socialnega zavarovanja v zapisu XXX-XXX-"
+"XXX."
 
 #: contrib/localflavor/ch/ch_states.py:5
 msgid "Aargau"
@@ -1862,6 +2078,82 @@ msgstr "Vpišite veljaven čilenski RUT v zapisu XX.XXX.XXX-X."
 msgid "The Chilean RUT is not valid."
 msgstr "Ta čilenski RUT ni veljaven."
 
+#: contrib/localflavor/cz/cz_regions.py:8
+msgid "Prague"
+msgstr "Praga"
+
+#: contrib/localflavor/cz/cz_regions.py:9
+msgid "Central Bohemian Region"
+msgstr "Central Bohemian Region"
+
+#: contrib/localflavor/cz/cz_regions.py:10
+msgid "South Bohemian Region"
+msgstr "South Bohemian Region"
+
+#: contrib/localflavor/cz/cz_regions.py:11
+msgid "Pilsen Region"
+msgstr "Pilsen Region"
+
+#: contrib/localflavor/cz/cz_regions.py:12
+msgid "Carlsbad Region"
+msgstr "Carlsbad Region"
+
+#: contrib/localflavor/cz/cz_regions.py:13
+msgid "Usti Region"
+msgstr "Usti Region"
+
+#: contrib/localflavor/cz/cz_regions.py:14
+msgid "Liberec Region"
+msgstr "Liberec Region"
+
+#: contrib/localflavor/cz/cz_regions.py:15
+msgid "Hradec Region"
+msgstr "Hradec Region"
+
+#: contrib/localflavor/cz/cz_regions.py:16
+msgid "Pardubice Region"
+msgstr "Pardubice Region"
+
+#: contrib/localflavor/cz/cz_regions.py:17
+msgid "Vysocina Region"
+msgstr "Vysocina Region"
+
+#: contrib/localflavor/cz/cz_regions.py:18
+msgid "South Moravian Region"
+msgstr "South Moravian Region"
+
+#: contrib/localflavor/cz/cz_regions.py:19
+msgid "Olomouc Region"
+msgstr "Olomouc Region"
+
+#: contrib/localflavor/cz/cz_regions.py:20
+msgid "Zlin Region"
+msgstr "Zlin Region"
+
+#: contrib/localflavor/cz/cz_regions.py:21
+msgid "Moravian-Silesian Region"
+msgstr "Moravian-Silesian Region"
+
+#: contrib/localflavor/cz/forms.py:27 contrib/localflavor/sk/forms.py:30
+msgid "Enter a postal code in the format XXXXX or XXX XX."
+msgstr "Vpišite poštno številko v zapisu XXXXX ali XXX XX."
+
+#: contrib/localflavor/cz/forms.py:47
+msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
+msgstr "Vnesite rojstno številko v obliki XXXXXX/XXXX ali XXXXXXXXXX."
+
+#: contrib/localflavor/cz/forms.py:48
+msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
+msgstr "Neveljaven neobvezni vnos Spol, veljavne vrednosti sta 'f' in 'm'"
+
+#: contrib/localflavor/cz/forms.py:49
+msgid "Enter a valid birth number."
+msgstr "Vnesite veljavno rojstno številko."
+
+#: contrib/localflavor/cz/forms.py:106
+msgid "Enter a valid IC number."
+msgstr "Vnesite veljavno IC številko."
+
 #: contrib/localflavor/de/de_states.py:5
 msgid "Baden-Wuerttemberg"
 msgstr "Baden-Wuerttemberg"
@@ -2214,7 +2506,9 @@ msgstr "Vpišite veljavno poštno številko v obsegu in zapisu od 01XXX do 52XXX
 msgid ""
 "Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
 "9XXXXXXXX."
-msgstr "Vpišite veljavno telefonsko številko v zapisu 6XXXXXXXX, 8XXXXXXXX ali 9XXXXXXXX."
+msgstr ""
+"Vpišite veljavno telefonsko številko v zapisu 6XXXXXXXX, 8XXXXXXXX ali "
+"9XXXXXXXX."
 
 #: contrib/localflavor/es/forms.py:66
 msgid "Please enter a valid NIF, NIE, or CIF."
@@ -2682,11 +2976,15 @@ msgstr "Napačna preverjevalna vsota za davčno številko (NIP)."
 
 #: contrib/localflavor/pl/forms.py:111
 msgid "National Business Register Number (REGON) consists of 7 or 9 digits."
-msgstr "Nacionalna poslovna registracijska številka (REGON) je sestavljena iz 7 ali 9 števk."
+msgstr ""
+"Nacionalna poslovna registracijska številka (REGON) je sestavljena iz 7 ali "
+"9 števk."
 
 #: contrib/localflavor/pl/forms.py:112
 msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "Napačna preverjevalna vsota za nacionalno poslovno registracijsko številko (REGON)."
+msgstr ""
+"Napačna preverjevalna vsota za nacionalno poslovno registracijsko številko "
+"(REGON)."
 
 #: contrib/localflavor/pl/forms.py:155
 msgid "Enter a postal code in the format XX-XXX."
@@ -2776,10 +3074,6 @@ msgstr "Telefonska številka mora biti v zapisu XXXX-XXXXXX."
 msgid "Enter a valid postal code in the format XXXXXX"
 msgstr "Vnesite veljavno poštno številko v obliki XXXXXX."
 
-#: contrib/localflavor/sk/forms.py:30
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Vpišite poštno številko v zapisu XXXXX ali XXX XX."
-
 #: contrib/localflavor/sk/sk_districts.py:8
 msgid "Banska Bystrica"
 msgstr "Banska Bystrica"
@@ -3528,54 +3822,60 @@ msgstr "prikazno ime"
 msgid "sites"
 msgstr "strani"
 
-#: db/models/fields/__init__.py:348 db/models/fields/__init__.py:683
+#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:700
 msgid "This value must be an integer."
 msgstr "Ta vrednost mora biti celo število."
 
-#: db/models/fields/__init__.py:379
+#: db/models/fields/__init__.py:387
 msgid "This value must be either True or False."
 msgstr "Ta vrednost mora biti \"True\" ali \"False\"."
 
-#: db/models/fields/__init__.py:412
+#: db/models/fields/__init__.py:420
 msgid "This field cannot be null."
 msgstr "To polje ne more biti prazno."
 
-#: db/models/fields/__init__.py:428
+#: db/models/fields/__init__.py:436
 msgid "Enter only digits separated by commas."
 msgstr "Vnesite samo števila, ločena z vejicami."
 
-#: db/models/fields/__init__.py:459
+#: db/models/fields/__init__.py:467
 msgid "Enter a valid date in YYYY-MM-DD format."
 msgstr "Vnesite veljaven datum v zapisu YYYY-MM-DD (leto-mesec-dan)."
 
-#: db/models/fields/__init__.py:468
+#: db/models/fields/__init__.py:476
 #, python-format
 msgid "Invalid date: %s"
 msgstr "Nepravilen datum: %s"
 
-#: db/models/fields/__init__.py:532 db/models/fields/__init__.py:550
+#: db/models/fields/__init__.py:540 db/models/fields/__init__.py:558
 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
 msgstr ""
-"Vnesite veljaven datum/čas v zapisu YYYY-MM-DD HH:MM[:ss[.uuuuuu]] (leto-mesec-dan ura:"
-"minuta:sekunde.mikrosekunde)."
+"Vnesite veljaven datum/čas v zapisu YYYY-MM-DD HH:MM[:ss[.uuuuuu]] (leto-"
+"mesec-dan ura:minuta:sekunde.mikrosekunde)."
 
-#: db/models/fields/__init__.py:586
+#: db/models/fields/__init__.py:594
 msgid "This value must be a decimal number."
 msgstr "Ta vrednost mora biti decimalno število."
 
-#: db/models/fields/__init__.py:719
+#: db/models/fields/__init__.py:676
+msgid "This value must be a float."
+msgstr "Ta vrednost mora biti decimalno število."
+
+#: db/models/fields/__init__.py:736
 msgid "This value must be either None, True or False."
 msgstr "Ta vrednost mora biti None, True ali False."
 
-#: db/models/fields/__init__.py:817 db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:839 db/models/fields/__init__.py:853
 msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Vnesite veljavni čas v zapisu HH:MM[:ss[.uuuuuu]] (ura:minuta:sekunde.mikrosekunde)."
+msgstr ""
+"Vnesite veljavni čas v zapisu HH:MM[:ss[.uuuuuu]] (ura:minuta:sekunde."
+"mikrosekunde)."
 
-#: db/models/fields/related.py:761
+#: db/models/fields/related.py:787
 msgid "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr "Držite \"Control\" (ali \"Command\" na Mac-u) za izbiro več kot enega."
 
-#: db/models/fields/related.py:838
+#: db/models/fields/related.py:865
 #, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
 msgid_plural "Please enter valid %(self)s IDs. The values %(value)r are invalid."
@@ -3595,12 +3895,16 @@ msgstr "Vnesite veljavno vrednost."
 #: forms/fields.py:138
 #, python-format
 msgid "Ensure this value has at most %(max)d characters (it has %(length)d)."
-msgstr "Poskrbite, da bo imela ta vrednost največ %(max)d znakov. Trenutno jih ima %(length)d."
+msgstr ""
+"Poskrbite, da bo imela ta vrednost največ %(max)d znakov. Trenutno jih ima %"
+"(length)d."
 
 #: forms/fields.py:139
 #, python-format
 msgid "Ensure this value has at least %(min)d characters (it has %(length)d)."
-msgstr "Poskrbite, da bo imela ta vrednost vsaj %(min)d znakov. Trenutno jih ima %(length)d."
+msgstr ""
+"Poskrbite, da bo imela ta vrednost vsaj %(min)d znakov. Trenutno jih ima %"
+"(length)d."
 
 #: forms/fields.py:166
 msgid "Enter a whole number."
@@ -3635,31 +3939,31 @@ msgstr "Poskrbite, da skupno ne bo več kot %s decimalnih mest."
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Poskrbite, da ne bo več kot %s števil pred decimalno piko."
 
-#: forms/fields.py:287 forms/fields.py:848
+#: forms/fields.py:288 forms/fields.py:850
 msgid "Enter a valid date."
 msgstr "Vnesite veljaven datum."
 
-#: forms/fields.py:321 forms/fields.py:849
+#: forms/fields.py:322 forms/fields.py:851
 msgid "Enter a valid time."
 msgstr "Vnesite veljaven čas."
 
-#: forms/fields.py:360
+#: forms/fields.py:361
 msgid "Enter a valid date/time."
 msgstr "Vnesite veljaven datum/čas."
 
-#: forms/fields.py:446
+#: forms/fields.py:447
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Datoteka ni bila poslana. Preverite nabor znakov v formi."
 
-#: forms/fields.py:447
+#: forms/fields.py:448
 msgid "No file was submitted."
 msgstr "Poslali niste nobene datoteke."
 
-#: forms/fields.py:448
+#: forms/fields.py:449
 msgid "The submitted file is empty."
 msgstr "Poslana datoteka je prazna."
 
-#: forms/fields.py:477
+#: forms/fields.py:478
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -3667,54 +3971,60 @@ msgstr ""
 "Naložite veljavno sliko. Naložena datoteka ni bila slika ali pa je bila le-"
 "ta okvarjena."
 
-#: forms/fields.py:538
+#: forms/fields.py:539
 msgid "Enter a valid URL."
 msgstr "Vnesite veljaven URL naslov."
 
-#: forms/fields.py:539
+#: forms/fields.py:540
 msgid "This URL appears to be a broken link."
 msgstr "Izgleda, da povezava na ta URL ne deluje."
 
-#: forms/fields.py:618 forms/fields.py:696
+#: forms/fields.py:619 forms/fields.py:697
 #, python-format
 msgid "Select a valid choice. %(value)s is not one of the available choices."
 msgstr "Izberite veljavno možnost. %(value)s ni med ponujenimi izbirami."
 
-#: forms/fields.py:697 forms/fields.py:758 forms/models.py:654
+#: forms/fields.py:698 forms/fields.py:759 forms/models.py:729
 msgid "Enter a list of values."
 msgstr "Vnesite seznam vrednosti."
 
-#: forms/fields.py:877
+#: forms/fields.py:879
 msgid "Enter a valid IPv4 address."
 msgstr "Vnesite veljaven IPv4 naslov."
 
-#: forms/fields.py:887
+#: forms/fields.py:889
 msgid "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
-msgstr "Vnesite veljavno URL okrajšavo. Vrednost sme vsebovati le črke, števila, podčrtaje ali pomišljaje."
+msgstr ""
+"Vnesite veljavno URL okrajšavo. Vrednost sme vsebovati le črke, števila, "
+"podčrtaje ali pomišljaje."
 
-#: forms/formsets.py:242 forms/formsets.py:244
+#: forms/formsets.py:247 forms/formsets.py:249
 msgid "Order"
 msgstr "Razvrsti"
 
-#: forms/models.py:268 forms/models.py:277
+#: forms/models.py:289 forms/models.py:298
 #, python-format
 msgid "%(model_name)s with this %(field_label)s already exists."
 msgstr "%(model_name)s s tem %(field_label)s že obstaja."
 
-#: forms/models.py:584
+#: forms/models.py:602
+msgid "The inline foreign key did not match the parent instance primary key."
+msgstr "Tuji ključ se ne ujema z glavnim ključem povezanega vnosa."
+
+#: forms/models.py:659
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Izberite veljavno možnost. Te možnosti ni med ponujenimi izbirami."
 
-#: forms/models.py:655
+#: forms/models.py:730
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Izberite veljavno možnost. %s ni med ponujenimi izbirami."
 
-#: template/defaultfilters.py:706
+#: template/defaultfilters.py:751
 msgid "yes,no,maybe"
 msgstr "da,ne,morda"
 
-#: template/defaultfilters.py:737
+#: template/defaultfilters.py:782
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
@@ -3723,17 +4033,17 @@ msgstr[1] "%(size)d bajta"
 msgstr[2] "%(size)d bajti"
 msgstr[3] "%(size)d bajtov"
 
-#: template/defaultfilters.py:739
+#: template/defaultfilters.py:784
 #, python-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
-#: template/defaultfilters.py:741
+#: template/defaultfilters.py:786
 #, python-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: template/defaultfilters.py:742
+#: template/defaultfilters.py:787
 #, python-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
@@ -4008,19 +4318,19 @@ msgstr "%(number)d %(type)s"
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: utils/translation/trans_real.py:403
+#: utils/translation/trans_real.py:399
 msgid "DATE_FORMAT"
 msgstr "j.n.Y"
 
-#: utils/translation/trans_real.py:405
+#: utils/translation/trans_real.py:401
 msgid "TIME_FORMAT"
 msgstr "H:i:s"
 
-#: utils/translation/trans_real.py:421
+#: utils/translation/trans_real.py:417
 msgid "YEAR_MONTH_FORMAT"
 msgstr "F Y"
 
-#: utils/translation/trans_real.py:422
+#: utils/translation/trans_real.py:418
 msgid "MONTH_DAY_FORMAT"
 msgstr "j. F"