diff --git a/django/conf/locale/sr/LC_MESSAGES/django.mo b/django/conf/locale/sr/LC_MESSAGES/django.mo
index 6ed6824b58..9aff1a9da0 100644
Binary files a/django/conf/locale/sr/LC_MESSAGES/django.mo and b/django/conf/locale/sr/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/sr/LC_MESSAGES/django.po b/django/conf/locale/sr/LC_MESSAGES/django.po
index 843f73196f..58ea128c5b 100644
--- a/django/conf/locale/sr/LC_MESSAGES/django.po
+++ b/django/conf/locale/sr/LC_MESSAGES/django.po
@@ -3,15 +3,13 @@ msgstr ""
 "Project-Id-Version: Django Serbian (latin) translation v1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-11-19 10:43+0100\n"
-"PO-Revision-Date: 2005-11-03 00:28+0100\n"
-"Last-Translator: Petar Marić <petar.maric@gmail.com>\n"
-"Language-Team: Nesh <nesh@studioquatro.co.yu> & Petar <petar.maric@gmail."
-"com>\n"
+"PO-Revision-Date: 2005-11-20 19:07+0100\n"
+"Last-Translator: Nebojša Đorđević <nesh@studioquattro.co.yu>\n"
+"Language-Team: Nesh <nesh@studioquatro.co.yu> & Petar <petar.maric@gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Poedit-Language: Serbian\n"
 "X-Poedit-Country: YUGOSLAVIA\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -19,95 +17,89 @@ msgstr ""
 
 #: contrib/comments/models/comments.py:8
 #: contrib/comments/models/comments.py:161
-#, fuzzy
 msgid "object ID"
 msgstr "id objekta"
 
 #: contrib/comments/models/comments.py:9
 msgid "headline"
-msgstr ""
+msgstr "naslov"
 
 #: contrib/comments/models/comments.py:10
 #: contrib/comments/models/comments.py:162
-#, fuzzy
 msgid "comment"
-msgstr "sadržaj"
+msgstr "komentar"
 
 #: contrib/comments/models/comments.py:11
 msgid "rating #1"
-msgstr ""
+msgstr "rejting #1"
 
 #: contrib/comments/models/comments.py:12
 msgid "rating #2"
-msgstr ""
+msgstr "rejting #2"
 
 #: contrib/comments/models/comments.py:13
 msgid "rating #3"
-msgstr ""
+msgstr "rejting #3"
 
 #: contrib/comments/models/comments.py:14
 msgid "rating #4"
-msgstr ""
+msgstr "rejting #4"
 
 #: contrib/comments/models/comments.py:15
 msgid "rating #5"
-msgstr ""
+msgstr "rejting #5"
 
 #: contrib/comments/models/comments.py:16
 msgid "rating #6"
-msgstr ""
+msgstr "rejting #6"
 
 #: contrib/comments/models/comments.py:17
 msgid "rating #7"
-msgstr ""
+msgstr "rejting #7"
 
 #: contrib/comments/models/comments.py:18
 msgid "rating #8"
-msgstr ""
+msgstr "rejting #8"
 
 #: contrib/comments/models/comments.py:23
 msgid "is valid rating"
-msgstr ""
+msgstr "da li je rejting validan"
 
 #: contrib/comments/models/comments.py:24
 #: contrib/comments/models/comments.py:164
 msgid "date/time submitted"
-msgstr ""
+msgstr "datum/vreme slanja"
 
 #: contrib/comments/models/comments.py:25
 #: contrib/comments/models/comments.py:165
 msgid "is public"
-msgstr ""
+msgstr "da li je javni"
 
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
-#, fuzzy
+#: contrib/comments/models/comments.py:26
+#: contrib/admin/views/doc.py:274
 msgid "IP address"
-msgstr "e-mail adresa"
+msgstr "IP adresa"
 
 #: contrib/comments/models/comments.py:27
 msgid "is removed"
-msgstr ""
+msgstr "obrisan je"
 
 #: contrib/comments/models/comments.py:27
-msgid ""
-"Check this box if the comment is inappropriate. A \"This comment has been "
-"removed\" message will be displayed instead."
-msgstr ""
+msgid "Check this box if the comment is inappropriate. A \"This comment has been removed\" message will be displayed instead."
+msgstr "Selektujte ako je komentar neodgovarajući. Biće ispisano \"Ovaj komentar je obrisan\" umesto teksta komentara."
 
 #: contrib/comments/models/comments.py:31
 msgid "Comment"
-msgstr ""
+msgstr "Komentar"
 
 #: contrib/comments/models/comments.py:32
-#, fuzzy
 msgid "Comments"
-msgstr "omogućite komentare"
+msgstr "Komentari"
 
 #: contrib/comments/models/comments.py:85
 #: contrib/comments/models/comments.py:204
-#, fuzzy
 msgid "Content object"
-msgstr "tip sadržaja"
+msgstr "Objekt sa sadržajem"
 
 #: contrib/comments/models/comments.py:113
 #, python-format
@@ -118,72 +110,69 @@ msgid ""
 "\n"
 "http://%(domain)s%(url)s"
 msgstr ""
+"Poslao %(user)s u %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
 
 #: contrib/comments/models/comments.py:163
-#, fuzzy
 msgid "person's name"
 msgstr "ime"
 
 #: contrib/comments/models/comments.py:166
-#, fuzzy
 msgid "ip address"
-msgstr "e-mail adresa"
+msgstr "ip adresa"
 
 #: contrib/comments/models/comments.py:168
 msgid "approved by staff"
-msgstr ""
+msgstr "odobreno od moderatora"
 
 #: contrib/comments/models/comments.py:172
-#, fuzzy
 msgid "Free comment"
-msgstr "omogućite komentare"
+msgstr "Slobodan komentar"
 
 #: contrib/comments/models/comments.py:173
-#, fuzzy
 msgid "Free comments"
-msgstr "omogućite komentare"
+msgstr "Slobodni komentari"
 
 #: contrib/comments/models/comments.py:209
 msgid "score"
-msgstr ""
+msgstr "rezultat"
 
 #: contrib/comments/models/comments.py:210
-#, fuzzy
 msgid "score date"
-msgstr "datum prestanka važenja sesije"
+msgstr "datum rezultata"
 
 #: contrib/comments/models/comments.py:213
 msgid "Karma score"
