Commit 2cb26740 authored by Jannis Leidel's avatar Jannis Leidel
Browse files

Copied "Norwegian Bokmål (nb)" translation to old "Norwegian (no)" translation... 

Copied "Norwegian Bokmål (nb)" translation to old "Norwegian (no)" translation for backwards compatibility.

This change slightly extends what was decided in #11068 (to not update the "no" translation due to complicated maintenance, but only "nb"). Thanks, Transifex!

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15887 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent ada8e2a6

django/conf/locale/no/LC_MESSAGES/django.po

+53 −51
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ msgstr "" 
"Report-Msgid-Bugs-To: \n"

"POT-Creation-Date: 2011-03-15 13:10-0400\n"

"PO-Revision-Date: 2011-03-04 18:40+0000\n"

"Last-Translator: Jannis <jannis@leidel.info>\n"

"Last-Translator: jonklo <jonklo@gmail.com>\n"

"Language-Team: Norwegian <>\n"

"MIME-Version: 1.0\n"

"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,7 @@ msgstr "Arabisk" 


#: conf/global_settings.py:45

msgid "Azerbaijani"

msgstr ""

msgstr "Aserbajdsjansk"



#: conf/global_settings.py:46

msgid "Bulgarian"
@@ -72,11 +72,11 @@ msgstr "Spansk" 


#: conf/global_settings.py:58

msgid "Argentinian Spanish"

msgstr ""

msgstr "Argentinsk spansk"



#: conf/global_settings.py:59

msgid "Mexican Spanish"

msgstr ""

msgstr "Meksikansk spansk"



#: conf/global_settings.py:60

msgid "Estonian"
@@ -172,7 +172,7 @@ msgstr "Makedonsk" 


#: conf/global_settings.py:83

msgid "Malayalam"

msgstr ""

msgstr "Malayalam"



#: conf/global_settings.py:84

msgid "Mongolian"
@@ -196,7 +196,7 @@ msgstr "Norsk (nynorsk)" 


#: conf/global_settings.py:89

msgid "Punjabi"

msgstr ""

msgstr "Panjabi"



#: conf/global_settings.py:90

msgid "Polish"
@@ -264,7 +264,7 @@ msgstr "Ukrainsk" 


#: conf/global_settings.py:106

msgid "Urdu"

msgstr ""

msgstr "Urdu"



#: conf/global_settings.py:107

msgid "Vietnamese"
@@ -561,7 +561,7 @@ msgstr "Filnavnet kan maksimalt ha %(max)d tegn (det har %(length)d)." 


#: forms/fields.py:464

msgid "Please either submit a file or check the clear checkbox, not both."

msgstr ""

msgstr "Vennligst last opp en ny fil eller marker fjern-boksen, ikke begge."



#: forms/fields.py:518

msgid ""
@@ -631,7 +631,7 @@ msgstr "\"%s\" er ikke en gyldig verdi for en primærnøkkel." 


#: forms/widgets.py:299

msgid "Currently"

msgstr ""

msgstr "Nå"



#: forms/widgets.py:300

msgid "Change"
@@ -639,7 +639,7 @@ msgstr "Endre" 


#: forms/widgets.py:301

msgid "Clear"

msgstr ""

msgstr "Fjern"



#: forms/widgets.py:548

msgid "Unknown"
@@ -667,27 +667,27 @@ msgstr[1] "%(size)d bytes" 
#: template/defaultfilters.py:812

#, python-format

msgid "%s KB"

msgstr ""

msgstr "%s KB"



#: template/defaultfilters.py:814

#, python-format

msgid "%s MB"

msgstr ""

msgstr "%s MB"



#: template/defaultfilters.py:816

#, python-format

msgid "%s GB"

msgstr ""

msgstr "%s GB"



#: template/defaultfilters.py:818

#, python-format

msgid "%s TB"

msgstr ""

msgstr "%s TB"



#: template/defaultfilters.py:819

#, python-format

msgid "%s PB"

msgstr ""

msgstr "%s PB"



#: utils/dateformat.py:42

msgid "p.m."
@@ -771,7 +771,7 @@ msgstr "søn" 


#: utils/dates.py:18

msgid "January"

msgstr "januar"

msgstr "Januar"



#: utils/dates.py:18

msgid "February"
@@ -868,122 +868,122 @@ msgstr "des" 
#: utils/dates.py:31

msgctxt "abbrev. month"

msgid "Jan."

msgstr ""

