The following commit has been merged in the lenny branch:
commit 626ef5f24fd4e8cb27b2ab334b82b07c3b876f64
Author: Christian Perrier <[EMAIL PROTECTED]>
Date: Tue May 13 20:30:09 2008 +0200
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 2247534..dd46a1e 100644
--- 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 <[EMAIL PROTECTED]> Mon, 12 May 2008 09:04:34 +0300
diff --git a/po/ChangeLog b/po/ChangeLog
index 6efe183..fab35cd 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,4 +1,7 @@
-<<<<<<< HEAD:po/ChangeLog
+2008-05-13 Christian Perrier <[EMAIL PROTECTED]>
+
+ * fr.po: Updated to 984t.
+
2008-05-13 Sven Joachim <[EMAIL PROTECTED]>
* de.po: Updated to 984t.
@@ -11,11 +14,10 @@
* dpkg.pot: Regenerated.
* *.po: Merged with dpkg.pot.
-=======
+
2008-05-13 Piarres Beobide <[EMAIL PROTECTED]>
* eu.po: Updated to 984t.
->>>>>>> Basque translation update:po/ChangeLog
2008-05-12 Guillem Jover <[EMAIL PROTECTED]>
diff --git a/po/fr.po b/po/fr.po
index 8cfb5f6..4bc88a4 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -25,7 +25,7 @@ msgstr ""
"Project-Id-Version: dpkg.fr.po\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
"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 <[EMAIL PROTECTED]>\n"
"Language-Team: French <[EMAIL PROTECTED]>\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"
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
