Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #13230 - Updated Finish translation. Thanks, Ville Säävuori.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13048 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit e0ac591ed73bcafd290be854ec8001ce2481008b 1 parent 77c1384
@jezdez jezdez authored
View
BIN  django/conf/locale/fi/LC_MESSAGES/django.mo
Binary file not shown
View
1,965 django/conf/locale/fi/LC_MESSAGES/django.po
@@ -6,9 +6,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-24 14:45+0300\n"
+"POT-Creation-Date: 2010-03-27 16:17+0200\n"
"PO-Revision-Date: 2007-09-15 00:34+0300\n"
-"Last-Translator: Leo Honkanen <sealage@gmail.com>\n"
+"Last-Translator: Ville Säävuori <ville@syneus.fi>\n"
"Language-Team: Django I18N <Django-I18N@googlegroups.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,215 +22,235 @@ msgid "Arabic"
msgstr "arabia"
#: conf/global_settings.py:45
-msgid "Bengali"
-msgstr "bengali"
-
-#: conf/global_settings.py:46
msgid "Bulgarian"
msgstr "bulgaria"
+#: conf/global_settings.py:46
+msgid "Bengali"
+msgstr "bengali"
+
#: conf/global_settings.py:47
+msgid "Bosnian"
+msgstr "bosnia"
+
+#: conf/global_settings.py:48
msgid "Catalan"
msgstr "katalaani"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
msgid "Czech"
msgstr "tšekki"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
msgid "Welsh"
msgstr "wales"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
msgid "Danish"
msgstr "tanska"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
msgid "German"
msgstr "saksa"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
msgid "Greek"
msgstr "kreikka"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
msgid "English"
msgstr "englanti"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
msgid "Spanish"
msgstr "espanja"
-#: conf/global_settings.py:55
-msgid "Estonian"
-msgstr "viro"
-
#: conf/global_settings.py:56
msgid "Argentinean Spanish"
msgstr "Argentiinan espanja"
#: conf/global_settings.py:57
+msgid "Estonian"
+msgstr "viro"
+
+#: conf/global_settings.py:58
msgid "Basque"
msgstr "baski"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:59
msgid "Persian"
msgstr "persia"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Finnish"
msgstr "suomi"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "French"
msgstr "ranska"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
+msgid "Frisian"
+msgstr "friisi"
+
+#: conf/global_settings.py:63
msgid "Irish"
msgstr "irlanti"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:64
msgid "Galician"
msgstr "galicia"
-#: conf/global_settings.py:63
-msgid "Hungarian"
-msgstr "unkari"
-
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Hebrew"
msgstr "heprea"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Hindi"
msgstr "hindi"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Croatian"
msgstr "kroatia"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
+msgid "Hungarian"
+msgstr "unkari"
+
+#: conf/global_settings.py:69
msgid "Icelandic"
msgstr "islanti"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:70
msgid "Italian"
msgstr "italia"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:71
msgid "Japanese"
msgstr "japani"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:72
msgid "Georgian"
msgstr "georgia"
-#: conf/global_settings.py:71
-msgid "Korean"
-msgstr "korea"
-
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Khmer"
msgstr "khmer"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Kannada"
msgstr "kannada"
-#: conf/global_settings.py:74
-msgid "Latvian"
-msgstr "latvia"
-
#: conf/global_settings.py:75
+msgid "Korean"
+msgstr "korea"
+
+#: conf/global_settings.py:76
msgid "Lithuanian"
msgstr "liettua"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
+msgid "Latvian"
+msgstr "latvia"
+
+#: conf/global_settings.py:78
msgid "Macedonian"
msgstr "makedonia"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:79
msgid "Dutch"
msgstr "hollanti"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:80
msgid "Norwegian"
msgstr "norja"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:81
msgid "Polish"
msgstr "puola"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:82
msgid "Portuguese"
msgstr "portugali"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:83
msgid "Brazilian Portuguese"
msgstr "brasilian portugali"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:84
msgid "Romanian"
msgstr "romania"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:85
msgid "Russian"
msgstr "venäjä"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:86
msgid "Slovak"
msgstr "slovakia"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:87
msgid "Slovenian"
msgstr "slovenia"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:88
+msgid "Albanian"
+msgstr "albaani"
+
+#: conf/global_settings.py:89
msgid "Serbian"
msgstr "serbia"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:90
+msgid "Serbian Latin"
+msgstr "serbian latina"
+
+#: conf/global_settings.py:91
msgid "Swedish"
msgstr "ruotsi"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Tamil"
msgstr "tamili"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Telugu"
msgstr "telugu"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Thai"
msgstr "thain kieli"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Turkish"
msgstr "turkki"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Ukrainian"
msgstr "ukraina"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
+msgid "Vietnamese"
+msgstr "vietnam"
+
+#: conf/global_settings.py:98
msgid "Simplified Chinese"
msgstr "kiina (yksinkertaistettu)"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:99
msgid "Traditional Chinese"
msgstr "kiina (perinteinen)"
-#: contrib/admin/actions.py:60
+#: contrib/admin/actions.py:52
#, python-format
msgid "Successfully deleted %(count)d %(items)s."
msgstr "Onnistuneesti poistettu %(count)d \"%(items)s\"-kohdetta."
-#: contrib/admin/actions.py:67 contrib/admin/options.py:1025
+#: contrib/admin/actions.py:59 contrib/admin/options.py:1097
msgid "Are you sure?"
msgstr "Oletko varma?"
-#: contrib/admin/actions.py:85
+#: contrib/admin/actions.py:77
#, python-format
msgid "Delete selected %(verbose_name_plural)s"
msgstr "Poista valitut \"%(verbose_name_plural)s\"-kohteet"
@@ -269,19 +289,19 @@ msgstr "Tässä kuussa"
msgid "This year"
msgstr "Tänä vuonna"
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:470
msgid "Yes"
msgstr "Kyllä"
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:470
msgid "No"
msgstr "Ei"
-#: contrib/admin/filterspecs.py:154 forms/widgets.py:434
+#: contrib/admin/filterspecs.py:154 forms/widgets.py:470
msgid "Unknown"
msgstr "Tuntematon"
-#: contrib/admin/helpers.py:14
+#: contrib/admin/helpers.py:19
msgid "Action:"
msgstr "Toiminto:"
@@ -313,104 +333,127 @@ msgstr "lokimerkintä"
msgid "log entries"
msgstr "lokimerkinnät"
-#: contrib/admin/options.py:133 contrib/admin/options.py:147
+#: contrib/admin/options.py:140 contrib/admin/options.py:155
msgid "None"
msgstr "Ei arvoa"
-#: contrib/admin/options.py:519
+#: contrib/admin/options.py:558
#, python-format
msgid "Changed %s."
msgstr "Muokattu: %s."
-#: contrib/admin/options.py:519 contrib/admin/options.py:529
-#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388
-#: forms/models.py:587
+#: contrib/admin/options.py:558 contrib/admin/options.py:568
+#: contrib/comments/templates/comments/preview.html:16 db/models/base.py:840
+#: forms/models.py:556
msgid "and"
msgstr "ja"
-#: contrib/admin/options.py:524
+#: contrib/admin/options.py:563
#, python-format
msgid "Added %(name)s \"%(object)s\"."
msgstr "Lisätty %(name)s \"%(object)s\"."
-#: contrib/admin/options.py:528
+#: contrib/admin/options.py:567
#, python-format
msgid "Changed %(list)s for %(name)s \"%(object)s\"."
msgstr "Muutettu %(list)s kohteelle %(name)s \"%(object)s\"."
-#: contrib/admin/options.py:533
+#: contrib/admin/options.py:572
#, python-format
msgid "Deleted %(name)s \"%(object)s\"."
msgstr "Poistettu %(name)s \"%(object)s\"."
-#: contrib/admin/options.py:537
+#: contrib/admin/options.py:576
msgid "No fields changed."
msgstr "Ei muutoksia kenttiin."
-#: contrib/admin/options.py:598 contrib/auth/admin.py:67
+#: contrib/admin/options.py:642
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "%(name)s \"%(obj)s\" on lisätty."
-#: contrib/admin/options.py:602 contrib/admin/options.py:635
-#: contrib/auth/admin.py:75
+#: contrib/admin/options.py:646 contrib/admin/options.py:679
msgid "You may edit it again below."
msgstr "Voit muokata sitä edelleen alla."
-#: contrib/admin/options.py:612 contrib/admin/options.py:645
+#: contrib/admin/options.py:656 contrib/admin/options.py:689
#, python-format
msgid "You may add another %s below."
msgstr "Uusi %s on lisättävissä alla."
-#: contrib/admin/options.py:633
+#: contrib/admin/options.py:677
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "%(name)s \"%(obj)s\" on muutettu."
-#: contrib/admin/options.py:641
+#: contrib/admin/options.py:685
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr "%(name)s \"%(obj)s\" on lisätty. Voit muokata sitä uudelleen alla."
-#: contrib/admin/options.py:772
+#: contrib/admin/options.py:739
+msgid ""
+"Items must be selected in order to perform actions on them. No items have "
+"been changed."
+msgstr ""
+
+#: contrib/admin/options.py:757
+msgid "No action selected."
+msgstr "Ei toimintoa valittuna."
+
+#: contrib/admin/options.py:837
#, python-format
msgid "Add %s"
msgstr "Lisää %s"
-#: contrib/admin/options.py:803 contrib/admin/options.py:1003
+#: contrib/admin/options.py:863 contrib/admin/options.py:1077
#, python-format
msgid "%(name)s object with primary key %(key)r does not exist."
msgstr "%(name)s perusavaimella %(key)r ei ole olemassa."
-#: contrib/admin/options.py:860
+#: contrib/admin/options.py:928
#, python-format
msgid "Change %s"
msgstr "Muokkaa %s"
-#: contrib/admin/options.py:904
+#: contrib/admin/options.py:973
msgid "Database error"
msgstr "Tietokantavirhe"
-#: contrib/admin/options.py:940
+#: contrib/admin/options.py:1009
#, 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 on muokattu."
msgstr[1] "%(count)s \"%(name)s\"-kohdetta on muokattu."
-#: contrib/admin/options.py:1018
+#: contrib/admin/options.py:1036
+#, python-format
+msgid "of %(count)d selected"
+msgid_plural "of %(count)d selected"
+msgstr[0] "valittuna (%(count)d mahdollisesta)"
+msgstr[1] "valittuna (%(count)d mahdollisesta)"
+
+#: contrib/admin/options.py:1038
+#, python-format
+msgid "%(total_count)s selected"
+msgid_plural "All %(total_count)s selected"
+msgstr[0] "%(total_count)s valittu"
+msgstr[1] "Kaikki %(total_count)s valittu"
+
+#: contrib/admin/options.py:1090
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "%(name)s \"%(obj)s\" on poistettu."
-#: contrib/admin/options.py:1054
+#: contrib/admin/options.py:1127
#, python-format
msgid "Change history: %s"
msgstr "Muokkaushistoria: %s"
-#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14
-#: contrib/auth/forms.py:80
+#: contrib/admin/sites.py:22 contrib/admin/views/decorators.py:14
+#: contrib/auth/forms.py:81
msgid ""
"Please enter a correct username and password. Note that both fields are case-"
"sensitive."
@@ -418,11 +461,11 @@ msgstr ""
"Käyttäjätunnus tai salasana ei kelpaa. Huomaa, että isot ja pienet kirjaimet "
"ovat merkitseviä."
-#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40
+#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:40
msgid "Please log in again, because your session has expired."
msgstr "Kirjaudu uudelleen sisään, sillä istuntosi on vanhentunut."
-#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47
+#: contrib/admin/sites.py:318 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."
@@ -430,62 +473,52 @@ msgstr ""
"Selaimesi ei vaikuta sallivan evästeitä. Muuta asetukset sallimaan evästeet, "
"lataa tämä sivu uudelleen ja yritä uudestaan."
-#: contrib/admin/sites.py:301 contrib/admin/sites.py:307
+#: contrib/admin/sites.py:334 contrib/admin/sites.py:340
#: contrib/admin/views/decorators.py:66
msgid "Usernames cannot contain the '@' character."
msgstr "Käyttäjätunnuksessa ei saa olla '@'-merkkiä."
-#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62
+#: contrib/admin/sites.py:337 contrib/admin/views/decorators.py:62
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr "Sähköpostiosoitteesi ei ole käyttäjätunnuksesi. Kokeile '%s'."
-#: contrib/admin/sites.py:360
+#: contrib/admin/sites.py:393
msgid "Site administration"
msgstr "Sivuston ylläpito"
-#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26
+#: contrib/admin/sites.py:407 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 "Kirjaudu sisään"
-#: contrib/admin/sites.py:417
+#: contrib/admin/sites.py:452
#, python-format
msgid "%s administration"
msgstr "%s ylläpito"
-#: contrib/admin/util.py:168
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr "Yksi tai useampi %(fieldname)s kohteessa %(name)s: %(obj)s"
-
-#: contrib/admin/util.py:173
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
-msgstr "Yksi tai useampi %(fieldname)s kohteessa %(name)s:"
-
-#: contrib/admin/widgets.py:71
+#: contrib/admin/widgets.py:75
msgid "Date:"
msgstr "Pvm:"
-#: contrib/admin/widgets.py:71
+#: contrib/admin/widgets.py:75
msgid "Time:"
msgstr "Klo:"
-#: contrib/admin/widgets.py:95
+#: contrib/admin/widgets.py:99
msgid "Currently:"
msgstr "Tällä hetkellä:"
-#: contrib/admin/widgets.py:95
+#: contrib/admin/widgets.py:99
msgid "Change:"
msgstr "Muokkaa:"
-#: contrib/admin/widgets.py:124
+#: contrib/admin/widgets.py:129
msgid "Lookup"
msgstr "Etsi"
-#: contrib/admin/widgets.py:236
+#: contrib/admin/widgets.py:244
msgid "Add Another"
msgstr "Lisää seuraava"
@@ -500,17 +533,17 @@ msgstr "Pahoittelemme, pyydettyä sivua ei löytynyt."
#: 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/change_form.html:17
-#: contrib/admin/templates/admin/change_list.html:25
+#: contrib/admin/templates/admin/base.html:54
+#: contrib/admin/templates/admin/change_form.html:18
+#: contrib/admin/templates/admin/change_list.html:39
#: contrib/admin/templates/admin/delete_confirmation.html:6
#: contrib/admin/templates/admin/delete_selected_confirmation.html:6
#: contrib/admin/templates/admin/invalid_setup.html:4
#: contrib/admin/templates/admin/object_history.html:6
-#: contrib/admin/templates/admin/auth/user/change_password.html:10
+#: contrib/admin/templates/admin/auth/user/change_password.html:11
#: contrib/admin/templates/registration/logged_out.html:4
#: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
+#: contrib/admin/templates/registration/password_change_form.html:5
#: contrib/admin/templates/registration/password_reset_complete.html:4
#: contrib/admin/templates/registration/password_reset_confirm.html:4
#: contrib/admin/templates/registration/password_reset_done.html:4
@@ -547,34 +580,47 @@ msgstr "Suorita valittu toiminto"
msgid "Go"
msgstr "Suorita"
+#: contrib/admin/templates/admin/actions.html:10
+msgid "Click here to select the objects across all pages"
+msgstr "Klikkaa tästä valitaksesi kohteet kaikilta sivuilta"
+
+#: contrib/admin/templates/admin/actions.html:10
+#, python-format
+msgid "Select all %(total_count)s %(module_name)s"
+msgstr "Valitse kaikki %(total_count)s %(module_name)s"
+
+#: contrib/admin/templates/admin/actions.html:12
+msgid "Clear selection"
+msgstr "Tyhjennä valinta"
+
#: contrib/admin/templates/admin/app_index.html:10
#: contrib/admin/templates/admin/index.html:19
#, python-format
msgid "%(name)s"
msgstr "%(name)s"
-#: contrib/admin/templates/admin/base.html:26
+#: contrib/admin/templates/admin/base.html:27
msgid "Welcome,"
msgstr "Tervetuloa,"
-#: 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/admin/templates/registration/password_change_form.html:4
#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
msgid "Documentation"
msgstr "Ohjeita"
-#: contrib/admin/templates/admin/base.html:26
-#: contrib/admin/templates/admin/auth/user/change_password.html:14
-#: contrib/admin/templates/admin/auth/user/change_password.html:47
+#: contrib/admin/templates/admin/base.html:40
+#: contrib/admin/templates/admin/auth/user/change_password.html:15
+#: contrib/admin/templates/admin/auth/user/change_password.html:48
#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/registration/password_change_form.html:4
msgid "Change password"
msgstr "Vaihda salasana"
-#: 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
+#: contrib/admin/templates/registration/password_change_form.html:4
msgid "Log out"
msgstr "Kirjaudu ulos"
@@ -586,41 +632,42 @@ msgstr "Django-sivuston ylläpito"
msgid "Django administration"
msgstr "Djangon ylläpito"
-#: contrib/admin/templates/admin/change_form.html:20
+#: contrib/admin/templates/admin/change_form.html:21
#: contrib/admin/templates/admin/index.html:29
msgid "Add"
msgstr "Lisää"
-#: contrib/admin/templates/admin/change_form.html:27
+#: contrib/admin/templates/admin/change_form.html:28
#: contrib/admin/templates/admin/object_history.html:10
msgid "History"
msgstr "Muokkaushistoria"
-#: contrib/admin/templates/admin/change_form.html:28
-#: contrib/admin/templates/admin/edit_inline/stacked.html:13
-#: contrib/admin/templates/admin/edit_inline/tabular.html:27
+#: contrib/admin/templates/admin/change_form.html:29
+#: contrib/admin/templates/admin/edit_inline/stacked.html:9
+#: contrib/admin/templates/admin/edit_inline/tabular.html:28
msgid "View on site"
msgstr "Näytä lopputulos"
-#: contrib/admin/templates/admin/change_form.html:38
-#: contrib/admin/templates/admin/change_list.html:54
-#: contrib/admin/templates/admin/auth/user/change_password.html:23
+#: contrib/admin/templates/admin/change_form.html:39
+#: contrib/admin/templates/admin/change_list.html:68
+#: contrib/admin/templates/admin/auth/user/change_password.html:24
+#: contrib/admin/templates/registration/password_change_form.html:15
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] "Korjaa allaoleva virhe."
msgstr[1] "Korjaa allaolevat virheet."
-#: contrib/admin/templates/admin/change_list.html:46
+#: contrib/admin/templates/admin/change_list.html:60
#, python-format
msgid "Add %(name)s"
msgstr "Lisää %(name)s"
-#: contrib/admin/templates/admin/change_list.html:65
+#: contrib/admin/templates/admin/change_list.html:79
msgid "Filter"
msgstr "Suodatin"
#: contrib/admin/templates/admin/delete_confirmation.html:10
-#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:275
+#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:297
msgid "Delete"
msgstr "Poista"
@@ -667,10 +714,10 @@ msgstr ""
#, 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:"
+"the following objects and their related items will be deleted:"
msgstr ""
"Haluatko varmasti poistaa valitut (%(object_name)s) kohteet? Myös seuraavat "
-"kohteet poistettaisiin samalla:"
+"kohteet ja niihin liittyvät kohteet poistettaisiin samalla:"
#: contrib/admin/templates/admin/filter.html:2
#, python-format
@@ -732,15 +779,9 @@ msgid "User"
msgstr "Käyttäjä"
#: contrib/admin/templates/admin/object_history.html:24
-#: contrib/comments/templates/comments/moderation_queue.html:33
msgid "Action"
msgstr "Tapahtuma"
-#: contrib/admin/templates/admin/object_history.html:30
-#: utils/translation/trans_real.py:400
-msgid "DATETIME_FORMAT"
-msgstr "j.n.Y G:i"
-
#: contrib/admin/templates/admin/object_history.html:38
msgid ""
"This object doesn't have a change history. It probably wasn't added via this "
@@ -753,6 +794,11 @@ msgstr ""
msgid "Show all"
msgstr "Näytä kaikki"
+#: contrib/admin/templates/admin/pagination.html:11
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Save"
+msgstr "Tallenna ja poistu"
+
#: contrib/admin/templates/admin/search_form.html:8
msgid "Search"
msgstr "Haku"
@@ -769,10 +815,6 @@ msgstr[1] "%(counter)s hakutulosta"
msgid "%(full_result_count)s total"
msgstr "yhteensä %(full_result_count)s"
-#: contrib/admin/templates/admin/submit_line.html:3
-msgid "Save"
-msgstr "Tallenna ja poistu"
-
#: contrib/admin/templates/admin/submit_line.html:5
msgid "Save as new"
msgstr "Tallenna uutena"
@@ -785,7 +827,7 @@ msgstr "Tallenna ja lisää toinen"
msgid "Save and continue editing"
msgstr "Tallenna välillä ja jatka muokkaamista"
-#: contrib/admin/templates/admin/auth/user/add_form.html:6
+#: contrib/admin/templates/admin/auth/user/add_form.html:5
msgid ""
"First, enter a username and password. Then, you'll be able to edit more user "
"options."
@@ -793,32 +835,38 @@ msgstr ""
"Syötä ensin käyttäjätunnus ja salasana. Sen jälkeen voit muokata muita "
"käyttäjän tietoja."
-#: contrib/admin/templates/admin/auth/user/add_form.html:13
-#: contrib/auth/forms.py:14 contrib/auth/forms.py:47 contrib/auth/forms.py:59
-msgid "Username"
-msgstr "Käyttäjätunnus"
+#: contrib/admin/templates/admin/auth/user/change_password.html:28
+#, python-format
+msgid "Enter a new password for the user <strong>%(username)s</strong>."
+msgstr "Syötä käyttäjän <strong>%(username)s</strong> uusi salasana."
-#: contrib/admin/templates/admin/auth/user/add_form.html:20
-#: contrib/admin/templates/admin/auth/user/change_password.html:34
-#: contrib/auth/forms.py:17 contrib/auth/forms.py:60 contrib/auth/forms.py:185
+#: contrib/admin/templates/admin/auth/user/change_password.html:35
+#: contrib/auth/forms.py:17 contrib/auth/forms.py:61 contrib/auth/forms.py:186
msgid "Password"
msgstr "Salasana"
-#: contrib/admin/templates/admin/auth/user/add_form.html:26
-#: contrib/admin/templates/admin/auth/user/change_password.html:40
-#: contrib/auth/forms.py:186
+#: contrib/admin/templates/admin/auth/user/change_password.html:41
+#: contrib/admin/templates/registration/password_change_form.html:37
+#: contrib/auth/forms.py:187
msgid "Password (again)"
msgstr "Salasana toistamiseen"
-#: contrib/admin/templates/admin/auth/user/add_form.html:27
-#: contrib/admin/templates/admin/auth/user/change_password.html:41
+#: contrib/admin/templates/admin/auth/user/change_password.html:42
+#: contrib/auth/forms.py:19
msgid "Enter the same password as above, for verification."
msgstr "Syötä sama salasana tarkistuksen vuoksi toistamiseen."
-#: contrib/admin/templates/admin/auth/user/change_password.html:27
+#: contrib/admin/templates/admin/edit_inline/stacked.html:53
+#: contrib/admin/templates/admin/edit_inline/tabular.html:99
#, python-format
-msgid "Enter a new password for the user <strong>%(username)s</strong>."
-msgstr "Syötä käyttäjän <strong>%(username)s</strong> uusi salasana."
+msgid "Add another %(verbose_name)s"
+msgstr "Lisää toinen %(verbose_name)s"
+
+#: contrib/admin/templates/admin/edit_inline/stacked.html:56
+#: contrib/admin/templates/admin/edit_inline/tabular.html:102
+#: contrib/comments/templates/comments/delete.html:12
+msgid "Remove"
+msgstr "Poista"
#: contrib/admin/templates/admin/edit_inline/tabular.html:15
msgid "Delete?"
@@ -833,9 +881,9 @@ msgid "Log in again"
msgstr "Kirjaudu uudelleen sisään"
#: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/registration/password_change_form.html:6
-#: contrib/admin/templates/registration/password_change_form.html:10
+#: contrib/admin/templates/registration/password_change_form.html:5
+#: contrib/admin/templates/registration/password_change_form.html:7
+#: contrib/admin/templates/registration/password_change_form.html:19
msgid "Password change"
msgstr "Salasanan vaihtaminen"
@@ -848,7 +896,7 @@ msgstr "Salasanan vaihtaminen onnistui"
msgid "Your password was changed."
msgstr "Salasanasi on vaihdettu."
-#: contrib/admin/templates/registration/password_change_form.html:12
+#: contrib/admin/templates/registration/password_change_form.html:21
msgid ""
"Please enter your old password, for security's sake, and then enter your new "
"password twice so we can verify you typed it in correctly."
@@ -856,21 +904,17 @@ msgstr ""
"Syötä vanha salasanasi varmistukseksi, ja syötä sitten uusi salasanasi kaksi "
"kertaa, jotta se tulee varmasti oikein."
-#: contrib/admin/templates/registration/password_change_form.html:17
-msgid "Old password:"
-msgstr "Vanha salasana:"
-
-#: contrib/admin/templates/registration/password_change_form.html:19
-#: contrib/admin/templates/registration/password_reset_confirm.html:18
-msgid "New password:"
-msgstr "Uusi salasana:"
+#: contrib/admin/templates/registration/password_change_form.html:27
+#: contrib/auth/forms.py:170
+msgid "Old password"
+msgstr "Vanha salasana"
-#: contrib/admin/templates/registration/password_change_form.html:21
-#: contrib/admin/templates/registration/password_reset_confirm.html:20
-msgid "Confirm password:"
-msgstr "Varmista uusi salasana:"
+#: contrib/admin/templates/registration/password_change_form.html:32
+#: contrib/auth/forms.py:144
+msgid "New password"
+msgstr "Uusi salasana"
-#: contrib/admin/templates/registration/password_change_form.html:23
+#: contrib/admin/templates/registration/password_change_form.html:43
#: contrib/admin/templates/registration/password_reset_confirm.html:21
msgid "Change my password"
msgstr "Vaihda salasana"
@@ -909,6 +953,14 @@ msgstr ""
"Syötä uusi salasanasi kaksi kertaa, jotta voimme varmistaa että syötit sen "
"oikein."
+#: contrib/admin/templates/registration/password_reset_confirm.html:18
+msgid "New password:"
+msgstr "Uusi salasana:"
+
+#: contrib/admin/templates/registration/password_reset_confirm.html:20
+msgid "Confirm password:"
+msgstr "Varmista uusi salasana:"
+
#: contrib/admin/templates/registration/password_reset_confirm.html:26
msgid "Password reset unsuccessful"
msgstr "Salasanan nollaus ei onnistunut"
@@ -976,7 +1028,7 @@ msgstr "Sähköpostiosoite:"
msgid "Reset my password"
msgstr "Nollaa salasanani"
-#: contrib/admin/templatetags/admin_list.py:299
+#: contrib/admin/templatetags/admin_list.py:240
msgid "All dates"
msgstr "Kaikki päivät"
@@ -990,152 +1042,71 @@ msgstr "Valitse %s"
msgid "Select %s to change"
msgstr "Valitse muokattava %s"
-#: contrib/admin/views/template.py:37 contrib/sites/models.py:38
+#: contrib/admin/views/template.py:38 contrib/sites/models.py:38
msgid "site"
msgstr "sivusto"
-#: contrib/admin/views/template.py:39
+#: contrib/admin/views/template.py:40
msgid "template"
msgstr "mallipohjan nimi"
-#: 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 "tagi:"
-#: 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 "suodatin:"
-#: 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 "näkymä:"
-#: contrib/admindocs/views.py:187
+#: contrib/admindocs/views.py:190
#, python-format
msgid "App %r not found"
msgstr "Sovellusta %r ei löydy"
-#: 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 "Sovelluksesta %(app_label)r ei löydy mallia %(model_name)r"
-#: contrib/admindocs/views.py:206
+#: contrib/admindocs/views.py:209
#, python-format
msgid "the related `%(app_label)s.%(data_type)s` object"
msgstr "tähän liittyvä `%(app_label)s.%(data_type)s`-kohde"
-#: 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 "malli:"
-#: 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 "tähän liittyvät `%(app_label)s.%(object_name)s`-kohteet"
-#: contrib/admindocs/views.py:242
+#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261
#, python-format
msgid "all %s"
msgstr "kaikki %s"
-#: contrib/admindocs/views.py:247
+#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266
#, python-format
msgid "number of %s"
msgstr "%s-kohteiden lukumäärä"
-#: contrib/admindocs/views.py:252
+#: contrib/admindocs/views.py:271
#, python-format
msgid "Fields on %s objects"
msgstr "%s-kohteiden kentät"
-#: contrib/admindocs/views.py:315 contrib/admindocs/views.py:326
-#: contrib/admindocs/views.py:328 contrib/admindocs/views.py:334
-#: contrib/admindocs/views.py:335 contrib/admindocs/views.py:337
-msgid "Integer"
-msgstr "Kokonaisluku"
-
-#: contrib/admindocs/views.py:316
-msgid "Boolean (Either True or False)"
-msgstr "Totuusarvo: joko tosi (True) tai epätosi (False)"
-
-#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336
-#, python-format
-msgid "String (up to %(max_length)s)"
-msgstr "Merkkijono (enintään %(max_length)s merkkiä)"
-
-#: contrib/admindocs/views.py:318
-msgid "Comma-separated integers"
-msgstr "Pilkulla erotetut kokonaisluvut"
-
-#: contrib/admindocs/views.py:319
-msgid "Date (without time)"
-msgstr "Päivämäärä (ilman kellonaikaa)"
-
-#: contrib/admindocs/views.py:320
-msgid "Date (with time)"
-msgstr "Päivämäärä ja kellonaika"
-
-#: contrib/admindocs/views.py:321
-msgid "Decimal number"
-msgstr "Desimaaliluku"
-
-#: contrib/admindocs/views.py:322
-msgid "E-mail address"
-msgstr "Sähköpostiosoite"
-
-#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324
-#: contrib/admindocs/views.py:327
-msgid "File path"
-msgstr "Tiedostopolku"
-
-#: contrib/admindocs/views.py:325
-msgid "Floating point number"
-msgstr "Liukuluku"
-
-#: contrib/admindocs/views.py:329 contrib/comments/models.py:60
-msgid "IP address"
-msgstr "IP-osoite"
-
-#: contrib/admindocs/views.py:331
-msgid "Boolean (Either True, False or None)"
-msgstr "Totuusarvo: joko tosi (True), epätosi (False) tai ei mikään (None)"
-
-#: contrib/admindocs/views.py:332
-msgid "Relation to parent model"
-msgstr "Relaatio emomalliin"
-
-#: contrib/admindocs/views.py:333
-msgid "Phone number"
-msgstr "Puhelinnumero"
-
-#: contrib/admindocs/views.py:338
-msgid "Text"
-msgstr "Tekstiä"
-
-#: contrib/admindocs/views.py:339
-msgid "Time"
-msgstr "Kellonaika"
-
-#: contrib/admindocs/views.py:340 contrib/comments/forms.py:95
-#: contrib/comments/templates/comments/moderation_queue.html:37
-#: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
-msgid "URL"
-msgstr "URL-osoite"
-
-#: contrib/admindocs/views.py:341
-msgid "U.S. state (two uppercase letters)"
-msgstr "USA:n osavaltio (suuraakkosin, kaksi kirjainta)"
-
-#: contrib/admindocs/views.py:342
-msgid "XML text"
-msgstr "XML-teksti"
-
-#: contrib/admindocs/views.py:368
+#: contrib/admindocs/views.py:361
#, python-format
msgid "%s does not appear to be a urlpattern object"
msgstr "%s ei näytä olevan urlpattern-olio"
@@ -1206,78 +1177,74 @@ msgstr "Muokkaa tätä kohdetta (uudessa ikkunassa)"
msgid "As above, but opens the admin page in a new window."
msgstr "Kuten yllä, mutta avaa ylläpitosivun uuteen ikkunaan."
-#: contrib/auth/admin.py:21
+#: contrib/auth/admin.py:29
msgid "Personal info"
msgstr "Henkilökohtaiset tiedot"
-#: contrib/auth/admin.py:22
+#: contrib/auth/admin.py:30
msgid "Permissions"
msgstr "Oikeudet"
-#: contrib/auth/admin.py:23
+#: contrib/auth/admin.py:31
msgid "Important dates"
msgstr "Tärkeät päivämäärät"
-#: contrib/auth/admin.py:24
+#: contrib/auth/admin.py:32
msgid "Groups"
msgstr "Ryhmät"
-#: contrib/auth/admin.py:80
-msgid "Add user"
-msgstr "Uusi käyttäjä"
-
-#: contrib/auth/admin.py:106
+#: contrib/auth/admin.py:114
msgid "Password changed successfully."
msgstr "Salasana muutettu onnistuneesti."
-#: contrib/auth/admin.py:112
+#: contrib/auth/admin.py:124
#, python-format
msgid "Change password: %s"
msgstr "Vaihda salasana: %s"
-#: contrib/auth/forms.py:15 contrib/auth/forms.py:48
-#: contrib/auth/models.py:128
-msgid ""
-"Required. 30 characters or fewer. Alphanumeric characters only (letters, "
-"digits and underscores)."
+#: contrib/auth/forms.py:14 contrib/auth/forms.py:48 contrib/auth/forms.py:60
+msgid "Username"
+msgstr "Käyttäjätunnus"
+
+#: contrib/auth/forms.py:15 contrib/auth/forms.py:49
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
msgstr ""
-" Vaaditaan. Enintään 30 kirjanta (A-Z, a-z), numeroa (0-9) tai alaviivaa (_)."
+" Vaaditaan. Enintään 30 merkkiä. Vain kirjaimet, numerot ja @/./+/-/_ ovat sallittuja."
-#: contrib/auth/forms.py:16 contrib/auth/forms.py:49
-msgid "This value must contain only letters, numbers and underscores."
+#: contrib/auth/forms.py:16 contrib/auth/forms.py:50
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
msgstr ""
-"Tässä voidaan käyttää vain kirjaimia (A-Z, a-z), numeroita (0-9) ja "
-"alaviivoja (_)."
+"Tässä voidaan käyttää vain kirjaimia, numeroita ja @/./+/-/_ merkkejä."
#: contrib/auth/forms.py:18
msgid "Password confirmation"
msgstr "Salasanan vahvistaminen"
-#: contrib/auth/forms.py:30
+#: contrib/auth/forms.py:31
msgid "A user with that username already exists."
msgstr "Käyttäjätunnus on jo rekisteröity."
-#: contrib/auth/forms.py:36 contrib/auth/forms.py:155
-#: contrib/auth/forms.py:197
+#: contrib/auth/forms.py:37 contrib/auth/forms.py:156
+#: contrib/auth/forms.py:198
msgid "The two password fields didn't match."
msgstr "Salasanat eivät täsmää."
-#: contrib/auth/forms.py:82
+#: contrib/auth/forms.py:83
msgid "This account is inactive."
msgstr "Tämä käyttäjätili ei ole voimassa."
-#: contrib/auth/forms.py:87
+#: contrib/auth/forms.py:88
msgid ""
"Your Web browser doesn't appear to have cookies enabled. Cookies are "
"required for logging in."
msgstr ""
"Selaimesi ei näytä sallivan evästeitä. Sisäänkirjautuminen vaatii evästeen."
-#: contrib/auth/forms.py:100
+#: contrib/auth/forms.py:101
msgid "E-mail"
msgstr "Sähköposti"
-#: contrib/auth/forms.py:109
+#: contrib/auth/forms.py:110
msgid ""
"That e-mail address doesn't have an associated user account. Are you sure "
"you've registered?"
@@ -1285,72 +1252,70 @@ msgstr ""
"Sähköpostiosoitetta vastaavaa käyttäjätunnusta ei löydy. Oletko varmasti jo "
"rekisteröitynyt?"
-#: contrib/auth/forms.py:135
+#: contrib/auth/forms.py:136
#, python-format
msgid "Password reset on %s"
msgstr "Salasanan nollaus sivustolla %s"
-#: contrib/auth/forms.py:143
-msgid "New password"
-msgstr "Uusi salasana"
-
-#: contrib/auth/forms.py:144
+#: contrib/auth/forms.py:145
msgid "New password confirmation"
msgstr "Uusi salasana uudelleen"
-#: contrib/auth/forms.py:169
-msgid "Old password"
-msgstr "Vanha salasana"
-
-#: contrib/auth/forms.py:177
+#: contrib/auth/forms.py:178
msgid "Your old password was entered incorrectly. Please enter it again."
msgstr "Vanha salasana on virheellinen. Yritä uudelleen."
-#: contrib/auth/models.py:63 contrib/auth/models.py:86
+#: contrib/auth/models.py:66 contrib/auth/models.py:94
msgid "name"
msgstr "nimi"
-#: contrib/auth/models.py:65
+#: contrib/auth/models.py:68
msgid "codename"
msgstr "tunniste"
-#: contrib/auth/models.py:68
+#: contrib/auth/models.py:72
msgid "permission"
msgstr "oikeus"
-#: contrib/auth/models.py:69 contrib/auth/models.py:87
+#: contrib/auth/models.py:73 contrib/auth/models.py:95
msgid "permissions"
msgstr "oikeudet"
-#: contrib/auth/models.py:90
+#: contrib/auth/models.py:98
msgid "group"
msgstr "ryhmä"
-#: contrib/auth/models.py:91 contrib/auth/models.py:138
+#: contrib/auth/models.py:99 contrib/auth/models.py:206
msgid "groups"
msgstr "ryhmät"
-#: contrib/auth/models.py:128
+#: contrib/auth/models.py:196
msgid "username"
msgstr "käyttäjätunnus"
-#: contrib/auth/models.py:129
+#: contrib/auth/models.py:196
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+" Vaaditaan. Enintään 30 merkkiä. Vain kirjaimet, numerot ja @/./+/-/_ ovat sallittuja."
+
+#: contrib/auth/models.py:197
msgid "first name"
msgstr "etunimi"
-#: contrib/auth/models.py:130
+#: contrib/auth/models.py:198
msgid "last name"
msgstr "sukunimi"
-#: contrib/auth/models.py:131
+#: contrib/auth/models.py:199
msgid "e-mail address"
msgstr "sähköposti"
-#: contrib/auth/models.py:132
+#: contrib/auth/models.py:200
msgid "password"
msgstr "salasana"
-#: contrib/auth/models.py:132
+#: contrib/auth/models.py:200
msgid ""
"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
"password form</a>."
@@ -1358,19 +1323,19 @@ msgstr ""
"Syötä muodossa '[algo]$[suola]$[heksa-digest]' tai käytä <a href=\"password/"
"\">muutoslomaketta</a>."
-#: contrib/auth/models.py:133
+#: contrib/auth/models.py:201
msgid "staff status"
msgstr "ylläpitäjä"
-#: contrib/auth/models.py:133
+#: contrib/auth/models.py:201
msgid "Designates whether the user can log into this admin site."
msgstr "Määrittää, pääseekö käyttäjä tähän sivuston ylläpito-osioon."
-#: contrib/auth/models.py:134
+#: contrib/auth/models.py:202
msgid "active"
msgstr "voimassa"
-#: contrib/auth/models.py:134
+#: contrib/auth/models.py:202
msgid ""
"Designates whether this user should be treated as active. Unselect this "
"instead of deleting accounts."
@@ -1378,26 +1343,26 @@ msgstr ""
"Määrää, voiko käyttäjä kirjautua sisään. Tällä voi estää käyttäjätilin "
"käytön poistamatta sitä."
-#: contrib/auth/models.py:135
+#: contrib/auth/models.py:203
msgid "superuser status"
msgstr "pääkäyttäjä"
-#: contrib/auth/models.py:135
+#: contrib/auth/models.py:203
msgid ""
"Designates that this user has all permissions without explicitly assigning "
"them."
msgstr ""
"Antaa käyttäjälle kaikki oikeudet ilman, että niitä täytyy erikseen luetella."
-#: contrib/auth/models.py:136
+#: contrib/auth/models.py:204
msgid "last login"
msgstr "viimeisin kirjautuminen"
-#: contrib/auth/models.py:137
+#: contrib/auth/models.py:205
msgid "date joined"
msgstr "liittynyt"
-#: contrib/auth/models.py:139
+#: contrib/auth/models.py:207
msgid ""
"In addition to the permissions manually assigned, this user will also get "
"all permissions granted to each group he/she is in."
@@ -1405,39 +1370,77 @@ msgstr ""
"Erikseen mainittujen oikeuksien lisäksi käyttäjä saa myös kaikki niiden "
"ryhmien oikeudet, joiden jäsen hän on."
-#: contrib/auth/models.py:140
+#: contrib/auth/models.py:208
msgid "user permissions"
msgstr "käyttäjän oikeudet"
-#: contrib/auth/models.py:144 contrib/comments/models.py:50
+#: contrib/auth/models.py:212 contrib/comments/models.py:50
#: contrib/comments/models.py:168
msgid "user"
msgstr "käyttäjä"
-#: contrib/auth/models.py:145
+#: contrib/auth/models.py:213
msgid "users"
msgstr "käyttäjät"
-#: contrib/auth/models.py:301
+#: contrib/auth/models.py:394
msgid "message"
msgstr "viesti"
-#: contrib/auth/views.py:56
+#: contrib/auth/views.py:79
msgid "Logged out"
msgstr "Kirjautunut ulos"
-#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:429
+#: contrib/auth/management/commands/createsuperuser.py:23
+#: core/validators.py:120 forms/fields.py:416
msgid "Enter a valid e-mail address."
msgstr "Syötä kelvollinen sähköpostiosoite."
-#: contrib/comments/admin.py:11
+#: contrib/comments/admin.py:12
msgid "Content"
msgstr "Sisältö"
-#: contrib/comments/admin.py:14
+#: contrib/comments/admin.py:15
msgid "Metadata"
msgstr "Metatieto"
+#: contrib/comments/admin.py:40
+msgid "flagged"
+msgid_plural "flagged"
+msgstr[0] "merkitty"
+msgstr[1] "merkitty"
+
+#: contrib/comments/admin.py:41
+msgid "Flag selected comments"
+msgstr "Merkitse valitut kommentit"
+
+#: contrib/comments/admin.py:45
+msgid "approved"
+msgid_plural "approved"
+msgstr[0] "hyväksytty"
+msgstr[1] "hyväksytty"
+
+#: contrib/comments/admin.py:46
+msgid "Approve selected comments"
+msgstr "Hyväksy valitut kommentit"
+
+#: contrib/comments/admin.py:50
+msgid "removed"
+msgid_plural "removed"
+msgstr[0] "poistettu"
+msgstr[1] "poistettu"
+
+#: contrib/comments/admin.py:51
+msgid "Remove selected comments"
+msgstr "Poista valitut kommentit"
+
+#: contrib/comments/admin.py:63
+#, python-format
+msgid "1 comment was successfully %(action)s."
+msgid_plural "%(count)s comments were successfully %(action)s."
+msgstr[0] "1 kommentti %(count)s onnistuneesti."
+msgstr[1] "%(count)s kommenttia %(action)s onnistuneesti."
+
#: contrib/comments/feeds.py:13
#, python-format
msgid "%(site_name)s comments"
@@ -1449,7 +1452,6 @@ msgid "Latest comments on %(site_name)s"
msgstr "Sivuston %(site_name)s viimeisimmät kommentit"
#: contrib/comments/forms.py:93
-#: contrib/comments/templates/comments/moderation_queue.html:34
msgid "Name"
msgstr "Nimi"
@@ -1457,25 +1459,29 @@ msgstr "Nimi"
msgid "Email address"
msgstr "Sähköpostiosoite"
+#: contrib/comments/forms.py:95 contrib/flatpages/admin.py:8
+#: contrib/flatpages/models.py:7 db/models/fields/__init__.py:1128
+msgid "URL"
+msgstr "URL-osoite"
+
#: contrib/comments/forms.py:96
-#: contrib/comments/templates/comments/moderation_queue.html:35
msgid "Comment"
msgstr "Kommentti"
-#: contrib/comments/forms.py:173
+#: contrib/comments/forms.py:175
#, 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] "Siivoa suusi! Sanaa \"%s\" ei saa käyttää tässä."
msgstr[1] "Siivoa suusi! Sanoja \"%s\" ei saa käyttää tässä."
-#: contrib/comments/forms.py:180
+#: contrib/comments/forms.py:182
msgid ""
"If you enter anything in this field your comment will be treated as spam"
msgstr ""
"Jos syötät tähän kenttään jotain, kommenttisi luokitellaan roskapostiksi"
-#: contrib/comments/models.py:22 contrib/contenttypes/models.py:74
+#: contrib/comments/models.py:22 contrib/contenttypes/models.py:81
msgid "content type"
msgstr "sisältötyyppi"
@@ -1504,6 +1510,10 @@ msgstr "kommentti"
msgid "date/time submitted"
msgstr "lähettämishetki"
+#: contrib/comments/models.py:60 db/models/fields/__init__.py:923
+msgid "IP address"
+msgstr "IP-osoite"
+
#: contrib/comments/models.py:61
msgid "is public"
msgstr "on julkinen"
@@ -1586,7 +1596,6 @@ msgid "Really make this comment public?"
msgstr "Haluatko varmasti tehdä kommentista julkisen?"
#: contrib/comments/templates/comments/approve.html:12
-#: contrib/comments/templates/comments/moderation_queue.html:49
msgid "Approve"
msgstr "Hyväksy"
@@ -1609,11 +1618,6 @@ msgstr "Poista kommentti"
msgid "Really remove this comment?"
msgstr "Haluatko varmasti poistaa tämän kommentin?"
-#: contrib/comments/templates/comments/delete.html:12
-#: contrib/comments/templates/comments/moderation_queue.html:53
-msgid "Remove"
-msgstr "Poista"
-
#: contrib/comments/templates/comments/deleted.html:4
msgid "Thanks for removing"
msgstr "Kiitos poistamisesta"
@@ -1644,39 +1648,6 @@ msgstr "Lähetä"
msgid "Preview"
msgstr "Esikatsele"
-#: contrib/comments/templates/comments/moderation_queue.html:4
-#: contrib/comments/templates/comments/moderation_queue.html:19
-msgid "Comment moderation queue"
-msgstr "Kommenttien valvontajono"
-
-#: contrib/comments/templates/comments/moderation_queue.html:26
-msgid "No comments to moderate"
-msgstr "Ei valvottavia kommentteja"
-
-#: contrib/comments/templates/comments/moderation_queue.html:36
-msgid "Email"
-msgstr "Sähköposti"
-
-#: contrib/comments/templates/comments/moderation_queue.html:38
-msgid "Authenticated?"
-msgstr "Kirjautunut?"
-
-#: contrib/comments/templates/comments/moderation_queue.html:39
-msgid "IP Address"
-msgstr "IP-osoite"
-
-#: contrib/comments/templates/comments/moderation_queue.html:40
-msgid "Date posted"
-msgstr "Lähettämispvm"
-
-#: contrib/comments/templates/comments/moderation_queue.html:63
-msgid "yes"
-msgstr "kyllä"
-
-#: contrib/comments/templates/comments/moderation_queue.html:63
-msgid "no"
-msgstr "ei"
-
#: contrib/comments/templates/comments/posted.html:4
msgid "Thanks for commenting"
msgstr "Kiitos kommentista"
@@ -1704,11 +1675,11 @@ msgstr "Lähetä kommentti"
msgid "or make changes"
msgstr "tai tee muutoksia"
-#: contrib/contenttypes/models.py:70
+#: contrib/contenttypes/models.py:77
msgid "python model class name"
msgstr "mallin python-luokan nimi"
-#: contrib/contenttypes/models.py:75
+#: contrib/contenttypes/models.py:82
msgid "content types"
msgstr "sisältötyypit"
@@ -1772,7 +1743,7 @@ msgstr "tekstisivu"
msgid "flat pages"
msgstr "tekstisivut"
-#: contrib/formtools/wizard.py:130
+#: contrib/formtools/wizard.py:140
msgid ""
"We apologize, but your form has expired. Please continue filling out the "
"form from this page."
@@ -1780,6 +1751,38 @@ msgstr ""
"Pahoittelumme, mutta sessiosi on vanhentunut. Ole hyvä ja jatka lomakkeen "
"täyttämistä tältä sivulta."
+#: contrib/gis/db/models/fields.py:50
+msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
+msgstr ""
+
+#: contrib/gis/db/models/fields.py:269
+msgid "Point"
+msgstr "Piste"
+
+#: contrib/gis/db/models/fields.py:273
+msgid "Line string"
+msgstr ""
+
+#: contrib/gis/db/models/fields.py:277
+msgid "Polygon"
+msgstr ""
+
+#: contrib/gis/db/models/fields.py:281
+msgid "Multi-point"
+msgstr ""
+
+#: contrib/gis/db/models/fields.py:285
+msgid "Multi-line string"
+msgstr ""
+
+#: contrib/gis/db/models/fields.py:289
+msgid "Multi polygon"
+msgstr ""
+
+#: contrib/gis/db/models/fields.py:293
+msgid "Geometry collection"
+msgstr ""
+
#: contrib/gis/forms/fields.py:17
msgid "No geometry value provided."
msgstr "Geometria-arvoa ei annettu."
@@ -1883,25 +1886,25 @@ msgstr "huomenna"
msgid "yesterday"
msgstr "eilen"
-#: contrib/localflavor/ar/forms.py:27
+#: contrib/localflavor/ar/forms.py:28
msgid "Enter a postal code in the format NNNN or ANNNNAAA."
msgstr "Syötä postinumero muodossa NNNN tai ANNNNAAA."
-#: contrib/localflavor/ar/forms.py:49 contrib/localflavor/br/forms.py:96
-#: contrib/localflavor/br/forms.py:135 contrib/localflavor/pe/forms.py:23
-#: contrib/localflavor/pe/forms.py:51
+#: contrib/localflavor/ar/forms.py:50 contrib/localflavor/br/forms.py:97
+#: contrib/localflavor/br/forms.py:136 contrib/localflavor/pe/forms.py:24
+#: contrib/localflavor/pe/forms.py:52
msgid "This field requires only numbers."
msgstr "Tähän kenttään kelpaavat vain numerot."
-#: contrib/localflavor/ar/forms.py:50
+#: contrib/localflavor/ar/forms.py:51
msgid "This field requires 7 or 8 digits."
msgstr "Tähän kenttään vaaditaan 7 tai 8 numeroa."
-#: contrib/localflavor/ar/forms.py:79
+#: contrib/localflavor/ar/forms.py:80
msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
msgstr "Syötä validi CUIT joko XX-XXXXXXXX-X tai XXXXXXXXXXXX -muodossa."
-#: contrib/localflavor/ar/forms.py:80
+#: contrib/localflavor/ar/forms.py:81
msgid "Invalid CUIT."
msgstr "Virheellinen CUIT."
@@ -1941,8 +1944,8 @@ msgstr "Vorarlberg"
msgid "Vienna"
msgstr "Wien"
-#: contrib/localflavor/at/forms.py:20 contrib/localflavor/ch/forms.py:16
-#: contrib/localflavor/no/forms.py:12
+#: contrib/localflavor/at/forms.py:20 contrib/localflavor/ch/forms.py:17
+#: contrib/localflavor/no/forms.py:13
msgid "Enter a zip code in the format XXXX."
msgstr "Syötä postinumero muodossa XXXX."
@@ -1950,19 +1953,19 @@ msgstr "Syötä postinumero muodossa XXXX."
msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
msgstr "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-#: contrib/localflavor/au/forms.py:16
+#: contrib/localflavor/au/forms.py:17
msgid "Enter a 4 digit post code."
msgstr "Syötä nelinumeroinen postinumero."
-#: contrib/localflavor/br/forms.py:21
+#: contrib/localflavor/br/forms.py:22
msgid "Enter a zip code in the format XXXXX-XXX."
msgstr "Syötä postinumero muodossa XXXXX-XXX."
-#: contrib/localflavor/br/forms.py:30
+#: contrib/localflavor/br/forms.py:31
msgid "Phone numbers must be in XX-XXXX-XXXX format."
msgstr "Puhelinnumeron tulee olla muodossa XX-XXXX-XXXX."
-#: contrib/localflavor/br/forms.py:58
+#: contrib/localflavor/br/forms.py:59
msgid ""
"Select a valid brazilian state. That state is not one of the available "
"states."
@@ -1970,27 +1973,27 @@ msgstr ""
"Select a valid brazilian state. That state is not one of the available "
"states."
-#: contrib/localflavor/br/forms.py:94
+#: contrib/localflavor/br/forms.py:95
msgid "Invalid CPF number."
msgstr "Virheellinen CPF-numero."
-#: contrib/localflavor/br/forms.py:95
+#: contrib/localflavor/br/forms.py:96
msgid "This field requires at most 11 digits or 14 characters."
msgstr "Tämä kenttä vaatii vähintään 11 ja enintään 14 merkkiä."
-#: contrib/localflavor/br/forms.py:134
+#: contrib/localflavor/br/forms.py:135
msgid "Invalid CNPJ number."
msgstr "Virheellinen CNPJ-numero."
-#: contrib/localflavor/br/forms.py:136
+#: contrib/localflavor/br/forms.py:137
msgid "This field requires at least 14 digits"
msgstr "Tähän kenttään vaaditaan ainakin 14 numeroa."
-#: contrib/localflavor/ca/forms.py:17
+#: contrib/localflavor/ca/forms.py:25
msgid "Enter a postal code in the format XXX XXX."
msgstr "Syötä postinumero muodossa XXX XXX."
-#: contrib/localflavor/ca/forms.py:88
+#: contrib/localflavor/ca/forms.py:96
msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
msgstr "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
@@ -2098,7 +2101,7 @@ msgstr "Zug"
msgid "Zurich"
msgstr "Zurich"
-#: contrib/localflavor/ch/forms.py:64
+#: contrib/localflavor/ch/forms.py:65
msgid ""
"Enter a valid Swiss identity or passport card number in X1234567<0 or "
"1234567890 format."
@@ -2106,15 +2109,15 @@ msgstr ""
"Enter a valid Swiss identity or passport card number in X1234567<0 or "
"1234567890 format."
-#: contrib/localflavor/cl/forms.py:29
+#: contrib/localflavor/cl/forms.py:30
msgid "Enter a valid Chilean RUT."
msgstr "Syötä oikea chileläinen RUT"
-#: contrib/localflavor/cl/forms.py:30
+#: contrib/localflavor/cl/forms.py:31
msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
msgstr "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-#: contrib/localflavor/cl/forms.py:31
+#: contrib/localflavor/cl/forms.py:32
msgid "The Chilean RUT is not valid."
msgstr "The Chilean RUT is not valid."
@@ -2174,24 +2177,24 @@ msgstr "Zilin region"
msgid "Moravian-Silesian Region"
msgstr "Moravian-Silesian Region"
-#: contrib/localflavor/cz/forms.py:27 contrib/localflavor/sk/forms.py:30
+#: contrib/localflavor/cz/forms.py:28 contrib/localflavor/sk/forms.py:30
msgid "Enter a postal code in the format XXXXX or XXX XX."
msgstr "Syötä postinumero muodossa XXXXX tai XXX XX."
-#: contrib/localflavor/cz/forms.py:47
+#: contrib/localflavor/cz/forms.py:48
msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
msgstr "Syötä henkilötunnus muodossa XXXXXX/XXXX tai XXXXXXXXXX."
-#: contrib/localflavor/cz/forms.py:48
+#: contrib/localflavor/cz/forms.py:49
msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
msgstr ""
"Virheellinen valinnainen sukupuoli, valitse 'f' (nainen) tai 'm' (mies)"
-#: contrib/localflavor/cz/forms.py:49
+#: contrib/localflavor/cz/forms.py:50
msgid "Enter a valid birth number."
msgstr "Syötä oikea henkilötunnus."
-#: contrib/localflavor/cz/forms.py:106
+#: contrib/localflavor/cz/forms.py:107
msgid "Enter a valid IC number."
msgstr "Syötä oikea IC-tunnus."
@@ -2259,12 +2262,12 @@ msgstr "Schleswig-Holstein"
msgid "Thuringia"
msgstr "Thuringia"
-#: contrib/localflavor/de/forms.py:14 contrib/localflavor/fi/forms.py:12
-#: contrib/localflavor/fr/forms.py:15
+#: contrib/localflavor/de/forms.py:15 contrib/localflavor/fi/forms.py:13
+#: contrib/localflavor/fr/forms.py:16
msgid "Enter a zip code in the format XXXXX."
msgstr "Syötä postinumero muodossa XXXXX."
-#: contrib/localflavor/de/forms.py:41
+#: contrib/localflavor/de/forms.py:42
msgid ""
"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
"format."
@@ -2511,103 +2514,535 @@ msgstr "Canary Islands"
msgid "Castile-La Mancha"
msgstr "Castile-La Mancha"
-#: contrib/localflavor/es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Castile and Leon"
+#: contrib/localflavor/es/es_regions.py:13
+msgid "Castile and Leon"
+msgstr "Castile and Leon"
+
+#: contrib/localflavor/es/es_regions.py:14
+msgid "Catalonia"
+msgstr "Catalonia"
+
+#: contrib/localflavor/es/es_regions.py:15
+msgid "Extremadura"
+msgstr "Extremadura"
+
+#: contrib/localflavor/es/es_regions.py:16
+msgid "Galicia"
+msgstr "Galicia"
+
+#: contrib/localflavor/es/es_regions.py:19
+msgid "Region of Murcia"
+msgstr "Region of Murcia"
+
+#: contrib/localflavor/es/es_regions.py:20
+msgid "Foral Community of Navarre"
+msgstr "Foral Community of Navarre"
+
+#: contrib/localflavor/es/es_regions.py:21
+msgid "Valencian Community"
+msgstr "Valencian Community"
+
+#: contrib/localflavor/es/forms.py:20
+msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
+msgstr "Syötä validi postinumero väliltä ja muodossa 01XXX-52XXX."
+
+#: contrib/localflavor/es/forms.py:40
+msgid ""
+"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
+"9XXXXXXXX."
+msgstr ""
+"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
+"9XXXXXXXX."
+
+#: contrib/localflavor/es/forms.py:67
+msgid "Please enter a valid NIF, NIE, or CIF."
+msgstr "Please enter a valid NIF, NIE, or CIF."
+
+#: contrib/localflavor/es/forms.py:68
+msgid "Please enter a valid NIF or NIE."
+msgstr "Please enter a valid NIF or NIE."
+
+#: contrib/localflavor/es/forms.py:69
+msgid "Invalid checksum for NIF."
+msgstr "Invalid checksum for NIF."
+
+#: contrib/localflavor/es/forms.py:70
+msgid "Invalid checksum for NIE."
+msgstr "Invalid checksum for NIE."
+
+#: contrib/localflavor/es/forms.py:71
+msgid "Invalid checksum for CIF."
+msgstr "Invalid checksum for CIF."
+
+#: contrib/localflavor/es/forms.py:143
+msgid ""
+"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
+msgstr ""
+"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
+
+#: contrib/localflavor/es/forms.py:144
+msgid "Invalid checksum for bank account number."
+msgstr "Invalid checksum for bank account number."
+
+#: contrib/localflavor/fi/forms.py:29
+msgid "Enter a valid Finnish social security number."
+msgstr "Syötä oikea suomalainen henkilötunnus."
+
+#: contrib/localflavor/fr/forms.py:31
+msgid "Phone numbers must be in 0X XX XX XX XX format."
+msgstr "Phone numbers must be in 0X XX XX XX XX format."
+
+#: contrib/localflavor/id/forms.py:28
+msgid "Enter a valid post code"
+msgstr "Enter a valid post code"
+
+#: contrib/localflavor/id/forms.py:68 contrib/localflavor/nl/forms.py:53
+msgid "Enter a valid phone number"
+msgstr "Syötä oikea puhelinnumero"
+
+#: contrib/localflavor/id/forms.py:107
+msgid "Enter a valid vehicle license plate number"
+msgstr "Enter a valid vehicle license plate number"
+
+#: contrib/localflavor/id/forms.py:170
+msgid "Enter a valid NIK/KTP number"
+msgstr "Enter a valid NIK/KTP number"
+
+#: contrib/localflavor/id/id_choices.py:9
+#: contrib/localflavor/id/id_choices.py:73
+msgid "Bali"
+msgstr "Bali"
+
+#: contrib/localflavor/id/id_choices.py:10
+#: contrib/localflavor/id/id_choices.py:45
+msgid "Banten"
+msgstr "Banten"
+
+#: contrib/localflavor/id/id_choices.py:11
+#: contrib/localflavor/id/id_choices.py:54
+msgid "Bengkulu"
+msgstr "Bengkulu"
+
+#: contrib/localflavor/id/id_choices.py:12
+#: contrib/localflavor/id/id_choices.py:47
+msgid "Yogyakarta"
+msgstr "Yogyakarta"
+
+#: contrib/localflavor/id/id_choices.py:13
+#: contrib/localflavor/id/id_choices.py:51
+msgid "Jakarta"
+msgstr "Jakarta"
+
+#: contrib/localflavor/id/id_choices.py:14
+#: contrib/localflavor/id/id_choices.py:75
+msgid "Gorontalo"
+msgstr "Gorontalo"
+
+#: contrib/localflavor/id/id_choices.py:15
+#: contrib/localflavor/id/id_choices.py:57
+msgid "Jambi"
+msgstr "Jambi"
+
+#: contrib/localflavor/id/id_choices.py:16
+msgid "Jawa Barat"
+msgstr "Jawa Barat"
+
+#: contrib/localflavor/id/id_choices.py:17
+msgid "Jawa Tengah"
+msgstr "Jawa Tengah"
+
+#: contrib/localflavor/id/id_choices.py:18
+msgid "Jawa Timur"
+msgstr "Jawa Timur"
+
+#: contrib/localflavor/id/id_choices.py:19
+#: contrib/localflavor/id/id_choices.py:88
+msgid "Kalimantan Barat"
+msgstr "Kalimantan Barat"
+
+#: contrib/localflavor/id/id_choices.py:20
+#: contrib/localflavor/id/id_choices.py:66
+msgid "Kalimantan Selatan"
+msgstr "Kalimantan Selatan"
+
+#: contrib/localflavor/id/id_choices.py:21
+#: contrib/localflavor/id/id_choices.py:89
+msgid "Kalimantan Tengah"
+msgstr "Kalimantan Tengah"
+
+#: contrib/localflavor/id/id_choices.py:22
+#: contrib/localflavor/id/id_choices.py:90
+msgid "Kalimantan Timur"
+msgstr "Kalimantan Timur"
+
+#: contrib/localflavor/id/id_choices.py:23
+msgid "Kepulauan Bangka-Belitung"
+msgstr "Kepulauan Bangka-Belitung"
+
+#: contrib/localflavor/id/id_choices.py:24
+#: contrib/localflavor/id/id_choices.py:62
+msgid "Kepulauan Riau"
+msgstr "Kepulauan Riau"
+
+#: contrib/localflavor/id/id_choices.py:25
+#: contrib/localflavor/id/id_choices.py:55
+msgid "Lampung"
+msgstr "Lampung"
+
+#: contrib/localflavor/id/id_choices.py:26
+#: contrib/localflavor/id/id_choices.py:70
+msgid "Maluku"
+msgstr "Maluku"
+
+#: contrib/localflavor/id/id_choices.py:27
+#: contrib/localflavor/id/id_choices.py:71
+msgid "Maluku Utara"
+msgstr "Maluku Utara"
+
+#: contrib/localflavor/id/id_choices.py:28
+#: contrib/localflavor/id/id_choices.py:59
+msgid "Nanggroe Aceh Darussalam"
+msgstr "Nanggroe Aceh Darussalam"
+
+#: contrib/localflavor/id/id_choices.py:29
+msgid "Nusa Tenggara Barat"
+msgstr "Nusa Tenggara Barat"
+
+#: contrib/localflavor/id/id_choices.py:30
+msgid "Nusa Tenggara Timur"
+msgstr "Nusa Tenggara Timur"
+
+#: contrib/localflavor/id/id_choices.py:31
+msgid "Papua"
+msgstr "Papua"
+
+#: contrib/localflavor/id/id_choices.py:32
+msgid "Papua Barat"
+msgstr "Papua Barat"
+
+#: contrib/localflavor/id/id_choices.py:33
+#: contrib/localflavor/id/id_choices.py:60
+msgid "Riau"
+msgstr "Riau"
+
+#: contrib/localflavor/id/id_choices.py:34
+#: contrib/localflavor/id/id_choices.py:68
+msgid "Sulawesi Barat"
+msgstr "Sulawesi Barat"
+
+#: contrib/localflavor/id/id_choices.py:35
+#: contrib/localflavor/id/id_choices.py:69
+msgid "Sulawesi Selatan"
+msgstr "Sulawesi Selatan"
+
+#: contrib/localflavor/id/id_choices.py:36
+#: contrib/localflavor/id/id_choices.py:76
+msgid "Sulawesi Tengah"
+msgstr "Sulawesi Tengah"
+
+#: contrib/localflavor/id/id_choices.py:37
+#: contrib/localflavor/id/id_choices.py:79
+msgid "Sulawesi Tenggara"
+msgstr "Sulawesi Tenggara"
+
+#: contrib/localflavor/id/id_choices.py:38
+msgid "Sulawesi Utara"
+msgstr "Sulawesi Utara"
+
+#: contrib/localflavor/id/id_choices.py:39
+#: contrib/localflavor/id/id_choices.py:52
+msgid "Sumatera Barat"
+msgstr "Sumatera Barat"
+
+#: contrib/localflavor/id/id_choices.py:40
+#: contrib/localflavor/id/id_choices.py:56
+msgid "Sumatera Selatan"
+msgstr "Sumatera Selatan"
+
+#: contrib/localflavor/id/id_choices.py:41
+#: contrib/localflavor/id/id_choices.py:58
+msgid "Sumatera Utara"
+msgstr "Sumatera Utara"
+
+#: contrib/localflavor/id/id_choices.py:46
+msgid "Magelang"
+msgstr "Magelang"
+
+#: contrib/localflavor/id/id_choices.py:48
+msgid "Surakarta - Solo"
+msgstr "Surakarta - Solo"
+
+#: contrib/localflavor/id/id_choices.py:49
+msgid "Madiun"
+msgstr "Madiun"
+
+#: contrib/localflavor/id/id_choices.py:50
+msgid "Kediri"
+msgstr "Kediri"
+
+#: contrib/localflavor/id/id_choices.py:53
+msgid "Tapanuli"
+msgstr "Tapanuli"
+
+#: contrib/localflavor/id/id_choices.py:61
+msgid "Kepulauan Bangka Belitung"
+msgstr "Kepulauan Bangka Belitung"
+
+#: contrib/localflavor/id/id_choices.py:63
+msgid "Corps Consulate"
+msgstr "Corps Consulate"
+
+#: contrib/localflavor/id/id_choices.py:64
+msgid "Corps Diplomatic"
+msgstr "Corps Diplomatic"
+
+#: contrib/localflavor/id/id_choices.py:65
+msgid "Bandung"
+msgstr "Bandung"
+
+#: contrib/localflavor/id/id_choices.py:67
+msgid "Sulawesi Utara Daratan"
+msgstr "Sulawesi Utara Daratan"
+
+#: contrib/localflavor/id/id_choices.py:72
+msgid "NTT - Timor"
+msgstr "NTT - Timor"
+
+#: contrib/localflavor/id/id_choices.py:74
+msgid "Sulawesi Utara Kepulauan"
+msgstr "Sulawesi Utara Kepulauan"
+
+#: contrib/localflavor/id/id_choices.py:77
+msgid "NTB - Lombok"
+msgstr "NTB - Lombok"
+
+#: contrib/localflavor/id/id_choices.py:78
+msgid "Papua dan Papua Barat"
+msgstr "Papua dan Papua Barat"
+
+#: contrib/localflavor/id/id_choices.py:80
+msgid "Cirebon"
+msgstr "Cirebon"
+
+#: contrib/localflavor/id/id_choices.py:81
+msgid "NTB - Sumbawa"
+msgstr "NTB - Sumbawa"
+
+#: contrib/localflavor/id/id_choices.py:82
+msgid "NTT - Flores"
+msgstr "NTT - Flores"
+
+#: contrib/localflavor/id/id_choices.py:83
+msgid "NTT - Sumba"
+msgstr "NTT - Sumba"
+
+#: contrib/localflavor/id/id_choices.py:84
+msgid "Bogor"
+msgstr "Bogor"
+
+#: contrib/localflavor/id/id_choices.py:85
+msgid "Pekalongan"
+msgstr "Pekalongan"
+
+#: contrib/localflavor/id/id_choices.py:86
+msgid "Semarang"
+msgstr "Semarang"
+
+#: contrib/localflavor/id/id_choices.py:87
+msgid "Pati"
+msgstr "Pati"
+
+#: contrib/localflavor/id/id_choices.py:91
+msgid "Surabaya"
+msgstr "Surabaya"
+
+#: contrib/localflavor/id/id_choices.py:92
+msgid "Madura"
+msgstr "Madura"
+
+#: contrib/localflavor/id/id_choices.py:93
+msgid "Malang"
+msgstr "Malang"
+
+#: contrib/localflavor/id/id_choices.py:94
+msgid "Jember"
+msgstr "Jember"
+
+#: contrib/localflavor/id/id_choices.py:95
+msgid "Banyumas"
+msgstr "Banyumas"
+
+#: contrib/localflavor/id/id_choices.py:96
+msgid "Federal Government"
+msgstr "Federal Government"
+
+#: contrib/localflavor/id/id_choices.py:97
+msgid "Bojonegoro"
+msgstr "Bojonegoro"
+
+#: contrib/localflavor/id/id_choices.py:98
+msgid "Purwakarta"
+msgstr "Purwakarta"
+
+#: contrib/localflavor/id/id_choices.py:99
+msgid "Sidoarjo"
+msgstr "Sidoarjo"
+
+#: contrib/localflavor/id/id_choices.py:100
+msgid "Garut"
+msgstr "Garut"
+
+#: contrib/localflavor/ie/ie_counties.py:8
+msgid "Antrim"
+msgstr "Antrim"
+
+#: contrib/localflavor/ie/ie_counties.py:9
+msgid "Armagh"
+msgstr "Armagh"
+
+#: contrib/localflavor/ie/ie_counties.py:10
+msgid "Carlow"
+msgstr "Carlow"
+
+#: contrib/localflavor/ie/ie_counties.py:11
+msgid "Cavan"
+msgstr "Cavan"
+
+#: contrib/localflavor/ie/ie_counties.py:12
+msgid "Clare"
+msgstr "Clare"
+
+#: contrib/localflavor/ie/ie_counties.py:13
+msgid "Cork"
+msgstr "Cork"
+
+#: contrib/localflavor/ie/ie_counties.py:14
+msgid "Derry"
+msgstr "Derry"
+
+#: contrib/localflavor/ie/ie_counties.py:15
+msgid "Donegal"
+msgstr "Donegal"
+
+#: contrib/localflavor/ie/ie_counties.py:16
+msgid "Down"
+msgstr "Down"
+
+#: contrib/localflavor/ie/ie_counties.py:17
+msgid "Dublin"
+msgstr "Dublin"
+
+#: contrib/localflavor/ie/ie_counties.py:18
+msgid "Fermanagh"
+msgstr "Fermanagh"
+
+#: contrib/localflavor/ie/ie_counties.py:19
+msgid "Galway"
+msgstr "Galway"
+
+#: contrib/localflavor/ie/ie_counties.py:20
+msgid "Kerry"
+msgstr "Kerry"
+
+#: contrib/localflavor/ie/ie_counties.py:21
+msgid "Kildare"
+msgstr "Kildare"
+
+#: contrib/localflavor/ie/ie_counties.py:22
+msgid "Kilkenny"
+msgstr "Kilkenny"
+
+#: contrib/localflavor/ie/ie_counties.py:23
+msgid "Laois"
+msgstr "Laois"
-#: contrib/localflavor/es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Catalonia"
+#: contrib/localflavor/ie/ie_counties.py:24
+msgid "Leitrim"
+msgstr "Leitrim"
-#: contrib/localflavor/es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Extremadura"
+#: contrib/localflavor/ie/ie_counties.py:25
+msgid "Limerick"
+msgstr "Limerick"
-#: contrib/localflavor/es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galicia"
+#: contrib/localflavor/ie/ie_counties.py:26
+msgid "Longford"
+msgstr "Longford"
-#: contrib/localflavor/es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Region of Murcia"
+#: contrib/localflavor/ie/ie_counties.py:27
+msgid "Louth"
+msgstr "Louth"
-#: contrib/localflavor/es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Foral Community of Navarre"
+#: contrib/localflavor/ie/ie_counties</