1
0
mirror of https://github.com/django/django.git synced 2025-07-03 17:29:12 +00:00

[soc2009/http-wsgi-improvements] Merged up to r11423.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/http-wsgi-improvements@11440 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Chris Cahoon 2009-08-13 00:52:32 +00:00
parent 1da736f0f9
commit d76879d1b3
34 changed files with 1656 additions and 1480 deletions

View File

@ -440,6 +440,7 @@ answer newbie questions, and generally made Django that much better:
viestards.lists@gmail.com
George Vilches <gav@thataddress.com>
Vlado <vlado@labath.org>
Zachary Voase <zacharyvoase@gmail.com>
Milton Waddams
Chris Wagner <cw264701@ohio.edu>
Rick Wagner <rwagner@physics.ucsd.edu>

File diff suppressed because it is too large Load Diff

View File

@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-04-11 07:53+0300\n"
"POT-Creation-Date: 2009-07-24 22:06+0300\n"
"PO-Revision-Date: 2008-09-03 00:35+0200\n"
"Last-Translator: Erik Allik <removethis-eallik_at_gmail-com>\n"
"Language-Team: Django-i18n <django-i18n@googlegroups.com>\n"
@ -217,19 +217,19 @@ msgstr "lihtsustatud hiina"
msgid "Traditional Chinese"
msgstr "traditsiooniline hiina"
#: contrib/admin/actions.py:56
#: contrib/admin/actions.py:60
#, python-format
msgid "Successfully deleted %(count)d %(items)s."
msgstr ""
msgstr "%(count)d %(items)s kustutamine õnnestus"
#: contrib/admin/actions.py:63 contrib/admin/options.py:1023
#: contrib/admin/actions.py:67 contrib/admin/options.py:1027
msgid "Are you sure?"
msgstr "Kas olete kindel?"
#: contrib/admin/actions.py:81
#: contrib/admin/actions.py:85
#, python-format
msgid "Delete selected %(verbose_name_plural)s"
msgstr ""
msgstr "Kustuta valitud %(verbose_name_plural)s"
#: contrib/admin/filterspecs.py:44
#, python-format
@ -265,15 +265,15 @@ msgstr "Käesolev kuu"
msgid "This year"
msgstr "Käesolev aasta"
#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
msgid "Yes"
msgstr "Jah"
#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
msgid "No"
msgstr "Ei"
#: contrib/admin/filterspecs.py:154 forms/widgets.py:413
#: contrib/admin/filterspecs.py:154 forms/widgets.py:434
msgid "Unknown"
msgstr "Tundmatu"
@ -311,100 +311,101 @@ msgstr "logisissekanded"
#: contrib/admin/options.py:133 contrib/admin/options.py:147
msgid "None"
msgstr "puudub"
msgstr "Puudub"
#: contrib/admin/options.py:517
#: contrib/admin/options.py:519
#, python-format
msgid "Changed %s."
msgstr "Muutsin %s."
#: contrib/admin/options.py:517 contrib/admin/options.py:527
#: contrib/comments/templates/comments/preview.html:16 forms/models.py:306
#: contrib/admin/options.py:519 contrib/admin/options.py:529
#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388
#: forms/models.py:600
msgid "and"
msgstr "ja"
#: contrib/admin/options.py:522
#: contrib/admin/options.py:524
#, python-format
msgid "Added %(name)s \"%(object)s\"."
msgstr "Lisatud %(name)s \"%(object)s\"."
#: contrib/admin/options.py:526
#: contrib/admin/options.py:528
#, python-format
msgid "Changed %(list)s for %(name)s \"%(object)s\"."
msgstr "Muudetud %(list)s objektil %(name)s \"%(object)s\"."
#: contrib/admin/options.py:531
#: contrib/admin/options.py:533
#, python-format
msgid "Deleted %(name)s \"%(object)s\"."
msgstr "Kustutatud %(name)s \"%(object)s\"."
#: contrib/admin/options.py:535
#: contrib/admin/options.py:537
msgid "No fields changed."
msgstr "Ühtegi välja ei muudetud."
#: contrib/admin/options.py:596 contrib/auth/admin.py:67
#: contrib/admin/options.py:599 contrib/auth/admin.py:67
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "%(name)s \"%(obj)s\" lisamine õnnestus."
#: contrib/admin/options.py:600 contrib/admin/options.py:633
#: contrib/admin/options.py:603 contrib/admin/options.py:636
#: contrib/auth/admin.py:75
msgid "You may edit it again below."
msgstr "Võite jätkata redigeerimist."
#: contrib/admin/options.py:610 contrib/admin/options.py:643
#: contrib/admin/options.py:613 contrib/admin/options.py:646
#, python-format
msgid "You may add another %s below."
msgstr "Võite jätkata uue %s lisamisega."
#: contrib/admin/options.py:631
#: contrib/admin/options.py:634
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "%(name)s \"%(obj)s\" muutmine õnnestus."
#: contrib/admin/options.py:639
#: contrib/admin/options.py:642
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr "%(name)s \"%(obj)s\" lisamine õnnestus. Te võite seda muuta."
#: contrib/admin/options.py:770
#: contrib/admin/options.py:773
#, python-format
msgid "Add %s"
msgstr "Lisa %s"
#: contrib/admin/options.py:801 contrib/admin/options.py:1001
#: contrib/admin/options.py:804 contrib/admin/options.py:1005
#, python-format
msgid "%(name)s object with primary key %(key)r does not exist."
msgstr "%(name)s primaarvõtmega %(key)r ei eksisteeri."
#: contrib/admin/options.py:858
#: contrib/admin/options.py:861
#, python-format
msgid "Change %s"
msgstr "Muuda %s"
#: contrib/admin/options.py:902
#: contrib/admin/options.py:905
msgid "Database error"
msgstr "Andmebaasi viga"
#: contrib/admin/options.py:938
#: contrib/admin/options.py:941
#, 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 muutmine õnnestus."
msgstr[1] "%(count)s %(name)s muutmine õnnestus."
#: contrib/admin/options.py:1016
#: contrib/admin/options.py:1020
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "%(name)s \"%(obj)s\" kustutati."
#: contrib/admin/options.py:1052
#: contrib/admin/options.py:1057
#, python-format
msgid "Change history: %s"
msgstr "Muudatuste ajalugu: %s"
#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14
#: contrib/admin/sites.py:21 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-"
@ -413,11 +414,11 @@ msgstr ""
"Palun sisestage korrektne kasutajatunnus ja salasõna. Mõlemad väljad on "
"tõstutundlikud."
#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40
#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:40
msgid "Please log in again, because your session has expired."
msgstr "Teie sessioon on aegunud. Palun logige uuesti sisse."
#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47
#: contrib/admin/sites.py:292 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."
@ -425,28 +426,27 @@ msgstr ""
"Paistab, et Teie brauser ei aktsepteeri küpsiseid. Palun võimaldage küpsised "
"ning seejärel laadige see leht uuesti."
#: contrib/admin/sites.py:301 contrib/admin/sites.py:307
#: contrib/admin/sites.py:308 contrib/admin/sites.py:314
#: contrib/admin/views/decorators.py:66
msgid "Usernames cannot contain the '@' character."
msgstr "Kasutajatunnused ei tohi sisaldada '@' märki."
#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62
#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:62
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
"Teie e-posti aadress ei ole Teie kasutajatunnus. Proovige '%s'."
msgstr "Teie e-posti aadress ei ole Teie kasutajatunnus. Proovige '%s'."
#: contrib/admin/sites.py:360
#: contrib/admin/sites.py:367
msgid "Site administration"
msgstr "Saidi administreerimine"
#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26
#: contrib/admin/sites.py:381 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 "Sisene"
#: contrib/admin/sites.py:417
#: contrib/admin/sites.py:426
#, python-format
msgid "%s administration"
msgstr "%s - administreerimine"
@ -496,7 +496,7 @@ msgstr "Vabandame, kuid soovitud lehte ei leitud."
#: contrib/admin/templates/admin/500.html:4
#: contrib/admin/templates/admin/app_index.html:8
#: contrib/admin/templates/admin/base.html:33
#: contrib/admin/templates/admin/base.html:54
#: contrib/admin/templates/admin/change_form.html:17
#: contrib/admin/templates/admin/change_list.html:25
#: contrib/admin/templates/admin/delete_confirmation.html:6
@ -541,7 +541,6 @@ msgid "Run the selected action"
msgstr "Käivita valitud toiming"
#: contrib/admin/templates/admin/actions.html:4
#: contrib/admin/templates/admin/search_form.html:8
msgid "Go"
msgstr "Mine"
@ -551,18 +550,18 @@ msgstr "Mine"
msgid "%(name)s"
msgstr "%(name)s"
#: contrib/admin/templates/admin/base.html:28
#: contrib/admin/templates/admin/base.html:27
msgid "Welcome,"
msgstr "Tere tulemast,"
#: contrib/admin/templates/admin/base.html:28
#: contrib/admin/templates/admin/base.html:32
#: 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 "Dokumentatsioon"
#: contrib/admin/templates/admin/base.html:28
#: contrib/admin/templates/admin/base.html:40
#: contrib/admin/templates/admin/auth/user/change_password.html:14
#: contrib/admin/templates/admin/auth/user/change_password.html:47
#: contrib/admin/templates/registration/password_change_done.html:3
@ -570,7 +569,7 @@ msgstr "Dokumentatsioon"
msgid "Change password"
msgstr "Muuda salasõna"
#: contrib/admin/templates/admin/base.html:28
#: contrib/admin/templates/admin/base.html:47
#: contrib/admin/templates/registration/password_change_done.html:3
#: contrib/admin/templates/registration/password_change_form.html:3
msgid "Log out"
@ -659,9 +658,8 @@ msgid ""
"your account doesn't have permission to delete the following types of "
"objects:"
msgstr ""
"%(object_name)s kustutamiseks on vaja "
"kustutada ka seotud objektid, aga teil puudub õigus järgnevat "
"tüüpi objektide kustutamiseks:"
"%(object_name)s kustutamiseks on vaja kustutada ka seotud objektid, aga teil "
"puudub õigus järgnevat tüüpi objektide kustutamiseks:"
#: contrib/admin/templates/admin/delete_selected_confirmation.html:22
#, python-format
@ -702,6 +700,10 @@ msgstr "Minu Toimingud"
msgid "None available"
msgstr "Ei leitud ühtegi"
#: contrib/admin/templates/admin/index.html:72
msgid "Unknown content"
msgstr "Tundmatu sisu"
#: contrib/admin/templates/admin/invalid_setup.html:7
msgid ""
"Something's wrong with your database installation. Make sure the appropriate "
@ -750,6 +752,15 @@ msgstr ""
msgid "Show all"
msgstr "Näita kõiki"
#: contrib/admin/templates/admin/pagination.html:11
#: contrib/admin/templates/admin/submit_line.html:3
msgid "Save"
msgstr "Salvesta"
#: contrib/admin/templates/admin/search_form.html:8
msgid "Search"
msgstr "Otsing"
#: contrib/admin/templates/admin/search_form.html:10
#, python-format
msgid "1 result"
@ -762,10 +773,6 @@ msgstr[1] "%(counter)s tulemust"
msgid "%(full_result_count)s total"
msgstr "Kokku %(full_result_count)s"
#: contrib/admin/templates/admin/submit_line.html:3
msgid "Save"
msgstr "Salvesta"
#: contrib/admin/templates/admin/submit_line.html:5
msgid "Save as new"
msgstr "Salvesta uuena"
@ -993,144 +1000,145 @@ msgstr "sait"
msgid "template"
msgstr "mall"
#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60
#: contrib/admindocs/views.py:62
#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63
#: contrib/admindocs/views.py:65
msgid "tag:"
msgstr "lipik:"
#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93
#: contrib/admindocs/views.py:95
#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96
#: contrib/admindocs/views.py:98
msgid "filter:"
msgstr "filtreeri:"
#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157
#: contrib/admindocs/views.py:159
#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160
#: contrib/admindocs/views.py:162
msgid "view:"
msgstr "vaade:"
#: contrib/admindocs/views.py:187
#: contrib/admindocs/views.py:190
#, python-format
msgid "App %r not found"
msgstr "Rakendust %r ei leitud"
#: contrib/admindocs/views.py:194
#: contrib/admindocs/views.py:197
#, python-format
msgid "Model %(model_name)r not found in app %(app_label)r"
msgstr "Mudelit %(model_name)r ei leitud rakendusest %(app_label)r"
#: contrib/admindocs/views.py:206
#: contrib/admindocs/views.py:209
#, python-format
msgid "the related `%(app_label)s.%(data_type)s` object"
msgstr "seotud `%(app_label)s.%(data_type)s` objekt"
#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228
#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247
#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228
#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247
#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266
msgid "model:"
msgstr "mudel:"
#: contrib/admindocs/views.py:237
#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256
#, python-format
msgid "related `%(app_label)s.%(object_name)s` objects"
msgstr "seotud `%(app_label)s.%(object_name)s` objektid"
#: contrib/admindocs/views.py:242
#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261
#, python-format
msgid "all %s"
msgstr "kõik %s"
#: contrib/admindocs/views.py:247
#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266
#, python-format
msgid "number of %s"
msgstr "%s arv"
#: contrib/admindocs/views.py:252
#: contrib/admindocs/views.py:271
#, python-format
msgid "Fields on %s objects"
msgstr "Objekti %s väljad"
#: contrib/admindocs/views.py:315 contrib/admindocs/views.py:326
#: contrib/admindocs/views.py:328 contrib/admindocs/views.py:334
#: contrib/admindocs/views.py:335 contrib/admindocs/views.py:337
#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345
#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353
#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356
msgid "Integer"
msgstr "Täisarv"
#: contrib/admindocs/views.py:316
#: contrib/admindocs/views.py:335
msgid "Boolean (Either True or False)"
msgstr "Tõeväärtus (Kas tõene või väär)"
#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336
#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "String (kuni %(max_length)s märki)"
#: contrib/admindocs/views.py:318
#: contrib/admindocs/views.py:337
msgid "Comma-separated integers"
msgstr "Komaga eraldatud täisarvud"
#: contrib/admindocs/views.py:319
#: contrib/admindocs/views.py:338
msgid "Date (without time)"
msgstr "Kuupäev (kellaajata)"
#: contrib/admindocs/views.py:320
#: contrib/admindocs/views.py:339
msgid "Date (with time)"
msgstr "Kuupäev (kellaajaga)"
#: contrib/admindocs/views.py:321
#: contrib/admindocs/views.py:340
msgid "Decimal number"
msgstr "Kümnendmurd"
#: contrib/admindocs/views.py:322
#: contrib/admindocs/views.py:341
msgid "E-mail address"
msgstr "E-posti aadress"
#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324
#: contrib/admindocs/views.py:327
#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343
#: contrib/admindocs/views.py:346
msgid "File path"
msgstr "Faili asukoht"
#: contrib/admindocs/views.py:325
#: contrib/admindocs/views.py:344
msgid "Floating point number"
msgstr "Ujukomaarv"
#: contrib/admindocs/views.py:329 contrib/comments/models.py:60
#: contrib/admindocs/views.py:348 contrib/comments/models.py:60
msgid "IP address"
msgstr "IP aadress"
#: contrib/admindocs/views.py:331
#: contrib/admindocs/views.py:350
msgid "Boolean (Either True, False or None)"
msgstr "Tõeväärtus (Kas tõene, väär või tühi)"
#: contrib/admindocs/views.py:332
#: contrib/admindocs/views.py:351
msgid "Relation to parent model"
msgstr "Seos ülem-mudeliga"
#: contrib/admindocs/views.py:333
#: contrib/admindocs/views.py:352
msgid "Phone number"
msgstr "Telefoninumber"
#: contrib/admindocs/views.py:338
#: contrib/admindocs/views.py:357
msgid "Text"
msgstr "Tekst"
#: contrib/admindocs/views.py:339
#: contrib/admindocs/views.py:358
msgid "Time"
msgstr "Aeg"
#: contrib/admindocs/views.py:340 contrib/comments/forms.py:95
#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95
#: contrib/comments/templates/comments/moderation_queue.html:37
#: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
msgid "URL"
msgstr "URL"
#: contrib/admindocs/views.py:341
#: contrib/admindocs/views.py:360
msgid "U.S. state (two uppercase letters)"
msgstr "U.S.A. osariik (kaks suurt tähte)"
#: contrib/admindocs/views.py:342
#: contrib/admindocs/views.py:361
msgid "XML text"
msgstr "XML tekst"
#: contrib/admindocs/views.py:368
#: contrib/admindocs/views.py:387
#, python-format
msgid "%s does not appear to be a urlpattern object"
msgstr "%s ei tundu olevat urlpattern objekt"
@ -1470,7 +1478,7 @@ msgid ""
"If you enter anything in this field your comment will be treated as spam"
msgstr "Kui sisestate sellesse lahtrisse midagi, loetakse kommentaar rämpsuks"
#: contrib/comments/models.py:22 contrib/contenttypes/models.py:71
#: contrib/comments/models.py:22 contrib/contenttypes/models.py:74
msgid "content type"
msgstr "sisutüüp"
@ -1698,11 +1706,11 @@ msgstr "Postita kommentaar"
msgid "or make changes"
msgstr "või tee muudatused"
#: contrib/contenttypes/models.py:67
#: contrib/contenttypes/models.py:70
msgid "python model class name"
msgstr "pythoni mudeli klassinimi"
#: contrib/contenttypes/models.py:72
#: contrib/contenttypes/models.py:75
msgid "content types"
msgstr "sisutüübid"
@ -1772,18 +1780,25 @@ msgstr ""
"Vabandame, kuid vorm on aegunud. Palun jätkake vormi täitmist käesolevalt "
"lehelt."
#: contrib/gis/forms/fields.py:14
#: contrib/gis/forms/fields.py:17
msgid "No geometry value provided."
msgstr "Geomeetriline väärtus puudub."
#: contrib/gis/forms/fields.py:15
#: contrib/gis/forms/fields.py:18
msgid "Invalid geometry value."
msgstr "Vigane geomeetriline väärtus."
#: contrib/gis/forms/fields.py:16
#: contrib/gis/forms/fields.py:19
msgid "Invalid geometry type."
msgstr "Vigane geomeetriline tüüp."
#: contrib/gis/forms/fields.py:20
msgid ""
"An error occurred when transforming the geometry to the SRID of the geometry "
"form field."
msgstr ""
"Geomeetria teisendamisel geomeetria vormivälja SRID-ks tekkis viga."
#: contrib/humanize/templatetags/humanize.py:19
msgid "th"
msgstr "."
@ -2104,59 +2119,59 @@ msgstr "Tšiili RUT on ebakorrektne."
#: contrib/localflavor/cz/cz_regions.py:8
msgid "Prague"
msgstr ""
msgstr "Praha"
#: contrib/localflavor/cz/cz_regions.py:9
msgid "Central Bohemian Region"
msgstr ""
msgstr "Kesk-Boheemia regioon"
#: contrib/localflavor/cz/cz_regions.py:10
msgid "South Bohemian Region"
msgstr ""
msgstr "Lõuna-Boheemia regioon"
#: contrib/localflavor/cz/cz_regions.py:11
msgid "Pilsen Region"
msgstr ""
msgstr "Pilseni regioon"
#: contrib/localflavor/cz/cz_regions.py:12
msgid "Carlsbad Region"
msgstr ""
msgstr "Carlsbadi regioon"
#: contrib/localflavor/cz/cz_regions.py:13
msgid "Usti Region"
msgstr ""
msgstr "Usti regioon"
#: contrib/localflavor/cz/cz_regions.py:14
msgid "Liberec Region"
msgstr ""
msgstr "Libereci regioon"
#: contrib/localflavor/cz/cz_regions.py:15
msgid "Hradec Region"
msgstr ""
msgstr "Hradeci regioon"
#: contrib/localflavor/cz/cz_regions.py:16
msgid "Pardubice Region"
msgstr ""
msgstr "Pardubice regioon"
#: contrib/localflavor/cz/cz_regions.py:17
msgid "Vysocina Region"
msgstr ""
msgstr "Vysocina regioon"
#: contrib/localflavor/cz/cz_regions.py:18
msgid "South Moravian Region"
msgstr ""
msgstr "Lõuna-Moraavia regioon"
#: contrib/localflavor/cz/cz_regions.py:19
msgid "Olomouc Region"
msgstr ""
msgstr "Olomouci regioon"
#: contrib/localflavor/cz/cz_regions.py:20
msgid "Zlin Region"
msgstr ""
msgstr "Zlini regioon"
#: contrib/localflavor/cz/cz_regions.py:21
msgid "Moravian-Silesian Region"
msgstr ""
msgstr "Moraavia-Sileesia regioon"
#: contrib/localflavor/cz/forms.py:27 contrib/localflavor/sk/forms.py:30
msgid "Enter a postal code in the format XXXXX or XXX XX."
@ -2164,12 +2179,13 @@ msgstr "Sisesta postiindeks kujul XXXXX või XXX XX."
#: contrib/localflavor/cz/forms.py:47
msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
msgstr ""
"Sisesta sünninumber formaadis XXXXXX/XXXX või XXXXXXXXXX"
msgstr "Sisesta sünninumber formaadis XXXXXX/XXXX või XXXXXXXXXX"
#: contrib/localflavor/cz/forms.py:48
msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
msgstr "Ebasobiv valikuline parameeter Sugu, sobivad väärtused on 'f' (naine) ja 'm' (mees)"
msgstr ""
"Ebasobiv valikuline parameeter Sugu, sobivad väärtused on 'f' (naine) ja "
"'m' (mees)"
#: contrib/localflavor/cz/forms.py:49
msgid "Enter a valid birth number."
@ -3846,7 +3862,7 @@ msgstr "hüüdnimi"
msgid "sites"
msgstr "saidid"
#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:707
#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:710
msgid "This value must be an integer."
msgstr "See väärtus peab olema täisarv."
@ -3880,24 +3896,24 @@ msgstr ""
msgid "This value must be a decimal number."
msgstr "See väärtus peab olema kümnendarv."
#: db/models/fields/__init__.py:683
#: db/models/fields/__init__.py:686
msgid "This value must be a float."
msgstr "See väärtus peab olema murdarv."
#: db/models/fields/__init__.py:743
#: db/models/fields/__init__.py:746
msgid "This value must be either None, True or False."
msgstr "See väärtus peab olema kas tühi, tõene või väär."
#: db/models/fields/__init__.py:846 db/models/fields/__init__.py:860
#: db/models/fields/__init__.py:849 db/models/fields/__init__.py:863
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
msgstr "Sisestage korrektne kellaaeg formaadis TT:MM[:ss[.uuuuuu]]"
#: db/models/fields/related.py:792
#: db/models/fields/related.py:816
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr "Et valida mitu, hoidke all \"Control\"-nuppu (Maci puhul \"Command\")."
#: db/models/fields/related.py:870
#: db/models/fields/related.py:894
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
@ -3961,11 +3977,11 @@ msgstr "Veenduge, et komakohtade arv ei ületaks %s."
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Veenduge, et komast vasakul olevaid numbreid ei oleks rohkem kui %s."
#: forms/fields.py:288 forms/fields.py:862
#: forms/fields.py:288 forms/fields.py:863
msgid "Enter a valid date."
msgstr "Sisestage korrektne kuupäev."
#: forms/fields.py:322 forms/fields.py:863
#: forms/fields.py:322 forms/fields.py:864
msgid "Enter a valid time."
msgstr "Sisestage korrektne kellaaeg."
@ -4009,20 +4025,20 @@ msgstr "Sisestage korrektne URL."
msgid "This URL appears to be a broken link."
msgstr "See URL näib olevat katkine."
#: forms/fields.py:624 forms/fields.py:702
#: forms/fields.py:625 forms/fields.py:703
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Valige korrektne väärtus. %(value)s ei ole valitav."
#: forms/fields.py:703 forms/fields.py:764 forms/models.py:776
#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003
msgid "Enter a list of values."
msgstr "Sisestage väärtuste nimekiri."
#: forms/fields.py:891
#: forms/fields.py:892
msgid "Enter a valid IPv4 address."
msgstr "Sisestage korrektne IPv4 aadress."
#: forms/fields.py:901
#: forms/fields.py:902
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
@ -4032,76 +4048,103 @@ msgstr ""
msgid "Order"
msgstr "Järjestus"
#: forms/models.py:299 forms/models.py:308
#: forms/models.py:367
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "%(field_name)s peab olema unikaalne %(date_field)s %(lookup)s suhtes."
#: forms/models.py:381 forms/models.py:389
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "Sellise %(field_label)s-väljaga %(model_name)s on juba olemas."
#: forms/models.py:651
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
#: forms/models.py:594
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Palun parandage duplikaat-andmed lahtris %(field)s."
#: forms/models.py:706
#: forms/models.py:598
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "Palun parandage duplikaat-andmed lahtris %(field)s, mis peab olema unikaalne."
#: forms/models.py:604
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
""
#: forms/models.py:612
msgid "Please correct the duplicate values below."
msgstr "Palun parandage allolevad duplikaat-väärtused"
#: forms/models.py:867
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "Pesastatud välisvõti ei sobi ülemobjekti primaarvõtmega."
#: forms/models.py:930
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Valige korrektne väärtus. Valitud väärtus ei ole valitav."
#: forms/models.py:777
#: forms/models.py:1004
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Valige korrektne väärtus. %s ei ole valitav."
#: forms/models.py:779
#: forms/models.py:1006
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr ""
msgstr "\"%s\" ei ole sobiv väärtust primaarvõtmeks."
#: template/defaultfilters.py:765
#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "jah,ei,võib-olla"
#: template/defaultfilters.py:796
#: template/defaultfilters.py:798
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d bait"
msgstr[1] "%(size)d baiti"
#: template/defaultfilters.py:798
#: template/defaultfilters.py:800
#, python-format
msgid "%.1f KB"
msgstr "%.1f KB"
#: template/defaultfilters.py:800
#: template/defaultfilters.py:802
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
#: template/defaultfilters.py:801
#: template/defaultfilters.py:803
#, python-format
msgid "%.1f GB"
msgstr "%.1f GB"
#: utils/dateformat.py:41
#: utils/dateformat.py:42
msgid "p.m."
msgstr "p.l."
#: utils/dateformat.py:42
#: utils/dateformat.py:43
msgid "a.m."
msgstr "e.l."
#: utils/dateformat.py:47
#: utils/dateformat.py:48
msgid "PM"
msgstr "PL"
#: utils/dateformat.py:48
#: utils/dateformat.py:49
msgid "AM"
msgstr "EL"
#: utils/dateformat.py:97
#: utils/dateformat.py:98
msgid "midnight"
msgstr "südaöö"
#: utils/dateformat.py:99
#: utils/dateformat.py:100
msgid "noon"
msgstr "keskpäev"