msgstr "jan."



#: utils/dates.py:32

msgctxt "abbrev. month"

msgid "Feb."

msgstr ""

msgstr "feb."



#: utils/dates.py:33

msgctxt "abbrev. month"

msgid "March"

msgstr ""

msgstr "mar."



#: utils/dates.py:34

msgctxt "abbrev. month"

msgid "April"

msgstr ""

msgstr "apr."



#: utils/dates.py:35

msgctxt "abbrev. month"

msgid "May"

msgstr ""

msgstr "mai"



#: utils/dates.py:36

msgctxt "abbrev. month"

msgid "June"

msgstr ""

msgstr "jun."



#: utils/dates.py:37

msgctxt "abbrev. month"

msgid "July"

msgstr ""

msgstr "jul."



#: utils/dates.py:38

msgctxt "abbrev. month"

msgid "Aug."

msgstr ""

msgstr "aug."



#: utils/dates.py:39

msgctxt "abbrev. month"

msgid "Sept."

msgstr ""

msgstr "sept."



#: utils/dates.py:40

msgctxt "abbrev. month"

msgid "Oct."

msgstr ""

msgstr "okt."



#: utils/dates.py:41

msgctxt "abbrev. month"

msgid "Nov."

msgstr ""

msgstr "nov."



#: utils/dates.py:42

msgctxt "abbrev. month"

msgid "Dec."

msgstr ""

msgstr "des."



#: utils/dates.py:45

msgctxt "alt. month"

msgid "January"

msgstr ""

msgstr "Januar"



#: utils/dates.py:46

msgctxt "alt. month"

msgid "February"

msgstr ""

msgstr "Februar"



#: utils/dates.py:47

msgctxt "alt. month"

msgid "March"

msgstr ""

msgstr "Mars"



#: utils/dates.py:48

msgctxt "alt. month"

msgid "April"

msgstr ""

msgstr "April"



#: utils/dates.py:49

msgctxt "alt. month"

msgid "May"

msgstr ""

msgstr "Mai"



#: utils/dates.py:50

msgctxt "alt. month"

msgid "June"

msgstr ""

msgstr "Juni"



#: utils/dates.py:51

msgctxt "alt. month"

msgid "July"

msgstr ""

msgstr "Juli"



#: utils/dates.py:52

msgctxt "alt. month"

msgid "August"

msgstr ""

msgstr "August"



#: utils/dates.py:53

msgctxt "alt. month"

msgid "September"

msgstr ""

msgstr "September"



#: utils/dates.py:54

msgctxt "alt. month"

msgid "October"

msgstr ""

msgstr "Oktober"



#: utils/dates.py:55

msgctxt "alt. month"

msgid "November"

msgstr ""

msgstr "November"



#: utils/dates.py:56

msgctxt "alt. month"

msgid "December"

msgstr ""

msgstr "Desember"



#: utils/text.py:136

msgid "or"
@@ -992,7 +992,7 @@ msgstr "eller" 
#. Translators: This string is used as a separator between list elements

#: utils/text.py:153

msgid ", "

msgstr ""

msgstr ","



#: utils/timesince.py:21

msgid "year"
@@ -1081,24 +1081,24 @@ msgstr "%(verbose_name)s ble slettet." 


#: views/generic/dates.py:33

msgid "No year specified"

msgstr ""

msgstr "År ikke spesifisert"



#: views/generic/dates.py:58

msgid "No month specified"

msgstr ""

msgstr "Måned ikke spesifisert"



#: views/generic/dates.py:99

msgid "No day specified"

msgstr ""

msgstr "Dag ikke spesifisert"



#: views/generic/dates.py:138

msgid "No week specified"

msgstr ""

msgstr "Uke ikke spesifisert"



#: views/generic/dates.py:198 views/generic/dates.py:214

#, python-format

msgid "No %(verbose_name_plural)s available"

msgstr ""

msgstr "Ingen %(verbose_name_plural)s tilgjengelig"



#: views/generic/dates.py:466

#, python-format
@@ -1106,27 +1106,29 @@ msgid "" 
"Future %(verbose_name_plural)s not available because %(class_name)s."

"allow_future is False."

msgstr ""

"Fremtidig %(verbose_name_plural)s ikke tilgjengelig fordi %(class_name)s."

"allow_future er False."



#: views/generic/dates.py:500

#, python-format

msgid "Invalid date string '%(datestr)s' given format '%(format)s'"