-msgstr ""
+msgstr "\"Karma\" rezultat"
 
 #: contrib/comments/models/comments.py:214
 msgid "Karma scores"
-msgstr ""
+msgstr "\"Karma\" rezultati"
 
 #: contrib/comments/models/comments.py:223
 #, python-format
 msgid "%(score)d rating by %(user)s"
-msgstr ""
+msgstr "Rezultat %(score)d od %(user)s"
 
 #: contrib/comments/models/comments.py:248
-#, fuzzy
 msgid "flag date"
-msgstr "statična strana"
+msgstr "datum markiranja"
 
 #: contrib/comments/models/comments.py:251
-#, fuzzy
 msgid "User flag"
-msgstr "Korisnik"
+msgstr "Korisnički marker"
 
 #: contrib/comments/models/comments.py:252
-#, fuzzy
 msgid "User flags"
-msgstr "Korisnici"
+msgstr "Korisnički markeri"
 
 #: contrib/comments/models/comments.py:256
 #, python-format
 msgid "Flag by %r"
-msgstr ""
+msgstr "%r je markirao"
 
 #: contrib/comments/models/comments.py:271
 #, python-format
@@ -192,59 +181,68 @@ msgid ""
 "\n"
 "%(text)s"
 msgstr ""
+"Ovaj komentar je markiran od %(user)s:\n"
+"\n"
+"%(text)s"
 
 #: contrib/comments/models/comments.py:278
-#, fuzzy
 msgid "deletion date"
-msgstr "podaci sesije"
+msgstr "datum brisanja"
 
 #: contrib/comments/models/comments.py:281
 msgid "Moderator deletion"
-msgstr ""
+msgstr "Brisanje od strane moderatora"
 
 #: contrib/comments/models/comments.py:282
 msgid "Moderator deletions"
-msgstr ""
+msgstr "Brisanja od strane moderatora"
 
 #: contrib/comments/models/comments.py:286
 #, python-format
 msgid "Moderator deletion by %r"
-msgstr ""
+msgstr "Obrisao moderator %r"
 
 #: contrib/comments/views/karma.py:18
 msgid "Anonymous users cannot vote"
-msgstr ""
+msgstr "Anonimni korisnici ne mogu da glasaju"
 
 #: contrib/comments/views/karma.py:22
-#, fuzzy
 msgid "Invalid comment ID"
-msgstr "omogućite komentare"
+msgstr "Neispravan ID komentara"
 
 #: contrib/comments/views/karma.py:24
 msgid "No voting for yourself"
-msgstr ""
+msgstr "Ne možete da glasate sami za sebe"
 
+# nesh: grrrrr, ala je rogobatno
 #: contrib/comments/views/comments.py:25
-msgid ""
-"This rating is required because you've entered at least one other rating."
-msgstr ""
+msgid "This rating is required because you've entered at least one other rating."
+msgstr "Ovaj rejting je obavezan pošto ste uneli još najmanje jedan rejting."
 
 #: contrib/comments/views/comments.py:109
 #, python-format
 msgid ""
-"This comment was posted by a user who has posted fewer than %(count)s "
-"comment:\n"
+"This comment was posted by a user who has posted fewer than %(count)s comment:\n"
 "\n"
 "%(text)s"
 msgid_plural ""
-"This comment was posted by a user who has posted fewer than %(count)s "
-"comments:\n"
+"This comment was posted by a user who has posted fewer than %(count)s comments:\n"
 "\n"
 "%(text)s"
 msgstr[0] ""
+"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s komentara:\n"
+"\n"
+"%(text)s"
 msgstr[1] ""
+"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s komentara:\n"
+"\n"
+"%(text)s"
 msgstr[2] ""
+"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s komentara:\n"
+"\n"
+"%(text)s"
 
+# nesh: skethcy???
 #: contrib/comments/views/comments.py:114
 #, python-format
 msgid ""
@@ -252,37 +250,38 @@ msgid ""
 "\n"
 "%(text)s"
 msgstr ""
+"Ovaj komentar je poslat od \"sketcy\" korisnika:\n"
+"\n"
+"%(text)s"
 
 #: contrib/comments/views/comments.py:186
 #: contrib/comments/views/comments.py:277
 msgid "Only POSTs are allowed"
-msgstr ""
+msgstr "Jedino je POST dozvoljen"
 
 #: contrib/comments/views/comments.py:190
 #: contrib/comments/views/comments.py:281
 msgid "One or more of the required fields wasn't submitted"
-msgstr ""
+msgstr "Jedno ili više obaveznih polja nije poslato."
 
 #: contrib/comments/views/comments.py:194
 #: contrib/comments/views/comments.py:283
 msgid "Somebody tampered with the comment form (security violation)"
-msgstr ""
+msgstr "Neko je menjao form za komentare (povreda sigurnosti)"
 
 #: contrib/comments/views/comments.py:204
 #: contrib/comments/views/comments.py:289
-msgid ""
-"The comment form had an invalid 'target' parameter -- the object ID was "
-"invalid"
-msgstr ""
+msgid "The comment form had an invalid 'target' parameter -- the object ID was invalid"
+msgstr "Form komentara ima neispravni 'target' parametar -- ID objekta nije ispravan"
 
 #: contrib/comments/views/comments.py:254
 #: contrib/comments/views/comments.py:318
 msgid "The comment form didn't provide either 'preview' or 'post'"
-msgstr ""
+msgstr "Ovaj komentar nije koristio 'preview' ili 'post'"
 
 #: contrib/admin/models/admin.py:6
 msgid "action time"
-msgstr "Datum/vreme akcije"
+msgstr "vreme akcije"
 
 #: contrib/admin/models/admin.py:9
 msgid "object id"
@@ -310,7 +309,7 @@ msgstr "unosi u dnevnik izmena"
 
 #: contrib/admin/templatetags/admin_list.py:283
 msgid "All dates"
-msgstr ""
+msgstr "Svi datumi"
 
 #: contrib/admin/views/decorators.py:22
 #: contrib/admin/templates/admin/login.html:24
@@ -318,30 +317,25 @@ msgid "Log in"
 msgstr "Prijavi se"
 
 #: contrib/admin/views/decorators.py:56
