sync with code & sync translations with urpmi

1 files changed, 59 insertions, 49 deletions

diff --git a/po/nb.po b/po/nb.po
index 3b4bf629..fc00f263 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-07 15:00+0100\n"
+"POT-Creation-Date: 2007-03-07 15:42+0100\n"
 "PO-Revision-Date: 2006-09-19 17:57+0200\n"
 "Last-Translator: Per Øyvind Karlsen <pkarlsen@mandriva.com>\n"
 "Language-Team: Norwegian Bokmål <cooker-i18n@mandrivalinux.com>\n"
@@ -234,7 +234,7 @@ msgstr "Mediumstype:"
 #: ../Rpmdrake/edit_urpm_sources.pm:521 ../Rpmdrake/edit_urpm_sources.pm:608
 #: ../Rpmdrake/edit_urpm_sources.pm:649 ../Rpmdrake/edit_urpm_sources.pm:707
 #: ../Rpmdrake/edit_urpm_sources.pm:857 ../Rpmdrake/gui.pm:502
-#: ../Rpmdrake/init.pm:126 ../Rpmdrake/pkg.pm:525 ../Rpmdrake/pkg.pm:571
+#: ../Rpmdrake/init.pm:126 ../Rpmdrake/pkg.pm:523 ../Rpmdrake/pkg.pm:568
 #: ../rpmdrake.pm:296 ../rpmdrake.pm:609 ../rpmdrake.pm:694 ../rpmdrake.pm:767
 #, c-format
 msgid "Cancel"
@@ -246,7 +246,7 @@ msgstr "Avbryt"
 #: ../Rpmdrake/edit_urpm_sources.pm:700 ../Rpmdrake/edit_urpm_sources.pm:773
 #: ../Rpmdrake/edit_urpm_sources.pm:903 ../Rpmdrake/edit_urpm_sources.pm:1063
 #: ../Rpmdrake/gui.pm:502 ../Rpmdrake/gui.pm:518 ../Rpmdrake/gui.pm:523
-#: ../Rpmdrake/init.pm:126 ../Rpmdrake/pkg.pm:525 ../Rpmdrake/pkg.pm:754
+#: ../Rpmdrake/init.pm:126 ../Rpmdrake/pkg.pm:523 ../Rpmdrake/pkg.pm:760
 #: ../Rpmdrake/rpmnew.pm:172 ../rpmdrake.pm:126 ../rpmdrake.pm:236
 #: ../rpmdrake.pm:298 ../rpmdrake.pm:609
 #, c-format
@@ -854,7 +854,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/gui.pm:615 ../Rpmdrake/pkg.pm:495
+#: ../Rpmdrake/gui.pm:615 ../Rpmdrake/pkg.pm:494
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Noen pakker må fjernes"
@@ -1724,23 +1724,23 @@ msgstr "Er du sikker på at du vil fjerne kilden «%s»?"
 msgid "Fatal error"
 msgstr "Kritisk feil"
 
-#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:510 ../Rpmdrake/pkg.pm:784
+#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:509 ../Rpmdrake/pkg.pm:790
 #: ../rpmdrake.pm:323
 #, c-format
 msgid "Please wait"
 msgstr "Vennligst vent"
 
-#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:510
+#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:509
 #, c-format
 msgid "Package installation..."
 msgstr "Pakkeinstallasjon..."
 
-#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:510 ../Rpmdrake/pkg.pm:784
+#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:509 ../Rpmdrake/pkg.pm:790
 #, c-format
 msgid "Initializing..."
 msgstr "Klargjør..."
 
-#: ../Rpmdrake/pkg.pm:215 ../Rpmdrake/pkg.pm:495
+#: ../Rpmdrake/pkg.pm:215 ../Rpmdrake/pkg.pm:494
 #, c-format
 msgid "Confirmation"
 msgstr "Bekreftelse"
@@ -1820,17 +1820,17 @@ msgstr "Lister opp pakker..."
 msgid "Please wait, finding installed packages..."
 msgstr "Finner tilgjengelige pakker..."
 
-#: ../Rpmdrake/pkg.pm:443 ../Rpmdrake/pkg.pm:731
+#: ../Rpmdrake/pkg.pm:443 ../Rpmdrake/pkg.pm:737
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Alle forespurte pakker ble vellykket installert."
 
-#: ../Rpmdrake/pkg.pm:447 ../Rpmdrake/pkg.pm:710
+#: ../Rpmdrake/pkg.pm:447 ../Rpmdrake/pkg.pm:716
 #, c-format
 msgid "Problem during installation"
 msgstr "Problemer under installasjon"
 