View File

@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-04-10 08:26+0200\n"
"PO-Revision-Date: 2009-04-10 08:29+0200\n"
"POT-Creation-Date: 2009-07-27 11:12+0200\n"
"PO-Revision-Date: 2009-07-27 11:10+0200\n"
"Last-Translator: Nicola Larosa <nico@tekNico.net>\n"
"Language-Team: Italian\n"
"Language-Team: Italian <django-it@googlegroups.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.11.4\n"
"X-Generator: Lokalize 0.3\n"
#: conf/global_settings.py:44
msgid "Arabic"
@ -202,7 +202,7 @@ msgstr "telugu"
#: conf/global_settings.py:90
msgid "Thai"
msgstr "thai"
msgstr "tailandese"
#: conf/global_settings.py:91
msgid "Turkish"
@ -220,19 +220,19 @@ msgstr "cinese semplificato"
msgid "Traditional Chinese"
msgstr "cinese tradizionale"
#: contrib/admin/actions.py:56
#: contrib/admin/actions.py:60
#, python-format
msgid "Successfully deleted %(count)d %(items)s."
msgstr "Cancellati con successo %(count)d %(items)s."
msgstr "Cancellati/e con successo %(count)d %(items)s."
#: contrib/admin/actions.py:63 contrib/admin/options.py:1023
#: contrib/admin/actions.py:67 contrib/admin/options.py:1027
msgid "Are you sure?"
msgstr "Sei sicuro?"
#: contrib/admin/actions.py:81
#: contrib/admin/actions.py:85
#, python-format
msgid "Delete selected %(verbose_name_plural)s"
msgstr "Cancellati i %(verbose_name_plural)s selezionati"
msgstr "Cancella %(verbose_name_plural)s selezionati/e"
#: contrib/admin/filterspecs.py:44
#, python-format
@ -268,15 +268,15 @@ msgstr "Questo mese"
msgid "This year"
msgstr "Quest'anno"
#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
msgid "Yes"
msgstr "Sì"
#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
msgid "No"
msgstr "No"
#: contrib/admin/filterspecs.py:154 forms/widgets.py:413
#: contrib/admin/filterspecs.py:154 forms/widgets.py:434
msgid "Unknown"
msgstr "Sconosciuto"
@ -316,99 +316,100 @@ msgstr "voci di log"
msgid "None"
msgstr "Nessuno"
#: contrib/admin/options.py:517
#: contrib/admin/options.py:519
#, python-format
msgid "Changed %s."
msgstr "%s modificato."
msgstr "%s modificato/a."
#: contrib/admin/options.py:517 contrib/admin/options.py:527
#: contrib/comments/templates/comments/preview.html:16 forms/models.py:306
#: contrib/admin/options.py:519 contrib/admin/options.py:529
#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388
#: forms/models.py:600
msgid "and"
msgstr "e"
#: contrib/admin/options.py:522
#: contrib/admin/options.py:524
#, python-format
msgid "Added %(name)s \"%(object)s\"."
msgstr "Aggiunti %(name)s \"%(object)s\"."
msgstr "Aggiunto/a %(name)s \"%(object)s\"."
#: contrib/admin/options.py:526
#: contrib/admin/options.py:528
#, python-format
msgid "Changed %(list)s for %(name)s \"%(object)s\"."
msgstr "Cambiati %(list)s per %(name)s \"%(object)s\"."
msgstr "Cambiato/i %(list)s per %(name)s \"%(object)s\"."
#: contrib/admin/options.py:531
#: contrib/admin/options.py:533
#, python-format
msgid "Deleted %(name)s \"%(object)s\"."
msgstr "Cancellati %(name)s \"%(object)s\"."
msgstr "Cancellato/a %(name)s \"%(object)s\"."
#: contrib/admin/options.py:535
#: contrib/admin/options.py:537
msgid "No fields changed."
msgstr "Nessun campo modificato."
#: contrib/admin/options.py:596 contrib/auth/admin.py:67
#: contrib/admin/options.py:599 contrib/auth/admin.py:67
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "%(name)s \"%(obj)s\" è stato aggiunto correttamente."
msgstr "%(name)s \"%(obj)s\" aggiunto/a correttamente."
#: contrib/admin/options.py:600 contrib/admin/options.py:633
#: contrib/admin/options.py:603 contrib/admin/options.py:636
#: contrib/auth/admin.py:75
msgid "You may edit it again below."
msgstr "È possibile modificarlo nuovamente qui sotto."
msgstr "È possibile modificare nuovamente qui sotto."
#: contrib/admin/options.py:610 contrib/admin/options.py:643
#: contrib/admin/options.py:613 contrib/admin/options.py:646
#, python-format
msgid "You may add another %s below."
msgstr "Puoi aggiungere un altro %s qui sotto."
msgstr "Puoi aggiungere un altro/a %s qui sotto."
#: contrib/admin/options.py:631
#: contrib/admin/options.py:634
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "%(name)s \"%(obj)s\" modificato correttamente."
msgstr "%(name)s \"%(obj)s\" modificato/a correttamente."
#: contrib/admin/options.py:639
#: contrib/admin/options.py:642
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
"%(name)s \"%(obj)s\" aggiunto correttamente. Puoi modificarlo ancora qui "
"%(name)s \"%(obj)s\" aggiunto/a correttamente. Puoi modificare ancora qui "
"sotto."
#: contrib/admin/options.py:770
#: contrib/admin/options.py:773
#, python-format
msgid "Add %s"
msgstr "Aggiungi %s"
#: contrib/admin/options.py:801 contrib/admin/options.py:1001
#: contrib/admin/options.py:804 contrib/admin/options.py:1005
#, python-format
msgid "%(name)s object with primary key %(key)r does not exist."
msgstr "L'oggetto %(name)s con chiave primaria %(key)r non esiste."
#: contrib/admin/options.py:858
#: contrib/admin/options.py:861
#, python-format
msgid "Change %s"
msgstr "Modifica %s"
#: contrib/admin/options.py:902
#: contrib/admin/options.py:905
msgid "Database error"
msgstr "Errore nel database"
#: contrib/admin/options.py:938
#: contrib/admin/options.py:941
#, 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 è stato modificato correttamente."
msgstr[1] "%(count)s %(name)s sono stati modificati correttamente."
msgstr[0] "%(count)s %(name)s modificato/a correttamente."
msgstr[1] "%(count)s %(name)s modificati/e correttamente."
#: contrib/admin/options.py:1016
#: contrib/admin/options.py:1020
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "%(name)s \"%(obj)s\" cancellato correttamente."
msgstr "%(name)s \"%(obj)s\" cancellato/a correttamente."
#: contrib/admin/options.py:1052
#: contrib/admin/options.py:1057
#, python-format
msgid "Change history: %s"
msgstr "Tracciato delle modifiche: %s"
#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14
#: contrib/admin/sites.py:21 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-"
@ -417,11 +418,11 @@ msgstr ""
"Inserisci nome utente e password corretti. In entrambi i campi le maiuscole "
"sono significative."
#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40
#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:40
msgid "Please log in again, because your session has expired."
msgstr "Effettua di nuovo l'accesso, perché la tua sessione è scaduta."
#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47
#: contrib/admin/sites.py:292 contrib/admin/views/decorators.py:47
msgid ""
"Looks like your browser isn't configured to accept cookies. Please enable "
"cookies, reload this page, and try again."
@ -429,27 +430,27 @@ msgstr ""
"Il browser non sembra configurato per accettare i cookie. Una volta "
"abilitati, ricarica la pagina e riprova."
#: contrib/admin/sites.py:301 contrib/admin/sites.py:307
#: contrib/admin/sites.py:308 contrib/admin/sites.py:314
#: contrib/admin/views/decorators.py:66
msgid "Usernames cannot contain the '@' character."
msgstr "I nomi utente non possono contenere il carattere '@'."
#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62
#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:62
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr "Il nome utente non è costituito dall'indirizzo e-mail. Prova con '%s'."
#: contrib/admin/sites.py:360
#: contrib/admin/sites.py:367
msgid "Site administration"
msgstr "Amministrazione sito"
#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26
#: contrib/admin/sites.py:381 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 "Accedi"
#: contrib/admin/sites.py:417
#: contrib/admin/sites.py:426
#, python-format
msgid "%s administration"
msgstr "Amministrazione %s"
@ -499,7 +500,7 @@ msgstr "Spiacenti, ma la pagina richiesta non è stata trovata."
#: contrib/admin/templates/admin/500.html:4
#: contrib/admin/templates/admin/app_index.html:8
#: contrib/admin/templates/admin/base.html:33
#: contrib/admin/templates/admin/base.html:54
#: contrib/admin/templates/admin/change_form.html:17
#: contrib/admin/templates/admin/change_list.html:25
#: contrib/admin/templates/admin/delete_confirmation.html:6
@ -535,7 +536,8 @@ 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 ""
"Si è verificato un errore. È stato riportato agli amministratori del sito "
"Si è verificato un errore. Gli amministratori del sito ne sono stati "
"informati"
"via e-mail e verrà corretto a breve. Grazie per la tua pazienza."
#: contrib/admin/templates/admin/actions.html:4
@ -543,7 +545,6 @@ msgid "Run the selected action"
msgstr "Esegui l'azione selezionata"
#: contrib/admin/templates/admin/actions.html:4
#: contrib/admin/templates/admin/search_form.html:8
msgid "Go"
msgstr "Vai"
@ -553,18 +554,18 @@ msgstr "Vai"
msgid "%(name)s"
msgstr "%(name)s"
#: contrib/admin/templates/admin/base.html:28
#: contrib/admin/templates/admin/base.html:27
msgid "Welcome,"
msgstr "Benvenuto,"
msgstr "Benvenuto/a,"
#: contrib/admin/templates/admin/base.html:28
#: contrib/admin/templates/admin/base.html:32
#: 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 "Documentazione"
#: contrib/admin/templates/admin/base.html:28
#: contrib/admin/templates/admin/base.html:40
#: contrib/admin/templates/admin/auth/user/change_password.html:14
#: contrib/admin/templates/admin/auth/user/change_password.html:47
#: contrib/admin/templates/registration/password_change_done.html:3
@ -572,7 +573,7 @@ msgstr "Documentazione"
msgid "Change password"
msgstr "Cambia la password"
#: contrib/admin/templates/admin/base.html:28
#: contrib/admin/templates/admin/base.html:47
#: contrib/admin/templates/registration/password_change_done.html:3
#: contrib/admin/templates/registration/password_change_form.html:3
msgid "Log out"
@ -607,7 +608,7 @@ msgstr "Vedi sul sito"
#: contrib/admin/templates/admin/auth/user/change_password.html:23
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] "Correggi gli errori qui sotto."
msgstr[0] "Correggi l'errore qui sotto."
msgstr[1] "Correggi gli errori qui sotto."
#: contrib/admin/templates/admin/change_list.html:46
@ -703,6 +704,10 @@ msgstr "Azioni Proprie"
msgid "None available"
msgstr "Nessuna disponibile"
#: contrib/admin/templates/admin/index.html:72
msgid "Unknown content"
msgstr "Contenuto sconosciuto"
#: contrib/admin/templates/admin/invalid_setup.html:7
msgid ""
"Something's wrong with your database installation. Make sure the appropriate "
@ -751,6 +756,15 @@ msgstr ""
msgid "Show all"
msgstr "Mostra tutto"
#: contrib/admin/templates/admin/pagination.html:11
#: contrib/admin/templates/admin/submit_line.html:3
msgid "Save"
msgstr "Salva"
#: contrib/admin/templates/admin/search_form.html:8
msgid "Search"
msgstr "Cerca"
#: contrib/admin/templates/admin/search_form.html:10
#, python-format
msgid "1 result"
@ -763,10 +777,6 @@ msgstr[1] "%(counter)s risultati"
msgid "%(full_result_count)s total"
msgstr "%(full_result_count)s totali"
#: contrib/admin/templates/admin/submit_line.html:3
msgid "Save"
msgstr "Salva"
#: contrib/admin/templates/admin/submit_line.html:5
msgid "Save as new"
msgstr "Salva come nuovo"
@ -836,7 +846,7 @@ msgstr "Cambio password"
#: contrib/admin/templates/registration/password_change_done.html:6
#: contrib/admin/templates/registration/password_change_done.html:10
msgid "Password change successful"
msgstr "Cambio di password avvenuto correttamente"
msgstr "Cambio password avvenuto correttamente"
#: contrib/admin/templates/registration/password_change_done.html:12
msgid "Your password was changed."
@ -905,7 +915,7 @@ msgstr ""
#: contrib/admin/templates/registration/password_reset_confirm.html:26
msgid "Password reset unsuccessful"
msgstr "Password NON reimpostata"
msgstr "Password non reimpostata"
#: contrib/admin/templates/registration/password_reset_confirm.html:28
msgid ""
@ -943,7 +953,7 @@ msgstr "Vai alla pagina seguente e scegli una nuova password:"
#: contrib/admin/templates/registration/password_reset_email.html:9
msgid "Your username, in case you've forgotten:"
msgstr "Il tuo nome utente, in caso l'abbia dimenticato:"
msgstr "Il tuo nome utente, in caso tu l'abbia dimenticato:"
#: contrib/admin/templates/registration/password_reset_email.html:11
msgid "Thanks for using our site!"
@ -959,7 +969,7 @@ msgid ""
"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
"instructions for setting a new one."
msgstr ""
"Dimenticata la password? Inserisci il tuo indirizzo email qui sotto, e ti "
"Password dimenticata? Inserisci il tuo indirizzo email qui sotto, e ti "
"invieremo per email le istruzioni per impostarne una nuova."
#: contrib/admin/templates/registration/password_reset_form.html:16
@ -992,144 +1002,145 @@ msgstr "sito"
msgid "template"
msgstr "modello"
#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60
#: contrib/admindocs/views.py:62
#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63
#: contrib/admindocs/views.py:65
msgid "tag:"
msgstr "tag:"
#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93
#: contrib/admindocs/views.py:95
#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96
#: contrib/admindocs/views.py:98
msgid "filter:"
msgstr "filtro:"
#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157
#: contrib/admindocs/views.py:159
#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160
#: contrib/admindocs/views.py:162
msgid "view:"
msgstr "view:"
#: contrib/admindocs/views.py:187
#: contrib/admindocs/views.py:190
#, python-format
msgid "App %r not found"
msgstr "Appl. %r non trovata"
#: contrib/admindocs/views.py:194
#: contrib/admindocs/views.py:197
#, python-format
msgid "Model %(model_name)r not found in app %(app_label)r"
msgstr "Modello %(model_name)r non trovato nell'appl. %(app_label)r"
#: contrib/admindocs/views.py:206
#: contrib/admindocs/views.py:209
#, python-format
msgid "the related `%(app_label)s.%(data_type)s` object"
msgstr "l'oggetto `%(app_label)s.%(data_type)s` collegato"
#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228
#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247
#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228
#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247
#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266
msgid "model:"
msgstr "modello:"
#: contrib/admindocs/views.py:237
#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256
#, python-format
msgid "related `%(app_label)s.%(object_name)s` objects"
msgstr "oggetti `%(app_label)s.%(object_name)s` collegati"
#: contrib/admindocs/views.py:242
#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261
#, python-format
msgid "all %s"
msgstr "tutti %s"
#: contrib/admindocs/views.py:247
#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266
#, python-format
msgid "number of %s"
msgstr "numero di %s"
#: contrib/admindocs/views.py:252
#: contrib/admindocs/views.py:271
#, python-format
msgid "Fields on %s objects"
msgstr "Campi sugli oggetti %s"
#: contrib/admindocs/views.py:315 contrib/admindocs/views.py:326
#: contrib/admindocs/views.py:328 contrib/admindocs/views.py:334
#: contrib/admindocs/views.py:335 contrib/admindocs/views.py:337
#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345
#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353
#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356
msgid "Integer"
msgstr "Intero"
#: contrib/admindocs/views.py:316
#: contrib/admindocs/views.py:335
msgid "Boolean (Either True or False)"
msgstr "Booleano (True o False)"
#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336
#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Stringa (fino a %(max_length)s)"
#: contrib/admindocs/views.py:318
#: contrib/admindocs/views.py:337
msgid "Comma-separated integers"
msgstr "Interi separati da virgola"
#: contrib/admindocs/views.py:319
#: contrib/admindocs/views.py:338
msgid "Date (without time)"
msgstr "Data (senza ora)"
#: contrib/admindocs/views.py:320
#: contrib/admindocs/views.py:339
msgid "Date (with time)"
msgstr "Data (con ora)"
#: contrib/admindocs/views.py:321
#: contrib/admindocs/views.py:340
msgid "Decimal number"
msgstr "Numero decimale"
#: contrib/admindocs/views.py:322
#: contrib/admindocs/views.py:341
msgid "E-mail address"
msgstr "Indirizzo e-mail"
#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324
#: contrib/admindocs/views.py:327
#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343
#: contrib/admindocs/views.py:346
msgid "File path"
msgstr "Percorso di file"
#: contrib/admindocs/views.py:325
#: contrib/admindocs/views.py:344
msgid "Floating point number"
msgstr "Numero decimale"
#: contrib/admindocs/views.py:329 contrib/comments/models.py:60
#: contrib/admindocs/views.py:348 contrib/comments/models.py:60
msgid "IP address"
msgstr "indirizzo IP"
#: contrib/admindocs/views.py:331
#: contrib/admindocs/views.py:350
msgid "Boolean (Either True, False or None)"
msgstr "Booleano (True, False o None)"
#: contrib/admindocs/views.py:332
#: contrib/admindocs/views.py:351
msgid "Relation to parent model"
msgstr "Collegamento a modello padre"
#: contrib/admindocs/views.py:333
#: contrib/admindocs/views.py:352
msgid "Phone number"
msgstr "Numero di telefono"
#: contrib/admindocs/views.py:338
#: contrib/admindocs/views.py:357
msgid "Text"
msgstr "Testo"
#: contrib/admindocs/views.py:339
#: contrib/admindocs/views.py:358
msgid "Time"
msgstr "Ora"
#: contrib/admindocs/views.py:340 contrib/comments/forms.py:95
#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95
#: contrib/comments/templates/comments/moderation_queue.html:37
#: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
msgid "URL"
msgstr "URL"
#: contrib/admindocs/views.py:341
#: contrib/admindocs/views.py:360
msgid "U.S. state (two uppercase letters)"
msgstr "Stato USA (due lettere maiuscole)"
#: contrib/admindocs/views.py:342
#: contrib/admindocs/views.py:361
msgid "XML text"
msgstr "Testo XML"
#: contrib/admindocs/views.py:368
#: contrib/admindocs/views.py:387
#, python-format
msgid "%s does not appear to be a urlpattern object"
msgstr "%s non sembra essere un oggetto urlpattern"
@ -1153,10 +1164,10 @@ msgid ""
"your computer is \"internal\").</p>\n"
msgstr ""
"\n"
"<p class=\"help\">Per installare i bookmarklet, trascina il link sulla "
"barra \n"
"dei bookmark, o clicca il link con il tasto destro e aggiungilo ai "
"bookmark.\n"
"<p class=\"help\">Per installare i bookmarklet, trascina il link sulla barra "
"\n"
"dei bookmark, o clicca il link con il tasto destro e aggiungilo ai bookmark."
"\n"
"Potrai poi scegliere un bookmarklet in qualsiasi pagina del sito.\n"
"Nota che alcuni di questi bookmarklet richiedono l'accesso al sito tramite "
"un\n"
@ -1253,7 +1264,7 @@ msgstr "Conferma password"
#: contrib/auth/forms.py:30
msgid "A user with that username already exists."
msgstr "Un utente con questo nome·è già presente."
msgstr "Un utente con questo nome è già presente."
#: contrib/auth/forms.py:36 contrib/auth/forms.py:155
#: contrib/auth/forms.py:197
@ -1303,7 +1314,8 @@ msgstr "Password attuale"
#: contrib/auth/forms.py:177
msgid "Your old password was entered incorrectly. Please enter it again."
msgstr "La password attuale non è stata inserita correttamente: va inserita di nuovo."
msgstr ""
"La password attuale non è stata inserita correttamente: va inserita di nuovo."
#: contrib/auth/models.py:63 contrib/auth/models.py:86
msgid "name"
@ -1466,14 +1478,14 @@ msgstr "Commento"
#, 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."
msgstr[0] "Modera i termini: la parola %s non è ammessa."
msgstr[1] "Modera i termini: le parole %s non sono ammesse."
msgstr[0] "Modera i termini: la parola %s non è ammessa qui."
msgstr[1] "Modera i termini: le parole %s non sono ammesse qui."
#: contrib/comments/forms.py:180
msgid "If you enter anything in this field your comment will be treated as spam"
msgstr "Se inserisci qualcosa in questo campo il tuo commento verrà considerato spam"
#: contrib/comments/models.py:22 contrib/contenttypes/models.py:71
#: contrib/comments/models.py:22 contrib/contenttypes/models.py:74
msgid "content type"
msgstr "content type"
@ -1701,11 +1713,11 @@ msgstr "Pubblica il tuo commento"
msgid "or make changes"
msgstr "o fai dei cambiamenti"
#: contrib/contenttypes/models.py:67
#: contrib/contenttypes/models.py:70
msgid "python model class name"
msgstr "nome della classe del modello Python"
#: contrib/contenttypes/models.py:72
#: contrib/contenttypes/models.py:75
msgid "content types"
msgstr "content type"
@ -1777,18 +1789,26 @@ msgstr ""
"Spiacenti, ma la tua form è scaduta. Puoi continuare a compilare la form da "
"questa pagina."
#: contrib/gis/forms/fields.py:14
#: contrib/gis/forms/fields.py:17
msgid "No geometry value provided."
msgstr "Nessun valore geometrico fornito."
#: contrib/gis/forms/fields.py:15
#: contrib/gis/forms/fields.py:18
msgid "Invalid geometry value."
msgstr "Valore geometrico non valido."
#: contrib/gis/forms/fields.py:16
#: contrib/gis/forms/fields.py:19
msgid "Invalid geometry type."
msgstr "Tipo geometrico non valido."
#: contrib/gis/forms/fields.py:20
msgid ""
"An error occurred when transforming the geometry to the SRID of the geometry "
"form field."
msgstr ""
"Si è verificato un errore durante la trasformazione della geometria nello "
"SRID del campo geometria della form."
#: contrib/humanize/templatetags/humanize.py:19
msgid "th"
msgstr "º"
@ -2251,7 +2271,7 @@ msgstr "Schleswig-Holstein"
#: contrib/localflavor/de/de_states.py:20
msgid "Thuringia"
msgstr "Thuringia"
msgstr "Turingia"
#: contrib/localflavor/de/forms.py:14 contrib/localflavor/fi/forms.py:12
#: contrib/localflavor/fr/forms.py:15
@ -3017,7 +3037,9 @@ msgstr "Checksum errato per il Numero d'Imposta (NIP)."
#: contrib/localflavor/pl/forms.py:109
msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
msgstr "Il Numero di Registro Nazionale d'Impresa (REGON) è costituito da 9 o 14 cifre."
msgstr ""
"Il Numero di Registro Nazionale d'Impresa (REGON) è costituito da 9 o 14 "
"cifre."
#: contrib/localflavor/pl/forms.py:110
msgid "Wrong checksum for the National Business Register Number (REGON)."
@ -3625,27 +3647,27 @@ msgstr "Worcestershire"
#: contrib/localflavor/uk/uk_regions.py:55
msgid "County Antrim"
msgstr "County Antrim"
msgstr "Contea di Antrim"
#: contrib/localflavor/uk/uk_regions.py:56
msgid "County Armagh"
msgstr "County Armagh"
msgstr "Contea di Armagh"
#: contrib/localflavor/uk/uk_regions.py:57
msgid "County Down"
msgstr "County Down"
msgstr "Contea di Down"
#: contrib/localflavor/uk/uk_regions.py:58
msgid "County Fermanagh"
msgstr "County Fermanagh"
msgstr "Contea di Fermanagh"
#: contrib/localflavor/uk/uk_regions.py:59
msgid "County Londonderry"
msgstr "County Londonderry"
msgstr "Contea di Londonderry"
#: contrib/localflavor/uk/uk_regions.py:60
msgid "County Tyrone"
msgstr "County Tyrone"
msgstr "Contea di Tyrone"
#: contrib/localflavor/uk/uk_regions.py:64
msgid "Clwyd"
@ -3750,7 +3772,7 @@ msgstr "Inserisci un codice postale nel formato XXXXX o XXXXX-XXXX ."
#: contrib/localflavor/us/forms.py:54
msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
msgstr ""
"Inserisci un numero di assistenza sociale statunitense valido, nel formato "
"Inserisci un numero di assistenza sociale USA valido, nel formato "
"XXX-XX-XXXX ."
#: contrib/localflavor/za/forms.py:20
@ -3861,56 +3883,57 @@ msgstr "nome visualizzato"
msgid "sites"
msgstr "siti"
#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:700
#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:710
msgid "This value must be an integer."
msgstr "Questo valore deve essere un intero."
#: db/models/fields/__init__.py:387
#: db/models/fields/__init__.py:388
msgid "This value must be either True or False."
msgstr "Questo valore deve essere True o False."
#: db/models/fields/__init__.py:420
#: db/models/fields/__init__.py:427
msgid "This field cannot be null."
msgstr "Questo campo non può essere nullo."
#: db/models/fields/__init__.py:436
#: db/models/fields/__init__.py:443
msgid "Enter only digits separated by commas."
msgstr "Inserisci solo cifre separate da virgole."
#: db/models/fields/__init__.py:467
#: db/models/fields/__init__.py:474
msgid "Enter a valid date in YYYY-MM-DD format."
msgstr "Inserisci una data valida in formato AAAA-MM-GG."
#: db/models/fields/__init__.py:476
#: db/models/fields/__init__.py:483
#, python-format
msgid "Invalid date: %s"
msgstr "Data non valida: %s"
#: db/models/fields/__init__.py:540 db/models/fields/__init__.py:558
#: db/models/fields/__init__.py:547 db/models/fields/__init__.py:565
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
msgstr "Inserisci una data/ora valida nel formato AAAA-MM-GG OO:MM[ss[.uuuuuu]]."
#: db/models/fields/__init__.py:594
#: db/models/fields/__init__.py:601
msgid "This value must be a decimal number."
msgstr "Questo valore deve essere un numero decimale."
#: db/models/fields/__init__.py:676
#: db/models/fields/__init__.py:686
msgid "This value must be a float."
msgstr "Questo valore deve essere un numero a virgola mobile."
#: db/models/fields/__init__.py:736
#: db/models/fields/__init__.py:746
msgid "This value must be either None, True or False."
msgstr "Questo valore deve essere None, True o False."
#: db/models/fields/__init__.py:839 db/models/fields/__init__.py:853
#: db/models/fields/__init__.py:849 db/models/fields/__init__.py:863
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
msgstr "Inserisci un'ora valida nel formato OO:MM[ss[.uuuuuu]]."
#: db/models/fields/related.py:792
#: db/models/fields/related.py:816
msgid "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr "Tieni premuto \"Control\", o \"Command\" su Mac, per selezionarne più di uno."
msgstr ""
"Tieni premuto \"Control\", o \"Command\" su Mac, per selezionarne più di uno."
#: db/models/fields/related.py:870
#: db/models/fields/related.py:894
#, 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."
@ -3972,11 +3995,11 @@ msgstr "Assicurarsi che non vi siano più di %s cifre decimali."
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Assicurarsi che non vi siano più di %s cifre prima della virgola."
#: forms/fields.py:288 forms/fields.py:862
#: forms/fields.py:288 forms/fields.py:863
msgid "Enter a valid date."
msgstr "Inserisci una data valida."
#: forms/fields.py:322 forms/fields.py:863
#: forms/fields.py:322 forms/fields.py:864
msgid "Enter a valid time."
msgstr "Inserisci un'ora valida."
@ -3999,7 +4022,9 @@ msgstr "Il file inviato è vuoto."
#: forms/fields.py:450
#, python-format
msgid "Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr "Assicurarsi che questo nome di file non contenga più di %(max)d caratteri (ne ha %(length)d)."
msgstr ""
"Assicurarsi che questo nome di file non contenga più di %(max)d caratteri "
"(ne ha %(length)d)."
#: forms/fields.py:483
msgid ""
@ -4015,20 +4040,20 @@ msgstr "Inserisci una URL valida."
msgid "This URL appears to be a broken link."
msgstr "Questa URL non sembra funzionare."
#: forms/fields.py:624 forms/fields.py:702
#: forms/fields.py:625 forms/fields.py:703
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Scegli un'opzione valida. '%(value)s non compare tra quelle disponibili."
#: forms/fields.py:703 forms/fields.py:764 forms/models.py:776
#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003
msgid "Enter a list of values."
msgstr "Inserisci una lista di valori."
#: forms/fields.py:891
#: forms/fields.py:892
msgid "Enter a valid IPv4 address."
msgstr "Inserisci un indirizzo IPv4 valido."
#: forms/fields.py:901
#: forms/fields.py:902
msgid "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Inserisci uno 'slug' valido contenente lettere, cifre, sottolineati o "
@ -4038,80 +4063,107 @@ msgstr ""
msgid "Order"
msgstr "Ordine"
#: forms/models.py:299 forms/models.py:308
#: forms/models.py:367
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "%(field_name)s deve essere unico per %(lookup)s %(date_field)s."
#: forms/models.py:381 forms/models.py:389
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s con questo %(field_label)s esiste già."
#: forms/models.py:651
#: forms/models.py:594, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Correggi i dati duplicati di %(field)s."
#: forms/models.py:598
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "Correggi i dati duplicati di %(field)s, che deve essere unico."
#: forms/models.py:604
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
"Correggi i dati duplicati di %(field_name)s che deve essere unico/a per %(lookup)s "
"in %(date_field)s."
#: forms/models.py:612
msgid "Please correct the duplicate values below."
msgstr "Correggi i dati duplicati qui sotto."
#: forms/models.py:867
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"La foreign key inline non concorda con la chiave primaria dell'istanza "
"principale."
"padre."
#: forms/models.py:706
#: forms/models.py:930
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Scegli un'opzione valida. La scelta effettuata non compare tra quelle "
"disponibili."
#: forms/models.py:777
#: forms/models.py:1004
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Scegli un'opzione valida. %s non compare tra quelle disponibili."
#: forms/models.py:779
#: forms/models.py:1006
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" non è un valore valido per una chiave primaria."
#: template/defaultfilters.py:765
#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "sì,no,forse"
#: template/defaultfilters.py:796
#: template/defaultfilters.py:798
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d byte"
#: template/defaultfilters.py:798
#: template/defaultfilters.py:800
#, python-format
msgid "%.1f KB"
msgstr "%.1f KB"
#: template/defaultfilters.py:800
#: template/defaultfilters.py:802
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
#: template/defaultfilters.py:801
#: template/defaultfilters.py:803
#, python-format
msgid "%.1f GB"
msgstr "%.1f GB"
#: utils/dateformat.py:41
#: utils/dateformat.py:42
msgid "p.m."
msgstr "p.m."
#: utils/dateformat.py:42
#: utils/dateformat.py:43
msgid "a.m."
msgstr "a.m."
#: utils/dateformat.py:47
#: utils/dateformat.py:48
msgid "PM"
msgstr "PM"
#: utils/dateformat.py:48
#: utils/dateformat.py:49
msgid "AM"
msgstr "AM"
#: utils/dateformat.py:97
#: utils/dateformat.py:98
msgid "midnight"
msgstr "mezzanotte"
#: utils/dateformat.py:99
#: utils/dateformat.py:100
msgid "noon"
msgstr "mezzogiorno"
@ -4368,15 +4420,15 @@ msgstr "F j"
#: views/generic/create_update.py:114
#, python-format
msgid "The %(verbose_name)s was created successfully."
msgstr "%(verbose_name)s creato correttamente."
msgstr "%(verbose_name)s creato/a correttamente."
#: views/generic/create_update.py:156
#, python-format
msgid "The %(verbose_name)s was updated successfully."
msgstr "%(verbose_name)s aggiornato correttamente."
msgstr "%(verbose_name)s aggiornato/a correttamente."
#: views/generic/create_update.py:198
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s è stato cancellato."
msgstr "%(verbose_name)s cancellato/a."