-msgid ""
-"Please log in again, because your session has expired. Don't worry: Your "
-"submission has been saved."
-msgstr ""
+msgid "Please log in again, because your session has expired. Don't worry: Your submission has been saved."
+msgstr "Ponovo se prijavite pošto je vaša sesija istekla. Ne brinite, vaši podaci su sačuvani."
 
 #: contrib/admin/views/decorators.py:63
-msgid ""
-"Looks like your browser isn't configured to accept cookies. Please enable "
-"cookies, reload this page, and try again."
-msgstr ""
+msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again."
+msgstr "Izgleda da vaš browser ne podržava \"cookie\". Uključite ih, ponovo učitajte stranu i pokušajte ponovo."
 
 #: contrib/admin/views/decorators.py:77
 msgid "Usernames cannot contain the '@' character."
-msgstr ""
+msgstr "Korisnička imena ne mogu sadržati karakter '@'."
 
 #: contrib/admin/views/decorators.py:79
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
+msgstr "Vaša e-mail adresa nije koriničko ime. Probajte sa '%s'."
 
 #: contrib/admin/views/main.py:50
-#, fuzzy
 msgid "Site administration"
-msgstr "Django administracija"
+msgstr "Administracija sajta"
 
 #: contrib/admin/views/main.py:84
 #, python-format
@@ -349,220 +343,223 @@ msgid ""
 "<h3>By %s:</h3>\n"
 "<ul>\n"
 msgstr ""
+"<h3>Od %s:</h3>\n"
+"<ul>\n"
 
-#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+#: contrib/admin/views/main.py:114
+#: contrib/admin/views/main.py:131
 #: contrib/admin/views/main.py:186
 msgid "All"
-msgstr ""
+msgstr "Sve"
 
 #: contrib/admin/views/main.py:152
 msgid "Any date"
-msgstr ""
+msgstr "Bilo koji datum"
 
 #: contrib/admin/views/main.py:153
-#, fuzzy
 msgid "Today"
-msgstr "Ponedeljak"
+msgstr "Danas"
 
 #: contrib/admin/views/main.py:156
 msgid "Past 7 days"
-msgstr ""
+msgstr "Zadnjih sedam dana"
 
 #: contrib/admin/views/main.py:158
 msgid "This month"
-msgstr ""
+msgstr "Ovaj mesec"
 
 #: contrib/admin/views/main.py:160
 msgid "This year"
-msgstr ""
+msgstr "Ova godina"
 
 #: contrib/admin/views/main.py:186
 msgid "Yes"
-msgstr ""
+msgstr "Da"
 
 #: contrib/admin/views/main.py:186
-#, fuzzy
 msgid "No"
-msgstr "Nov."
+msgstr "Ne"
 
 #: contrib/admin/views/main.py:194
 msgid "Unknown"
-msgstr ""
+msgstr "Nepoznato"
 
 #: contrib/admin/views/main.py:208
 #, python-format
 msgid "Select %s"
-msgstr ""
+msgstr "Izaberi %s"
 
 #: contrib/admin/views/main.py:209
 #, python-format
 msgid "Select %s to change"
-msgstr ""
+msgstr "Izaberi %s za izmenu"
 
 #: contrib/admin/views/main.py:572
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr ""
+msgstr "Uspešno dodat %(name)s \"%(obj)s\"."
 
-#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+#: contrib/admin/views/main.py:577
+#: contrib/admin/views/main.py:653
 msgid "You may edit it again below."
-msgstr ""
+msgstr "Ispod ga možete ponovo izmeniti."
 
-#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:585
+#: contrib/admin/views/main.py:662
 #, python-format
 msgid "You may add another %s below."
-msgstr ""
+msgstr "Ispod možete dodati još jedan %s."
 
 #: contrib/admin/views/main.py:602
-#, fuzzy, python-format
+#, python-format
 msgid "Add %s"
-msgstr "Dodaj"
+msgstr "Dodaj %s"
 
 #: contrib/admin/views/main.py:618
 #, python-format
 msgid "Added %s."
-msgstr ""
+msgstr "Dodat %s"
 
-#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:618
+#: contrib/admin/views/main.py:620
 #: contrib/admin/views/main.py:622
 msgid "and"
-msgstr ""
+msgstr "i"
 
 #: contrib/admin/views/main.py:620
-#, fuzzy, python-format
+#, python-format
 msgid "Changed %s."
-msgstr "Izmena"
+msgstr "Izmenjen %s."
 
 #: contrib/admin/views/main.py:622
 #, python-format
 msgid "Deleted %s."
-msgstr ""
+msgstr "Obrisan %s"
 
 #: contrib/admin/views/main.py:625
 msgid "No fields changed."
-msgstr ""
+msgstr "Nijedno polje nije promenjeno."
 
 #: contrib/admin/views/main.py:650
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr ""
+msgstr "Uspešno izmenjen: %(name)s \"%(obj)s\"."
 
 #: contrib/admin/views/main.py:659
 #, python-format
-msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-msgstr ""
+msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr "%(name)s \"%(obj)s\" je uspešno dodat. Ispod ga možete ponovo menjati."
 
 #: contrib/admin/views/main.py:697
-#, fuzzy, python-format
+#, python-format
 msgid "Change %s"
-msgstr "Izmena"
+msgstr "Izmeni %s"
 
 #: contrib/admin/views/main.py:777
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr ""
+msgstr "Jedno ili više %(fieldname)s u %(name)s: %(obj)s"
 
 #: contrib/admin/views/main.py:782
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
-msgstr ""
+msgstr "Jedan ili više %(fieldname)s u %(name)s:"
 
 #: contrib/admin/views/main.py:811
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr ""
+msgstr "Uspešno obrisan: %(name)s \"%(obj)s\"."
 
 #: contrib/admin/views/main.py:814
 msgid "Are you sure?"
-msgstr ""
+msgstr "Da li ste sigurni?"
 
 #: contrib/admin/views/main.py:829
-#, fuzzy, python-format
+#, python-format
 msgid "Change history: %s"
-msgstr "Izmeni lozinku"
+msgstr "Istorija izmena: %s"
 
-#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
-#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
-#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+#: contrib/admin/views/doc.py:262
+#: contrib/admin/views/doc.py:271
+#: contrib/admin/views/doc.py:273
+#: contrib/admin/views/doc.py:278
+#: contrib/admin/views/doc.py:279
+#: contrib/admin/views/doc.py:281
 msgid "Integer"