-#: ../Rpmdrake/pkg.pm:448 ../Rpmdrake/pkg.pm:712 ../Rpmdrake/pkg.pm:770
+#: ../Rpmdrake/pkg.pm:448 ../Rpmdrake/pkg.pm:718 ../Rpmdrake/pkg.pm:776
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1841,17 +1841,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:473
+#: ../Rpmdrake/pkg.pm:472
 #, c-format
 msgid "Unable to get source packages."
 msgstr "Ikke i stand til å få tak i kildepakker."
 
-#: ../Rpmdrake/pkg.pm:474
+#: ../Rpmdrake/pkg.pm:473
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Ikke i stand til å hente kildepakker, beklager. %s"
 
-#: ../Rpmdrake/pkg.pm:475 ../Rpmdrake/pkg.pm:700
+#: ../Rpmdrake/pkg.pm:474 ../Rpmdrake/pkg.pm:706
 #, c-format
 msgid ""
 "\n"
@@ -1864,7 +1864,7 @@ msgstr ""
 "Feil rapportert:\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:492
+#: ../Rpmdrake/pkg.pm:491
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
@@ -1873,14 +1873,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../Rpmdrake/pkg.pm:497
+#: ../Rpmdrake/pkg.pm:496
 #, c-format
 msgid "Remove one package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Fjern en nøkkel"
 msgstr[1] "Fjern en nøkkel"
 
-#: ../Rpmdrake/pkg.pm:499
+#: ../Rpmdrake/pkg.pm:498
 #, fuzzy, c-format
 msgid "The following package has to be removed for others to be upgraded:"
 msgstr ""
@@ -1890,14 +1890,14 @@ msgstr ""
 "\n"
 "Er det ok å fortsette?"
 
-#: ../Rpmdrake/pkg.pm:500
+#: ../Rpmdrake/pkg.pm:499
 #, fuzzy, c-format
 msgid "The following packages have to be removed for others to be upgraded:"
 msgstr ""
 "Følgende pakker må fjernes for at andre skal bli oppgradert:\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:500
+#: ../Rpmdrake/pkg.pm:499
 #, fuzzy, c-format
 msgid "Is it ok to continue?"
 msgstr ""
@@ -1905,47 +1905,57 @@ msgstr ""
 "\n"
 "Er det greit å fortsette?"
 
-#: ../Rpmdrake/pkg.pm:523
+#: ../Rpmdrake/pkg.pm:521
 #, c-format
 msgid "Change medium"
 msgstr "Endre medium"
 
-#: ../Rpmdrake/pkg.pm:524
+#: ../Rpmdrake/pkg.pm:522
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Sett inn medium kalt «%s» på enhet [%s]"
 
-#: ../Rpmdrake/pkg.pm:545
+#: ../Rpmdrake/pkg.pm:543
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "Forbereder pakker for installasjon..."
 
-#: ../Rpmdrake/pkg.pm:545
+#: ../Rpmdrake/pkg.pm:543
 #, c-format
 msgid "Preparing..."
 msgstr "Forbereder..."
 
-#: ../Rpmdrake/pkg.pm:548
+#: ../Rpmdrake/pkg.pm:546
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installerer pakke `%s' (%s/%s)..."
 
-#: ../Rpmdrake/pkg.pm:569
+#: ../Rpmdrake/pkg.pm:567 ../Rpmdrake/pkg.pm:572
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Laster ned pakke «%s» (%s/%s)..."
+msgid "Downloading package `%s'..."
+msgstr "Laster ned pakke «%s»..."
 
-#: ../Rpmdrake/pkg.pm:589
+#: ../Rpmdrake/pkg.pm:574
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr ""
+
+#: ../Rpmdrake/pkg.pm:575
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr ""
+
+#: ../Rpmdrake/pkg.pm:595
 #, c-format
 msgid "Verifying package signatures..."
 msgstr "Sjekker pakkersignaturer..."
 
-#: ../Rpmdrake/pkg.pm:602 ../rpmdrake.pm:750 ../rpmdrake.pm:859
+#: ../Rpmdrake/pkg.pm:608 ../rpmdrake.pm:750 ../rpmdrake.pm:859
 #, c-format
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../Rpmdrake/pkg.pm:603
+#: ../Rpmdrake/pkg.pm:609
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -1960,48 +1970,48 @@ msgstr ""
 "\n"
 "Vil du fortsette installasjon?"
 