View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-04-10 08:26+0200\n"
"PO-Revision-Date: 2008-08-14 18:36+0200\n"
"PO-Revision-Date: 2009-07-26 17:51+0200\n"
"Last-Translator: Nicola Larosa <nico@tekNico.net>\n"
"Language-Team: Italian\n"
"Language-Team: Italian <django-it@googlegroups.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.11.4\n"
"X-Generator: Lokalize 0.3\n"
#: contrib/admin/media/js/SelectFilter2.js:33
#, perl-format
@ -40,7 +40,7 @@ msgstr "%s scelti"
#: contrib/admin/media/js/SelectFilter2.js:54
msgid "Select your choice(s) and click "
msgstr "Fai le tue scelte e clicca "
msgstr "Seleziona le tue scelte e clicca "
#: contrib/admin/media/js/SelectFilter2.js:59
msgid "Clear all"
@ -118,3 +118,4 @@ msgstr "Ieri"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179
msgid "Tomorrow"
msgstr "Domani"

View File

@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-12 17:02+0200\n"
"POT-Creation-Date: 2009-07-24 21:56+0200\n"
"PO-Revision-Date: 2008-09-03 11:20+0200\n"
"Last-Translator: Vasil Vangelovski <vvangelovski@gmail.com>\n"
"Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
@ -222,14 +222,14 @@ msgstr "Традиционален кинески"
msgid "Successfully deleted %(count)d %(items)s."
msgstr "Успешно беа избришани %(count)d %(items)s."
#: contrib/admin/actions.py:67 contrib/admin/options.py:1025
#: contrib/admin/actions.py:67 contrib/admin/options.py:1027
msgid "Are you sure?"
msgstr "Сигурни сте?"
#: contrib/admin/actions.py:85
#, python-format
msgid "Delete selected %(verbose_name_plural)s"
msgstr "Избриши ги селектираните %(verbose_name_plural)s"
msgstr "Избриши ги избраните %(verbose_name_plural)s"
#: contrib/admin/filterspecs.py:44
#, python-format
@ -237,7 +237,7 @@ msgid ""
"<h3>By %s:</h3>\n"
"<ul>\n"
msgstr ""
"<h3>Од %s:</h3>\n"
"<h3>Според %s:</h3>\n"
"<ul>\n"
#: contrib/admin/filterspecs.py:75 contrib/admin/filterspecs.py:92
@ -343,70 +343,71 @@ msgstr "Избришан %(name)s „%(object)s“."
msgid "No fields changed."
msgstr "Не беше изменето ниедно поле."
#: contrib/admin/options.py:598 contrib/auth/admin.py:67
#: contrib/admin/options.py:599 contrib/auth/admin.py:67
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "%(name)s \"%(obj)s\" беше успешно додаден."
msgstr "Ставката %(name)s \"%(obj)s\" беше успешно додадена."
#: contrib/admin/options.py:602 contrib/admin/options.py:635
#: contrib/admin/options.py:603 contrib/admin/options.py:636
#: contrib/auth/admin.py:75
msgid "You may edit it again below."
msgstr "Подолу можете повторно да го уредите."
#: contrib/admin/options.py:612 contrib/admin/options.py:645
#: contrib/admin/options.py:613 contrib/admin/options.py:646
#, python-format
msgid "You may add another %s below."
msgstr "Подолу можете да додате уште еден %s."
#: contrib/admin/options.py:633
#: contrib/admin/options.py:634
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "%(name)s \"%(obj)s\" беше успешно изменета."
#: contrib/admin/options.py:641
#: contrib/admin/options.py:642
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
"%(name)s \"%(obj)s\" беше успешно додадена.Подолу можете повторно да ја "
"уредите."
"Ставката %(name)s \"%(obj)s\" беше успешно додадена. Подолу можете повторно "
"да ја уредите."
#: contrib/admin/options.py:772
#: contrib/admin/options.py:773
#, python-format
msgid "Add %s"
msgstr "Додади %s"
#: contrib/admin/options.py:803 contrib/admin/options.py:1003
#: contrib/admin/options.py:804 contrib/admin/options.py:1005
#, python-format
msgid "%(name)s object with primary key %(key)r does not exist."
msgstr ""
msgstr "објект %(name)s со примарен клуч %(key)r не постои."
#: contrib/admin/options.py:860
#: contrib/admin/options.py:861
#, python-format
msgid "Change %s"
msgstr "Измени %s"
#: contrib/admin/options.py:904
#: contrib/admin/options.py:905
msgid "Database error"
msgstr "Грешка во базата со податоци"
msgstr "Грешка во базата на податоци"
#: contrib/admin/options.py:940
#: contrib/admin/options.py:941
#, 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 беше успешно изменета."
msgstr[1] "%(count)s %(name)s беа успешно изменети."
msgstr[1] "%(count)s ставки %(name)s беа успешно изменети."
#: contrib/admin/options.py:1018
#: contrib/admin/options.py:1020
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "%(name)s \"%(obj)s\" беше избришана успешно."
msgstr "Ставаката %(name)s \"%(obj)s\" беше избришана успешно."
#: contrib/admin/options.py:1054
#: contrib/admin/options.py:1057
#, python-format
msgid "Change history: %s"
msgstr "Историја на измени: %s"
#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14
#: contrib/admin/sites.py:21 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-"
@ -415,11 +416,11 @@ msgstr ""
"Ве молам внесете точно корисничко име и лозинка. Имајте на ум дека и во "
"двете полиња се битни големите и малите букви."
#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40
#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:40
msgid "Please log in again, because your session has expired."
msgstr "Ве молам најавете се повторно бидејќи вашата сесија е истечена."
#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47
#: contrib/admin/sites.py:292 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."
@ -427,27 +428,27 @@ msgstr ""
"Изгледа дека вашиот прелистувач не е конфигуриран да прифаќа колачиња. Ве "
"молам овозможете ги колачињата, превчитајте ја страта и пробајте повторно."
#: contrib/admin/sites.py:301 contrib/admin/sites.py:307
#: contrib/admin/sites.py:308 contrib/admin/sites.py:314
#: contrib/admin/views/decorators.py:66
msgid "Usernames cannot contain the '@' character."
msgstr "Корисничките имиња неможе да го содржат „@“ знакот."
#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62
#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:62
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr "Вашата е-пошта не е вашето корисничко име. Пробајте со „%s“."
#: contrib/admin/sites.py:360
#: contrib/admin/sites.py:367
msgid "Site administration"
msgstr "Администрација на сајт"
#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26
#: contrib/admin/sites.py:381 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 "Најава"
#: contrib/admin/sites.py:417
#: contrib/admin/sites.py:426
#, python-format
msgid "%s administration"
msgstr "%s администрација"
@ -497,7 +498,7 @@ msgstr "Се извинуваме, но неможе да ја најдеме с
#: contrib/admin/templates/admin/500.html:4
#: contrib/admin/templates/admin/app_index.html:8
#: contrib/admin/templates/admin/base.html:31
#: contrib/admin/templates/admin/base.html:54
#: contrib/admin/templates/admin/change_form.html:17
#: contrib/admin/templates/admin/change_list.html:25
#: contrib/admin/templates/admin/delete_confirmation.html:6
@ -538,7 +539,7 @@ msgstr ""
#: contrib/admin/templates/admin/actions.html:4
msgid "Run the selected action"
msgstr ""
msgstr "Изврши ја избраната акција"
#: contrib/admin/templates/admin/actions.html:4
msgid "Go"
@ -550,18 +551,18 @@ msgstr "Оди"
msgid "%(name)s"
msgstr "%(name)s"
#: contrib/admin/templates/admin/base.html:26
#: contrib/admin/templates/admin/base.html:27
msgid "Welcome,"
msgstr "Добредојдовте,"
#: contrib/admin/templates/admin/base.html:26
#: contrib/admin/templates/admin/base.html:32
#: contrib/admin/templates/registration/password_change_done.html:3
#: contrib/admin/templates/registration/password_change_form.html:3
#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
msgid "Documentation"
msgstr "Документација"
#: contrib/admin/templates/admin/base.html:26
#: contrib/admin/templates/admin/base.html:40
#: contrib/admin/templates/admin/auth/user/change_password.html:14
#: contrib/admin/templates/admin/auth/user/change_password.html:47
#: contrib/admin/templates/registration/password_change_done.html:3
@ -569,7 +570,7 @@ msgstr "Документација"
msgid "Change password"
msgstr "Промени лозинка"
#: contrib/admin/templates/admin/base.html:26
#: contrib/admin/templates/admin/base.html:47
#: contrib/admin/templates/registration/password_change_done.html:3
#: contrib/admin/templates/registration/password_change_form.html:3
msgid "Log out"
@ -648,7 +649,7 @@ msgstr "Да, сигурен сум"
#: contrib/admin/templates/admin/delete_selected_confirmation.html:9
msgid "Delete multiple objects"
msgstr "Избриши повеќе ставки."
msgstr "Избриши повеќе ставки"
#: contrib/admin/templates/admin/delete_selected_confirmation.html:15
msgid ""
@ -656,17 +657,18 @@ msgid ""
"your account doesn't have permission to delete the following types of "
"objects:"
msgstr ""
"Бришење на %(object_name)s '%(escaped_object)s' ќе резултира со бришење на "
"Бришење на %(object_name)s би резултирало со бришење на "
"поврзаните објекти, но вие како корисник немате доволно привилегии да ги "
"бришете следните типови на објекти:"
#: 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 ""
"Сигурне сте дека сакате да ги избришете избраните %(object_name)s? "
"Сите овие ставки и ставките поврзани со нив ќе бидат избришани:"
"Сигурне сте дека сакате да ги избришете избраните %(object_name)s? Сите овие "
"ставки и ставките поврзани со нив ќе бидат избришани:"
#: contrib/admin/templates/admin/filter.html:2
#, python-format
@ -829,7 +831,7 @@ msgstr ""
#: contrib/admin/templates/registration/logged_out.html:10
msgid "Log in again"
msgstr "Логирајте се повторно"
msgstr "Најавете се повторно"
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_change_form.html:4
@ -983,7 +985,7 @@ msgstr "Сите датуми"
#: contrib/admin/views/main.py:70
#, python-format
msgid "Select %s"
msgstr "Изберет %s"
msgstr "Изберете %s"
#: contrib/admin/views/main.py:70
#, python-format
@ -998,145 +1000,145 @@ msgstr "сајт"
msgid "template"
msgstr "шаблон"
#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60
#: contrib/admindocs/views.py:62
#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63
#: contrib/admindocs/views.py:65
msgid "tag:"
msgstr "таг:"
#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93
#: contrib/admindocs/views.py:95
#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96
#: contrib/admindocs/views.py:98
msgid "filter:"
msgstr "филтер:"
#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157
#: contrib/admindocs/views.py:159
#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160
#: contrib/admindocs/views.py:162
msgid "view:"
msgstr "поглед:"
#: contrib/admindocs/views.py:187
#: contrib/admindocs/views.py:190
#, python-format
msgid "App %r not found"
msgstr "Не е најдена апликацијата %r"
#: contrib/admindocs/views.py:194
#: contrib/admindocs/views.py:197
#, python-format
msgid "Model %(model_name)r not found in app %(app_label)r"
msgstr "Моделот %(model_name)r не е најден во апликацијата %(app_label)r"
#: contrib/admindocs/views.py:206
#: contrib/admindocs/views.py:209
#, python-format
msgid "the related `%(app_label)s.%(data_type)s` object"
msgstr "поврзаниот `%(app_label)s.%(data_type)s` објект"
#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:225
#: contrib/admindocs/views.py:230 contrib/admindocs/views.py:244
#: contrib/admindocs/views.py:258 contrib/admindocs/views.py:263
#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228
#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247
#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266
msgid "model:"
msgstr "модел:"
#: contrib/admindocs/views.py:221 contrib/admindocs/views.py:253
#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256
#, python-format
msgid "related `%(app_label)s.%(object_name)s` objects"
msgstr "поврзани `%(app_label)s.%(object_name)s` објекти"
#: contrib/admindocs/views.py:225 contrib/admindocs/views.py:258
#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261
#, python-format
msgid "all %s"
msgstr "сите %s"
#: contrib/admindocs/views.py:230 contrib/admindocs/views.py:263
#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266
#, python-format
msgid "number of %s"
msgstr "број на %s"
#: contrib/admindocs/views.py:268
#: contrib/admindocs/views.py:271
#, python-format
msgid "Fields on %s objects"
msgstr "Полиња на %s објекти"
#: contrib/admindocs/views.py:331 contrib/admindocs/views.py:342
#: contrib/admindocs/views.py:344 contrib/admindocs/views.py:350
#: contrib/admindocs/views.py:351 contrib/admindocs/views.py:353
#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345
#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353
#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356
msgid "Integer"
msgstr "Цел број"
#: contrib/admindocs/views.py:332
#: contrib/admindocs/views.py:335
msgid "Boolean (Either True or False)"
msgstr "Логичка (или точно или неточно)"
#: contrib/admindocs/views.py:333 contrib/admindocs/views.py:352
#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Збор (до %(max_length)s)"
#: contrib/admindocs/views.py:334
#: contrib/admindocs/views.py:337
msgid "Comma-separated integers"
msgstr "Целобројни вредности одделени со запирка"
#: contrib/admindocs/views.py:335
#: contrib/admindocs/views.py:338
msgid "Date (without time)"
msgstr "Датум (без час)"
#: contrib/admindocs/views.py:336
#: contrib/admindocs/views.py:339
msgid "Date (with time)"
msgstr "Датум (со час)"
#: contrib/admindocs/views.py:337
#: contrib/admindocs/views.py:340
msgid "Decimal number"
msgstr "Децимален број"
#: contrib/admindocs/views.py:338
#: contrib/admindocs/views.py:341
msgid "E-mail address"
msgstr "Адреса на е-пошта"
#: contrib/admindocs/views.py:339 contrib/admindocs/views.py:340
#: contrib/admindocs/views.py:343
#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343
#: contrib/admindocs/views.py:346
msgid "File path"
msgstr "Патека на датотека"
#: contrib/admindocs/views.py:341
#: contrib/admindocs/views.py:344
msgid "Floating point number"
msgstr "Децимален број"
#: contrib/admindocs/views.py:345 contrib/comments/models.py:60
#: contrib/admindocs/views.py:348 contrib/comments/models.py:60
msgid "IP address"
msgstr "ИП адреса"
#: contrib/admindocs/views.py:347
#: contrib/admindocs/views.py:350
msgid "Boolean (Either True, False or None)"
msgstr "Логичка (точно,неточно или празно)"
#: contrib/admindocs/views.py:348
#: contrib/admindocs/views.py:351
msgid "Relation to parent model"
msgstr "Релација со родителскиот модел"
#: contrib/admindocs/views.py:349
#: contrib/admindocs/views.py:352
msgid "Phone number"
msgstr "Телефонски број"
#: contrib/admindocs/views.py:354
#: contrib/admindocs/views.py:357
msgid "Text"
msgstr "Текст"
#: contrib/admindocs/views.py:355
#: contrib/admindocs/views.py:358
msgid "Time"
msgstr "Час"
#: contrib/admindocs/views.py:356 contrib/comments/forms.py:95
#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95
#: contrib/comments/templates/comments/moderation_queue.html:37
#: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
msgid "URL"
msgstr "URL"
#: contrib/admindocs/views.py:357
#: contrib/admindocs/views.py:360
msgid "U.S. state (two uppercase letters)"
msgstr "Држава во САД (две големи букви)"
#: contrib/admindocs/views.py:358
#: contrib/admindocs/views.py:361
msgid "XML text"
msgstr "XML текст"
#: contrib/admindocs/views.py:384
#: contrib/admindocs/views.py:387
#, python-format
msgid "%s does not appear to be a urlpattern object"
msgstr "%s не изгледа дека е url објект"
@ -1447,10 +1449,12 @@ msgid "Metadata"
msgstr "Метаподатоци"
#: contrib/comments/feeds.py:13
#, python-format
msgid "%(site_name)s comments"
msgstr "коментари за %(site_name)s"
#: contrib/comments/feeds.py:23
#, python-format
msgid "Latest comments on %(site_name)s"
msgstr "Последни коментари за %(site_name)s"
@ -1576,14 +1580,12 @@ msgid "date"
msgstr "датум"
#: contrib/comments/models.py:181
#, fuzzy
msgid "comment flag"
msgstr "коментар"
msgstr "обележје за коментар"
#: contrib/comments/models.py:182
#, fuzzy
msgid "comment flags"
msgstr "коментар"
msgstr "обележја за коментари"
#: contrib/comments/templates/comments/approve.html:4
msgid "Approve a comment"
@ -1796,17 +1798,19 @@ msgstr "Не е внесена геометриска вредност."
#: contrib/gis/forms/fields.py:18
msgid "Invalid geometry value."
msgstr "невалидна геометриска вредност."
msgstr "Невалидна геометриска вредност."
#: contrib/gis/forms/fields.py:19
msgid "Invalid geometry type."
msgstr "невалиден геометриски тип."
msgstr "Невалиден геометриски тип."
#: contrib/gis/forms/fields.py:20
msgid ""
"An error occurred when transforming the geometry to the SRID of the geometry "
"form field."
msgstr ""
"Се појави грешка при трансформација на геометриската вредност во SRID од "
"геометриското поле"
#: contrib/humanize/templatetags/humanize.py:19
msgid "th"
@ -2135,84 +2139,75 @@ msgstr "Прага"
#: contrib/localflavor/cz/cz_regions.py:9
msgid "Central Bohemian Region"
msgstr ""
msgstr "Централен Бохемиски регион"
#: contrib/localflavor/cz/cz_regions.py:10
msgid "South Bohemian Region"
msgstr ""
msgstr "Јужен Бохемиски регион"
#: contrib/localflavor/cz/cz_regions.py:11
#, fuzzy
msgid "Pilsen Region"
msgstr "Зилина регион"
msgstr "Пилзенски регион"
#: contrib/localflavor/cz/cz_regions.py:12
msgid "Carlsbad Region"
msgstr ""
msgstr "Карлсбадски регион"
#: contrib/localflavor/cz/cz_regions.py:13
#, fuzzy
msgid "Usti Region"
msgstr "Кошице регион"
msgstr "Усти регион"
#: contrib/localflavor/cz/cz_regions.py:14
#, fuzzy
msgid "Liberec Region"
msgstr "Тренцин регион"
msgstr "Либерец регион"
#: contrib/localflavor/cz/cz_regions.py:15
#, fuzzy
msgid "Hradec Region"
msgstr "Тренцин регион"
msgstr "Храдец регион"
#: contrib/localflavor/cz/cz_regions.py:16
#, fuzzy
msgid "Pardubice Region"
msgstr "Кошице регион"
msgstr "Пардубице регион"
#: contrib/localflavor/cz/cz_regions.py:17
#, fuzzy
msgid "Vysocina Region"
msgstr "Зилина регион"
msgstr "Висоцина регион"
#: contrib/localflavor/cz/cz_regions.py:18
msgid "South Moravian Region"
msgstr ""
msgstr "Јужно Моравски регион"
#: contrib/localflavor/cz/cz_regions.py:19
msgid "Olomouc Region"
msgstr ""
msgstr "Оломуц регион"
#: contrib/localflavor/cz/cz_regions.py:20
#, fuzzy
msgid "Zlin Region"
msgstr "Зилина регион"
#: contrib/localflavor/cz/cz_regions.py:21
msgid "Moravian-Silesian Region"
msgstr ""
msgstr "Моравско-Силесански регион"
#: 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 "Внесете поштенски број во форматот XXXXX или XXX XX."
#: contrib/localflavor/cz/forms.py:47
#, fuzzy
msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
msgstr ""
"Внесете даночен број (NIP) во форматот XXX-XXX-XX-XX или XX-XX-XXX-XXX."
msgstr "Внесете даночен број (NIP) во форматот XXXXXX/XXXX или XXXXXXXXXX."
#: contrib/localflavor/cz/forms.py:48
msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
msgstr ""
"Невалидна вредност за опционален параметар пол, валидни вредности се 'f' и "
"'m'"
#: contrib/localflavor/cz/forms.py:49
#, fuzzy
msgid "Enter a valid birth number."
msgstr "Внесете правилен даночен број."
#: contrib/localflavor/cz/forms.py:106
#, fuzzy
msgid "Enter a valid IC number."
msgstr "Внесете правилен даночен број."
@ -4029,10 +4024,12 @@ msgid "The submitted file is empty."
msgstr "Пратената датотека е празна."
#: forms/fields.py:450
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
"Осигурајте се дека ова име на датотека има најмногу %(max)d знаци (има %(length)d)."
"Осигурајте се дека ова име на датотека има најмногу %(max)d знаци (има %"
"(length)d)."
#: forms/fields.py:483
msgid ""
@ -4077,7 +4074,7 @@ msgstr "Редослед"
#: forms/models.py:367
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
msgstr "%(field_name)s мора да биде уникатно за %(date_field)s %(lookup)s."
#: forms/models.py:381 forms/models.py:389
#, python-format
@ -4085,13 +4082,16 @@ msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s со %(field_label)s веќе постои."
#: forms/models.py:594
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Ве молам поправете ја дуплираната вредност за %(field)s."
#: forms/models.py:598
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "Ве молам поправете ја дуплираната вредност за %(field)s, која мора да биде уникатна."
msgstr ""
"Ве молам поправете ја дуплираната вредност за %(field)s, која мора да биде "
"уникатна."
#: forms/models.py:604
#, python-format
@ -4099,8 +4099,8 @@ msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
"Ве молам поправете ја дуплираната вредност за %(field_name)s која мора да биде уникатна "
"за %(lookup)s во %(date_field)s."
"Ве молам поправете ја дуплираната вредност за %(field_name)s која мора да "
"биде уникатна за %(lookup)s во %(date_field)s."
#: forms/models.py:612
msgid "Please correct the duplicate values below."
@ -4109,6 +4109,8 @@ msgstr "Ве молам поправете ги дуплираните вред
#: forms/models.py:867
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"Надворешниот клуч на вгезденото поле не се совпаѓа со примарниот клуч на "
"родителската инстанца."
#: forms/models.py:930
msgid "Select a valid choice. That choice is not one of the available choices."
@ -4122,7 +4124,7 @@ msgstr "Внесете правилно. %s не е еден од достапн
#: forms/models.py:1006
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr ""
msgstr "\"%s\" не е правилна вредност за примарен клуч."
#: template/defaultfilters.py:767
msgid "yes,no,maybe"
@ -4427,14 +4429,14 @@ msgstr "F j"
#: views/generic/create_update.py:114
#, python-format
msgid "The %(verbose_name)s was created successfully."
msgstr "%(verbose_name)s беше успешно создаден."
msgstr "Ставка %(verbose_name)s беше успешно создадена."
#: views/generic/create_update.py:156
#, python-format
msgid "The %(verbose_name)s was updated successfully."
msgstr "%(verbose_name)s беше успешно ажуриран."
msgstr "Ставка %(verbose_name)s беше успешно ажурирана."
#: views/generic/create_update.py:198
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s беше избришан."
msgstr "Ставка %(verbose_name)s беше избришана."