msgstr ""

msgstr "Ugyldig datostreng '%(datestr)s' gitt formatet '%(format)s'"



#: views/generic/detail.py:51

#, python-format

msgid "No %(verbose_name)s found matching the query"

msgstr ""

msgstr "Fant ingen %(verbose_name)s fra spørringen"



#: views/generic/list.py:47

msgid "Page is not 'last', nor can it be converted to an int."

msgstr ""

msgstr "Siden er ikke 'last', og kan heller ikke konverteres til et tall."



#: views/generic/list.py:52

#, python-format

msgid "Invalid page (%(page_number)s)"

msgstr ""

msgstr "Ugyldig side (%(page_number)s)"



#: views/generic/list.py:119

#, python-format

msgid "Empty list and '%(class_name)s.allow_empty' is False."

msgstr ""
 
msgstr "Tom liste og '%(class_name)s.allow_empty' er False."

django/contrib/admin/locale/no/LC_MESSAGES/django.po

+17 −6
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ msgstr "" 
"Report-Msgid-Bugs-To: \n"

"POT-Creation-Date: 2011-03-20 21:03+0100\n"

"PO-Revision-Date: 2011-03-04 18:44+0000\n"

"Last-Translator: Jannis <jannis@leidel.info>\n"

"Last-Translator: jonklo <jonklo@gmail.com>\n"

"Language-Team: Norwegian <>\n"

"MIME-Version: 1.0\n"

"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +22,7 @@ msgstr "Slettet %(count)d %(items)s." 
#: actions.py:61 options.py:1219

#, python-format

msgid "Cannot delete %(name)s"

msgstr ""

msgstr "Kan ikke slette %(name)s"



#: actions.py:63 options.py:1221

msgid "Are you sure?"
@@ -432,6 +432,8 @@ msgid "" 
"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "

"following protected related objects:"

msgstr ""

"Sletting av %(object_name)s '%(escaped_object)s' krever sletting av følgende "

"beskyttede relaterte objekter:"



#: templates/admin/delete_confirmation.html:33

#, python-format
@@ -458,6 +460,9 @@ msgid "" 
"objects, but your account doesn't have permission to delete the following "

"types of objects:"

msgstr ""

"Sletting av det valgte %(objects_name)s ville resultere i sletting av "

"relaterte objekter, men kontoen din har ikke tillatelse til å slette "

"følgende objekttyper:"



#: templates/admin/delete_selected_confirmation.html:24

#, python-format
@@ -465,6 +470,8 @@ msgid "" 
"Deleting the selected %(objects_name)s would require deleting the following "

"protected related objects:"

msgstr ""

"Sletting av det valgte %(objects_name)s ville kreve sletting av følgende "

"beskyttede relaterte objekter:"



#: templates/admin/delete_selected_confirmation.html:32

#, python-format
@@ -472,6 +479,8 @@ msgid "" 
"Are you sure you want to delete the selected %(objects_name)s? All of the "

"following objects and their related items will be deleted:"

msgstr ""

"Er du sikker på vil slette det valgte %(objects_name)s? De følgende "

"objektene og deres relaterte objekter vil bli slettet:"



#: templates/admin/filter.html:2

#, python-format
@@ -560,8 +569,8 @@ msgstr "Søk" 
#, python-format

msgid "%(counter)s result"

msgid_plural "%(counter)s results"

msgstr[0] ""

msgstr[1] ""

msgstr[0] "%(counter)s resultat"

msgstr[1] "%(counter)s resultater"



#: templates/admin/search_form.html:10

#, python-format
@@ -590,7 +599,7 @@ msgstr "" 


#: templates/admin/auth/user/add_form.html:8

msgid "Enter a username and password."

msgstr ""

msgstr "Oppgi brukernavn og passord."



#: templates/admin/auth/user/change_password.html:29

#, python-format
@@ -743,6 +752,8 @@ msgid "" 
"You're receiving this e-mail because you requested a password reset for your "

"user account at %(site_name)s."

msgstr ""

"Du har mottatt denne e-posten fordi du har bedt om nullstilling av passordet "

"ditt for din konto på %(site_name)s."



#: templates/registration/password_reset_email.html:4

msgid "Please go to the following page and choose a new password:"
@@ -783,7 +794,7 @@ msgstr "Alle datoer" 


#: views/main.py:27

msgid "(None)"

msgstr ""

msgstr "(Ingen)"



#: views/main.py:66

#, python-format