-msgstr ""
+msgstr "Ceo broj"
 
 #: contrib/admin/views/doc.py:263
 msgid "Boolean (Either True or False)"
-msgstr ""
+msgstr "Logička vrednost (Tačno ili Netačno)"
 
 #: contrib/admin/views/doc.py:264
 #, python-format
 msgid "String (up to %(maxlength)s)"
-msgstr ""
+msgstr "Niz karaktera (maksimalno %(maxlength)s karaktera)"
 
 #: contrib/admin/views/doc.py:265
 msgid "Comma-separated integers"
-msgstr ""
+msgstr "Brojevi razdvojeni zarezima"
 
 #: contrib/admin/views/doc.py:266
-#, fuzzy
 msgid "Date (without time)"
-msgstr "Datum/vreme akcije"
+msgstr "Datum (bez vremena)"
 
 #: contrib/admin/views/doc.py:267
-#, fuzzy
 msgid "Date (with time)"
-msgstr "Datum/vreme"
+msgstr "Datum (sa vremenom)"
 
 #: contrib/admin/views/doc.py:268
-#, fuzzy
 msgid "E-mail address"
-msgstr "E-mail adresa:"
+msgstr "E-mail adresa"
 
-#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+#: contrib/admin/views/doc.py:269
+#: contrib/admin/views/doc.py:272
 msgid "File path"
-msgstr ""
+msgstr "Putanja do fajla"
 
 #: contrib/admin/views/doc.py:270
-#, fuzzy
 msgid "Decimal number"
-msgstr "Decembar"
+msgstr "Decimalni broj"
 
 #: contrib/admin/views/doc.py:276
 msgid "Boolean (Either True, False or None)"
-msgstr ""
+msgstr "Logička vrednost (Tačno, Netačno ili prazno)"
 
 #: contrib/admin/views/doc.py:277
-#, fuzzy
 msgid "Phone number"
-msgstr "Unesite celi broj."
+msgstr "Telefonski broj"
 
 #: contrib/admin/views/doc.py:280
 msgid "String (up to 50)"
-msgstr ""
+msgstr "Niz karaktera (maksimalno 50 karaktera)"
 
 #: contrib/admin/views/doc.py:282
 msgid "Text"
-msgstr ""
+msgstr "Tekst"
 
 #: contrib/admin/views/doc.py:283
 msgid "Time"
-msgstr ""
+msgstr "Vreme"
 
 # nesh: ovo se valjda ne prevodi
 # petar: ne prevodi se
-#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:284
+#: contrib/flatpages/models/flatpages.py:6
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
 #: contrib/admin/views/doc.py:285
 msgid "U.S. state (two uppercase letters)"
-msgstr ""
+msgstr "U.S. država (dva VELIKA slova)"
 
 #: contrib/admin/views/doc.py:286
 msgid "XML text"
-msgstr ""
+msgstr "XML tekst"
 
 #: contrib/admin/templates/admin/template_debug.html:6
 msgid "Error in Template"
-msgstr ""
+msgstr "Greška u templejtu"
 
 #: contrib/admin/templates/admin/template_debug.html:8
 #, python-format
@@ -570,6 +567,8 @@ msgid ""
 "\n"
 "In template %(name)s, error at line %(line)s:\n"
 msgstr ""
+"\n"
+"U templejtu %(name)s, greška u redu %(line)s:\n"
 
 #: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/500.html:4
@@ -586,9 +585,9 @@ msgid "Home"
 msgstr "Početna strana"
 
 #: contrib/admin/templates/admin/change_list.html:10
-#, fuzzy, python-format
+#, python-format
 msgid "Add %(name)s"
-msgstr "Dodaj"
+msgstr "Dodaj %(name)s"
 
 #: contrib/admin/templates/admin/index.html:27
 #: contrib/admin/templates/admin/change_form.html:14
@@ -628,12 +627,8 @@ msgid "Server Error <em>(500)</em>"
 msgstr "Greška na serveru <em>(500)</em>"
 
 #: contrib/admin/templates/admin/500.html:10
-msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
-msgstr ""
-"Dogodila se greška koja je prijavljena administratorima i biće popravljena "
-"uskoro. Hvala Vam na strpljenju."
+msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience."
+msgstr "Dogodila se greška koja je prijavljena administratorima i biće popravljena uskoro. Hvala Vam na strpljenju."
 
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
@@ -644,7 +639,8 @@ msgstr "Istorija"
 msgid "Date/time"
 msgstr "Datum/vreme"
 
-#: contrib/admin/templates/admin/object_history.html:19 models/auth.py:47
+#: contrib/admin/templates/admin/object_history.html:19
+#: models/auth.py:47
 msgid "User"
 msgstr "Korisnik"
 
@@ -657,12 +653,8 @@ msgid "DATE_WITH_TIME_FULL"
 msgstr "j. N Y, H:i"
 
 #: contrib/admin/templates/admin/object_history.html:36
-msgid ""
-"This object doesn't have a change history. It probably wasn't added via this "
-"admin site."
-msgstr ""
-"Ovaj objekat nema istoriju promena. Najverovatnije nije dodat korišćenjem "
-"administracije sajta."
+msgid "This object doesn't have a change history. It probably wasn't added via this admin site."
+msgstr "Ovaj objekat nema istoriju promena. Najverovatnije nije dodat korišćenjem administracije sajta."
 
 #: contrib/admin/templates/admin/base_site.html:4
 msgid "Django site admin"
@@ -695,41 +687,32 @@ msgstr "Tražena strana ne postoji."
 
 #: contrib/admin/templates/admin/change_form.html:20
 msgid "View on site"
-msgstr ""
+msgstr "Pogledaj na sajtu"
 
 #: contrib/admin/templates/admin/change_form.html:28
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Ispravite dole navedenu grešku."
+msgstr[1] "Ispravite dole navedene greške."
+msgstr[2] "Ispravite dole navedene greške."
 
 #: contrib/admin/templates/admin/change_form.html:45
 msgid "Ordering"
-msgstr ""
+msgstr "Redosled"
 
 #: contrib/admin/templates/admin/change_form.html:48
 msgid "Order:"