View File

@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-05-16 10:12+0200\n"
"PO-Revision-Date: 2009-04-12 15:27+0200\n"
"PO-Revision-Date: 2009-07-24 15:44+0200\n"
"Last-Translator: Christian Mikalsen and Jon Lønne\n"
"Language-Team: Norsk <no@li.org>\n"
"MIME-Version: 1.0\n"
@ -218,16 +218,16 @@ msgstr "Simplifisert kinesisk"
msgid "Traditional Chinese"
msgstr "Tradisjonell kinesisk"
#: contrib/admin/actions.py:56
#: contrib/admin/actions.py:60
#, python-format
msgid "Successfully deleted %(count)d %(items)s."
msgstr "Slettet %(count)d %(items)s."
#: contrib/admin/actions.py:63 contrib/admin/options.py:1023
#: contrib/admin/actions.py:67 contrib/admin/options.py:1027
msgid "Are you sure?"
msgstr "Er du sikker?"
#: contrib/admin/actions.py:81
#: contrib/admin/actions.py:85
#, python-format
msgid "Delete selected %(verbose_name_plural)s"
msgstr "Slett valgte %(verbose_name_plural)s"
@ -266,15 +266,15 @@ msgstr "Denne måneden"
msgid "This year"
msgstr "I år"
#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
msgid "Yes"
msgstr "Ja"
#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
msgid "No"
msgstr "Nei"
#: contrib/admin/filterspecs.py:154 forms/widgets.py:413
#: contrib/admin/filterspecs.py:154 forms/widgets.py:434
msgid "Unknown"
msgstr "Ukjent"
@ -314,98 +314,99 @@ msgstr "logginnlegg"
msgid "None"
msgstr "Ingen"
#: contrib/admin/options.py:517
#: contrib/admin/options.py:519
#, python-format
msgid "Changed %s."
msgstr "Endret %s."
#: contrib/admin/options.py:517 contrib/admin/options.py:527
#: contrib/comments/templates/comments/preview.html:16 forms/models.py:306
#: contrib/admin/options.py:519 contrib/admin/options.py:529
#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388
#: forms/models.py:600
msgid "and"
msgstr "og"
#: contrib/admin/options.py:522
#: contrib/admin/options.py:524
#, python-format
msgid "Added %(name)s \"%(object)s\"."
msgstr "Opprettet %(name)s \"%(object)s\"."
#: contrib/admin/options.py:526
#: contrib/admin/options.py:528
#, python-format
msgid "Changed %(list)s for %(name)s \"%(object)s\"."
msgstr "Endret %(list)s for %(name)s \"%(object)s\"."
#: contrib/admin/options.py:531
#: contrib/admin/options.py:533
#, python-format
msgid "Deleted %(name)s \"%(object)s\"."
msgstr "Slettet %(name)s \"%(object)s\"."
#: contrib/admin/options.py:535
#: contrib/admin/options.py:537
msgid "No fields changed."
msgstr "Ingen felt endret."
#: contrib/admin/options.py:596 contrib/auth/admin.py:67
#: contrib/admin/options.py:599 contrib/auth/admin.py:67
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "%(name)s \"%(obj)s\" ble opprettet."
#: contrib/admin/options.py:600 contrib/admin/options.py:633
#: contrib/admin/options.py:603 contrib/admin/options.py:636
#: contrib/auth/admin.py:75
msgid "You may edit it again below."
msgstr "Du kan redigere videre nedenfor."
#: contrib/admin/options.py:610 contrib/admin/options.py:643
#: contrib/admin/options.py:613 contrib/admin/options.py:646
#, python-format
msgid "You may add another %s below."
msgstr "Du kan opprette ny %s nedenfor."
#: contrib/admin/options.py:631
#: contrib/admin/options.py:634
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "%(name)s \"%(obj)s\" ble endret."
#: contrib/admin/options.py:639
#: contrib/admin/options.py:642
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr "%(name)s \"%(obj)s\" ble endret. Du kan redigere videre nedenfor."
#: contrib/admin/options.py:770
#: contrib/admin/options.py:773
#, python-format
msgid "Add %s"
msgstr "Opprett %s"
#: contrib/admin/options.py:801 contrib/admin/options.py:1001
#: contrib/admin/options.py:804 contrib/admin/options.py:1005
#, python-format
msgid "%(name)s object with primary key %(key)r does not exist."
msgstr "%(name)s-objekt med primærnøkkelen %(key)r finnes ikke."
#: contrib/admin/options.py:858
#: contrib/admin/options.py:861
#, python-format
msgid "Change %s"
msgstr "Rediger %s"
#: contrib/admin/options.py:902
#: contrib/admin/options.py:905
msgid "Database error"
msgstr "Databasefeil"
#: contrib/admin/options.py:938
#: contrib/admin/options.py:941
#, 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 ble endret."
msgstr[1] "%(count)s %(name)s ble endret."
#: contrib/admin/options.py:1016
#: contrib/admin/options.py:1020
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "%(name)s \"%(obj)s\" ble slettet."
#: contrib/admin/options.py:1052
#: contrib/admin/options.py:1057
#, python-format
msgid "Change history: %s"
msgstr "Endringshistorikk: %s"
#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14
#: contrib/admin/sites.py:21 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-"
@ -414,11 +415,11 @@ msgstr ""
"Vennligst angi korrekt brukernavn og passord. Merk at det er forskjell på "
"små og store bokstaver."
#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40
#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:40
msgid "Please log in again, because your session has expired."
msgstr "Økten din har tidsavbrutt, vennligst logg inn igjen."
#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47
#: contrib/admin/sites.py:292 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."
@ -426,27 +427,27 @@ msgstr ""
"Det ser ut som om nettleseren din ikke støtter informasjonskapsler "
"(cookies). Vennligst konfigurer nettleseren din og prøv igjen."
#: contrib/admin/sites.py:301 contrib/admin/sites.py:307
#: contrib/admin/sites.py:308 contrib/admin/sites.py:314
#: contrib/admin/views/decorators.py:66
msgid "Usernames cannot contain the '@' character."
msgstr "Brukernavnet kan ikke inneholde tegnet '@'."
#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62
#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:62
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr "E-postadressen er ikke brukernavnet ditt, prøv '%s' isteden."
#: contrib/admin/sites.py:360
#: contrib/admin/sites.py:367
msgid "Site administration"
msgstr "Nettstedsadministrasjon"
#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26
#: contrib/admin/sites.py:381 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 "Logg inn"
#: contrib/admin/sites.py:417
#: contrib/admin/sites.py:426
#, python-format
msgid "%s administration"
msgstr "%s-administrasjon"
@ -496,7 +497,7 @@ msgstr "Beklager, men siden du spør etter finnes ikke."
#: contrib/admin/templates/admin/500.html:4
#: contrib/admin/templates/admin/app_index.html:8
#: contrib/admin/templates/admin/base.html:33
#: contrib/admin/templates/admin/base.html:54
#: contrib/admin/templates/admin/change_form.html:17
#: contrib/admin/templates/admin/change_list.html:25
#: contrib/admin/templates/admin/delete_confirmation.html:6
@ -540,7 +541,6 @@ msgid "Run the selected action"
msgstr "Utfør den valgte handlingen"
#: contrib/admin/templates/admin/actions.html:4
#: contrib/admin/templates/admin/search_form.html:8
msgid "Go"
msgstr "Gå"
@ -550,18 +550,18 @@ msgstr "Gå"
msgid "%(name)s"
msgstr "%(name)s"
#: contrib/admin/templates/admin/base.html:28
#: contrib/admin/templates/admin/base.html:27
msgid "Welcome,"
msgstr "Velkommen,"
#: contrib/admin/templates/admin/base.html:28
#: contrib/admin/templates/admin/base.html:32
#: 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 "Dokumentasjon"
#: contrib/admin/templates/admin/base.html:28
#: contrib/admin/templates/admin/base.html:40
#: contrib/admin/templates/admin/auth/user/change_password.html:14
#: contrib/admin/templates/admin/auth/user/change_password.html:47
#: contrib/admin/templates/registration/password_change_done.html:3
@ -569,7 +569,7 @@ msgstr "Dokumentasjon"
msgid "Change password"
msgstr "Endre passord"
#: contrib/admin/templates/admin/base.html:28
#: contrib/admin/templates/admin/base.html:47
#: contrib/admin/templates/registration/password_change_done.html:3
#: contrib/admin/templates/registration/password_change_form.html:3
msgid "Log out"
@ -699,6 +699,10 @@ msgstr "Mine handlinger"
msgid "None available"
msgstr "Ingen tilgjengelige"
#: contrib/admin/templates/admin/index.html:72
msgid "Unknown content"
msgstr "Ukjent innhold"
#: contrib/admin/templates/admin/invalid_setup.html:7
msgid ""
"Something's wrong with your database installation. Make sure the appropriate "
@ -746,6 +750,15 @@ msgstr ""
msgid "Show all"
msgstr "Vis alle"
#: contrib/admin/templates/admin/pagination.html:11
#: contrib/admin/templates/admin/submit_line.html:3
msgid "Save"
msgstr "Lagre"
#: contrib/admin/templates/admin/search_form.html:8
msgid "Search"
msgstr "Søk"
#: contrib/admin/templates/admin/search_form.html:10
#, python-format
msgid "1 result"
@ -758,10 +771,6 @@ msgstr[1] "%(counter)s resultater"
msgid "%(full_result_count)s total"
msgstr "%(full_result_count)s totalt"
#: contrib/admin/templates/admin/submit_line.html:3
msgid "Save"
msgstr "Lagre"
#: contrib/admin/templates/admin/submit_line.html:5
msgid "Save as new"
msgstr "Lagre som ny"
@ -989,144 +998,145 @@ msgstr "nettside"
msgid "template"
msgstr "mal"
#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60
#: contrib/admindocs/views.py:62
#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63
#: contrib/admindocs/views.py:65
msgid "tag:"
msgstr "tag:"
#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93
#: contrib/admindocs/views.py:95
#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96
#: contrib/admindocs/views.py:98
msgid "filter:"
msgstr "filter:"
#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157
#: contrib/admindocs/views.py:159
#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160
#: contrib/admindocs/views.py:162
msgid "view:"
msgstr "view:"
#: contrib/admindocs/views.py:187
#: contrib/admindocs/views.py:190
#, python-format
msgid "App %r not found"
msgstr "Fant ikke applikasjonen %r"
#: contrib/admindocs/views.py:194
#: contrib/admindocs/views.py:197
#, python-format
msgid "Model %(model_name)r not found in app %(app_label)r"
msgstr "Fant ikke modellen %(model_name)r i applikasjonen %(app_label)r"
#: contrib/admindocs/views.py:206
#: contrib/admindocs/views.py:209
#, python-format
msgid "the related `%(app_label)s.%(data_type)s` object"
msgstr "det relaterte `%(app_label)s.%(data_type)s`-objektet"
#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228
#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247
#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228
#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247
#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266
msgid "model:"
msgstr "modell:"
#: contrib/admindocs/views.py:237
#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256
#, python-format
msgid "related `%(app_label)s.%(object_name)s` objects"
msgstr "relaterte `%(app_label)s.%(object_name)s`-objekter"
#: contrib/admindocs/views.py:242
#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261
#, python-format
msgid "all %s"
msgstr "alle %s"
#: contrib/admindocs/views.py:247
#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266
#, python-format
msgid "number of %s"
msgstr "antall %s"
#: contrib/admindocs/views.py:252
#: contrib/admindocs/views.py:271
#, python-format
msgid "Fields on %s objects"
msgstr "Felter på %s-objekter"
#: contrib/admindocs/views.py:315 contrib/admindocs/views.py:326
#: contrib/admindocs/views.py:328 contrib/admindocs/views.py:334
#: contrib/admindocs/views.py:335 contrib/admindocs/views.py:337
#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345
#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353
#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356
msgid "Integer"
msgstr "Heltall"
#: contrib/admindocs/views.py:316
#: contrib/admindocs/views.py:335
msgid "Boolean (Either True or False)"
msgstr "Boolsk (True eller False)"
#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336
#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Tekst (opp til %(max_length)s tegn)"
#: contrib/admindocs/views.py:318
#: contrib/admindocs/views.py:337
msgid "Comma-separated integers"
msgstr "Heltall adskilt med komma"
#: contrib/admindocs/views.py:319
#: contrib/admindocs/views.py:338
msgid "Date (without time)"
msgstr "Dato (uten tid)"
#: contrib/admindocs/views.py:320
#: contrib/admindocs/views.py:339
msgid "Date (with time)"
msgstr "Dato (med tid)"
#: contrib/admindocs/views.py:321
#: contrib/admindocs/views.py:340
msgid "Decimal number"
msgstr "Desimaltall"
#: contrib/admindocs/views.py:322
#: contrib/admindocs/views.py:341
msgid "E-mail address"
msgstr "E-postadresse"
#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324
#: contrib/admindocs/views.py:327
#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343
#: contrib/admindocs/views.py:346
msgid "File path"
msgstr "Filsti"
#: contrib/admindocs/views.py:325
#: contrib/admindocs/views.py:344
msgid "Floating point number"
msgstr "Flyttall"
#: contrib/admindocs/views.py:329 contrib/comments/models.py:60
#: contrib/admindocs/views.py:348 contrib/comments/models.py:60
msgid "IP address"
msgstr "IP-adresse"
#: contrib/admindocs/views.py:331
#: contrib/admindocs/views.py:350
msgid "Boolean (Either True, False or None)"
msgstr "Boolsk (True, False eller None)"
#: contrib/admindocs/views.py:332
#: contrib/admindocs/views.py:351
msgid "Relation to parent model"
msgstr "Relasjon til foreldermodell"
#: contrib/admindocs/views.py:333
#: contrib/admindocs/views.py:352
msgid "Phone number"
msgstr "Telefonnummer"
#: contrib/admindocs/views.py:338
#: contrib/admindocs/views.py:357
msgid "Text"
msgstr "Tekst"
#: contrib/admindocs/views.py:339
#: contrib/admindocs/views.py:358
msgid "Time"
msgstr "Tid"
#: contrib/admindocs/views.py:340 contrib/comments/forms.py:95
#: contrib/admindocs/views.py:359 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 "Nettadresse"
#: contrib/admindocs/views.py:341
#: contrib/admindocs/views.py:360
msgid "U.S. state (two uppercase letters)"
msgstr "Stat (i USA, to store bokstaver)"
#: contrib/admindocs/views.py:342
#: contrib/admindocs/views.py:361
msgid "XML text"
msgstr "XML-tekst"
#: contrib/admindocs/views.py:368
#: contrib/admindocs/views.py:387
#, python-format
msgid "%s does not appear to be a urlpattern object"
msgstr "%s ser ikke ut til å være et urlpattern-objekt"
@ -1770,18 +1780,25 @@ msgstr ""
"Vi beklager, men dette skjemaet har tidsavbrutt. Vennligst fyll ut skjemaet "
"fra denne siden."
#: contrib/gis/forms/fields.py:14
#: contrib/gis/forms/fields.py:17
msgid "No geometry value provided."
msgstr "Ingen geometriverdi oppgitt."
#: contrib/gis/forms/fields.py:15
#: contrib/gis/forms/fields.py:18
msgid "Invalid geometry value."
msgstr "Ugyldig geometriverdi"
#: contrib/gis/forms/fields.py:16
#: contrib/gis/forms/fields.py:19
msgid "Invalid geometry type."
msgstr "Ugyldig geometritype"
#: contrib/gis/forms/fields.py:20
msgid ""
"An error occurred when transforming the geometry to the SRID of the geometry "
"form field."
msgstr ""
"En feil oppstod ved transformering av geometrien til SRID fra geometrifeltet."
#: contrib/humanize/templatetags/humanize.py:19
msgid "th"
msgstr "."
@ -3891,13 +3908,13 @@ msgstr "Verdien må være None, True eller False."
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
msgstr "Oppgi tiden på formen TT:MM[:ss[.uuuuuu]]."
#: db/models/fields/related.py:792
#: db/models/fields/related.py:816
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Hold nede \"Control\", eller \"Command\" på en Mac, for å velge mer enn en."
#: db/models/fields/related.py:870
#: db/models/fields/related.py:894
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
@ -3956,11 +3973,11 @@ msgstr "Verdien kan ikke ha mer enn %s desimaler."
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Verdien kan ikke ha mer enn %s siffer foran komma."
#: forms/fields.py:288 forms/fields.py:862
#: forms/fields.py:288 forms/fields.py:863
msgid "Enter a valid date."
msgstr "Oppgi en gyldig dato."
#: forms/fields.py:322 forms/fields.py:863
#: forms/fields.py:322 forms/fields.py:864
msgid "Enter a valid time."
msgstr "Oppgi et gyldig tidspunkt."
@ -4002,20 +4019,20 @@ msgstr "Oppgi en gyldig nettadresse."
msgid "This URL appears to be a broken link."
msgstr "Nettadressen fører til en side som ikke eksisterer."
#: forms/fields.py:624 forms/fields.py:702
#: forms/fields.py:625 forms/fields.py:703
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Velg et gyldig valg. %(value)s er ikke et av de tilgjengelige valgene."
#: forms/fields.py:703 forms/fields.py:764 forms/models.py:776
#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003
msgid "Enter a list of values."
msgstr "Oppgi en liste med verdier."
#: forms/fields.py:891
#: forms/fields.py:892
msgid "Enter a valid IPv4 address."
msgstr "Oppgi en gyldig IPv4-adresse."
#: forms/fields.py:901
#: forms/fields.py:902
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
@ -4026,25 +4043,53 @@ msgstr ""
msgid "Order"
msgstr "Rekkefølge"
#: forms/models.py:299 forms/models.py:308
#: forms/models.py:367
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "%(field_name)s må være unik for %(date_field)s %(lookup)s."
#: forms/models.py:381 forms/models.py:389
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s med %(field_label)s finnes allerede."
#: forms/models.py:651
#: forms/models.py:594
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Vennligst korriger duplisert data for %(field)s."
#: forms/models.py:598
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "Vennligst korriger duplisert data for %(field)s, som må være unik."
#: forms/models.py:604
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
"Vennligst korriger duplisert data for %(field_name)s, som må være unik for "
"%(lookup)s i %(date_field)s."
#: forms/models.py:612
msgid "Please correct the duplicate values below."
msgstr "Vennligst korriger de dupliserte verdiene nedenfor."
#: forms/models.py:867
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "Primærnøkkelen er ikke den samme som foreldreinstansens primærnøkkel."
#: forms/models.py:706
#: forms/models.py:930
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Velg et gyldig valg. Valget er ikke et av de tilgjengelige valgene."
#: forms/models.py:777
#: forms/models.py:1004
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Velg et gyldig valg. %s er ikke et av de tilgjengelige valgene."
#: forms/models.py:779
#: forms/models.py:1006
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" er ikke en gyldig verdi for en primærnøkkel."
@ -4075,27 +4120,27 @@ msgstr "%.1f MB"
msgid "%.1f GB"
msgstr "%.1f GB"
#: utils/dateformat.py:41
#: utils/dateformat.py:42
msgid "p.m."
msgstr "p.m."
#: utils/dateformat.py:42
#: utils/dateformat.py:43
msgid "a.m."
msgstr "a.m."
#: utils/dateformat.py:47
#: utils/dateformat.py:48
msgid "PM"
msgstr "PM"
#: utils/dateformat.py:48
#: utils/dateformat.py:49
msgid "AM"
msgstr "AM"
#: utils/dateformat.py:97
#: utils/dateformat.py:98
msgid "midnight"
msgstr "midnatt"
#: utils/dateformat.py:99
#: utils/dateformat.py:100
msgid "noon"
msgstr "12:00"

