Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #13544 -- Updated Norwegian bokmal translation. Thanks, Jon Lønne.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13265 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit fa14e3127d64c9e5995a71977220516e1181a0f5 1 parent 626d2e7
@jezdez jezdez authored
View
BIN  django/conf/locale/nb/LC_MESSAGES/django.mo
Binary file not shown
View
514 django/conf/locale/nb/LC_MESSAGES/django.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-16 10:12+0200\n"
-"PO-Revision-Date: 2010-03-11 14:22+0100\n"
+"POT-Creation-Date: 2010-05-15 02:05+0200\n"
+"PO-Revision-Date: 2010-05-14 21:43+0200\n"
"Last-Translator: Christian Mikalsen and Jon Lønne\n"
"Language-Team: Norsk <no@li.org>\n"
"MIME-Version: 1.0\n"
@@ -59,195 +59,215 @@ msgid "English"
msgstr "Engelsk"
#: conf/global_settings.py:55
+msgid "British English"
+msgstr "Engelsk (britisk)"
+
+#: conf/global_settings.py:56
msgid "Spanish"
msgstr "Spansk"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:57
msgid "Argentinean Spanish"
msgstr "Argentinsk spansk"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:58
msgid "Estonian"
msgstr "Estisk"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:59
msgid "Basque"
msgstr "Baskisk"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Persian"
msgstr "Persisk"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Finnish"
msgstr "Finsk"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "French"
msgstr "Fransk"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "Frisian"
msgstr "Frisisk"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Irish"
msgstr "Irsk"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Galician"
msgstr "Galisisk"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Hebrew"
msgstr "Hebraisk"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Croatian"
msgstr "Kroatisk"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Hungarian"
msgstr "Ungarsk"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
+msgid "Indonesian"
+msgstr "Indonesisk"
+
+#: conf/global_settings.py:71
msgid "Icelandic"
msgstr "Islandsk"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:72
msgid "Italian"
msgstr "Italiensk"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:73
msgid "Japanese"
msgstr "Japansk"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:74
msgid "Georgian"
msgstr "Georgisk"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:75
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:76
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:77
msgid "Korean"
msgstr "Koreansk"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:78
msgid "Lithuanian"
msgstr "Litauisk"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:79
msgid "Latvian"
msgstr "Latvisk"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:80
msgid "Macedonian"
msgstr "Makedonsk"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:81
+msgid "Mongolian"
+msgstr "Mongolsk"
+
+#: conf/global_settings.py:82
msgid "Dutch"
msgstr "Nederlandsk"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:83
msgid "Norwegian"
msgstr "Norsk"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:84
+msgid "Norwegian Bokmal"
+msgstr "Norsk (bokmål)"
+
+#: conf/global_settings.py:85
+msgid "Norwegian Nynorsk"
+msgstr "Norsk (nynorsk)"
+
+#: conf/global_settings.py:86
msgid "Polish"
msgstr "Polsk"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Portuguese"
msgstr "Portugisisk"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Brazilian Portuguese"
msgstr "Brasiliansk portugisisk"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Romanian"
msgstr "Rumensk"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Russian"
msgstr "Russisk"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
msgid "Slovak"
msgstr "Slovakisk"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
msgid "Slovenian"
msgstr "Slovensk"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:93
msgid "Albanian"
msgstr "Albansk"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:94
msgid "Serbian"
msgstr "Serbisk"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:95
msgid "Serbian Latin"
msgstr "Serbisk latin"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:96
msgid "Swedish"
msgstr "Svensk"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:97
msgid "Tamil"
msgstr "Tamil"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:98
msgid "Telugu"
msgstr "Telugu"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:99
msgid "Thai"
msgstr "Thai"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:100
msgid "Turkish"
msgstr "Tyrkisk"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:101
msgid "Ukrainian"
msgstr "Ukrainsk"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:102
msgid "Vietnamese"
msgstr "Vietnamesisk"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:103
msgid "Simplified Chinese"
msgstr "Forenklet kinesisk"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:104
msgid "Traditional Chinese"
msgstr "Tradisjonell kinesisk"
-#: contrib/admin/actions.py:52
+#: contrib/admin/actions.py:48
#, python-format
msgid "Successfully deleted %(count)d %(items)s."
msgstr "Slettet %(count)d %(items)s."
-#: contrib/admin/actions.py:59 contrib/admin/options.py:1101
+#: contrib/admin/actions.py:55 contrib/admin/options.py:1125
msgid "Are you sure?"
msgstr "Er du sikker?"
-#: contrib/admin/actions.py:77
+#: contrib/admin/actions.py:73
#, python-format
msgid "Delete selected %(verbose_name_plural)s"
msgstr "Slett valgte %(verbose_name_plural)s"
@@ -286,19 +306,19 @@ msgstr "Denne måneden"
msgid "This year"
msgstr "I år"
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:470
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:469
msgid "Yes"
msgstr "Ja"
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:470
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:469
msgid "No"
msgstr "Nei"
-#: contrib/admin/filterspecs.py:154 forms/widgets.py:470
+#: contrib/admin/filterspecs.py:154 forms/widgets.py:469
msgid "Unknown"
msgstr "Ukjent"
-#: contrib/admin/helpers.py:19
+#: contrib/admin/helpers.py:20
msgid "Action:"
msgstr "Handling:"
@@ -330,87 +350,88 @@ msgstr "logginnlegg"
msgid "log entries"
msgstr "logginnlegg"
-#: contrib/admin/options.py:139 contrib/admin/options.py:154
+#: contrib/admin/options.py:138 contrib/admin/options.py:153
msgid "None"
msgstr "Ingen"
-#: contrib/admin/options.py:558
+#: contrib/admin/options.py:559
#, python-format
msgid "Changed %s."
msgstr "Endret %s."
-#: contrib/admin/options.py:558 contrib/admin/options.py:568
-#: contrib/comments/templates/comments/preview.html:16 db/models/base.py:802
-#: forms/models.py:553
+#: contrib/admin/options.py:559 contrib/admin/options.py:569
+#: contrib/comments/templates/comments/preview.html:16 db/models/base.py:845
+#: forms/models.py:568
msgid "and"
msgstr "og"
-#: contrib/admin/options.py:563
+#: contrib/admin/options.py:564
#, python-format
msgid "Added %(name)s \"%(object)s\"."
msgstr "Opprettet %(name)s \"%(object)s\"."
-#: contrib/admin/options.py:567
+#: contrib/admin/options.py:568
#, python-format
msgid "Changed %(list)s for %(name)s \"%(object)s\"."
msgstr "Endret %(list)s for %(name)s \"%(object)s\"."
-#: contrib/admin/options.py:572
+#: contrib/admin/options.py:573
#, python-format
msgid "Deleted %(name)s \"%(object)s\"."
msgstr "Slettet %(name)s \"%(object)s\"."
-#: contrib/admin/options.py:576
+#: contrib/admin/options.py:577
msgid "No fields changed."
msgstr "Ingen felt endret."
-#: contrib/admin/options.py:642
+#: contrib/admin/options.py:643
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "%(name)s \"%(obj)s\" ble opprettet."
-#: contrib/admin/options.py:646 contrib/admin/options.py:679
+#: contrib/admin/options.py:647 contrib/admin/options.py:680
msgid "You may edit it again below."
msgstr "Du kan redigere videre nedenfor."
-#: contrib/admin/options.py:656 contrib/admin/options.py:689
+#: contrib/admin/options.py:657 contrib/admin/options.py:690
#, python-format
msgid "You may add another %s below."
msgstr "Du kan opprette ny %s nedenfor."
-#: contrib/admin/options.py:677
+#: contrib/admin/options.py:678
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "%(name)s \"%(obj)s\" ble endret."
-#: contrib/admin/options.py:685
+#: contrib/admin/options.py:686
#, 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:743
+#: contrib/admin/options.py:740 contrib/admin/options.py:997
msgid ""
"Items must be selected in order to perform actions on them. No items have "
"been changed."
-msgstr "Du må velge objekter for å utføre handlinger på dem. Ingen objekter "
-"har blitt endret."
+msgstr ""
+"Du må velge objekter for å utføre handlinger på dem. Ingen objekter har "
+"blitt endret."
-#: contrib/admin/options.py:761
+#: contrib/admin/options.py:759
msgid "No action selected."
msgstr "Ingen handling valgt."
-#: contrib/admin/options.py:841
+#: contrib/admin/options.py:840
#, python-format
msgid "Add %s"
msgstr "Opprett %s"
-#: contrib/admin/options.py:867 contrib/admin/options.py:1081
+#: contrib/admin/options.py:866 contrib/admin/options.py:1105
#, 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:932
+#: contrib/admin/options.py:931
#, python-format
msgid "Change %s"
msgstr "Endre %s"
@@ -419,38 +440,36 @@ msgstr "Endre %s"
msgid "Database error"
msgstr "Databasefeil"
-#: contrib/admin/options.py:1013
+#: contrib/admin/options.py:1039
#, 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:1040
-#, python-format
-msgid "of %(count)d selected"
-msgid_plural "of %(count)d selected"
-msgstr[0] "av %(count)d valgt"
-msgstr[1] "av %(count)d valgt"
-
-#: contrib/admin/options.py:1042
+#: contrib/admin/options.py:1066
#, python-format
msgid "%(total_count)s selected"
msgid_plural "All %(total_count)s selected"
msgstr[0] "%(total_count)s valgt"
msgstr[1] "Alle %(total_count)s valgt"
-#: contrib/admin/options.py:1094
+#: contrib/admin/options.py:1071
+#, python-format
+msgid "0 of %(cnt)s selected"
+msgstr "0 av %(cnt)s valgt"
+
+#: contrib/admin/options.py:1118
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "%(name)s \"%(obj)s\" ble slettet."
-#: contrib/admin/options.py:1131
+#: contrib/admin/options.py:1155
#, python-format
msgid "Change history: %s"
msgstr "Endringshistorikk: %s"
-#: contrib/admin/sites.py:22 contrib/admin/views/decorators.py:14
+#: contrib/admin/sites.py:18 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-"
@@ -459,11 +478,11 @@ msgstr ""
"Vennligst angi korrekt brukernavn og passord. Merk at det er forskjell på "
"små og store bokstaver."
-#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:40
+#: contrib/admin/sites.py:307 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:318 contrib/admin/views/decorators.py:47
+#: contrib/admin/sites.py:314 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."
@@ -471,27 +490,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:334 contrib/admin/sites.py:340
+#: contrib/admin/sites.py:330 contrib/admin/sites.py:336
#: contrib/admin/views/decorators.py:66
msgid "Usernames cannot contain the '@' character."
msgstr "Brukernavnet kan ikke inneholde tegnet '@'."
-#: contrib/admin/sites.py:337 contrib/admin/views/decorators.py:62
+#: contrib/admin/sites.py:333 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:393
+#: contrib/admin/sites.py:389
msgid "Site administration"
msgstr "Nettstedsadministrasjon"
-#: contrib/admin/sites.py:407 contrib/admin/templates/admin/login.html:26
+#: contrib/admin/sites.py:403 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:452
+#: contrib/admin/sites.py:448
#, python-format
msgid "%s administration"
msgstr "%s-administrasjon"
@@ -531,9 +550,9 @@ 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:54
+#: contrib/admin/templates/admin/base.html:55
#: contrib/admin/templates/admin/change_form.html:18
-#: contrib/admin/templates/admin/change_list.html:39
+#: contrib/admin/templates/admin/change_list.html:42
#: 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
@@ -578,16 +597,16 @@ msgstr "Utfør den valgte handlingen"
msgid "Go"
msgstr "Gå"
-#: contrib/admin/templates/admin/actions.html:10
+#: contrib/admin/templates/admin/actions.html:11
msgid "Click here to select the objects across all pages"
msgstr "Trykk her for å velge samtlige objekter fra alle sider"
-#: contrib/admin/templates/admin/actions.html:10
+#: contrib/admin/templates/admin/actions.html:11
#, python-format
msgid "Select all %(total_count)s %(module_name)s"
msgstr "Velg alle %(total_count)s %(module_name)s"
-#: contrib/admin/templates/admin/actions.html:12
+#: contrib/admin/templates/admin/actions.html:13
msgid "Clear selection"
msgstr "Nullstill valg"
@@ -597,18 +616,18 @@ msgstr "Nullstill valg"
msgid "%(name)s"
msgstr "%(name)s"
-#: contrib/admin/templates/admin/base.html:27
+#: contrib/admin/templates/admin/base.html:28
msgid "Welcome,"
msgstr "Velkommen,"
-#: contrib/admin/templates/admin/base.html:32
+#: contrib/admin/templates/admin/base.html:33
#: contrib/admin/templates/registration/password_change_done.html:3
#: contrib/admin/templates/registration/password_change_form.html:4
#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
msgid "Documentation"
msgstr "Dokumentasjon"
-#: contrib/admin/templates/admin/base.html:40
+#: contrib/admin/templates/admin/base.html:41
#: 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
@@ -616,7 +635,7 @@ msgstr "Dokumentasjon"
msgid "Change password"
msgstr "Endre passord"
-#: contrib/admin/templates/admin/base.html:47
+#: contrib/admin/templates/admin/base.html:48
#: contrib/admin/templates/registration/password_change_done.html:3
#: contrib/admin/templates/registration/password_change_form.html:4
msgid "Log out"
@@ -647,7 +666,7 @@ msgid "View on site"
msgstr "Vis på nettsted"
#: contrib/admin/templates/admin/change_form.html:39
-#: contrib/admin/templates/admin/change_list.html:68
+#: contrib/admin/templates/admin/change_list.html:71
#: 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."
@@ -655,17 +674,17 @@ msgid_plural "Please correct the errors below."
msgstr[0] "Vennligst korriger feilen under."
msgstr[1] "Vennligst korriger feilene under."
-#: contrib/admin/templates/admin/change_list.html:60
+#: contrib/admin/templates/admin/change_list.html:63
#, python-format
msgid "Add %(name)s"
msgstr "Opprett %(name)s"
-#: contrib/admin/templates/admin/change_list.html:79
+#: contrib/admin/templates/admin/change_list.html:82
msgid "Filter"
msgstr "Filtrering"
#: contrib/admin/templates/admin/delete_confirmation.html:10
-#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:294
+#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:302
msgid "Delete"
msgstr "Slett"
@@ -854,14 +873,14 @@ msgstr "Passord (gjenta)"
msgid "Enter the same password as above, for verification."
msgstr "Skriv inn det samme passordet som ovenfor, for verifisering."
-#: contrib/admin/templates/admin/edit_inline/stacked.html:53
-#: contrib/admin/templates/admin/edit_inline/tabular.html:99
+#: contrib/admin/templates/admin/edit_inline/stacked.html:64
+#: contrib/admin/templates/admin/edit_inline/tabular.html:110
#, python-format
msgid "Add another %(verbose_name)s"
msgstr "Legg til ny %(verbose_name)s"
-#: contrib/admin/templates/admin/edit_inline/stacked.html:56
-#: contrib/admin/templates/admin/edit_inline/tabular.html:102
+#: contrib/admin/templates/admin/edit_inline/stacked.html:67
+#: contrib/admin/templates/admin/edit_inline/tabular.html:113
#: contrib/comments/templates/comments/delete.html:12
msgid "Remove"
msgstr "Fjern"
@@ -1028,16 +1047,16 @@ msgstr "E-postadresse:"
msgid "Reset my password"
msgstr "Nullstill mitt passord"
-#: contrib/admin/templatetags/admin_list.py:240
+#: contrib/admin/templatetags/admin_list.py:257
msgid "All dates"
msgstr "Alle datoer"
-#: contrib/admin/views/main.py:70
+#: contrib/admin/views/main.py:65
#, python-format
msgid "Select %s"
msgstr "Velg %s"
-#: contrib/admin/views/main.py:70
+#: contrib/admin/views/main.py:65
#, python-format
msgid "Select %s to change"
msgstr "Velg %s du ønsker å endre"
@@ -1209,8 +1228,7 @@ msgstr "Brukernavn"
#: contrib/auth/forms.py:15 contrib/auth/forms.py:49
msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
-msgstr ""
-"Påkrevet. 30 tegn eller færre. Kun bokstaver, tall og @/./+/-/_."
+msgstr "Påkrevet. 30 tegn eller færre. Kun bokstaver, tall og @/./+/-/_."
#: contrib/auth/forms.py:16 contrib/auth/forms.py:50
msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
@@ -1297,8 +1315,7 @@ msgstr "brukernavn"
#: contrib/auth/models.py:196
msgid ""
"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-"Påkrevet. 30 tegn eller færre. Bokstaver, tall og @/./+/-/_."
+msgstr "Påkrevet. 30 tegn eller færre. Bokstaver, tall og @/./+/-/_."
#: contrib/auth/models.py:197
msgid "first name"
@@ -1392,7 +1409,7 @@ msgid "Logged out"
msgstr "Logget ut"
#: contrib/auth/management/commands/createsuperuser.py:23
-#: core/validators.py:120 forms/fields.py:416
+#: core/validators.py:120 forms/fields.py:428
msgid "Enter a valid e-mail address."
msgstr "Oppgi en gyldig e-postadresse."
@@ -1404,31 +1421,37 @@ msgstr "Innhold"
msgid "Metadata"
msgstr "Metadata"
-#: contrib/comments/admin.py:39
+#: contrib/comments/admin.py:40
msgid "flagged"
-msgstr "flagget"
+msgid_plural "flagged"
+msgstr[0] "flagget"
+msgstr[1] "flagget"
-#: contrib/comments/admin.py:40
+#: contrib/comments/admin.py:41
msgid "Flag selected comments"
msgstr "Flagg valgte kommentarer"
-#: contrib/comments/admin.py:43
+#: contrib/comments/admin.py:45
msgid "approved"
-msgstr "godkjent"
+msgid_plural "approved"
+msgstr[0] "godkjent"
+msgstr[1] "godkjent"
-#: contrib/comments/admin.py:44
+#: contrib/comments/admin.py:46
msgid "Approve selected comments"
msgstr "Tillat valgte kommentarer"
-#: contrib/comments/admin.py:47
+#: contrib/comments/admin.py:50
msgid "removed"
-msgstr "fjernet"
+msgid_plural "removed"
+msgstr[0] "fjernet"
+msgstr[1] "fjernet"
-#: contrib/comments/admin.py:48
+#: contrib/comments/admin.py:51
msgid "Remove selected comments"
msgstr "Fjern valgte kommentarer"
-#: contrib/comments/admin.py:60
+#: contrib/comments/admin.py:63
#, python-format
msgid "1 comment was successfully %(action)s."
msgid_plural "%(count)s comments were successfully %(action)s."
@@ -1454,7 +1477,7 @@ msgid "Email address"
msgstr "E-postadresse"
#: contrib/comments/forms.py:95 contrib/flatpages/admin.py:8
-#: contrib/flatpages/models.py:7 db/models/fields/__init__.py:1121
+#: contrib/flatpages/models.py:7 db/models/fields/__init__.py:1101
msgid "URL"
msgstr "Nettadresse"
@@ -1504,7 +1527,7 @@ msgstr "kommentar"
msgid "date/time submitted"
msgstr "dato/tid for innsendelse"
-#: contrib/comments/models.py:60 db/models/fields/__init__.py:916
+#: contrib/comments/models.py:60 db/models/fields/__init__.py:896
msgid "IP address"
msgstr "IP-adresse"
@@ -1748,31 +1771,31 @@ msgstr ""
msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
msgstr ""
-#: contrib/gis/db/models/fields.py:269
+#: contrib/gis/db/models/fields.py:270
msgid "Point"
msgstr "Punkt"
-#: contrib/gis/db/models/fields.py:273
+#: contrib/gis/db/models/fields.py:274
msgid "Line string"
msgstr ""
-#: contrib/gis/db/models/fields.py:277
+#: contrib/gis/db/models/fields.py:278
msgid "Polygon"
msgstr "Polygon"
-#: contrib/gis/db/models/fields.py:281
+#: contrib/gis/db/models/fields.py:282
msgid "Multi-point"
msgstr ""
-#: contrib/gis/db/models/fields.py:285
+#: contrib/gis/db/models/fields.py:286
msgid "Multi-line string"
msgstr ""
-#: contrib/gis/db/models/fields.py:289
+#: contrib/gis/db/models/fields.py:290
msgid "Multi polygon"
msgstr ""
-#: contrib/gis/db/models/fields.py:293
+#: contrib/gis/db/models/fields.py:294
msgid "Geometry collection"
msgstr ""
@@ -1884,8 +1907,8 @@ msgstr "i går"
msgid "Enter a postal code in the format NNNN or ANNNNAAA."
msgstr "Oppgi et postnummer på formen NNNN eller ANNNNAAA."
-#: 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/ar/forms.py:50 contrib/localflavor/br/forms.py:92
+#: contrib/localflavor/br/forms.py:131 contrib/localflavor/pe/forms.py:24
#: contrib/localflavor/pe/forms.py:52
msgid "This field requires only numbers."
msgstr "Feltet krever kun tall."
@@ -1951,15 +1974,15 @@ msgstr "Oppgi et gyldig Østerrisk personnummer på formen XXXX XXXXXX."
msgid "Enter a 4 digit post code."
msgstr "Oppgi et firesifret postnummer."
-#: contrib/localflavor/br/forms.py:22
+#: contrib/localflavor/br/forms.py:17
msgid "Enter a zip code in the format XXXXX-XXX."
msgstr "Oppgi et postnummer på formen XXXXX-XXX."
-#: contrib/localflavor/br/forms.py:31
+#: contrib/localflavor/br/forms.py:26
msgid "Phone numbers must be in XX-XXXX-XXXX format."
msgstr "Telefonnummeret må være på formen XX-XXXX-XXXX."
-#: contrib/localflavor/br/forms.py:59
+#: contrib/localflavor/br/forms.py:54
msgid ""
"Select a valid brazilian state. That state is not one of the available "
"states."
@@ -1967,19 +1990,19 @@ msgstr ""
"Velg en gyldig brasiliansk stat. Den staten er ikke et av de tilgjengelige "
"valgene."
-#: contrib/localflavor/br/forms.py:95
+#: contrib/localflavor/br/forms.py:90
msgid "Invalid CPF number."
msgstr "Ugyldig CPF-nummer."
-#: contrib/localflavor/br/forms.py:96
+#: contrib/localflavor/br/forms.py:91
msgid "This field requires at most 11 digits or 14 characters."
msgstr "Feltet krever maksimum 11 eller 14 siffer."
-#: contrib/localflavor/br/forms.py:135
+#: contrib/localflavor/br/forms.py:130
msgid "Invalid CNPJ number."
msgstr "Ugyldig CNPJ-nummer."
-#: contrib/localflavor/br/forms.py:137
+#: contrib/localflavor/br/forms.py:132
msgid "This field requires at least 14 digits"
msgstr "Feltet krever minst 14 siffer."
@@ -4324,7 +4347,7 @@ msgstr ""
#: contrib/localflavor/us/forms.py:88
msgid "Enter a U.S. state or territory."
-msgstr ""
+msgstr "Oppgi en amerikansk stat eller et område"
#: contrib/localflavor/us/models.py:8
msgid "U.S. state (two uppercase letters)"
@@ -4458,26 +4481,26 @@ msgstr "nettsteder"
msgid "Enter a valid value."
msgstr "Oppgi en gyldig verdi."
-#: core/validators.py:87 forms/fields.py:517
+#: core/validators.py:87 forms/fields.py:529
msgid "Enter a valid URL."
msgstr "Oppgi en gyldig nettadresse."
-#: core/validators.py:89 forms/fields.py:518
+#: core/validators.py:89 forms/fields.py:530
msgid "This URL appears to be a broken link."
msgstr "Nettadressen fører til en side som ikke eksisterer."
-#: core/validators.py:123 forms/fields.py:861
+#: core/validators.py:123 forms/fields.py:873
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Oppgi en gyldig 'slug' bestående av bokstaver, nummer, understreker eller "
"bindestreker."
-#: core/validators.py:126 forms/fields.py:854
+#: core/validators.py:126 forms/fields.py:866
msgid "Enter a valid IPv4 address."
msgstr "Oppgi en gyldig IPv4-adresse."
-#: core/validators.py:129 db/models/fields/__init__.py:598
+#: core/validators.py:129 db/models/fields/__init__.py:572
msgid "Enter only digits separated by commas."
msgstr "Oppgi kun tall adskilt med komma."
@@ -4486,12 +4509,12 @@ msgstr "Oppgi kun tall adskilt med komma."
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Verdien må være %(limit_value)s (den er %(show_value)s)."
-#: core/validators.py:153 forms/fields.py:196 forms/fields.py:246
+#: core/validators.py:153 forms/fields.py:205 forms/fields.py:257
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Verdien må være mindre enn eller lik som %(limit_value)s."
-#: core/validators.py:158 forms/fields.py:197 forms/fields.py:247
+#: core/validators.py:158 forms/fields.py:206 forms/fields.py:258
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Verdien må være større enn eller lik som %(limit_value)s."
@@ -4510,159 +4533,159 @@ msgid ""
"(show_value)d)."
msgstr "Verdien kan maksimalt ha %(limit_value)d tegn (den er %(show_value)d)."
-#: db/models/base.py:780
+#: db/models/base.py:823
#, 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."
-#: db/models/base.py:795 db/models/base.py:803
+#: db/models/base.py:838 db/models/base.py:846
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s med %(field_label)s finnes allerede."
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:63
#, python-format
msgid "Value %r is not a valid choice."
msgstr "Verdien %r er ikke et gyldig valg."
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:64
msgid "This field cannot be null."
msgstr "Feltet kan ikke være tomt."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:65
msgid "This field cannot be blank."
msgstr "Feltet kan ikke være blankt."
-#: db/models/fields/__init__.py:69
+#: db/models/fields/__init__.py:70
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Felt av typen: %(field_type)s"
-#: db/models/fields/__init__.py:477 db/models/fields/__init__.py:878
-#: db/models/fields/__init__.py:981 db/models/fields/__init__.py:992
-#: db/models/fields/__init__.py:1019
+#: db/models/fields/__init__.py:451 db/models/fields/__init__.py:852
+#: db/models/fields/__init__.py:961 db/models/fields/__init__.py:972
+#: db/models/fields/__init__.py:999
msgid "Integer"
msgstr "Heltall"
-#: db/models/fields/__init__.py:481 db/models/fields/__init__.py:876
+#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:850
msgid "This value must be an integer."
msgstr "Verdien må være et heltall."
-#: db/models/fields/__init__.py:516
+#: db/models/fields/__init__.py:490
msgid "This value must be either True or False."
msgstr "Verdien må være True eller False."
-#: db/models/fields/__init__.py:518
+#: db/models/fields/__init__.py:492
msgid "Boolean (Either True or False)"
msgstr "Boolsk (True eller False)"
-#: db/models/fields/__init__.py:565 db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:539 db/models/fields/__init__.py:982
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Tekst (opp til %(max_length)s tegn)"
-#: db/models/fields/__init__.py:593
+#: db/models/fields/__init__.py:567
msgid "Comma-separated integers"
msgstr "Heltall adskilt med komma"
-#: db/models/fields/__init__.py:607
+#: db/models/fields/__init__.py:581
msgid "Date (without time)"
msgstr "Dato (uten tid)"
-#: db/models/fields/__init__.py:611
+#: db/models/fields/__init__.py:585
msgid "Enter a valid date in YYYY-MM-DD format."
msgstr "Oppgi en gyldig dato på formen ÅÅÅÅ-MM-DD."
-#: db/models/fields/__init__.py:612
+#: db/models/fields/__init__.py:586
#, python-format
msgid "Invalid date: %s"
msgstr "Ugyldig dato: %s"
-#: db/models/fields/__init__.py:693
+#: db/models/fields/__init__.py:667
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
msgstr "Oppgi dato og tid på formen ÅÅÅÅ-MM-DD TT:MM[:ss[.uuuuuu]]."
-#: db/models/fields/__init__.py:695
+#: db/models/fields/__init__.py:669
msgid "Date (with time)"
msgstr "Dato (med tid)"
-#: db/models/fields/__init__.py:761
+#: db/models/fields/__init__.py:735
msgid "This value must be a decimal number."
msgstr "Verdien må være et desimaltall."
-#: db/models/fields/__init__.py:763
+#: db/models/fields/__init__.py:737
msgid "Decimal number"
msgstr "Desimaltall"
-#: db/models/fields/__init__.py:818
+#: db/models/fields/__init__.py:792
msgid "E-mail address"
msgstr "E-postadresse"
-#: db/models/fields/__init__.py:825 db/models/fields/files.py:220
+#: db/models/fields/__init__.py:799 db/models/fields/files.py:220
#: db/models/fields/files.py:331
msgid "File path"
msgstr "Filsti"
-#: db/models/fields/__init__.py:848
+#: db/models/fields/__init__.py:822
msgid "This value must be a float."
msgstr "Verdien må være et flyttall."
-#: db/models/fields/__init__.py:850
+#: db/models/fields/__init__.py:824
msgid "Floating point number"
msgstr "Flyttall"
-#: db/models/fields/__init__.py:903
+#: db/models/fields/__init__.py:883
msgid "Big (8 byte) integer"
msgstr "Stort (8 byte) heltall"
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:912
msgid "This value must be either None, True or False."
msgstr "Verdien må være None, True eller False."
-#: db/models/fields/__init__.py:934
+#: db/models/fields/__init__.py:914
msgid "Boolean (Either True, False or None)"
msgstr "Boolsk (True, False eller None)"
-#: db/models/fields/__init__.py:1025
+#: db/models/fields/__init__.py:1005
msgid "Text"
msgstr "Tekst"
-#: db/models/fields/__init__.py:1041
+#: db/models/fields/__init__.py:1021
msgid "Time"
msgstr "Tid"
-#: db/models/fields/__init__.py:1045
+#: db/models/fields/__init__.py:1025
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
msgstr "Oppgi tiden på formen TT:MM[:ss[.uuuuuu]]."
-#: db/models/fields/__init__.py:1129
+#: db/models/fields/__init__.py:1109
msgid "XML text"
msgstr "XML-tekst"
-#: db/models/fields/related.py:755
+#: db/models/fields/related.py:799
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Modell %(model)s med primærnøkkelen %(pk)r finnes ikke."
-#: db/models/fields/related.py:757
+#: db/models/fields/related.py:801
msgid "Foreign Key (type determined by related field)"
msgstr "Fremmednøkkel (type bestemmes av relatert felt)"
-#: db/models/fields/related.py:879
+#: db/models/fields/related.py:918
msgid "One-to-one relationship"
msgstr "En-til-en-relasjon"
-#: db/models/fields/related.py:939
+#: db/models/fields/related.py:980
msgid "Many-to-many relationship"
msgstr "Mange-til-mange-relasjon"
-#: db/models/fields/related.py:959
+#: db/models/fields/related.py:1000
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:1020
+#: db/models/fields/related.py:1061
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
@@ -4674,60 +4697,60 @@ msgstr[1] "Oppgi gyldige %(self)s-ID-er. Verdiene %(value)r er ugyldige."
msgid "This field is required."
msgstr "Feltet er påkrevet."
-#: forms/fields.py:195
+#: forms/fields.py:204
msgid "Enter a whole number."
msgstr "Oppgi et heltall."
-#: forms/fields.py:225 forms/fields.py:245
+#: forms/fields.py:235 forms/fields.py:256
msgid "Enter a number."
msgstr "Oppgi et tall."
-#: forms/fields.py:248
+#: forms/fields.py:259
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Verdien kan ikke ha mer enn %s siffer totalt."
-#: forms/fields.py:249
+#: forms/fields.py:260
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Verdien kan ikke ha mer enn %s desimaler."
-#: forms/fields.py:250
+#: forms/fields.py:261
#, python-format
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:311 forms/fields.py:826
+#: forms/fields.py:323 forms/fields.py:838
msgid "Enter a valid date."
msgstr "Oppgi en gyldig dato."
-#: forms/fields.py:339 forms/fields.py:827
+#: forms/fields.py:351 forms/fields.py:839
msgid "Enter a valid time."
msgstr "Oppgi et gyldig tidspunkt."
-#: forms/fields.py:365
+#: forms/fields.py:377
msgid "Enter a valid date/time."
msgstr "Oppgi gyldig dato og tidspunkt."
-#: forms/fields.py:423
+#: forms/fields.py:435
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Ingen fil ble sendt. Sjekk \"encoding\"-typen på skjemaet."
-#: forms/fields.py:424
+#: forms/fields.py:436
msgid "No file was submitted."
msgstr "Ingen fil ble sendt."
-#: forms/fields.py:425
+#: forms/fields.py:437
msgid "The submitted file is empty."
msgstr "Filen er tom."
-#: forms/fields.py:426
+#: forms/fields.py:438
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr "Filnavnet kan maksimalt ha %(max)d tegn (det har %(length)d)."
-#: forms/fields.py:461
+#: forms/fields.py:473
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -4735,30 +4758,30 @@ msgstr ""
"Last opp et gyldig bilde. Filen du lastet opp var ødelagt eller ikke et "
"bilde."
-#: forms/fields.py:584 forms/fields.py:659
+#: forms/fields.py:596 forms/fields.py:671
#, 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:660 forms/fields.py:722 forms/models.py:986
+#: forms/fields.py:672 forms/fields.py:734 forms/models.py:1002
msgid "Enter a list of values."
msgstr "Oppgi en liste med verdier."
-#: forms/formsets.py:290 forms/formsets.py:292
+#: forms/formsets.py:298 forms/formsets.py:300
msgid "Order"
msgstr "Rekkefølge"
-#: forms/models.py:547
+#: forms/models.py:562
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Vennligst korriger duplisert data for %(field)s."
-#: forms/models.py:551
+#: forms/models.py:566
#, 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:557
+#: forms/models.py:572
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -4767,50 +4790,50 @@ msgstr ""
"Vennligst korriger duplisert data for %(field_name)s, som må være unik for %"
"(lookup)s i %(date_field)s."
-#: forms/models.py:565
+#: forms/models.py:580
msgid "Please correct the duplicate values below."
msgstr "Vennligst korriger de dupliserte verdiene nedenfor."
-#: forms/models.py:839
+#: forms/models.py:855
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:905
+#: forms/models.py:921
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:987
+#: forms/models.py:1003
#, 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:989
+#: forms/models.py:1005
#, 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."
-#: template/defaultfilters.py:781
+#: template/defaultfilters.py:776
msgid "yes,no,maybe"
msgstr "ja,nei,kanskje"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:807
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:809
#, python-format
msgid "%.1f KB"
msgstr "%.1f KB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:811
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
-#: template/defaultfilters.py:817
+#: template/defaultfilters.py:812
#, python-format
msgid "%.1f GB"
msgstr "%.1f GB"
@@ -5073,23 +5096,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:512
+#: utils/translation/trans_real.py:519
msgid "DATE_FORMAT"
msgstr "j. F Y"
-#: utils/translation/trans_real.py:513
+#: utils/translation/trans_real.py:520
msgid "DATETIME_FORMAT"
msgstr "j. F Y H:i"
-#: utils/translation/trans_real.py:514
+#: utils/translation/trans_real.py:521
msgid "TIME_FORMAT"
msgstr "H:i"
-#: utils/translation/trans_real.py:535
+#: utils/translation/trans_real.py:542
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:536
+#: utils/translation/trans_real.py:543
msgid "MONTH_DAY_FORMAT"
msgstr "j. F"
@@ -5107,42 +5130,3 @@ msgstr "%(verbose_name)s ble oppdatert."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s ble slettet."
-
-#~ msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-#~ msgstr "En eller flere %(fieldname)s i %(name)s: %(obj)s"
-
-#~ msgid "One or more %(fieldname)s in %(name)s:"
-#~ msgstr "En eller flere %(fieldname)s i %(name)s:"
-
-#~ msgid "Old password:"
-#~ msgstr "Gammelt passord:"
-
-#~ msgid "Relation to parent model"
-#~ msgstr "Relasjon til foreldermodell"
-
-#~ msgid "Add user"
-#~ msgstr "Opprett ny bruker"
-
-#~ msgid "Comment moderation queue"
-#~ msgstr "Kommentarmoderasjonskø"
-
-#~ msgid "No comments to moderate"
-#~ msgstr "Ingen kommentarer å moderere"
-
-#~ msgid "Email"
-#~ msgstr "E-post"
-
-#~ msgid "Authenticated?"
-#~ msgstr "Godkjent?"
-
-#~ msgid "IP Address"
-#~ msgstr "IP-adresse"
-
-#~ msgid "Date posted"
-#~ msgstr "Dato lagt inn"
-
-#~ msgid "yes"
-#~ msgstr "ja"
-
-#~ msgid "no"
-#~ msgstr "nei"
View
BIN  django/conf/locale/no/LC_MESSAGES/django.mo
Binary file not shown
View
512 django/conf/locale/no/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-16 10:12+0200\n"
+"POT-Creation-Date: 2010-05-15 02:08+0200\n"
"PO-Revision-Date: 2010-03-11 14:22+0100\n"
"Last-Translator: Christian Mikalsen and Jon Lønne\n"
"Language-Team: Norsk <no@li.org>\n"
@@ -60,195 +60,215 @@ msgid "English"
msgstr "Engelsk"
#: conf/global_settings.py:55
+msgid "British English"
+msgstr "Engelsk (britisk)"
+
+#: conf/global_settings.py:56
msgid "Spanish"
msgstr "Spansk"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:57
msgid "Argentinean Spanish"
msgstr "Argentinsk spansk"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:58
msgid "Estonian"
msgstr "Estisk"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:59
msgid "Basque"
msgstr "Baskisk"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Persian"
msgstr "Persisk"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Finnish"
msgstr "Finsk"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "French"
msgstr "Fransk"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "Frisian"
msgstr "Frisisk"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Irish"
msgstr "Irsk"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Galician"
msgstr "Galisisk"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Hebrew"
msgstr "Hebraisk"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Croatian"
msgstr "Kroatisk"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Hungarian"
msgstr "Ungarsk"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
+msgid "Indonesian"
+msgstr "Indonesisk"
+
+#: conf/global_settings.py:71
msgid "Icelandic"
msgstr "Islandsk"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:72
msgid "Italian"
msgstr "Italiensk"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:73
msgid "Japanese"
msgstr "Japansk"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:74
msgid "Georgian"
msgstr "Georgisk"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:75
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:76
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:77
msgid "Korean"
msgstr "Koreansk"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:78
msgid "Lithuanian"
msgstr "Litauisk"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:79
msgid "Latvian"
msgstr "Latvisk"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:80
msgid "Macedonian"
msgstr "Makedonsk"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:81
+msgid "Mongolian"
+msgstr "Mongolsk"
+
+#: conf/global_settings.py:82
msgid "Dutch"
msgstr "Nederlandsk"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:83
msgid "Norwegian"
msgstr "Norsk"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:84
+msgid "Norwegian Bokmal"
+msgstr "Norsk (bokmål)"
+
+#: conf/global_settings.py:85
+msgid "Norwegian Nynorsk"
+msgstr "Norsk (nynorsk)"
+
+#: conf/global_settings.py:86
msgid "Polish"
msgstr "Polsk"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Portuguese"
msgstr "Portugisisk"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Brazilian Portuguese"
msgstr "Brasiliansk portugisisk"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Romanian"
msgstr "Rumensk"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Russian"
msgstr "Russisk"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
msgid "Slovak"
msgstr "Slovakisk"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
msgid "Slovenian"
msgstr "Slovensk"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:93
msgid "Albanian"
msgstr "Albansk"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:94
msgid "Serbian"
msgstr "Serbisk"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:95
msgid "Serbian Latin"
msgstr "Serbisk latin"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:96
msgid "Swedish"
msgstr "Svensk"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:97
msgid "Tamil"
msgstr "Tamil"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:98
msgid "Telugu"
msgstr "Telugu"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:99
msgid "Thai"
msgstr "Thai"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:100
msgid "Turkish"
msgstr "Tyrkisk"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:101
msgid "Ukrainian"
msgstr "Ukrainsk"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:102
msgid "Vietnamese"
msgstr "Vietnamesisk"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:103
msgid "Simplified Chinese"
msgstr "Forenklet kinesisk"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:104
msgid "Traditional Chinese"
msgstr "Tradisjonell kinesisk"
-#: contrib/admin/actions.py:52
+#: contrib/admin/actions.py:48
#, python-format
msgid "Successfully deleted %(count)d %(items)s."
msgstr "Slettet %(count)d %(items)s."
-#: contrib/admin/actions.py:59 contrib/admin/options.py:1101
+#: contrib/admin/actions.py:55 contrib/admin/options.py:1125
msgid "Are you sure?"
msgstr "Er du sikker?"
-#: contrib/admin/actions.py:77
+#: contrib/admin/actions.py:73
#, python-format
msgid "Delete selected %(verbose_name_plural)s"
msgstr "Slett valgte %(verbose_name_plural)s"
@@ -287,19 +307,19 @@ msgstr "Denne måneden"
msgid "This year"
msgstr "I år"
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:470
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:469
msgid "Yes"
msgstr "Ja"
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:470
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:469
msgid "No"
msgstr "Nei"
-#: contrib/admin/filterspecs.py:154 forms/widgets.py:470
+#: contrib/admin/filterspecs.py:154 forms/widgets.py:469
msgid "Unknown"
msgstr "Ukjent"
-#: contrib/admin/helpers.py:19
+#: contrib/admin/helpers.py:20
msgid "Action:"
msgstr "Handling:"
@@ -331,87 +351,88 @@ msgstr "logginnlegg"
msgid "log entries"
msgstr "logginnlegg"
-#: contrib/admin/options.py:139 contrib/admin/options.py:154
+#: contrib/admin/options.py:138 contrib/admin/options.py:153
msgid "None"
msgstr "Ingen"
-#: contrib/admin/options.py:558
+#: contrib/admin/options.py:559
#, python-format
msgid "Changed %s."
msgstr "Endret %s."
-#: contrib/admin/options.py:558 contrib/admin/options.py:568
-#: contrib/comments/templates/comments/preview.html:16 db/models/base.py:802
-#: forms/models.py:553
+#: contrib/admin/options.py:559 contrib/admin/options.py:569
+#: contrib/comments/templates/comments/preview.html:16 db/models/base.py:845
+#: forms/models.py:568
msgid "and"
msgstr "og"
-#: contrib/admin/options.py:563
+#: contrib/admin/options.py:564
#, python-format
msgid "Added %(name)s \"%(object)s\"."
msgstr "Opprettet %(name)s \"%(object)s\"."
-#: contrib/admin/options.py:567
+#: contrib/admin/options.py:568
#, python-format
msgid "Changed %(list)s for %(name)s \"%(object)s\"."
msgstr "Endret %(list)s for %(name)s \"%(object)s\"."
-#: contrib/admin/options.py:572
+#: contrib/admin/options.py:573
#, python-format
msgid "Deleted %(name)s \"%(object)s\"."
msgstr "Slettet %(name)s \"%(object)s\"."
-#: contrib/admin/options.py:576
+#: contrib/admin/options.py:577
msgid "No fields changed."
msgstr "Ingen felt endret."
-#: contrib/admin/options.py:642
+#: contrib/admin/options.py:643
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "%(name)s \"%(obj)s\" ble opprettet."
-#: contrib/admin/options.py:646 contrib/admin/options.py:679
+#: contrib/admin/options.py:647 contrib/admin/options.py:680
msgid "You may edit it again below."
msgstr "Du kan redigere videre nedenfor."
-#: contrib/admin/options.py:656 contrib/admin/options.py:689
+#: contrib/admin/options.py:657 contrib/admin/options.py:690
#, python-format
msgid "You may add another %s below."
msgstr "Du kan opprette ny %s nedenfor."
-#: contrib/admin/options.py:677
+#: contrib/admin/options.py:678
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "%(name)s \"%(obj)s\" ble endret."
-#: contrib/admin/options.py:685
+#: contrib/admin/options.py:686
#, 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:743
+#: contrib/admin/options.py:740 contrib/admin/options.py:997
msgid ""
"Items must be selected in order to perform actions on them. No items have "
"been changed."
-msgstr "Du må velge objekter for å utføre handlinger på dem. Ingen objekter "
-"har blitt endret."
+msgstr ""
+"Du må velge objekter for å utføre handlinger på dem. Ingen objekter har "
+"blitt endret."
-#: contrib/admin/options.py:761
+#: contrib/admin/options.py:759
msgid "No action selected."
msgstr "Ingen handling valgt."
-#: contrib/admin/options.py:841
+#: contrib/admin/options.py:840
#, python-format
msgid "Add %s"
msgstr "Opprett %s"
-#: contrib/admin/options.py:867 contrib/admin/options.py:1081
+#: contrib/admin/options.py:866 contrib/admin/options.py:1105
#, 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:932
+#: contrib/admin/options.py:931
#, python-format
msgid "Change %s"
msgstr "Endre %s"
@@ -420,38 +441,36 @@ msgstr "Endre %s"
msgid "Database error"
msgstr "Databasefeil"
-#: contrib/admin/options.py:1013
+#: contrib/admin/options.py:1039
#, 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:1040
-#, python-format
-msgid "of %(count)d selected"
-msgid_plural "of %(count)d selected"
-msgstr[0] "av %(count)d valgt"
-msgstr[1] "av %(count)d valgt"
-
-#: contrib/admin/options.py:1042
+#: contrib/admin/options.py:1066
#, python-format
msgid "%(total_count)s selected"
msgid_plural "All %(total_count)s selected"
msgstr[0] "%(total_count)s valgt"
msgstr[1] "Alle %(total_count)s valgt"
-#: contrib/admin/options.py:1094
+#: contrib/admin/options.py:1071
+#, python-format
+msgid "0 of %(cnt)s selected"
+msgstr "0 av %(cnt)s valgt"
+
+#: contrib/admin/options.py:1118
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "%(name)s \"%(obj)s\" ble slettet."
-#: contrib/admin/options.py:1131
+#: contrib/admin/options.py:1155
#, python-format
msgid "Change history: %s"
msgstr "Endringshistorikk: %s"
-#: contrib/admin/sites.py:22 contrib/admin/views/decorators.py:14
+#: contrib/admin/sites.py:18 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-"
@@ -460,11 +479,11 @@ msgstr ""
"Vennligst angi korrekt brukernavn og passord. Merk at det er forskjell på "
"små og store bokstaver."
-#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:40
+#: contrib/admin/sites.py:307 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:318 contrib/admin/views/decorators.py:47
+#: contrib/admin/sites.py:314 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."
@@ -472,27 +491,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:334 contrib/admin/sites.py:340
+#: contrib/admin/sites.py:330 contrib/admin/sites.py:336
#: contrib/admin/views/decorators.py:66
msgid "Usernames cannot contain the '@' character."
msgstr "Brukernavnet kan ikke inneholde tegnet '@'."
-#: contrib/admin/sites.py:337 contrib/admin/views/decorators.py:62
+#: contrib/admin/sites.py:333 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:393
+#: contrib/admin/sites.py:389
msgid "Site administration"
msgstr "Nettstedsadministrasjon"
-#: contrib/admin/sites.py:407 contrib/admin/templates/admin/login.html:26
+#: contrib/admin/sites.py:403 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:452
+#: contrib/admin/sites.py:448
#, python-format
msgid "%s administration"
msgstr "%s-administrasjon"
@@ -532,9 +551,9 @@ 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:54
+#: contrib/admin/templates/admin/base.html:55
#: contrib/admin/templates/admin/change_form.html:18
-#: contrib/admin/templates/admin/change_list.html:39
+#: contrib/admin/templates/admin/change_list.html:42
#: 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
@@ -579,16 +598,16 @@ msgstr "Utfør den valgte handlingen"
msgid "Go"
msgstr "Gå"
-#: contrib/admin/templates/admin/actions.html:10
+#: contrib/admin/templates/admin/actions.html:11
msgid "Click here to select the objects across all pages"
msgstr "Trykk her for å velge samtlige objekter fra alle sider"
-#: contrib/admin/templates/admin/actions.html:10
+#: contrib/admin/templates/admin/actions.html:11
#, python-format
msgid "Select all %(total_count)s %(module_name)s"
msgstr "Velg alle %(total_count)s %(module_name)s"
-#: contrib/admin/templates/admin/actions.html:12
+#: contrib/admin/templates/admin/actions.html:13
msgid "Clear selection"
msgstr "Nullstill valg"
@@ -598,18 +617,18 @@ msgstr "Nullstill valg"
msgid "%(name)s"
msgstr "%(name)s"
-#: contrib/admin/templates/admin/base.html:27
+#: contrib/admin/templates/admin/base.html:28
msgid "Welcome,"
msgstr "Velkommen,"
-#: contrib/admin/templates/admin/base.html:32
+#: contrib/admin/templates/admin/base.html:33
#: contrib/admin/templates/registration/password_change_done.html:3
#: contrib/admin/templates/registration/password_change_form.html:4
#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
msgid "Documentation"
msgstr "Dokumentasjon"
-#: contrib/admin/templates/admin/base.html:40
+#: contrib/admin/templates/admin/base.html:41
#: 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
@@ -617,7 +636,7 @@ msgstr "Dokumentasjon"
msgid "Change password"
msgstr "Endre passord"
-#: contrib/admin/templates/admin/base.html:47
+#: contrib/admin/templates/admin/base.html:48
#: contrib/admin/templates/registration/password_change_done.html:3
#: contrib/admin/templates/registration/password_change_form.html:4
msgid "Log out"
@@ -648,7 +667,7 @@ msgid "View on site"
msgstr "Vis på nettsted"
#: contrib/admin/templates/admin/change_form.html:39
-#: contrib/admin/templates/admin/change_list.html:68
+#: contrib/admin/templates/admin/change_list.html:71
#: 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."
@@ -656,17 +675,17 @@ msgid_plural "Please correct the errors below."
msgstr[0] "Vennligst korriger feilen under."
msgstr[1] "Vennligst korriger feilene under."
-#: contrib/admin/templates/admin/change_list.html:60
+#: contrib/admin/templates/admin/change_list.html:63
#, python-format
msgid "Add %(name)s"
msgstr "Opprett %(name)s"
-#: contrib/admin/templates/admin/change_list.html:79
+#: contrib/admin/templates/admin/change_list.html:82
msgid "Filter"
msgstr "Filtrering"
#: contrib/admin/templates/admin/delete_confirmation.html:10
-#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:294
+#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:302
msgid "Delete"
msgstr "Slett"
@@ -855,14 +874,14 @@ msgstr "Passord (gjenta)"
msgid "Enter the same password as above, for verification."
msgstr "Skriv inn det samme passordet som ovenfor, for verifisering."
-#: contrib/admin/templates/admin/edit_inline/stacked.html:53
-#: contrib/admin/templates/admin/edit_inline/tabular.html:99
+#: contrib/admin/templates/admin/edit_inline/stacked.html:64
+#: contrib/admin/templates/admin/edit_inline/tabular.html:110
#, python-format
msgid "Add another %(verbose_name)s"
msgstr "Legg til ny %(verbose_name)s"
-#: contrib/admin/templates/admin/edit_inline/stacked.html:56
-#: contrib/admin/templates/admin/edit_inline/tabular.html:102
+#: contrib/admin/templates/admin/edit_inline/stacked.html:67
+#: contrib/admin/templates/admin/edit_inline/tabular.html:113
#: contrib/comments/templates/comments/delete.html:12
msgid "Remove"
msgstr "Fjern"
@@ -1029,16 +1048,16 @@ msgstr "E-postadresse:"
msgid "Reset my password"
msgstr "Nullstill mitt passord"
-#: contrib/admin/templatetags/admin_list.py:240
+#: contrib/admin/templatetags/admin_list.py:257
msgid "All dates"
msgstr "Alle datoer"
-#: contrib/admin/views/main.py:70
+#: contrib/admin/views/main.py:65
#, python-format
msgid "Select %s"
msgstr "Velg %s"
-#: contrib/admin/views/main.py:70
+#: contrib/admin/views/main.py:65
#, python-format
msgid "Select %s to change"
msgstr "Velg %s du ønsker å endre"
@@ -1210,8 +1229,7 @@ msgstr "Brukernavn"
#: contrib/auth/forms.py:15 contrib/auth/forms.py:49
msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
-msgstr ""
-"Påkrevet. 30 tegn eller færre. Kun bokstaver, tall og @/./+/-/_."
+msgstr "Påkrevet. 30 tegn eller færre. Kun bokstaver, tall og @/./+/-/_."
#: contrib/auth/forms.py:16 contrib/auth/forms.py:50
msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
@@ -1298,8 +1316,7 @@ msgstr "brukernavn"
#: contrib/auth/models.py:196
msgid ""
"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-"Påkrevet. 30 tegn eller færre. Bokstaver, tall og @/./+/-/_."
+msgstr "Påkrevet. 30 tegn eller færre. Bokstaver, tall og @/./+/-/_."
#: contrib/auth/models.py:197
msgid "first name"
@@ -1393,7 +1410,7 @@ msgid "Logged out"
msgstr "Logget ut"
#: contrib/auth/management/commands/createsuperuser.py:23
-#: core/validators.py:120 forms/fields.py:416
+#: core/validators.py:120 forms/fields.py:428
msgid "Enter a valid e-mail address."
msgstr "Oppgi en gyldig e-postadresse."
@@ -1405,31 +1422,37 @@ msgstr "Innhold"
msgid "Metadata"
msgstr "Metadata"
-#: contrib/comments/admin.py:39
+#: contrib/comments/admin.py:40
msgid "flagged"
-msgstr "flagget"
+msgid_plural "flagged"
+msgstr[0] "flagget"
+msgstr[1] "flagget"
-#: contrib/comments/admin.py:40
+#: contrib/comments/admin.py:41
msgid "Flag selected comments"
msgstr "Flagg valgte kommentarer"
-#: contrib/comments/admin.py:43
+#: contrib/comments/admin.py:45
msgid "approved"
-msgstr "godkjent"
+msgid_plural "approved"
+msgstr[0] "godkjent"
+msgstr[1] "godkjent"
-#: contrib/comments/admin.py:44
+#: contrib/comments/admin.py:46
msgid "Approve selected comments"
msgstr "Tillat valgte kommentarer"
-#: contrib/comments/admin.py:47
+#: contrib/comments/admin.py:50
msgid "removed"
-msgstr "fjernet"
+msgid_plural "removed"
+msgstr[0] "fjernet"
+msgstr[1] "fjernet"
-#: contrib/comments/admin.py:48
+#: contrib/comments/admin.py:51
msgid "Remove selected comments"
msgstr "Fjern valgte kommentarer"
-#: contrib/comments/admin.py:60
+#: contrib/comments/admin.py:63
#, python-format
msgid "1 comment was successfully %(action)s."
msgid_plural "%(count)s comments were successfully %(action)s."
@@ -1455,7 +1478,7 @@ msgid "Email address"
msgstr "E-postadresse"
#: contrib/comments/forms.py:95 contrib/flatpages/admin.py:8
-#: contrib/flatpages/models.py:7 db/models/fields/__init__.py:1121
+#: contrib/flatpages/models.py:7 db/models/fields/__init__.py:1101
msgid "URL"
msgstr "Nettadresse"
@@ -1505,7 +1528,7 @@ msgstr "kommentar"
msgid "date/time submitted"
msgstr "dato/tid for innsendelse"
-#: contrib/comments/models.py:60 db/models/fields/__init__.py:916
+#: contrib/comments/models.py:60 db/models/fields/__init__.py:896
msgid "IP address"
msgstr "IP-adresse"
@@ -1749,31 +1772,31 @@ msgstr ""
msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
msgstr ""
-#: contrib/gis/db/models/fields.py:269
+#: contrib/gis/db/models/fields.py:270
msgid "Point"
msgstr "Punkt"
-#: contrib/gis/db/models/fields.py:273
+#: contrib/gis/db/models/fields.py:274
msgid "Line string"
msgstr ""
-#: contrib/gis/db/models/fields.py:277
+#: contrib/gis/db/models/fields.py:278
msgid "Polygon"
msgstr "Polygon"
-#: contrib/gis/db/models/fields.py:281
+#: contrib/gis/db/models/fields.py:282
msgid "Multi-point"
msgstr ""
-#: contrib/gis/db/models/fields.py:285
+#: contrib/gis/db/models/fields.py:286
msgid "Multi-line string"
msgstr ""
-#: contrib/gis/db/models/fields.py:289
+#: contrib/gis/db/models/fields.py:290
msgid "Multi polygon"
msgstr ""
-#: contrib/gis/db/models/fields.py:293
+#: contrib/gis/db/models/fields.py:294
msgid "Geometry collection"
msgstr ""
@@ -1885,8 +1908,8 @@ msgstr "i går"
msgid "Enter a postal code in the format NNNN or ANNNNAAA."
msgstr "Oppgi et postnummer på formen NNNN eller ANNNNAAA."
-#: 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/ar/forms.py:50 contrib/localflavor/br/forms.py:92
+#: contrib/localflavor/br/forms.py:131 contrib/localflavor/pe/forms.py:24
#: contrib/localflavor/pe/forms.py:52
msgid "This field requires only numbers."
msgstr "Feltet krever kun tall."
@@ -1952,15 +1975,15 @@ msgstr "Oppgi et gyldig Østerrisk personnummer på formen XXXX XXXXXX."
msgid "Enter a 4 digit post code."
msgstr "Oppgi et firesifret postnummer."
-#: contrib/localflavor/br/forms.py:22
+#: contrib/localflavor/br/forms.py:17
msgid "Enter a zip code in the format XXXXX-XXX."
msgstr "Oppgi et postnummer på formen XXXXX-XXX."
-#: contrib/localflavor/br/forms.py:31
+#: contrib/localflavor/br/forms.py:26
msgid "Phone numbers must be in XX-XXXX-XXXX format."
msgstr "Telefonnummeret må være på formen XX-XXXX-XXXX."
-#: contrib/localflavor/br/forms.py:59
+#: contrib/localflavor/br/forms.py:54
msgid ""
"Select a valid brazilian state. That state is not one of the available "
"states."
@@ -1968,19 +1991,19 @@ msgstr ""
"Velg en gyldig brasiliansk stat. Den staten er ikke et av de tilgjengelige "
"valgene."
-#: contrib/localflavor/br/forms.py:95
+#: contrib/localflavor/br/forms.py:90
msgid "Invalid CPF number."
msgstr "Ugyldig CPF-nummer."
-#: contrib/localflavor/br/forms.py:96
+#: contrib/localflavor/br/forms.py:91
msgid "This field requires at most 11 digits or 14 characters."
msgstr "Feltet krever maksimum 11 eller 14 siffer."
-#: contrib/localflavor/br/forms.py:135
+#: contrib/localflavor/br/forms.py:130
msgid "Invalid CNPJ number."
msgstr "Ugyldig CNPJ-nummer."
-#: contrib/localflavor/br/forms.py:137
+#: contrib/localflavor/br/forms.py:132
msgid "This field requires at least 14 digits"
msgstr "Feltet krever minst 14 siffer."
@@ -4325,7 +4348,7 @@ msgstr ""
#: contrib/localflavor/us/forms.py:88
msgid "Enter a U.S. state or territory."
-msgstr ""
+msgstr "Oppgi en amerikansk stat eller et område"
#: contrib/localflavor/us/models.py:8
msgid "U.S. state (two uppercase letters)"
@@ -4459,26 +4482,26 @@ msgstr "nettsteder"
msgid "Enter a valid value."
msgstr "Oppgi en gyldig verdi."
-#: core/validators.py:87 forms/fields.py:517
+#: core/validators.py:87 forms/fields.py:529
msgid "Enter a valid URL."
msgstr "Oppgi en gyldig nettadresse."
-#: core/validators.py:89 forms/fields.py:518
+#: core/validators.py:89 forms/fields.py:530
msgid "This URL appears to be a broken link."
msgstr "Nettadressen fører til en side som ikke eksisterer."
-#: core/validators.py:123 forms/fields.py:861
+#: core/validators.py:123 forms/fields.py:873
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Oppgi en gyldig 'slug' bestående av bokstaver, nummer, understreker eller "
"bindestreker."
-#: core/validators.py:126 forms/fields.py:854
+#: core/validators.py:126 forms/fields.py:866
msgid "Enter a valid IPv4 address."
msgstr "Oppgi en gyldig IPv4-adresse."
-#: core/validators.py:129 db/models/fields/__init__.py:598
+#: core/validators.py:129 db/models/fields/__init__.py:572
msgid "Enter only digits separated by commas."
msgstr "Oppgi kun tall adskilt med komma."
@@ -4487,12 +4510,12 @@ msgstr "Oppgi kun tall adskilt med komma."
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Verdien må være %(limit_value)s (den er %(show_value)s)."
-#: core/validators.py:153 forms/fields.py:196 forms/fields.py:246
+#: core/validators.py:153 forms/fields.py:205 forms/fields.py:257
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Verdien må være mindre enn eller lik som %(limit_value)s."
-#: core/validators.py:158 forms/fields.py:197 forms/fields.py:247
+#: core/validators.py:158 forms/fields.py:206 forms/fields.py:258
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Verdien må være større enn eller lik som %(limit_value)s."
@@ -4511,159 +4534,159 @@ msgid ""
"(show_value)d)."
msgstr "Verdien kan maksimalt ha %(limit_value)d tegn (den er %(show_value)d)."
-#: db/models/base.py:780
+#: db/models/base.py:823
#, 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."
-#: db/models/base.py:795 db/models/base.py:803
+#: db/models/base.py:838 db/models/base.py:846
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s med %(field_label)s finnes allerede."
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:63
#, python-format
msgid "Value %r is not a valid choice."
msgstr "Verdien %r er ikke et gyldig valg."
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:64
msgid "This field cannot be null."
msgstr "Feltet kan ikke være tomt."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:65
msgid "This field cannot be blank."
msgstr "Feltet kan ikke være blankt."
-#: db/models/fields/__init__.py:69
+#: db/models/fields/__init__.py:70
#, python-format