-msgstr ""
+msgstr "Red:"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, python-format
-msgid ""
-"Deleting the %(object_name)s '%(object)s' would result in deleting related "
-"objects, but your account doesn't have permission to delete the following "
-"types of objects:"
-msgstr ""
-"Brisanjem %(object_name)s  '%(object)s' došlo bi do brisanja dodatnih "
-"podataka, ali nemate prava da brišete sledeće tipove podataka:"
+msgid "Deleting the %(object_name)s '%(object)s' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:"
+msgstr "Brisanjem %(object_name)s  '%(object)s' došlo bi do brisanja dodatnih podataka, ali nemate prava da brišete sledeće tipove podataka:"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:14
 #, python-format
-msgid ""
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
-"the following related items will be deleted:"
-msgstr ""
-"Da li ste sigurni da želite da obrišete %(object_name)s \"%(object)s\"? Biće "
-"obrisani i sledeći pridruženi objekti:"
+msgid "Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of the following related items will be deleted:"
+msgstr "Da li ste sigurni da želite da obrišete %(object_name)s \"%(object)s\"? Biće obrisani i sledeći pridruženi objekti:"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:18
 msgid "Yes, I'm sure"
@@ -749,29 +732,28 @@ msgstr "Odjavi se"
 
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
-msgstr ""
+msgstr "Obriši"
 
 #: contrib/admin/templates/admin/submit_line.html:4
 msgid "Save as new"
-msgstr ""
+msgstr "Snimi kao novi"
 
 #: contrib/admin/templates/admin/submit_line.html:5
 msgid "Save and add another"
-msgstr ""
+msgstr "Snimi i dodaj još jedan"
 
 #: contrib/admin/templates/admin/submit_line.html:6
 msgid "Save and continue editing"
-msgstr ""
+msgstr "Snimi i nastavi sa izmenama"
 
 #: contrib/admin/templates/admin/submit_line.html:7
-#, fuzzy
 msgid "Save"
-msgstr "aktivan"
+msgstr "Snimi"
 
 #: contrib/admin/templates/admin/filter.html:1
 #, python-format
 msgid " By %(title)s "
-msgstr ""
+msgstr "Po %(title)s "
 
 #: contrib/admin/templates/registration/password_change_done.html:4
 #: contrib/admin/templates/registration/password_change_form.html:4
@@ -796,12 +778,8 @@ msgid "Password reset"
 msgstr "Resetovanje lozinke"
 
 #: contrib/admin/templates/registration/password_reset_form.html:12
-msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll reset "
-"your password and e-mail the new one to you."
-msgstr ""
-"Zaboravili ste svoju lozinku? Unesite vašu e-mail adresu i dobićete novu "
-"lozinku na dati e-mail."
+msgid "Forgotten your password? Enter your e-mail address below, and we'll reset your password and e-mail the new one to you."
+msgstr "Zaboravili ste svoju lozinku? Unesite vašu e-mail adresu i dobićete novu lozinku na dati e-mail."
 
 #: contrib/admin/templates/registration/password_reset_form.html:16
 msgid "E-mail address:"
@@ -825,20 +803,12 @@ msgid "Password reset successful"
 msgstr "Vaša lozinka je uspešno resetovana"
 
 #: contrib/admin/templates/registration/password_reset_done.html:12
-msgid ""
-"We've e-mailed a new password to the e-mail address you submitted. You "
-"should be receiving it shortly."
-msgstr ""
-"Nova lozinka poslata vam je na zadatu e-mail adresu. E-mail bi trebao da "
-"stigne u narednih nekoliko minuta."
+msgid "We've e-mailed a new password to the e-mail address you submitted. You should be receiving it shortly."
+msgstr "Nova lozinka poslata vam je na zadatu e-mail adresu. E-mail bi trebao da stigne u narednih nekoliko minuta."
 
 #: contrib/admin/templates/registration/password_change_form.html:12
-msgid ""
-"Please enter your old password, for security's sake, and then enter your new "
-"password twice so we can verify you typed it in correctly."
-msgstr ""
-"Unesite staru lozinku, nakon toga unesite novu lozinku dva puta, radi "
-"provere ispravnosti unosa."
+msgid "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly."
+msgstr "Unesite staru lozinku, nakon toga unesite novu lozinku dva puta, radi provere ispravnosti unosa."
 
 #: contrib/admin/templates/registration/password_change_form.html:17
 msgid "Old password:"
@@ -889,15 +859,15 @@ msgstr "%(site_name)s tim"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
-msgstr ""
+msgstr "Dokumentacija"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Bookmarklets"
-msgstr ""
+msgstr "Bookmarklets"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:5
 msgid "Documentation bookmarklets"
-msgstr ""
+msgstr "Dokumentacioni \"bookmarklets\""
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:9
 msgid ""
@@ -909,67 +879,56 @@ msgid ""
 "as \"internal\" (talk to your system administrator if you aren't sure if\n"
 "your computer is \"internal\").</p>\n"
 msgstr ""
+"\n"
+"<p class=\"help\">Da bi ste instalirali \"bookmarklet\", odvučite link u vaše \"bookmark\"-e, ili kliknite desnim tasterom i dodajte ga. Sada možete da izaberete \"bookmark\" sa bilo koje strane na sajtu. Napomena: pristup nekima od strana mora biti sa kompjutera čija je IP adresa označena kao \"internal\" (kontaktirajte sistem administratora ako niste sigurni da li je vaš IP označen kao \"internal\").</p>\n"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:19
 msgid "Documentation for this page"
-msgstr ""
+msgstr "Dokumentacija za ovu stranu"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:20
-msgid ""
-"Jumps you from any page to the documentation for the view that generates "
-"that page."
-msgstr ""
+msgid "Jumps you from any page to the documentation for the view that generates that page."
+msgstr "Skače sa bilo koje strane na stranu sa dokumentacijom za \"view\" koji generiše tu stranu."
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:22
-#, fuzzy
 msgid "Show object ID"
-msgstr "id objekta"
+msgstr "Prikaži ID objekta"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:23
-msgid ""
-"Shows the content-type and unique ID for pages that represent a single "
-"object."
-msgstr ""
+msgid "Shows the content-type and unique ID for pages that represent a single object."
+msgstr "Prikazuje \"content-type\" i jedinstveni ID strane koje predstavlja jedan objekt."
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:25
 msgid "Edit this object (current window)"
-msgstr ""
+msgstr "Izmena objekta (u aktivnom prozoru)"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:26
 msgid "Jumps to the admin page for pages that represent a single object."
