Merge strings

1 files changed, 11 insertions, 11 deletions

diff --git a/po/nb.po b/po/nb.po
index 84684c00..308374a8 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-04-21 14:52+0200\n"
+"POT-Creation-Date: 2005-04-21 15:09+0200\n"
 "PO-Revision-Date: 2005-04-02 13:49+0200\n"
 "Last-Translator: Per Øyvind Karlsen <peroyvind@linux-mandrake.com>\n"
 "Language-Team: Norsk Bokmål <cooker-i18n@linux-mandrake.com>\n"
@@ -1447,7 +1447,7 @@ msgstr ""
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --install-src  - installer bare kildepakke (ingen binære).\n"
 
-#: ../urpmi:88
+#: ../urpmi:88 ../urpmq:52
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -2123,15 +2123,6 @@ msgstr ""
 "\n"
 "bruk:\n"
 
-#: ../urpmq:52
-#, fuzzy, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
-msgstr ""
-"  --keep         - behold eksisterende pakker hvis mulig, avvis forespurte\n"
-"                   pakker som fører til fjerning.\n"
-
 #: ../urpmq:54
 #, c-format
 msgid "  --list         - list available packages.\n"
@@ -2281,6 +2272,15 @@ msgstr "Ingen filliste funnet\n"
 msgid "No changelog found\n"
 msgstr "Ingen changelog funnet\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "  --keep         - keep existing packages if possible, reject requested\n"
+#~ "                   packages that leads to remove.\n"
+#~ msgstr ""
+#~ "  --keep         - behold eksisterende pakker hvis mulig, avvis "
+#~ "forespurte\n"
+#~ "                   pakker som fører til fjerning.\n"
+
 #~ msgid "unable to write file [%s]"
 #~ msgstr "kunne ikke skrive til fil [%s]"