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/cy.po | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'po/cy.po') diff --git a/po/cy.po b/po/cy.po index 83a8fd37..707f167f 100644 --- a/po/cy.po +++ b/po/cy.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: urpmi 3.3\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-02-01 20:27-0000\n" "Last-Translator: Rhoslyn Prys \n" "Language-Team: Cymraeg/Welsh \n" @@ -1447,7 +1447,7 @@ msgid " --no-install - don't install packages (only download)\n" msgstr "" " --install-src - gosod pecynnau ffynhonnell yn unig (dim binaries).\n" -#: ../urpmi:88 +#: ../urpmi:88 ../urpmq:52 #, c-format msgid "" " --keep - keep existing packages if possible, reject requested\n" @@ -2135,15 +2135,6 @@ msgstr "" "\n" "defnydd:\n" -#: ../urpmq:52 -#, fuzzy, c-format -msgid "" -" --keep - keep existing packages if possible, reject requested\n" -" packages that leads to remove.\n" -msgstr "" -" --keep - cadw'r pecynnau presennol os yn bosibl, gwrthod\n" -" pecynnau sy'n arwain at dynnu.\n" - #: ../urpmq:54 #, c-format msgid " --list - list available packages.\n" @@ -2301,6 +2292,14 @@ msgstr "Heb ganfod filelist\n" msgid "No changelog found\n" msgstr "Heb ganfod changelog\n" +#, fuzzy +#~ msgid "" +#~ " --keep - keep existing packages if possible, reject requested\n" +#~ " packages that leads to remove.\n" +#~ msgstr "" +#~ " --keep - cadw'r pecynnau presennol os yn bosibl, gwrthod\n" +#~ " pecynnau sy'n arwain at dynnu.\n" + #~ msgid "unable to write file [%s]" #~ msgstr "methu ysgrifennu ffeil (%s)" -- cgit v1.2.1