sync with code

1 files changed, 31 insertions, 21 deletions

diff --git a/po/nn.po b/po/nn.po
index bdae8fee..f447f388 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nn\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-31 21:25+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -180,16 +180,6 @@ msgstr ""
 "%s\n"
 "Vil du likevel halda fram?"
 
-#: ../gurpmi2:210
-#, 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:\n"
-"%s\n"
-
 #: ../gurpmi2:217
 #, c-format
 msgid "Package installation..."
@@ -2138,14 +2128,13 @@ msgstr[1] ""
 msgid "(test only, removal will not be actually done)"
 msgstr "(Berre ein test. Pakkane vert ikkje fjerna.)"
 
-#: ../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"
-msgstr[0] "Grunna avhengnader vert desse pakkane installerte"
-msgstr[1] "Grunna avhengnader vert desse pakkane installerte"
+"To satisfy dependencies, the following packages are going to be installed"
+msgstr[0] "Grunna avhengnader vert denne pakken installert"
+msgstr[1] "Grunna avhengnader vert denne pakken installert"
 
 #: ../urpmi:580
 #, c-format
@@ -2161,6 +2150,15 @@ msgstr ""
 "Du må vera «root»-brukar for å kunna installera desse avhengnadene:\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] "Grunna avhengnader vert denne pakken installert"
+msgstr[1] "Grunna avhengnader vert denne pakken installert"
+
 #: ../urpmi:592
 #, c-format
 msgid "(test only, installation will not be actually done)"
@@ -2901,6 +2899,22 @@ msgstr "Fann ikkje filliste.\n"
 msgid "No changelog found\n"
 msgstr "Fann ikkje endringslogg.\n"
 
+#~ msgid ""
+#~ "To satisfy dependencies, the following %d packages are going to be "
+#~ "installed:\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Grunna avhengnader vert desse %d pakkane installerte:\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] "Grunna avhengnader vert desse pakkane installerte"
+#~ msgstr[1] "Grunna avhengnader vert desse pakkane installerte"
+
 #~ msgid "skipping media %s: no hdlist"
 #~ msgstr "Hoppar over mediet «%s»: Inga «hdlist»."
 
@@ -2959,10 +2973,6 @@ msgstr "Fann ikkje endringslogg.\n"
 #~ msgid "Preparing install on %s..."
 #~ msgstr "Førebur installering på %s ..."
 
-#~ msgid ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgstr "Grunna avhengnader vert denne pakken installert"
-
 #~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 #~ msgstr "  --probe-synthesis – Prøv å finna og bruka syntesefil.\n"