Merge new strings

1 files changed, 216 insertions, 52 deletions

diff --git a/po/nn.po b/po/nn.po
index 3954be9f..3c0bce64 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-03 13:52+0100\n"
+"POT-Creation-Date: 2005-01-06 15:42+0100\n"
 "PO-Revision-Date: 2005-01-06 12:29+0100\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -78,6 +78,216 @@ msgstr " (J/N) "
 msgid "%s: command not found\n"
 msgstr "%s: Fann ikkje kommandoen.\n"
 
+#: ../gurpmi:99
+#, c-format
+msgid "Please wait..."
+msgstr ""
+
+#: ../gurpmi:110
+#, fuzzy, c-format
+msgid "Unknown option %s"
+msgstr ""
+"\n"
+"Ukjende val: «%s».\n"
+
+#: ../gurpmi:114
+#, fuzzy, c-format
+msgid "No packages specified"
+msgstr "Det finst ingen «%s»-pakke."
+
+#: ../gurpmi:118
+#, c-format
+msgid "Must be root"
+msgstr ""
+
+#: ../gurpmi:128
+#, fuzzy, c-format
+msgid "RPM installation"
+msgstr "Feil ved installering."
+
+#: ../gurpmi:141
+#, c-format
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it would "
+"allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+
+#: ../gurpmi:149
+#, c-format
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+
+#: ../gurpmi:154
+#, fuzzy, c-format
+msgid ""
+"You are about to install the following software packages on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"Proceed?"
+msgstr ""
+"Du må vera «root»-brukar for å kunna installera desse avhengnadene:\n"
+"%s\n"
+
+#: ../gurpmi:164
+#, c-format
+msgid "_Install"
+msgstr ""
+
+#: ../gurpmi:165
+#, c-format
+msgid "_Save"
+msgstr ""
+
+#: ../gurpmi:166 ../gurpmi:229
+#, fuzzy, c-format
+msgid "_Cancel"
+msgstr "Avbryt"
+
+#: ../gurpmi:170
+#, c-format
+msgid "Choose location to save file"
+msgstr ""
+
+#: ../gurpmi:220
+#, c-format
+msgid " (to upgrade)"
+msgstr ""
+
+#: ../gurpmi:221
+#, fuzzy, c-format
+msgid " (to install)"
+msgstr "for å kunna installera «%s»"
+
+#: ../gurpmi:225 ../urpmi:350
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Du treng éin av desse pakkane:"
+
+#: ../gurpmi:230 ../gurpmi:246
+#, fuzzy, c-format
+msgid "_Ok"
+msgstr "OK"
+
+#: ../gurpmi:247
+#, c-format
+msgid "_Abort"
+msgstr ""
+
+#: ../gurpmi:276
+#, fuzzy, c-format
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s\n"
+"Continue?"
+msgstr ""
+"Nokre av pakkane kan ikkje installerast:\n"
+"%s"
+
+#: ../gurpmi:287
+#, fuzzy, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s\n"
+"Continue?"
+msgstr ""
+"Desse pakkane må fjernast for at andre skal kunna oppgraderast:\n"
+"%s"
+
+#: ../gurpmi:300
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be "
+"installed:\n"
+"%s\n"
+msgstr "Grunna avhengnader vert desse %d pakkane installerte (%d MiB)"
+
+#: ../gurpmi:307
+#, c-format
+msgid "Package installation..."
+msgstr ""
+
+#: ../gurpmi:309 ../urpmi:483 ../urpmq:302
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "Fann ikkje kjeldepakke. Avbryter."
+
+#: ../gurpmi:323 ../urpmi:494
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Set inn «%s» i eininga [%s]."
+
+#: ../gurpmi:350
+#, fuzzy, c-format
+msgid "Downloading package `%s'..."
+msgstr "Fjernar pakken «%s»."
+
+#: ../gurpmi:365
+#, fuzzy, c-format
+msgid ""
+"The following packages have bad signatures:\n"
+"%s\n"
+"\n"
+"Do you want to continue installation ?"
+msgstr "Desse pakkane har ugyldige signaturar"
+
+#: ../gurpmi:372 ../gurpmi:421 ../urpmi:556 ../urpmi:672
+#, c-format
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
+msgstr ""
+"Feil ved installering. Nokre filer manglar:\n"
+"%s\n"
+"Du bør oppdatera urpmi-databasen."
+
+#: ../gurpmi:379 ../urpme:111 ../urpmi:597
+#, c-format
+msgid "removing %s"
+msgstr "Fjernar «%s»."
+
+#: ../gurpmi:387 ../urpm.pm:2751
+#, c-format
+msgid "Preparing..."
+msgstr "Førebur ... "
+
+#: ../gurpmi:389
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr ""
+
+#: ../gurpmi:407 ../urpmi:566 ../urpmi:610 ../urpmi:631 ../urpmi:651
+#, c-format
+msgid "Installation failed"
+msgstr "Feil ved installering."
+
+#: ../gurpmi:416
+#, c-format
+msgid "_Done"
+msgstr ""
+
+#: ../gurpmi:424 ../urpmi:688
+#, c-format
+msgid "The package(s) are already installed"
+msgstr "Alt er allereie installert."
+
+#: ../gurpmi:426
+#, fuzzy, c-format
+msgid "Installation finished"
+msgstr "Feil ved installering."
+
 #: ../rpm-find-leaves:12
 #, c-format
 msgid ""