File diff suppressed because it is too large Load Diff

View File

@ -2,23 +2,24 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: kowito@felspar.com\n"
"Project-Id-Version: Django-1.1-rc-1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-09-02 22:36-0700\n"
"PO-Revision-Date: 2008-11-04 00:35+0700\n"
"PO-Revision-Date: 2009-07-27 21:47+0700\n"
"Last-Translator: Kowit Charoenratchatabhan <kowito@felspar.com>\n"
"Language-Team: Kowit Charoenratchatabhan,Kadsarin Sanjek, Felspar <kowito@felspar.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Thai\n"
"X-Poedit-Country: Thailand\n"
"X-Poedit-Country: THAILAND\n"
"X-Poedit-SourceCharset: utf-8\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: contrib/admin/media/js/SelectFilter2.js:33
#, perl-format
msgid "Available %s"
msgstr "ที่มีอยู่ %s"
msgstr "%sที่มีอยู่"
#: contrib/admin/media/js/SelectFilter2.js:41
msgid "Choose all"
@ -35,7 +36,7 @@ msgstr "ลบออก"
#: contrib/admin/media/js/SelectFilter2.js:53
#, perl-format
msgid "Chosen %s"
msgstr "ได้เลือก %s"
msgstr "%sที่ถูกเลือก"
#: contrib/admin/media/js/SelectFilter2.js:54
msgid "Select your choice(s) and click "
@ -43,7 +44,7 @@ msgstr "เลือกและคลิก"
#: contrib/admin/media/js/SelectFilter2.js:59
msgid "Clear all"
msgstr "ล้างทั้งหมด"
msgstr "ลทั้งหมด"
#: contrib/admin/media/js/calendar.js:24
#: contrib/admin/media/js/dateparse.js:32
@ -52,11 +53,11 @@ msgstr "มกราคม กุมภาพันธ์ มีนาคม เ
#: contrib/admin/media/js/calendar.js:25
msgid "S M T W T F S"
msgstr "อา จ. อ. พ. พฤ. ศ. ส."
msgstr "อา. จ. อ. พ. พฤ. ศ. ส."
#: contrib/admin/media/js/dateparse.js:33
msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
msgstr "อาทิตย์ จันทร์ อังคาร พุธ พฤหัส ศุกร์ เสาร์"
msgstr "อาทิตย์ จันทร์ อังคาร พุธ พฤหัสบดี ศุกร์ เสาร์"
#: contrib/admin/media/js/admin/CollapsedFieldsets.js:34
#: contrib/admin/media/js/admin/CollapsedFieldsets.js:72
@ -70,7 +71,7 @@ msgstr "ซ่อน"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:47
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
msgid "Now"
msgstr "เดี๋ยวนี้"
msgstr "ขณะนี้"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:51
msgid "Clock"
@ -86,11 +87,11 @@ msgstr "เที่ยงคืน"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
msgid "6 a.m."
msgstr "6 นาฬิกา"
msgstr "หกโมงเช้า"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
msgid "Noon"
msgstr "เที่ยง"
msgstr "เที่ยงวัน"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:88
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:183
@ -108,7 +109,7 @@ msgstr "ปฏิทิน"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:175
msgid "Yesterday"
msgstr "เมื่อวานนี้"
msgstr "เมื่อวาน"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179
msgid "Tomorrow"

