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/nn.po | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'po/nn.po') diff --git a/po/nn.po b/po/nn.po index a7cb32a5..b9f52800 100644 --- a/po/nn.po +++ b/po/nn.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: nn\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-01-31 20:13+0100\n" "Last-Translator: Karl Ove Hufthammer \n" "Language-Team: Norwegian Nynorsk \n" @@ -1440,7 +1440,7 @@ msgstr "" msgid " --no-install - don't install packages (only download)\n" msgstr " --install-src – Berre installer kjeldepakkar.\n" -#: ../urpmi:88 +#: ../urpmi:88 ../urpmq:52 #, c-format msgid "" " --keep - keep existing packages if possible, reject requested\n" @@ -2117,15 +2117,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 – Behald eksisterande pakkar viss mogleg. Ikkje installer\n" -" pakkar som krev fjerning av andre pakkar.\n" - #: ../urpmq:54 #, c-format msgid " --list - list available packages.\n" @@ -2278,6 +2269,15 @@ msgstr "Fann ikkje filliste.\n" msgid "No changelog found\n" msgstr "Fann ikkje endringslogg.\n" +#, fuzzy +#~ msgid "" +#~ " --keep - keep existing packages if possible, reject requested\n" +#~ " packages that leads to remove.\n" +#~ msgstr "" +#~ " --keep – Behald eksisterande pakkar viss mogleg. Ikkje " +#~ "installer\n" +#~ " pakkar som krev fjerning av andre pakkar.\n" + #~ msgid "unable to write file [%s]" #~ msgstr "Klarte ikkje skriva fila [%s]." -- cgit v1.2.1