Re-re-re-re-re-update French translation

Also remove conflict markers I inadvertenly left in po/ChangeLog

diff --git a/debian/changelog b/debian/changelog
index 224753409156cff631d63df56b9c2d140a11fa34..dd46a1e1630504ec5dd409059a9ce32a23c640ed 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ dpkg (1.14.20) UNRELEASED; urgency=low
 
   [ Updated programs translations ]
   * Basque (Piarres Beobide). Closes: #481043
+  * French (Christian Perrier).
 
  -- Guillem Jover <guillem@debian.org>  Mon, 12 May 2008 09:04:34 +0300
 

diff --git a/po/ChangeLog b/po/ChangeLog
index 6efe183d9a7fd1f3ecc86537d18d7e3c862a4ad8..fab35cddbeddaeb39bb686e821c2def0f585fff7 100644 (file)
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,4 +1,7 @@
-<<<<<<< HEAD:po/ChangeLog
+2008-05-13  Christian Perrier  <bubulle@debian.org>
+
+       * fr.po: Updated to 984t.
+
 2008-05-13  Sven Joachim  <svenjoac@gmx.de>
 
        * de.po: Updated to 984t.
@@ -11,11 +14,10 @@
 
        * dpkg.pot: Regenerated.
        * *.po: Merged with dpkg.pot.
-=======
+
 2008-05-13  Piarres Beobide  <pi+debian@beobide.net>
 
        * eu.po: Updated to 984t.
->>>>>>> Basque translation update:po/ChangeLog
 
 2008-05-12  Guillem Jover  <guillem@debian.org>
 

diff --git a/po/fr.po b/po/fr.po
index 8cfb5f642551e779bbeb297a91ae5ea80227ee81..4bc88a46029f75d4b559682ec19a27b05fa4a522 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -25,7 +25,7 @@ msgstr ""
 "Project-Id-Version: dpkg.fr.po\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
 "POT-Creation-Date: 2008-05-13 05:54+0300\n"
-"PO-Revision-Date: 2008-05-08 18:18+0200\n"
+"PO-Revision-Date: 2008-05-13 20:28+0200\n"
 "Last-Translator: Florent USSEIL <swiip81@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -2927,7 +2927,7 @@ msgid "invalid integer for --%s: `%.250s'"
 msgstr "entier incorrect pour --%s « %.250s »"
 
 #: src/main.c:320
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
 "  warn but continue:  --force-<thing>,<thing>,...\n"
@@ -3004,6 +3004,7 @@ msgstr ""
 "                           confold ou confnew soit aussi choisie\n"
 "  confmiss [!]           Toujours installer les fichiers de configuration\n"
 "                           manquants\n"
+"  breaks [!]             Installer même si cela casse un autre paquet\n"
 "  conflicts [!]          Autoriser l'installation de paquets conflictuels\n"
 "  architecture [!]       Traiter même les paquets d'une autre architecture\n"
 "  overwrite-dir [!]      Remplacer le répertoire d'un paquet par le fichier\n"