From 3c35cc8951f384fe83dd276790c99a6a0b9a8f51 Mon Sep 17 00:00:00 2001 From: Rafael Garcia-Suarez Date: Thu, 21 Apr 2005 13:28:01 +0000 Subject: Merge strings --- po/nb.po | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'po/nb.po') 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 \n" "Language-Team: Norsk Bokmål \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]" -- cgit v1.2.1