From 3c35cc8951f384fe83dd276790c99a6a0b9a8f51 Mon Sep 17 00:00:00 2001
From: Rafael Garcia-Suarez <rgarciasuarez@mandriva.org>
Date: Thu, 21 Apr 2005 13:28:01 +0000
Subject: Merge strings

---
 po/fr.po | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

(limited to 'po/fr.po')

diff --git a/po/fr.po b/po/fr.po
index 3123f6aa..966c4fd1 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-fr\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-21 15:13+0200\n"
 "Last-Translator: Christophe Berthelé <cpjc@free.fr>\n"
 "Language-Team: Français <cooker-i18n@linux-mandrake.com>\n"
@@ -1507,9 +1507,11 @@ msgstr ""
 #: ../urpmi:87
 #, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
-msgstr "  --no-install   - ne pas installer les paquetages (les télécharger seulement)\n"
+msgstr ""
+"  --no-install   - ne pas installer les paquetages (les télécharger "
+"seulement)\n"
 
-#: ../urpmi:88
+#: ../urpmi:88 ../urpmq:52
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -2049,7 +2051,9 @@ msgstr ""
 #: ../urpmi.addmedia:69
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
-msgstr "  --raw          - ajoute le media dans la configuration, mais sans le mettre à jour.\n"
+msgstr ""
+"  --raw          - ajoute le media dans la configuration, mais sans le "
+"mettre à jour.\n"
 
 #: ../urpmi.addmedia:70 ../urpmi.removemedia:47 ../urpmi.update:45
 #, c-format
@@ -2231,15 +2235,6 @@ msgstr ""
 "\n"
 "usage :\n"
 
-#: ../urpmq:52
-#, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
-msgstr ""
-"  --keep         - conserve les paquetages existants si possible, rejette les\n"
-"                   paquetages demandés qui seront désinstallés.\n"
-
 #: ../urpmq:54
 #, c-format
 msgid "  --list         - list available packages.\n"
@@ -2402,6 +2397,14 @@ msgstr "Aucune liste de fichiers complète n'a pu être trouvée\n"
 msgid "No changelog found\n"
 msgstr "Aucun Changelog trouvé\n"
 
+#~ msgid ""
+#~ "  --keep         - keep existing packages if possible, reject requested\n"
+#~ "                   packages that leads to remove.\n"
+#~ msgstr ""
+#~ "  --keep         - conserve les paquetages existants si possible, rejette "
+#~ "les\n"
+#~ "                   paquetages demandés qui seront désinstallés.\n"
+
 #~ msgid "unable to write file [%s]"
 #~ msgstr "impossible d'écrire le fichier [%s]"
 
-- 
cgit v1.2.1