@@ -703,11 +913,6 @@ msgstr "Ugyldig inndata: [%s]."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "Mottek rpm-filer frå mediet «%s» ..."
 
-#: ../urpm.pm:2751
-#, c-format
-msgid "Preparing..."
-msgstr "Førebur ... "
-
 #: ../urpm.pm:2789
 #, c-format
 msgid "using process %d for executing transaction"
@@ -933,11 +1138,6 @@ msgstr "På grunn av avhengnader vert desse %d pakkane fjerna (%d MiB)"
 msgid " (y/N) "
 msgstr " (J/N) "
 
-#: ../urpme:111 ../urpmi:597
-#, c-format
-msgid "removing %s"
-msgstr "Fjernar «%s»."
-
 #: ../urpme:115
 #, c-format
 msgid "Removing failed"
@@ -1462,11 +1662,6 @@ msgstr ""
 "Feil: %s ser ut til å vera montert som skriveverna.\n"
 "Bruk «--allow-force» for å tvinga gjennom operasjonen."
 
-#: ../urpmi:350
-#, c-format
-msgid "One of the following packages is needed:"
-msgstr "Du treng éin av desse pakkane:"
-
 #: ../urpmi:353
 #, c-format
 msgid "What is your choice? (1-%d) "
@@ -1544,16 +1739,6 @@ msgstr ""
 "Du må vera «root»-brukar for å kunna installera desse avhengnadene:\n"
 "%s\n"
 
-#: ../urpmi:483 ../urpmq:302
-#, c-format
-msgid "unable to get source packages, aborting"
-msgstr "Fann ikkje kjeldepakke. Avbryter."
-
-#: ../urpmi:494
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Set inn «%s» i eininga [%s]."
-
 #: ../urpmi:495
 #, c-format
 msgid "Press Enter when ready..."
@@ -1569,22 +1754,6 @@ msgstr "Desse pakkane har ugyldige signaturar"
 msgid "Do you want to continue installation ?"
 msgstr "Vil du halda fram med å installera?"
 
-#: ../urpmi:556 ../urpmi:672
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"Feil ved installering. Nokre filer manglar:\n"
-"%s\n"
-"Du bør oppdatera urpmi-databasen."
-
-#: ../urpmi:566 ../urpmi:610 ../urpmi:631 ../urpmi:651
-#, c-format
-msgid "Installation failed"
-msgstr "Feil ved installering."
-
 #: ../urpmi:581
 #, c-format
 msgid "distributing %s"
@@ -1620,12 +1789,7 @@ msgstr "%d mislykka installasjonstransaksjon."
 msgid "Installation is possible"
 msgstr "Det går an å installera."
 
-#: ../urpmi:688
-#, c-format
-msgid "The package(s) are already installed"
-msgstr "Alt er allereie installert."
-
-#: ../urpmi:702
+#: ../urpmi:703
 #, c-format
 msgid "restarting urpmi"
 msgstr "Startar urpmi på nytt."
@@ -1922,10 +2086,10 @@ msgid "enabling media %s"
 msgstr "Brukar mediet «%s»."
 
 #: ../urpmq:38
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "urpmq version %s\n"
-"Copyright (C) 2000-2004 Mandrakesoft.\n"
+"Copyright (C) 2000-2005 Mandrakesoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -2080,12 +2244,12 @@ msgstr "Kan berre bruka «--list-nodes« saman med «--parallel»."
 msgid "skipping media %s: no hdlist\n"
 msgstr "Hoppar over mediet «%s»: Inga «hdlist»\n"
 
-#: ../urpmq:401
+#: ../urpmq:399
 #, c-format
 msgid "No filelist found\n"
 msgstr "Fann ikkje filliste.\n"
 
-#: ../urpmq:411
+#: ../urpmq:409
 #, c-format
 msgid "No changelog found\n"
 msgstr "Fann ikkje endringslogg.\n"