-msgstr ""
+msgstr "Skače na admin stranu za strane koje predstavljaju objekt."
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:28
 msgid "Edit this object (new window)"
-msgstr ""
+msgstr "Izmeni objekt (novi prozor)"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:29
 msgid "As above, but opens the admin page in a new window."
-msgstr ""
+msgstr "Kao iznad, samo otvara admin stranu u novom prozoru."
 
 #: contrib/redirects/models/redirects.py:7
 msgid "redirect from"
 msgstr "redirekcija od"
 
 #: contrib/redirects/models/redirects.py:8
-msgid ""
-"This should be an absolute path, excluding the domain name. Example: '/"
-"events/search/'."
-msgstr ""
-"Ovde treba upisati apsolutnu putanju bez imena domena. Primer: '/events/"
-"search/'."
+msgid "This should be an absolute path, excluding the domain name. Example: '/events/search/'."
+msgstr "Ovde treba upisati apsolutnu putanju bez imena domena. Primer: '/events/search/'."
 
 #: contrib/redirects/models/redirects.py:9
 msgid "redirect to"
 msgstr "redirekcija na"
 
 #: contrib/redirects/models/redirects.py:10
-msgid ""
-"This can be either an absolute path (as above) or a full URL starting with "
-"'http://'."
-msgstr ""
-"Ovo može biti apsolutna putanja (kao gore) ili puni URL koji počinje sa "
-"'http://'."
+msgid "This can be either an absolute path (as above) or a full URL starting with 'http://'."
+msgstr "Ovo može biti apsolutna putanja (kao gore) ili puni URL koji počinje sa 'http://'."
 
 #: contrib/redirects/models/redirects.py:12
 msgid "redirect"
@@ -980,11 +939,8 @@ msgid "redirects"
 msgstr "redirekcije"
 
 #: contrib/flatpages/models/flatpages.py:7
-msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr ""
-"Primer: '/about/contact/'. Proverite da li ste uneli početnu i kranju kosu "
-"crtu."
+msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr "Primer: '/about/contact/'. Proverite da li ste uneli početnu i kranju kosu crtu."
 
 #: contrib/flatpages/models/flatpages.py:8
 msgid "title"
@@ -1003,13 +959,8 @@ msgid "template name"
 msgstr "ime templejta"
 
 #: contrib/flatpages/models/flatpages.py:12
-#, fuzzy
-msgid ""
-"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
-"use 'flatpages/default'."
-msgstr ""
-"Primer: 'flatfiles/contact-page'. Ako nije dato sistem će koristiti "
-"'flatfiles/default'."
+msgid "Example: 'flatpages/contact_page'. If this isn't provided, the system will use 'flatpages/default'."
+msgstr "Primer: 'flatpages/contact-page'. Ako nije dato sistem će koristiti flatpages/default'."
 
 #: contrib/flatpages/models/flatpages.py:13
 msgid "registration required"
@@ -1017,9 +968,7 @@ msgstr "samo za registrovane korisnike"
 
 #: contrib/flatpages/models/flatpages.py:13
 msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr ""
-"Ako izaberete ovu opciju samo prijavljeni korisnici će imati pristup datoj "
-"strani."
+msgstr "Ako izaberete ovu opciju samo prijavljeni korisnici će imati pristup datoj strani."
 
 #: contrib/flatpages/models/flatpages.py:17
 msgid "flat page"
@@ -1077,23 +1026,28 @@ msgstr "Januar"
 msgid "February"
 msgstr "Februar"
 
-#: utils/dates.py:14 utils/dates.py:27
+#: utils/dates.py:14
+#: utils/dates.py:27
 msgid "March"
 msgstr "Mart"
 
-#: utils/dates.py:14 utils/dates.py:27
+#: utils/dates.py:14
+#: utils/dates.py:27
 msgid "April"
 msgstr "April"
 
-#: utils/dates.py:14 utils/dates.py:27
+#: utils/dates.py:14
+#: utils/dates.py:27
 msgid "May"
 msgstr "Maj"
 
-#: utils/dates.py:14 utils/dates.py:27
+#: utils/dates.py:14
+#: utils/dates.py:27
 msgid "June"
 msgstr "Jun"
 
-#: utils/dates.py:15 utils/dates.py:27
+#: utils/dates.py:15
+#: utils/dates.py:27
 msgid "July"
 msgstr "Jul"
 
@@ -1163,19 +1117,22 @@ msgstr "sajtovi"
 
 #: models/core.py:28
 msgid "label"
-msgstr ""
+msgstr "labela"
 
-#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
+#: models/core.py:29
+#: models/core.py:40
+#: models/auth.py:6
+#: models/auth.py:19
 msgid "name"
 msgstr "ime"
 
 #: models/core.py:31
 msgid "package"
-msgstr ""
+msgstr "paket"
 
 #: models/core.py:32
 msgid "packages"
-msgstr ""
+msgstr "paketi"
 
 #: models/core.py:42
 msgid "python module name"
@@ -1211,13 +1168,14 @@ msgstr "sesije"
 
 #: models/auth.py:8
 msgid "codename"
-msgstr ""
+msgstr "kodno ime"
 
 #: models/auth.py:10
 msgid "Permission"
 msgstr "Pravo"
 
-#: models/auth.py:11 models/auth.py:58
+#: models/auth.py:11
+#: models/auth.py:58
 msgid "Permissions"
 msgstr "Prava"
 
@@ -1225,7 +1183,8 @@ msgstr "Prava"
 msgid "Group"
 msgstr "Grupa"
 
-#: models/auth.py:23 models/auth.py:60
+#: models/auth.py:23
+#: models/auth.py:60
 msgid "Groups"
 msgstr "Grupe"
 
@@ -1278,11 +1237,8 @@ msgid "date joined"
 msgstr "datum otvaranja naloga"
 
 #: models/auth.py:44
-msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
-msgstr ""
-"Uz ručno dodata prava, korisnik će dobiti sva prava iz grupa kojima pripada."
+msgid "In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in."
+msgstr "Uz ručno dodata prava, korisnik će dobiti sva prava iz grupa kojima pripada."
 
 #: models/auth.py:48
 msgid "Users"
@@ -1313,9 +1269,8 @@ msgid "Welsh"
 msgstr "Welšski"
 
 #: conf/global_settings.py:40