-#: ../Rpmdrake/pkg.pm:616
+#: ../Rpmdrake/pkg.pm:622
 #, c-format
 msgid "installing %s from %s"
 msgstr "installerer %s fra %s"
 
-#: ../Rpmdrake/pkg.pm:618
+#: ../Rpmdrake/pkg.pm:624
 #, c-format
 msgid "installing %s"
 msgstr "installerer %s"
 
-#: ../Rpmdrake/pkg.pm:622
+#: ../Rpmdrake/pkg.pm:628
 #, c-format
 msgid "removing %s"
 msgstr "fjerner %s"
 
-#: ../Rpmdrake/pkg.pm:648 ../Rpmdrake/pkg.pm:666 ../Rpmdrake/pkg.pm:759
+#: ../Rpmdrake/pkg.pm:654 ../Rpmdrake/pkg.pm:672 ../Rpmdrake/pkg.pm:765
 #: ../rpmdrake.pm:737 ../rpmdrake.pm:818 ../rpmdrake.pm:842
 #, c-format
 msgid "Error"
 msgstr "Feil"
 
-#: ../Rpmdrake/pkg.pm:649 ../Rpmdrake/pkg.pm:667
+#: ../Rpmdrake/pkg.pm:655 ../Rpmdrake/pkg.pm:673
 #, c-format
 msgid "Installation failed:"
 msgstr "Installasjon mislyktes:"
 
-#: ../Rpmdrake/pkg.pm:650
+#: ../Rpmdrake/pkg.pm:656
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Prøv å installere uten å sjekke avhengigheter? (j/N) "
 
-#: ../Rpmdrake/pkg.pm:668
+#: ../Rpmdrake/pkg.pm:674
 #, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Prøv enda hardere å installere (--force)? (j/N) "
 
-#: ../Rpmdrake/pkg.pm:680 ../Rpmdrake/pkg.pm:697 ../Rpmdrake/pkg.pm:769
+#: ../Rpmdrake/pkg.pm:686 ../Rpmdrake/pkg.pm:703 ../Rpmdrake/pkg.pm:775
 #, c-format
 msgid "Installation failed"
 msgstr "Installasjon mislyktes"
 
-#: ../Rpmdrake/pkg.pm:698
+#: ../Rpmdrake/pkg.pm:704
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -2014,12 +2024,12 @@ msgstr ""
 "\n"
 "Du vil kanskje oppdatere din mediedatabase."
 
-#: ../Rpmdrake/pkg.pm:711
+#: ../Rpmdrake/pkg.pm:717
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d installasjonstransjaksjon mislyktes"
 
-#: ../Rpmdrake/pkg.pm:726
+#: ../Rpmdrake/pkg.pm:732
 #, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
@@ -2032,42 +2042,42 @@ msgstr ""
 "Noen oppsettsfiler ble opprettet som `.rpmnew' eller `.rpmsave',\n"
 "du kan nå sjekke noen for å utføre handlinger:"
 
-#: ../Rpmdrake/pkg.pm:734
+#: ../Rpmdrake/pkg.pm:740
 #, c-format
 msgid "Upgrade information"
 msgstr ""
 
-#: ../Rpmdrake/pkg.pm:736
+#: ../Rpmdrake/pkg.pm:742
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr "Disse pakkene kommer med oppgraderingsinformasjon"
 
-#: ../Rpmdrake/pkg.pm:744
+#: ../Rpmdrake/pkg.pm:750
 #, fuzzy, c-format
 msgid "Upgrade information about this package"
 msgstr "Mer informasjon om pakke..."
 
-#: ../Rpmdrake/pkg.pm:747
+#: ../Rpmdrake/pkg.pm:753
 #, fuzzy, c-format
 msgid "Upgrade information about package %s"
 msgstr "Mer informasjon om pakke... [%s]"
 
-#: ../Rpmdrake/pkg.pm:760
+#: ../Rpmdrake/pkg.pm:766
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Uopprettelig feil: ingen pakke ble funnet for installasjon, beklager."
 
-#: ../Rpmdrake/pkg.pm:784 ../Rpmdrake/pkg.pm:789
+#: ../Rpmdrake/pkg.pm:790 ../Rpmdrake/pkg.pm:795
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "Fjerner pakker..."
 
-#: ../Rpmdrake/pkg.pm:800
+#: ../Rpmdrake/pkg.pm:806
 #, c-format
 msgid "Problem during removal"
 msgstr "Problem under fjerning"
 
-#: ../Rpmdrake/pkg.pm:801
+#: ../Rpmdrake/pkg.pm:807
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"