From afea9f23bd47b71e45bc0b1ee689be5c6230ff87 Mon Sep 17 00:00:00 2001 From: Guillaume Cottenceau Date: Wed, 18 Jun 2003 17:08:29 +0000 Subject: merge --- po/rpmdrake.pot | 44 +++++++++++++++++++------------------------- 1 file changed, 19 insertions(+), 25 deletions(-) (limited to 'po/rpmdrake.pot') diff --git a/po/rpmdrake.pot b/po/rpmdrake.pot index 4cf91cf9..d05968ad 100644 --- a/po/rpmdrake.pot +++ b/po/rpmdrake.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-06-13 21:08+0200\n" +"POT-Creation-Date: 2003-06-18 19:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -556,6 +556,16 @@ msgstr "" msgid "Unable to create medium." msgstr "" +#: ../rpmdrake:1 +#, c-format +msgid "" +"The following packages have to be removed for others to be upgraded:\n" +"\n" +"%s\n" +"\n" +"Is it ok to continue?" +msgstr "" + #: ../edit-urpm-sources.pl:1 #, c-format msgid "" @@ -771,6 +781,14 @@ msgstr "" msgid "Some packages can't be removed" msgstr "" +#: ../rpmdrake:1 +#, c-format +msgid "" +"Sorry, the following package(s) can't be selected:\n" +"\n" +"%s" +msgstr "" + #: ../rpmdrake.pm:1 #, c-format msgid "Finland" @@ -941,18 +959,6 @@ msgstr "" msgid "Removable device" msgstr "" -#: ../rpmdrake:1 -#, c-format -msgid "" -"The following packages have to be removed for others to be upgraded:\n" -"\n" -"%s\n" -"\n" -"(waiting for urpmi subroutine for explanation)\n" -"\n" -"Is it ok to continue?" -msgstr "" - #: ../rpmdrake:1 #, c-format msgid "Graphical desktop/Icewm" @@ -1160,18 +1166,6 @@ msgstr "" msgid "%s KB" msgstr "" -#: ../rpmdrake:1 -#, c-format -msgid "" -"Sorry, the following package(s) can't be selected:\n" -"\n" -"%s\n" -"\n" -"Reasons follow:\n" -"\n" -"%s" -msgstr "" - #: ../rpmdrake:1 #, c-format msgid "Sciences/Chemistry" -- cgit v1.2.1