From d6bf53760b4e39248e1e2f622a569be7484545ea Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Mon, 16 Jan 2006 18:56:44 +0000 Subject: [PATCH] magic-removal: Merged to [2010] git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2011 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/conf/locale/sk/LC_MESSAGES/django.mo | Bin 30819 -> 31297 bytes django/conf/locale/sk/LC_MESSAGES/django.po | 14 +- django/conf/locale/sr/LC_MESSAGES/django.mo | Bin 30125 -> 30950 bytes django/conf/locale/sr/LC_MESSAGES/django.po | 370 +++++++----------- django/conf/locale/sr/LC_MESSAGES/djangojs.mo | Bin 1238 -> 1699 bytes django/conf/locale/sr/LC_MESSAGES/djangojs.po | 34 +- django/contrib/admin/views/decorators.py | 8 +- docs/db-api.txt | 19 + 8 files changed, 183 insertions(+), 262 deletions(-) diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo index e7c5dbbc5da44334b16f67494d99a59ee8539ac5..157307f7e62228d171eabc84f16eddac7e408201 100644 GIT binary patch delta 8335 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 delta 7898 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¬Y7ZSneZW33?LT73 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 XxIE>ytJv=*(_YVFckRW>SEBw6ftqU8 delta 7951 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 ex6k>@$DP^lxQ~18;CX@W=\n" -"Language-Team: Nesh & Petar \n" +"Language-Team: Nesh & Petar \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" @@ -77,7 +75,8 @@ msgstr "datum/vreme slanja" msgid "is public" msgstr "da li je javni" -#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256 +#: contrib/comments/models/comments.py:26 +#: contrib/admin/views/doc.py:256 msgid "IP address" msgstr "IP adresa" @@ -86,12 +85,8 @@ msgid "is removed" 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 "" -"Selektujte ako je komentar neodgovarajući. Biće ispisano \"Ovaj komentar je " -"obrisan\" umesto teksta komentara." +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" @@ -221,35 +216,29 @@ 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." +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" +"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" +"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" +"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s komentara:\n" "\n" "%(text)s" @@ -282,11 +271,8 @@ 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 "" -"Form komentara ima neispravni 'target' parametar -- ID objekta nije ispravan" +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 @@ -302,7 +288,8 @@ msgstr "" "

Od %s:

\n" "
    \n" -#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88 +#: contrib/admin/filterspecs.py:70 +#: contrib/admin/filterspecs.py:88 #: contrib/admin/filterspecs.py:143 msgid "All" msgstr "Sve" @@ -371,12 +358,11 @@ msgstr "unosi u dnevnik izmena" msgid "All dates" msgstr "Svi datumi" -#: contrib/admin/views/decorators.py:9 parts/auth/formfields.py:33 +#: contrib/admin/views/decorators.py:9 +#: parts/auth/formfields.py:33 #: parts/auth/formfields.py:38 -msgid "" -"Please enter a correct username and password. Note that both fields are case-" -"sensitive." -msgstr "" +msgid "Please enter a correct username and password. Note that both fields are case-sensitive." +msgstr "Unesite ispravno korisničko ime i šifru. Napomena: oba polja prave razliku između velikih i malih slova." #: contrib/admin/views/decorators.py:23 #: contrib/admin/templates/admin/login.html:24 @@ -384,20 +370,12 @@ msgid "Log in" msgstr "Prijavi se" #: contrib/admin/views/decorators.py:57 -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." +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:64 -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." +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:78 msgid "Usernames cannot contain the '@' character." @@ -427,11 +405,13 @@ msgstr "Izaberi %s za izmenu" msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Uspešno dodat %(name)s \"%(obj)s\"." -#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:492 +#: contrib/admin/views/main.py:415 +#: contrib/admin/views/main.py:492 msgid "You may edit it again below." msgstr "Ispod ga možete ponovo izmeniti." -#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:501 +#: contrib/admin/views/main.py:423 +#: contrib/admin/views/main.py:501 #, python-format msgid "You may add another %s below." msgstr "Ispod možete dodati još jedan %s." @@ -446,7 +426,8 @@ msgstr "Dodaj %s" msgid "Added %s." msgstr "Dodat %s" -#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459 +#: contrib/admin/views/main.py:457 +#: contrib/admin/views/main.py:459 #: contrib/admin/views/main.py:461 msgid "and" msgstr "i" @@ -472,8 +453,7 @@ msgstr "Uspešno izmenjen: %(name)s \"%(obj)s\"." #: contrib/admin/views/main.py:498 #, python-format -msgid "" -"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." +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:536 @@ -505,9 +485,12 @@ msgstr "Da li ste sigurni?" msgid "Change history: %s" msgstr "Istorija izmena: %s" -#: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253 -#: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261 -#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:264 +#: contrib/admin/views/doc.py:244 +#: contrib/admin/views/doc.py:253 +#: contrib/admin/views/doc.py:255 +#: contrib/admin/views/doc.py:261 +#: contrib/admin/views/doc.py:262 +#: contrib/admin/views/doc.py:264 msgid "Integer" msgstr "Ceo broj" @@ -536,7 +519,8 @@ msgstr "Datum (sa vremenom)" msgid "E-mail address" msgstr "E-mail adresa" -#: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254 +#: contrib/admin/views/doc.py:251 +#: contrib/admin/views/doc.py:254 msgid "File path" msgstr "Putanja do fajla" @@ -570,7 +554,8 @@ msgstr "Vreme" # nesh: ovo se valjda ne prevodi # petar: ne prevodi se -#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6 +#: contrib/admin/views/doc.py:267 +#: contrib/flatpages/models/flatpages.py:6 msgid "URL" msgstr "URL" @@ -650,7 +635,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" @@ -663,12 +649,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" @@ -691,12 +673,8 @@ msgid "Server Error (500)" msgstr "Greška na serveru (500)" #: 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/404.html:4 #: contrib/admin/templates/admin/404.html:8 @@ -755,22 +733,13 @@ msgstr "Dobrodošli," #: contrib/admin/templates/admin/delete_confirmation.html:6 #, 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:13 #, 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:17 msgid "Yes, I'm sure" @@ -848,12 +817,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:" @@ -877,20 +842,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:" @@ -958,36 +915,23 @@ msgid "" "your computer is \"internal\").

    \n" msgstr "" "\n" -"

    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\").

    \n" +"

    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\").

    \n" #: contrib/admin/templates/admin_doc/bookmarklets.html:19 msgid "Documentation for this page" 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 "" -"Skače sa bilo koje strane na stranu sa dokumentacijom za \"view\" koji " -"generiše tu stranu." +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 msgid "Show object ID" 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 "" -"Prikazuje \"content-type\" i jedinstveni ID strane koje predstavlja jedan " -"objekt." +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)" @@ -1015,36 +959,27 @@ msgstr "Vreme:" #: contrib/admin/templates/widget/file.html:2 msgid "Currently:" -msgstr "" +msgstr "Trenutno:" #: contrib/admin/templates/widget/file.html:3 -#, fuzzy msgid "Change:" -msgstr "Izmena" +msgstr "Izmenite:" #: 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" @@ -1055,11 +990,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" @@ -1078,12 +1010,8 @@ msgid "template name" msgstr "ime templejta" #: contrib/flatpages/models/flatpages.py:12 -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'." +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" @@ -1091,9 +1019,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" @@ -1151,23 +1077,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" @@ -1274,7 +1205,10 @@ msgstr "sajtovi" msgid "label" 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" @@ -1326,7 +1260,8 @@ msgstr "kodno ime" msgid "Permission" msgstr "Pravo" -#: models/auth.py:11 models/auth.py:58 +#: models/auth.py:11 +#: models/auth.py:58 msgid "Permissions" msgstr "Prava" @@ -1334,7 +1269,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" @@ -1387,11 +1323,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" @@ -1455,11 +1388,11 @@ msgstr "Italijanski" #: conf/global_settings.py:48 msgid "Japanese" -msgstr "" +msgstr "Japanski" #: conf/global_settings.py:49 msgid "Dutch" -msgstr "" +msgstr "Holandski" #: conf/global_settings.py:50 msgid "Norwegian" @@ -1495,9 +1428,11 @@ msgstr "Kineski (pojednostavljen)" #: conf/global_settings.py:58 msgid "Traditional Chinese" -msgstr "" +msgstr "Tradicionalni Kineski" -#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488 +#: core/formfields.py:59 +#: core/meta/fields.py:285 +#: core/meta/fields.py:488 #: core/meta/fields.py:499 msgid "This field is required." msgstr "Obavezno polje." @@ -1514,7 +1449,9 @@ msgstr[2] "Tekst mora imati manje od %s slova." msgid "Line breaks are not allowed here." msgstr "Novi redovi ovde nisu dozvoljeni." -#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547 +#: core/formfields.py:438 +#: core/formfields.py:509 +#: core/formfields.py:547 #, python-format msgid "Select a valid choice; '%(data)s' is not in %(choices)s." msgstr "Izaberite validnu opciju: '%(data)s' nije u %(choices)s." @@ -1542,8 +1479,7 @@ msgstr "Ovo polje može sadržati samo slova, brojeve i donju crtu (_)." #: core/validators.py:66 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:74 msgid "Uppercase letters are not allowed here." @@ -1602,12 +1538,8 @@ msgid "Enter a valid e-mail address." msgstr "Unesite ispravnu e-mail adresu." #: core/validators.py:150 -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:157 #, python-format @@ -1618,8 +1550,7 @@ msgstr "URL %s ne pokazuje na ispravnu sliku" #: core/validators.py:161 #, python-format msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." -msgstr "" -"Telefonski brojevi moraju biti u formatu XXX-XXX-XXXX. \"%s\" je neispravan." +msgstr "Telefonski brojevi moraju biti u formatu XXX-XXX-XXXX. \"%s\" je neispravan." #: core/validators.py:169 #, python-format @@ -1649,7 +1580,8 @@ msgstr "Neispravan XML: %s" msgid "Invalid URL: %s" msgstr "Neispravan URL: %s" -#: core/validators.py:208 core/validators.py:210 +#: core/validators.py:208 +#: core/validators.py:210 #, python-format msgid "The URL %s is a broken link." msgstr "URL %s je neispravan link." @@ -1676,7 +1608,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:266 core/validators.py:277 +#: core/validators.py:266 +#: core/validators.py:277 msgid "Please enter both fields or leave them both empty." msgstr "Popunite oba polja ili oba ostavite prazna." @@ -1706,8 +1639,7 @@ msgstr "Unesite ispravan decimalni broj." #: core/validators.py:351 #, 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." @@ -1715,8 +1647,7 @@ msgstr[2] "Unesite ispravan decimalni broj sa %s cifara." #: core/validators.py:354 #, 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." @@ -1746,68 +1677,43 @@ msgstr "Ništa nije moglo da se skine sa URL-a %s." #: core/validators.py:431 #, 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:464 #, 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:468 #, 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:473 #, 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:478 #, 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:482 #, 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:487 #, 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/__init__.py:1947 -#, fuzzy, python-format +#, python-format msgid "%(object)s with this %(type)s already exists for the given %(field)s." -msgstr "%(optname)s sa ovim %(fieldname)s već postoji." +msgstr "%(object)s sa ovim tipom %(type)s već postoji za polje %(field)s." #: core/meta/fields.py:46 #, python-format @@ -1824,11 +1730,8 @@ msgid " Separate multiple IDs with commas." msgstr " Odvojite višestruke ID-ove zarezima." #: core/meta/fields.py:132 -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:508 msgid "Enter a valid filename." @@ -1837,8 +1740,7 @@ msgstr "Unesite ispravno ime fajla." #: core/meta/fields.py:782 #, 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." +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." @@ -1848,14 +1750,11 @@ msgid "yes,no,maybe" msgstr "da,ne,možda" #: parts/auth/formfields.py:27 -msgid "" -"Your Web browser doesn't appear to have cookies enabled. Cookies are " -"required for logging in." -msgstr "" +msgid "Your Web browser doesn't appear to have cookies enabled. Cookies are required for logging in." +msgstr "Vaš web brovser nema omogućenje \"cookie\". \"cookie\" podrška je potrebna da bi ste mogli da se prijavite." #~ msgid "Error in Template" #~ msgstr "Greška u templejtu" - #~ msgid "" #~ "\n" #~ "In template %(name)s, error at line %(line)s:\n" @@ -1866,3 +1765,4 @@ msgstr "" #, fuzzy #~ msgid "count" #~ msgstr "sadržaj" + diff --git a/django/conf/locale/sr/LC_MESSAGES/djangojs.mo b/django/conf/locale/sr/LC_MESSAGES/djangojs.mo index b9e73b972cd1231aaeaf319432ede846deaf3a75..4ae94424df381a90540f8de9670e40640afaf6c0 100644 GIT binary patch delta 907 zcmYk3%WD%+6o>EB_=q-YV--XTr_@&$DW+%;$)+>}Dt!beq3FsxGZ!<>WNx`L6G>4b zZqu>LU8TUKfsmlL|phglMy^{&Ufy4-PhOr^TOa;G51hFjzEt? zzd)y;H!T>*4{#Uw6Wjs*0>{BW;2tnPHp&;l0@g>tz2Ipu56)+-f;+LUgDr3wME^iM zgOfwxCCD4R26@AGAP;;G68IUs0DcE~&Z8VDVY6W3FH^7f)(&8$n_60 zKFat6w6K3VKe>s4~K`0-HZ(D@&>+p?sLviu+TQD;{#3XnK%EI5lFTgUv zrb2SAJ0})APmC}0q#sBpP;@dHu30qI);dxogFq~{;f08c#Xw2Jv0>NJgUhO`drH`} zLQPtS*2xyO3X~gDUnhp#w)S0hCYmJ~dgKPa+aX~mp(p#aqEj>z74dRidEv-wwiAc;1cE#t(%5lua^U2TlMA+8L6Tm3?%bhcb7pQm#9;{3U{x5r*t6E)Orh?{BQ3J0W6XRe37dkkruO$m>um)<$;7Hp-J2qT-&3v2G}~cH-z*ikb{%ga?U@ L6ql0i`%3%;1pTK) delta 429 zcmXxfKTE@45XbRL(`c*4L05-U2d9Qqh=P-Y_zx`6Sj5c?;?xe>4o=;ror15Rn}Z1A z;N+62lOTwL_yU|<1qZ(;@yIWqbEHpZ$q%vGc0|T-2P+sC z@5ku#eu5shv56hDz7dx31zmhY>wib<|3vzF^2I}yg>PIe(M)XM5?|X!LE$Re2J2`W zHZaBmwEiL5#y7|%ciil!9*Xt6a8&q=j_iw!(_}S8Y=C|AUp9!ozXMJdi*_g*I6-Wn z6=xP%(KKiUS*4`eR;lGDx~GSFL^d_a7Tha8s@0ckVWjnFEe!7;-CHNS^fY_&&gL5$ bYf}@=`#dDFk+#zdNxGf$RCc@h;8cDAQT8!V diff --git a/django/conf/locale/sr/LC_MESSAGES/djangojs.po b/django/conf/locale/sr/LC_MESSAGES/djangojs.po index 9a911848d5..ce23be3ee4 100644 --- a/django/conf/locale/sr/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/sr/LC_MESSAGES/djangojs.po @@ -8,61 +8,54 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-12-09 11:51+0100\n" -"PO-Revision-Date: 2005-12-05 15:00+0100\n" +"PO-Revision-Date: 2006-01-15 11:24+0100\n" "Last-Translator: Nebojša Đorđević \n" -"Language-Team: Nesh & Petar \n" +"Language-Team: Nesh & Petar \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Serbian\n" "X-Poedit-Country: YUGOSLAVIA\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" #: contrib/admin/media/js/SelectFilter2.js:33 #, perl-format msgid "Available %s" -msgstr "" +msgstr "Dostupno %s" #: contrib/admin/media/js/SelectFilter2.js:41 -#, fuzzy msgid "Choose all" -msgstr "Izaberi vreme" +msgstr "Izaberi sve" #: contrib/admin/media/js/SelectFilter2.js:46 msgid "Add" -msgstr "" +msgstr "Dodaj" #: contrib/admin/media/js/SelectFilter2.js:48 msgid "Remove" -msgstr "" +msgstr "Izbaci" #: contrib/admin/media/js/SelectFilter2.js:53 #, perl-format msgid "Chosen %s" -msgstr "" +msgstr "Izabrano %s" #: contrib/admin/media/js/SelectFilter2.js:54 msgid "Select your choice(s) and click " -msgstr "" +msgstr "Izaberite potrebno i kliknite" #: contrib/admin/media/js/SelectFilter2.js:59 msgid "Clear all" -msgstr "" +msgstr "Obrišite sve" #: contrib/admin/media/js/dateparse.js:26 #: contrib/admin/media/js/calendar.js:24 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Januar Februar Mart April Maj Jun Jul Avgust Septembar Oktobar Novembar " -"Decembar" +msgid "January February March April May June July August September October November December" +msgstr "Januar Februar Mart April Maj Jun Jul Avgust Septembar Oktobar Novembar Decembar" #: contrib/admin/media/js/dateparse.js:27 msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday" -msgstr "" +msgstr "Nedelja Ponedeljak Utorak Sreda Četvrtak Petak Subota" #: contrib/admin/media/js/calendar.js:25 msgid "S M T W T F S" @@ -114,3 +107,4 @@ msgstr "Juče" #: contrib/admin/media/js/admin/DateTimeShortcuts.js:164 msgid "Tomorrow" msgstr "Sutra" + diff --git a/django/contrib/admin/views/decorators.py b/django/contrib/admin/views/decorators.py index 5eb9028a8e..8b2d97bdd5 100644 --- a/django/contrib/admin/views/decorators.py +++ b/django/contrib/admin/views/decorators.py @@ -4,7 +4,7 @@ from django.conf import settings from django.contrib.auth.models import User, SESSION_KEY from django import http from django.utils.translation import gettext_lazy -import base64, md5 +import base64, datetime, md5 import cPickle as pickle ERROR_MESSAGE = gettext_lazy("Please enter a correct username and password. Note that both fields are case-sensitive.") @@ -48,6 +48,10 @@ def staff_member_required(view_func): def _checklogin(request, *args, **kwargs): if not request.user.is_anonymous() and request.user.is_staff: # The user is valid. Continue to the admin page. + if request.POST.has_key('post_data'): + # User must have re-authenticated through a different window + # or tab. + request.POST = _decode_post_data(request.POST['post_data']) return view_func(request, *args, **kwargs) assert hasattr(request, 'session'), "The Django admin requires session middleware to be installed. Edit your MIDDLEWARE_CLASSES setting to insert 'django.contrib.sessions.middleware.SessionMiddleware'." @@ -85,6 +89,8 @@ def staff_member_required(view_func): else: if user.check_password(request.POST.get('password', '')): request.session[SESSION_KEY] = user.id + user.last_login = datetime.datetime.now() + user.save() if request.POST.has_key('post_data'): post_data = _decode_post_data(request.POST['post_data']) if post_data and not post_data.has_key(LOGIN_FORM_KEY): diff --git a/docs/db-api.txt b/docs/db-api.txt index f4b4675c82..5261ab6fda 100644 --- a/docs/db-api.txt +++ b/docs/db-api.txt @@ -544,6 +544,25 @@ deletes the object and has no return value. Example:: >>> c.delete() +Comparing objects +================= + +To compare two model objects, just use the standard Python comparison operator, +the double equals sign: ``==``. Behind the scenes, that compares the primary +key values of two models. + +Using the ``Poll`` example above, the following two statements are equivalent:: + + some_poll == other_poll + some_poll.id == other_poll.id + +If a model's primary key isn't called ID, no problem. Comparisons will always +use the primary key, whatever it's called. For example, if a model's primary +key field is called ``name``, these two statements are equivalent:: + + some_obj == other_obj + some_obj.name == other_obj.name + Extra instance methods ======================