-#, fuzzy
 msgid "Danish"
-msgstr "Španski"
+msgstr "Danski"
 
 #: conf/global_settings.py:41
 msgid "German"
@@ -1335,11 +1290,11 @@ msgstr "Francuski"
 
 #: conf/global_settings.py:45
 msgid "Galician"
-msgstr ""
+msgstr "Galski"
 
 #: conf/global_settings.py:46
 msgid "Icelandic"
-msgstr ""
+msgstr "Islandski"
 
 #: conf/global_settings.py:47
 msgid "Italian"
@@ -1355,7 +1310,7 @@ msgstr "Brazilski"
 
 #: conf/global_settings.py:50
 msgid "Romanian"
-msgstr ""
+msgstr "Rumunski"
 
 #: conf/global_settings.py:51
 msgid "Russian"
@@ -1363,7 +1318,7 @@ msgstr "Ruski"
 
 #: conf/global_settings.py:52
 msgid "Slovak"
-msgstr ""
+msgstr "Slovački"
 
 #: conf/global_settings.py:53
 msgid "Serbian"
@@ -1371,54 +1326,53 @@ msgstr "Srpski"
 
 #: conf/global_settings.py:54
 msgid "Swedish"
-msgstr ""
+msgstr "Švedski"
 
 #: conf/global_settings.py:55
 msgid "Simplified Chinese"
 msgstr "Kineski (pojednostavljen)"
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
+#: core/formfields.py:59
+#: core/meta/fields.py:287
+#: core/meta/fields.py:484
 #: core/meta/fields.py:495
-#, fuzzy
 msgid "This field is required."
-msgstr "Neispravno polje."
+msgstr "Obavezno polje."
 
 #: core/formfields.py:338
 #, python-format
 msgid "Ensure your text is less than %s character"
 msgid_plural "Ensure your text is less than %s characters."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Tekst mora imati manje od %s karaktera."
+msgstr[1] "Tekst mora imati manje od %s karaktera."
+msgstr[2] "Tekst mora imati manje od %s karaktera."
 
 #: core/formfields.py:343
-#, fuzzy
 msgid "Line breaks are not allowed here."
-msgstr "Mala slova ovde nisu dozvoljena."
+msgstr "Novi redovi ovde nisu dozvoljeni."
 
-#: core/formfields.py:439 core/formfields.py:510 core/formfields.py:548
+#: core/formfields.py:439
+#: core/formfields.py:510
+#: core/formfields.py:548
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
-msgstr ""
+msgstr "Izaberite validnu opciju: '%(data)s' nije u %(choices)s."
 
 #: core/formfields.py:604
 msgid "The submitted file is empty."
-msgstr ""
+msgstr "Poslati fajl je prazan."
 
 #: core/formfields.py:658
-#, fuzzy
 msgid "Enter a whole number between -32,768 and 32,767."
-msgstr "Unesite celi broj."
+msgstr "Unesite celi broj između -32,768 i 32,767."
 
 #: core/formfields.py:667
-#, fuzzy
 msgid "Enter a positive number."
-msgstr "Unesite celi broj."
+msgstr "Unesite pozitivan broj."
 
 #: core/formfields.py:676
-#, fuzzy
 msgid "Enter a whole number between 0 and 32,767."
-msgstr "Unesite celi broj."
+msgstr "Unesite celi broj između 0 i 32,767."
 
 # nesh: Ovo je opis za stari SlugField
 #: core/validators.py:59
@@ -1427,8 +1381,7 @@ msgstr "Ovo polje može sadržati samo slova, brojeve i donju crtu (_)."
 
 #: core/validators.py:63
 msgid "This value must contain only letters, numbers, underscores and slashes."
-msgstr ""
-"Ovo polje može sadržati samo slova, brojeve, donju crtu (_) i kose crte."
+msgstr "Ovo polje može sadržati samo slova, brojeve, donju crtu (_) i kose crte."
 
 #: core/validators.py:71
 msgid "Uppercase letters are not allowed here."
@@ -1487,12 +1440,8 @@ msgid "Enter a valid e-mail address."
 msgstr "Unesite ispravnu e-mail adresu."
 
 #: core/validators.py:147
-msgid ""
-"Upload a valid image. The file you uploaded was either not an image or a "
-"corrupted image."
-msgstr ""
-"Pošaljite ispravnu sliku. Fajl koji ste poslali ili nije slika ili je sam "
-"fajl oštećen."
+msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
+msgstr "Pošaljite ispravnu sliku. Fajl koji ste poslali ili nije slika ili je sam fajl oštećen."
 
 #: core/validators.py:154
 #, python-format
@@ -1503,7 +1452,7 @@ msgstr "URL %s ne pokazuje na ispravnu sliku"
 #: core/validators.py:158
 #, python-format
 msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
-msgstr ""
+msgstr "Telefonski brojevi moraju biti u formatu XXX-XXX-XXXX. \"%s\" je neispravan."
 
 #: core/validators.py:166
 #, python-format
@@ -1533,7 +1482,8 @@ msgstr "Neispravan XML: %s"
 msgid "Invalid URL: %s"
 msgstr "Neispravan URL: %s"
 
-#: core/validators.py:205 core/validators.py:207
+#: core/validators.py:205
+#: core/validators.py:207
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr "URL %s je neispravan link."
@@ -1541,7 +1491,7 @@ msgstr "URL %s je neispravan link."
 # nesh: Ni ovo nije interesantno za i18n
 #: core/validators.py:213
 msgid "Enter a valid U.S. state abbreviation."
-msgstr ""
+msgstr "Unesite ispravnu skraćenicu za U.S. državu."
 
 #: core/validators.py:228
 #, python-format
@@ -1560,7 +1510,8 @@ msgstr "Ovo polje mora biti jednako sa poljem '%s'."
 msgid "Please enter something for at least one field."
 msgstr "Morate popuniti barem jedno polje."
 
-#: core/validators.py:263 core/validators.py:274
+#: core/validators.py:263
+#: core/validators.py:274
 msgid "Please enter both fields or leave them both empty."
 msgstr "Popunite oba polja ili oba ostavite prazna."
 
@@ -1590,8 +1541,7 @@ msgstr "Unesite ispravan decimalni broj."
 #: core/validators.py:348
 #, python-format
 msgid "Please enter a valid decimal number with at most %s total digit."