View File

@ -125,11 +125,19 @@ class GeoQuerySet(QuerySet):
if not isinstance(precision, (int, long)):
raise TypeError('Precision keyword must be set with an integer.')
# Setting the options flag
options = 0
if crs and bbox: options = 3
elif crs: options = 1
elif bbox: options = 2
# Setting the options flag -- which depends on which version of
# PostGIS we're using.
major, minor1, minor2 = SpatialBackend.version
if major >=1 and (minor1 >= 4):
options = 0
if crs and bbox: options = 3
elif bbox: options = 1
elif crs: options = 2
else:
options = 0
if crs and bbox: options = 3
elif crs: options = 1
elif bbox: options = 2
s = {'desc' : 'GeoJSON',
'procedure_args' : {'precision' : precision, 'options' : options},
'procedure_fmt' : '%(geo_col)s,%(precision)s,%(options)s',

View File

@ -148,15 +148,16 @@ class GeoModelTest(unittest.TestCase):
ptown1 = City.objects.gml(field_name='point', precision=9).get(name='Pueblo')
ptown2 = City.objects.gml(precision=9).get(name='Pueblo')
import re
if SpatialBackend.oracle:
# No precision parameter for Oracle :-/
import re
gml_regex = re.compile(r'<gml:Point srsName="SDO:4326" xmlns:gml="http://www.opengis.net/gml"><gml:coordinates decimal="\." cs="," ts=" ">-104.60925\d+,38.25500\d+ </gml:coordinates></gml:Point>')
gml_regex = re.compile(r'^<gml:Point srsName="SDO:4326" xmlns:gml="http://www.opengis.net/gml"><gml:coordinates decimal="\." cs="," ts=" ">-104.60925\d+,38.25500\d+ </gml:coordinates></gml:Point>')
for ptown in [ptown1, ptown2]:
self.assertEqual(True, bool(gml_regex.match(ptown.gml)))
self.failUnless(gml_regex.match(ptown.gml))
else:
gml_regex = re.compile(r'^<gml:Point srsName="EPSG:4326"><gml:coordinates>-104\.60925\d+,38\.255001</gml:coordinates></gml:Point>')
for ptown in [ptown1, ptown2]:
self.assertEqual('<gml:Point srsName="EPSG:4326"><gml:coordinates>-104.609252,38.255001</gml:coordinates></gml:Point>', ptown.gml)
self.failUnless(gml_regex.match(ptown.gml))
@no_spatialite
@no_oracle
@ -167,28 +168,38 @@ class GeoModelTest(unittest.TestCase):
if not SpatialBackend.geojson:
return
major, minor1, minor2 = SpatialBackend.version
if major >=1 and minor1 >= 4:
pueblo_json = '{"type":"Point","coordinates":[-104.609252,38.255001]}'
houston_json = '{"type":"Point","crs":{"type":"name","properties":{"name":"EPSG:4326"}},"coordinates":[-95.363151,29.763374]}'
victoria_json = '{"type":"Point","bbox":[-123.30519600,48.46261100,-123.30519600,48.46261100],"coordinates":[-123.305196,48.462611]}'
chicago_json = '{"type":"Point","crs":{"type":"name","properties":{"name":"EPSG:4326"}},"bbox":[-87.65018,41.85039,-87.65018,41.85039],"coordinates":[-87.65018,41.85039]}'
else:
pueblo_json = '{"type":"Point","coordinates":[-104.60925200,38.25500100]}'
houston_json = '{"type":"Point","crs":{"type":"EPSG","properties":{"EPSG":4326}},"coordinates":[-95.36315100,29.76337400]}'
victoria_json = '{"type":"Point","bbox":[-123.30519600,48.46261100,-123.30519600,48.46261100],"coordinates":[-123.30519600,48.46261100]}'
chicago_json = '{"type":"Point","crs":{"type":"EPSG","properties":{"EPSG":4326}},"bbox":[-87.65018,41.85039,-87.65018,41.85039],"coordinates":[-87.65018,41.85039]}'
# Precision argument should only be an integer
self.assertRaises(TypeError, City.objects.geojson, precision='foo')
# Reference queries and values.
# SELECT ST_AsGeoJson("geoapp_city"."point", 8, 0) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Pueblo';
json = '{"type":"Point","coordinates":[-104.60925200,38.25500100]}'
self.assertEqual(City.objects.geojson().get(name='Pueblo').geojson, json)
self.assertEqual(pueblo_json, City.objects.geojson().get(name='Pueblo').geojson)
# SELECT ST_AsGeoJson("geoapp_city"."point", 8, 1) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Houston';
json = '{"type":"Point","crs":{"type":"EPSG","properties":{"EPSG":4326}},"coordinates":[-95.36315100,29.76337400]}'
# 1.3.x: SELECT ST_AsGeoJson("geoapp_city"."point", 8, 1) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Houston';
# 1.4.x: SELECT ST_AsGeoJson("geoapp_city"."point", 8, 2) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Houston';
# This time we want to include the CRS by using the `crs` keyword.
self.assertEqual(City.objects.geojson(crs=True, model_att='json').get(name='Houston').json, json)
self.assertEqual(houston_json, City.objects.geojson(crs=True, model_att='json').get(name='Houston').json)
# SELECT ST_AsGeoJson("geoapp_city"."point", 8, 2) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Victoria';
json = '{"type":"Point","bbox":[-123.30519600,48.46261100,-123.30519600,48.46261100],"coordinates":[-123.30519600,48.46261100]}'
# 1.3.x: SELECT ST_AsGeoJson("geoapp_city"."point", 8, 2) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Victoria';
# 1.4.x: SELECT ST_AsGeoJson("geoapp_city"."point", 8, 1) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Houston';
# This time we include the bounding box by using the `bbox` keyword.
self.assertEqual(City.objects.geojson(bbox=True).get(name='Victoria').geojson, json)
self.assertEqual(victoria_json, City.objects.geojson(bbox=True).get(name='Victoria').geojson)
# SELECT ST_AsGeoJson("geoapp_city"."point", 5, 3) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Chicago';
json = '{"type":"Point","crs":{"type":"EPSG","properties":{"EPSG":4326}},"bbox":[-87.65018,41.85039,-87.65018,41.85039],"coordinates":[-87.65018,41.85039]}'
# 1.(3|4).x: SELECT ST_AsGeoJson("geoapp_city"."point", 5, 3) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Chicago';
# Finally, we set every available keyword.
self.assertEqual(City.objects.geojson(bbox=True, crs=True, precision=5).get(name='Chicago').geojson, json)
self.assertEqual(chicago_json, City.objects.geojson(bbox=True, crs=True, precision=5).get(name='Chicago').geojson)
@no_oracle
def test03d_svg(self):

View File

@ -39,10 +39,7 @@ class RelatedGeoModelTest(unittest.TestCase):
"Testing the `transform` GeoQuerySet method on related geographic models."
# All the transformations are to state plane coordinate systems using
# US Survey Feet (thus a tolerance of 0 implies error w/in 1 survey foot).
if SpatialBackend.postgis:
tol = 3
else:
tol = 0
tol = 0
def check_pnt(ref, pnt):
self.assertAlmostEqual(ref.x, pnt.x, tol)

View File

@ -1,4 +1,5 @@
import unittest
from django.contrib.gis.db.backend import SpatialBackend
from django.contrib.gis.tests.utils import mysql, no_mysql, oracle, postgis, spatialite
if not mysql:
from django.contrib.gis.models import SpatialRefSys
@ -7,6 +8,7 @@ test_srs = ({'srid' : 4326,
'auth_name' : ('EPSG', True),
'auth_srid' : 4326,
'srtext' : 'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]',
'srtext14' : 'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]',
'proj4' : '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs ',
'spheroid' : 'WGS 84', 'name' : 'WGS 84',
'geographic' : True, 'projected' : False, 'spatialite' : True,
@ -17,6 +19,7 @@ test_srs = ({'srid' : 4326,
'auth_name' : ('EPSG', False),
'auth_srid' : 32140,
'srtext' : 'PROJCS["NAD83 / Texas South Central",GEOGCS["NAD83",DATUM["North_American_Datum_1983",SPHEROID["GRS 1980",6378137,298.257222101,AUTHORITY["EPSG","7019"]],AUTHORITY["EPSG","6269"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4269"]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["standard_parallel_1",30.28333333333333],PARAMETER["standard_parallel_2",28.38333333333333],PARAMETER["latitude_of_origin",27.83333333333333],PARAMETER["central_meridian",-99],PARAMETER["false_easting",600000],PARAMETER["false_northing",4000000],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AUTHORITY["EPSG","32140"]]',
'srtext14': 'PROJCS["NAD83 / Texas South Central",GEOGCS["NAD83",DATUM["North_American_Datum_1983",SPHEROID["GRS 1980",6378137,298.257222101,AUTHORITY["EPSG","7019"]],AUTHORITY["EPSG","6269"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4269"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["standard_parallel_1",30.28333333333333],PARAMETER["standard_parallel_2",28.38333333333333],PARAMETER["latitude_of_origin",27.83333333333333],PARAMETER["central_meridian",-99],PARAMETER["false_easting",600000],PARAMETER["false_northing",4000000],AUTHORITY["EPSG","32140"],AXIS["X",EAST],AXIS["Y",NORTH]]',
'proj4' : '+proj=lcc +lat_1=30.28333333333333 +lat_2=28.38333333333333 +lat_0=27.83333333333333 +lon_0=-99 +x_0=600000 +y_0=4000000 +ellps=GRS80 +datum=NAD83 +units=m +no_defs ',
'spheroid' : 'GRS 1980', 'name' : 'NAD83 / Texas South Central',
'geographic' : False, 'projected' : True, 'spatialite' : False,
@ -25,6 +28,10 @@ test_srs = ({'srid' : 4326,
},
)
if SpatialBackend.postgis:
major, minor1, minor2 = SpatialBackend.version
POSTGIS_14 = major >=1 and minor1 >= 4
class SpatialRefSysTest(unittest.TestCase):
@no_mysql
@ -45,7 +52,11 @@ class SpatialRefSysTest(unittest.TestCase):
# No proj.4 and different srtext on oracle backends :(
if postgis:
self.assertEqual(sd['srtext'], srs.wkt)
if POSTGIS_14:
srtext = sd['srtext14']
else:
srtext = sd['srtext']
self.assertEqual(srtext, srs.wkt)
self.assertEqual(sd['proj4'], srs.proj4text)
@no_mysql
@ -68,7 +79,11 @@ class SpatialRefSysTest(unittest.TestCase):
self.assertEqual(sd['proj4'], srs.proj4)
# No `srtext` field in the `spatial_ref_sys` table in SpatiaLite
if not spatialite:
self.assertEqual(sd['srtext'], srs.wkt)
if POSTGIS_14:
srtext = sd['srtext14']
else:
srtext = sd['srtext']
self.assertEqual(srtext, srs.wkt)
@no_mysql
def test03_ellipsoid(self):

View File

@ -73,7 +73,8 @@ class Command(BaseCommand):
model_list = get_models(app)
for model in model_list:
objects.extend(model._default_manager.all())
if not model._meta.proxy:
objects.extend(model._default_manager.all())
try:
return serializers.serialize(format, objects, indent=indent)

View File

@ -56,8 +56,7 @@ class Command(BaseCommand):
translation.activate(settings.LANGUAGE_CODE)
try:
path = admin_media_path or django.__path__[0] + '/contrib/admin/media'
handler = AdminMediaHandler(WSGIHandler(), path)
handler = AdminMediaHandler(WSGIHandler(), admin_media_path)
run(addr, int(port), handler)
except WSGIServerException, e:
# Use helpful error messages instead of ugly tracebacks.

View File

@ -16,6 +16,7 @@ import sys
import urllib
from django.utils.http import http_date
from django.utils._os import safe_join
__version__ = "0.1"
__all__ = ['WSGIServer','WSGIRequestHandler']
@ -620,11 +621,25 @@ class AdminMediaHandler(object):
self.application = application
if not media_dir:
import django
self.media_dir = django.__path__[0] + '/contrib/admin/media'
self.media_dir = \
os.path.join(django.__path__[0], 'contrib', 'admin', 'media')
else:
self.media_dir = media_dir
self.media_url = settings.ADMIN_MEDIA_PREFIX
def file_path(self, url):
"""
Returns the path to the media file on disk for the given URL.
The passed URL is assumed to begin with ADMIN_MEDIA_PREFIX. If the
resultant file path is outside the media directory, then a ValueError
is raised.
"""
# Remove ADMIN_MEDIA_PREFIX.
relative_url = url[len(self.media_url):]
relative_path = urllib.url2pathname(relative_url)
return safe_join(self.media_dir, relative_path)
def __call__(self, environ, start_response):
import os.path
@ -635,19 +650,25 @@ class AdminMediaHandler(object):
return self.application(environ, start_response)
# Find the admin file and serve it up, if it exists and is readable.
relative_url = environ['PATH_INFO'][len(self.media_url):]
file_path = os.path.join(self.media_dir, relative_url)
try:
file_path = self.file_path(environ['PATH_INFO'])
except ValueError: # Resulting file path was not valid.
status = '404 NOT FOUND'
headers = {'Content-type': 'text/plain'}
output = ['Page not found: %s' % environ['PATH_INFO']]
start_response(status, headers.items())
return output
if not os.path.exists(file_path):
status = '404 NOT FOUND'
headers = {'Content-type': 'text/plain'}
output = ['Page not found: %s' % file_path]
output = ['Page not found: %s' % environ['PATH_INFO']]
else:
try:
fp = open(file_path, 'rb')
except IOError:
status = '401 UNAUTHORIZED'
headers = {'Content-type': 'text/plain'}
output = ['Permission denied: %s' % file_path]
output = ['Permission denied: %s' % environ['PATH_INFO']]
else:
# This is a very simple implementation of conditional GET with
# the Last-Modified header. It makes media files a bit speedier

View File

@ -40,7 +40,7 @@ class BaseDatabaseCreation(object):
from django.db import models
opts = model._meta
if not opts.managed:
if not opts.managed or opts.proxy:
return [], {}
final_output = []
table_output = []
@ -121,7 +121,7 @@ class BaseDatabaseCreation(object):
"Returns any ALTER TABLE statements to add constraints after the fact."
from django.db.backends.util import truncate_name
if not model._meta.managed:
if not model._meta.managed or model._meta.proxy:
return []
qn = self.connection.ops.quote_name
final_output = []
@ -236,7 +236,7 @@ class BaseDatabaseCreation(object):
def sql_indexes_for_model(self, model, style):
"Returns the CREATE INDEX SQL statements for a single model"
if not model._meta.managed:
if not model._meta.managed or model._meta.proxy:
return []
output = []
for f in model._meta.local_fields:
@ -268,7 +268,7 @@ class BaseDatabaseCreation(object):
def sql_destroy_model(self, model, references_to_delete, style):
"Return the DROP TABLE and restraint dropping statements for a single model"
if not model._meta.managed:
if not model._meta.managed or model._meta.proxy:
return []
# Drop the table now
qn = self.connection.ops.quote_name
@ -286,7 +286,7 @@ class BaseDatabaseCreation(object):
def sql_remove_table_constraints(self, model, references_to_delete, style):
from django.db.backends.util import truncate_name
if not model._meta.managed:
if not model._meta.managed or model._meta.proxy:
return []
output = []
qn = self.connection.ops.quote_name

View File

@ -326,8 +326,8 @@ shortcut. Here's the ``detail()`` view, rewritten::
return render_to_response('polls/detail.html', {'poll': p})
The :func:`~django.shortcuts.get_object_or_404` function takes a Django model
module as its first argument and an arbitrary number of keyword arguments, which
it passes to the module's :meth:`~django.db.models.QuerySet.get` function. It
as its first argument and an arbitrary number of keyword arguments, which it
passes to the module's :meth:`~django.db.models.QuerySet.get` function. It
raises :exc:`~django.http.Http404` if the object doesn't exist.
.. admonition:: Philosophy

View File

@ -188,6 +188,46 @@ almost always do the right thing and trying to override that will lead to
errors that are difficult to track down. This feature is for advanced use
only.
Updating attributes based on existing fields
--------------------------------------------
Sometimes you'll need to perform a simple arithmetic task on a field, such
as incrementing or decrementing the current value. The obvious way to
achieve this is to do something like::
>>> product = Product.objects.get(name='Venezuelan Beaver Cheese')
>>> product.number_sold += 1
>>> product.save()
If the old ``number_sold`` value retrieved from the database was 10, then
the value of 11 will be written back to the database.
This can be optimized slightly by expressing the update relative to the
original field value, rather than as an explicit assignment of a new value.
Django provides :ref:`F() expressions <query-expressions>` as a way of
performing this kind of relative update. Using ``F()`` expressions, the
previous example would be expressed as::
>>> from django.db.models import F
>>> product = Product.objects.get(name='Venezuelan Beaver Cheese')
>>> product.number_sold = F('number_sold') + 1
>>> product.save()
This approach doesn't use the initial value from the database. Instead, it
makes the database do the update based on whatever value is current at the
time that the save() is executed.
Once the object has been saved, you must reload the object in order to access
the actual value that was applied to the updated field::
>>> product = Products.objects.get(pk=product.pk)
>>> print product.number_sold
42
For more details, see the documentation on :ref:`F() expressions
<query-expressions>` and their :ref:`use in update queries
<topics-db-queries-update>`.
Deleting objects
================
@ -196,7 +236,7 @@ Deleting objects
Issues a SQL ``DELETE`` for the object. This only deletes the object in the
database; the Python instance will still be around, and will still have data
in its fields.
For more details, including how to delete objects in bulk, see
:ref:`topics-db-queries-delete`.

View File

@ -3,7 +3,7 @@
Release notes
=============
Releases notes for the official Django releases. Each release note will tell you
Release notes for the official Django releases. Each release note will tell you
what's new in each version, and will also describe any backwards-incompatible
changes made in that version.

View File

@ -80,4 +80,43 @@ Traceback (most recent call last):
...
FieldError: Joined field references are not permitted in this query
# F expressions can be used to update attributes on single objects
>>> test_gmbh = Company.objects.get(name='Test GmbH')
>>> test_gmbh.num_employees
32
>>> test_gmbh.num_employees = F('num_employees') + 4
>>> test_gmbh.save()
>>> test_gmbh = Company.objects.get(pk=test_gmbh.pk)
>>> test_gmbh.num_employees
36
# F expressions cannot be used to update attributes which are foreign keys, or
# attributes which involve joins.
>>> test_gmbh.point_of_contact = None
>>> test_gmbh.save()
>>> test_gmbh.point_of_contact is None
True
>>> test_gmbh.point_of_contact = F('ceo')
Traceback (most recent call last):
...
ValueError: Cannot assign "<django.db.models.expressions.F object at ...>": "Company.point_of_contact" must be a "Employee" instance.
>>> test_gmbh.point_of_contact = test_gmbh.ceo
>>> test_gmbh.save()
>>> test_gmbh.name = F('ceo__last_name')
>>> test_gmbh.save()
Traceback (most recent call last):
...
FieldError: Joined field references are not permitted in this query
# F expressions cannot be used to update attributes on objects which do not yet
# exist in the database
>>> acme = Company(name='The Acme Widget Co.', num_employees=12, num_chairs=5,
... ceo=test_gmbh.ceo)
>>> acme.num_employees = F('num_employees') + 16
>>> acme.save()
Traceback (most recent call last):
...
TypeError: int() argument must be a string or a number, not 'ExpressionNode'
"""}

View File

@ -54,7 +54,7 @@ class Parent(models.Model):
class Child(Parent):
data = models.CharField(max_length=10)
# Models to regresison check #7572
# Models to regression test #7572
class Channel(models.Model):
name = models.CharField(max_length=255)
@ -65,6 +65,14 @@ class Article(models.Model):
class Meta:
ordering = ('id',)
# Models to regression test #11428
class Widget(models.Model):
name = models.CharField(max_length=255)
class WidgetProxy(Widget):
class Meta:
proxy = True
__test__ = {'API_TESTS':"""
>>> from django.core import management
@ -170,4 +178,18 @@ Weight = 1.2 (<type 'float'>)
>>> management.call_command('dumpdata', 'fixtures_regress.animal', format='json')
[{"pk": 1, "model": "fixtures_regress.animal", "fields": {"count": 3, "weight": 1.2, "name": "Lion", "latin_name": "Panthera leo"}}, {"pk": 2, "model": "fixtures_regress.animal", "fields": {"count": 2, "weight": 2.29..., "name": "Platypus", "latin_name": "Ornithorhynchus anatinus"}}, {"pk": 10, "model": "fixtures_regress.animal", "fields": {"count": 42, "weight": 1.2, "name": "Emu", "latin_name": "Dromaius novaehollandiae"}}]
###############################################
# Regression for #11428 - Proxy models aren't included
# when you run dumpdata over an entire app
# Flush out the database first
>>> management.call_command('reset', 'fixtures_regress', interactive=False, verbosity=0)
# Create an instance of the concrete class
>>> Widget(name='grommet').save()
# Dump data for the entire app. The proxy class shouldn't be included
>>> management.call_command('dumpdata', 'fixtures_regress', format='json')
[{"pk": 1, "model": "fixtures_regress.widget", "fields": {"name": "grommet"}}]
"""}

View File

@ -90,8 +90,8 @@ BadHeaderError: Header values can't contain newlines (got u'Subject\nInjection T
# Make sure we can manually set the From header (#9214)
>>> email = EmailMessage('Subject', 'Content', 'bounce@example.com', ['to@example.com'], headers={'From': 'from@example.com'})
>>> message = email.message()
>>> email = EmailMessage('Subject', 'Content', 'bounce@example.com', ['to@example.com'], headers={'From': 'from@example.com'})
>>> message = email.message()
>>> message['From']
'from@example.com'
@ -115,8 +115,7 @@ To: to@example.com
Date: Fri, 09 Nov 2001 01:08:47 -0000
Message-ID: foo
...
Content-Type: multipart/alternative; boundary="..."
MIME-Version: 1.0
Content-Type: multipart/alternative;...
...
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0

View File

View File

@ -0,0 +1,67 @@
"""
Tests for django.core.servers.
"""
import os
import django
from django.test import TestCase
from django.core.handlers.wsgi import WSGIHandler
from django.core.servers.basehttp import AdminMediaHandler
class AdminMediaHandlerTests(TestCase):
def setUp(self):
self.admin_media_file_path = \
os.path.join(django.__path__[0], 'contrib', 'admin', 'media')
self.handler = AdminMediaHandler(WSGIHandler())
def test_media_urls(self):
"""
Tests that URLs that look like absolute file paths after the
settings.ADMIN_MEDIA_PREFIX don't turn into absolute file paths.
"""
# Cases that should work on all platforms.
data = (
('/media/css/base.css', ('css', 'base.css')),
)
# Cases that should raise an exception.
bad_data = ()
# Add platform-specific cases.
if os.sep == '/':
data += (
# URL, tuple of relative path parts.
('/media/\\css/base.css', ('\\css', 'base.css')),
)
bad_data += (
'/media//css/base.css',
'/media////css/base.css',
'/media/../css/base.css',
)
elif os.sep == '\\':
bad_data += (
'/media/C:\css/base.css',
'/media//\\css/base.css',
'/media/\\css/base.css',
'/media/\\\\css/base.css'
)
for url, path_tuple in data:
try:
output = self.handler.file_path(url)
except ValueError:
self.fail("Got a ValueError exception, but wasn't expecting"
" one. URL was: %s" % url)
rel_path = os.path.join(*path_tuple)
desired = os.path.normcase(
os.path.join(self.admin_media_file_path, rel_path))
self.assertEqual(output, desired,
"Got: %s, Expected: %s, URL was: %s" % (output, desired, url))
for url in bad_data:
try:
output = self.handler.file_path(url)
except ValueError:
continue
self.fail('URL: %s should have caused a ValueError exception.'
% url)