sync with code

1 files changed, 36 insertions, 22 deletions

diff --git a/po/nb.po b/po/nb.po
index 18cdc89f..5ac4c246 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-15 14:22+0100\n"
+"POT-Creation-Date: 2007-01-18 15:22+0100\n"
 "PO-Revision-Date: 2006-08-18 02:05+0200\n"
 "Last-Translator: Per Øyvind Karlsen <pkarlsen@mandriva.com>\n"
 "Language-Team: Norwegian Bokmål <cooker-i18n@mandrivalinux.com>\n"
@@ -187,17 +187,6 @@ msgstr ""
 "%s\n"
 "Fortsett installasjon uansett?"
 
-#: ../gurpmi2:210
-#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be "
-"installed:\n"
-"%s\n"
-msgstr ""
-"For å tilfredstille avhengigheter, så vil de følgende %d pakkene bli "
-"installert:\n"
-"%s\n"
-
 #: ../gurpmi2:217
 #, c-format
 msgid "Package installation..."
@@ -2156,12 +2145,11 @@ msgstr[1] ""
 msgid "(test only, removal will not be actually done)"
 msgstr "(kun test, fjerning vil egentlig ikke bli gjennomført)"
 
-#: ../urpmi:578 ../urpmi:589
+#: ../urpmi:578
 #, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following packages are going to be installed"
+msgid "To satisfy dependencies, the following package is going to be installed"
 msgid_plural ""
-"To satisfy dependencies, the following package is going to be installed"
+"To satisfy dependencies, the following packages are going to be installed"
 msgstr[0] ""
 "For å tilfredstille avhengigheter, så vil de følgende pakkene bli installert"
 msgstr[1] ""
@@ -2181,6 +2169,17 @@ msgstr ""
 "Du må være root for å installere følgende avhengigheter:\n"
 "%s\n"
 
+#: ../urpmi:589 ../gurpmi2:209
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
+msgid_plural ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr[0] ""
+"For å tilfredstille avhengigheter, så vil de følgende pakkene bli installert"
+msgstr[1] ""
+"For å tilfredstille avhengigheter, så vil de følgende pakkene bli installert"
+
 #: ../urpmi:592
 #, c-format
 msgid "(test only, installation will not be actually done)"
@@ -2917,6 +2916,27 @@ msgstr "Ingen filliste funnet\n"
 msgid "No changelog found\n"
 msgstr "Ingen changelog funnet\n"
 
+#~ msgid ""
+#~ "To satisfy dependencies, the following %d packages are going to be "
+#~ "installed:\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "For å tilfredstille avhengigheter, så vil de følgende %d pakkene bli "
+#~ "installert:\n"
+#~ "%s\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed"
+#~ msgid_plural ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr[0] ""
+#~ "For å tilfredstille avhengigheter, så vil de følgende pakkene bli "
+#~ "installert"
+#~ msgstr[1] ""
+#~ "For å tilfredstille avhengigheter, så vil de følgende pakkene bli "
+#~ "installert"
+
 #~ msgid "skipping media %s: no hdlist"
 #~ msgstr "hopper over medie %s: ingen hdliste"
 
@@ -2974,12 +2994,6 @@ msgstr "Ingen changelog funnet\n"
 #~ msgid "Preparing install on %s..."
 #~ msgstr "Forebereder installasjon på %s..."
 
-#~ msgid ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgstr ""
-#~ "For å tilfredstille avhengigheter, så vil de følgende pakkene bli "
-#~ "installert"
-
 #~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 #~ msgstr "  --probe-synthesis - prøv å finn og bruk syntesefilen.\n"