-msgid_plural ""
-"Please enter a valid decimal number with at most %s total digits."
+msgid_plural "Please enter a valid decimal number with at most %s total digits."
 msgstr[0] "Unesite ispravan decimalni broj sa %s cifrom."
 msgstr[1] "Unesite ispravan decimalni broj sa %s cifre."
 msgstr[2] "Unesite ispravan decimalni broj sa %s cifara."
@@ -1599,8 +1549,7 @@ msgstr[2] "Unesite ispravan decimalni broj sa %s cifara."
 #: core/validators.py:351
 #, python-format
 msgid "Please enter a valid decimal number with at most %s decimal place."
-msgid_plural ""
-"Please enter a valid decimal number with at most %s decimal places."
+msgid_plural "Please enter a valid decimal number with at most %s decimal places."
 msgstr[0] "Unesite decimalni broj sa najviše %s decimalnim mestom."
 msgstr[1] "Unesite decimalni broj sa najviše %s decimalna mesta."
 msgstr[2] "Unesite decimalni broj sa najviše %s decimalnih mesta."
@@ -1630,99 +1579,70 @@ msgstr "Ništa nije moglo da se skine sa URL-a %s."
 
 #: core/validators.py:428
 #, python-format
-msgid ""
-"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
-msgstr ""
-"Sa URL-a %(url)s se vratio pogrešan Content-Type header '%(contenttype)s'."
+msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
+msgstr "Sa URL-a %(url)s se vratio pogrešan Content-Type header '%(contenttype)s'."
 
 #: core/validators.py:461
 #, python-format
-msgid ""
-"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
-"\"%(start)s\".)"
-msgstr ""
-"Zatvorite nezatvoren tag \"%(tag)s\" iz reda %(line)s. (Red počinje sa \"%"
-"(start)s\".)"
+msgid "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with \"%(start)s\".)"
+msgstr "Zatvorite nezatvoren tag \"%(tag)s\" iz reda %(line)s. (Red počinje sa \"%(start)s\".)"
 
 #: core/validators.py:465
 #, python-format
-msgid ""
-"Some text starting on line %(line)s is not allowed in that context. (Line "
-"starts with \"%(start)s\".)"
-msgstr ""
-"Tekst koji počinje u redu %(line)s nije dozvoljen u ovom kontekstu. (Red "
-"počinje sa \"%(start)s\".)"
+msgid "Some text starting on line %(line)s is not allowed in that context. (Line starts with \"%(start)s\".)"
+msgstr "Tekst koji počinje u redu %(line)s nije dozvoljen u ovom kontekstu. (Red počinje sa \"%(start)s\".)"
 
 #: core/validators.py:470
 #, python-format
-msgid ""
-"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
-"(start)s\".)"
-msgstr ""
-"Atribut \"%(attr)s\" u red %(line)s je neispravan. (Red počinje sa \"%(start)"
-"s\".)"
+msgid "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%(start)s\".)"
+msgstr "Atribut \"%(attr)s\" u red %(line)s je neispravan. (Red počinje sa \"%(start)s\".)"
 
 #: core/validators.py:475
 #, python-format
-msgid ""
-"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
-"(start)s\".)"
-msgstr ""
-"Tag \"<%(tag)s>\" u redu %(line)s je neispravan. (Red počinje \"%(start)s\".)"
+msgid "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%(start)s\".)"
+msgstr "Tag \"<%(tag)s>\" u redu %(line)s je neispravan. (Red počinje \"%(start)s\".)"
 
 #: core/validators.py:479
 #, python-format
-msgid ""
-"A tag on line %(line)s is missing one or more required attributes. (Line "
-"starts with \"%(start)s\".)"
-msgstr ""
-"Tag-u u redu %(line)s nedostaje jedan ili više atributa. (Red počinje sa \"%"
-"(start)s\".)"
+msgid "A tag on line %(line)s is missing one or more required attributes. (Line starts with \"%(start)s\".)"
+msgstr "Tag-u u redu %(line)s nedostaje jedan ili više atributa. (Red počinje sa \"%(start)s\".)"
 
 #: core/validators.py:484
 #, python-format
-msgid ""
-"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
-"starts with \"%(start)s\".)"
-msgstr ""
-"Atribut \"%(attr)s\" u redu %(line)s ima neispravnu vrednost. (Red počinje "
-"sa \"%(start)s\".)"
+msgid "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line starts with \"%(start)s\".)"
+msgstr "Atribut \"%(attr)s\" u redu %(line)s ima neispravnu vrednost. (Red počinje sa \"%(start)s\".)"
 
 #: core/meta/fields.py:46
-#, fuzzy, python-format
+#, python-format
 msgid "Please enter a valid %s."
-msgstr "Unesite ispravnu IP adresu."
+msgstr "Unesite ispravan %s."
 
 #: core/meta/fields.py:60
 #, python-format
 msgid "%(optname)s with this %(fieldname)s already exists."
-msgstr ""
+msgstr "%(optname)s sa ovim %(fieldname)s već postoji."
 
 #: core/meta/fields.py:131
 msgid " Separate multiple IDs with commas."
 msgstr " Odvojite višestruke ID-ove zarezima."
 
 #: core/meta/fields.py:134
-msgid ""
-" Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
-msgstr ""
-" Koristite \"Ctrl\" (PC) ili \"Jabuku\" (Mek) da bi ste selektovali više "
-"stavki."
+msgid " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr " Koristite \"Ctrl\" (PC) ili \"Jabuku\" (Mek) da bi ste selektovali više stavki."
 
 #: core/meta/fields.py:504
-#, fuzzy
 msgid "Enter a valid filename."
-msgstr "Unesite ispravnu e-mail adresu."
+msgstr "Unesite ispravno ime fajla."
 
 #: core/meta/fields.py:773
 #, 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"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgid_plural "Please enter valid %(self)s IDs. The values %(value)r are invalid"
+msgstr[0] "Unesite validne %(self)s ID-ove. Vrednost %(value)r je neispravna."
+msgstr[1] "Unesite validne %(self)s ID-ove. Vrednost %(value)r je neispravna."
+msgstr[2] "Unesite validne %(self)s ID-ove. Vrednost %(value)r je neispravna."
 
 #, fuzzy
 #~ msgid "count"
 #~ msgstr "sadržaj"
+