From: Christian Perrier <bubulle@debian.org>
Date: Mon, 24 Sep 2007 04:06:58 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d181f5203d579366a1c31a9e0290f656160c6d0;p=dpkg

Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg

Conflicts:

	debian/changelog
	scripts/po/ChangeLog
---

8d181f5203d579366a1c31a9e0290f656160c6d0
diff --cc debian/changelog
index 6637384a,1d822c95..14c9664a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -32,11 -36,7 +36,15 @@@ dpkg (1.14.7) UNRELEASED; urgency=lo
    * Swedish (Peter Karlsson).
    * Korean (Sunjae Park). Closes: #443191
  
++<<<<<<< HEAD:debian/changelog
 +  [ Updated scripts translations ]
 +  * Correct a typo in the French translation. Closes: #443276
 +  
 +
 + -- Guillem Jover <guillem@debian.org>  Thu, 06 Sep 2007 03:42:40 +0300
++=======
+  -- Frank Lichtenheld <djpig@debian.org>  Sun, 23 Sep 2007 02:40:20 +0200
++>>>>>>> 482cc83e0404956b88767cde50f744e72c0e9516:debian/changelog
  
  dpkg (1.14.6) unstable; urgency=low
  
diff --cc scripts/po/ChangeLog
index c89b9778,3061a3b0..530ad102
--- a/scripts/po/ChangeLog
+++ b/scripts/po/ChangeLog
@@@ -1,6 -1,39 +1,15 @@@
++<<<<<<< HEAD:scripts/po/ChangeLog
 +2007-09-20  Christian Perrier  <bubulle@debian.org>
++=======
+ 2007-09-23  Frank Lichtenheld  <djpig@debian.org>
+ 
+ 	* dpkg-dev.pot: Regenerated.
+ 	* *.po: Merged with dpkg-dev.pot.
+ 
+ 2007-08-30  Peter Karlsson  <peterk@debian.org>
++>>>>>>> 482cc83e0404956b88767cde50f744e72c0e9516:scripts/po/ChangeLog
  
 -	* LINGUAS, sv.po: Added Swedish.
 -
 -2007-08-18  Guillem Jover  <guillem@debian.org>
 -
 -	* dpkg-dev.pot: Regenerated.
 -	* *.po: Merged with dpkg-dev.pot.
 -
 -2007-07-08  Frédéric Bothamy  <frederic.bothamy@free.fr>
 -
 -	* fr.po: Proofread.
 -
 -2007-07-06  Christian Perrier  <bubulle@debian.org>
 -
 -	* fr.po: Re-re-re-re-completed (438t).
 -
 -2007-07-02  Frank Lichtenheld  <djpig@debian.org>
 -
 -	* dpkg-dev.pot: Regenerated.
 -	* *.po: Merged with dpkg-dev.pot.
 -
 -2007-05-24  Guillem Jover  <guillem@debian.org>
 -
 -	* dpkg-dev.pot: Regenerated.
 -	* *.po: Merged with dpkg-dev.pot.
 -
 -2007-05-15  Guillem Jover  <guillem@debian.org>
 -
 -	* dpkg-dev.pot: Regenerated.
 -	* *.po: Merged with dpkg-dev.pot.
 +	* fr.po: Typo correcion
  
  2007-05-11  Frédéric Bothamy  <frederic.bothamy@free.fr>
  
diff --cc scripts/po/fr.po
index b2bdef47,3353359e..098c94be
--- a/scripts/po/fr.po
+++ b/scripts/po/fr.po
@@@ -1832,12 -1990,12 +1990,12 @@@ msgid "newly created empty file '%s' wi
  msgstr ""
  "le fichier « %s », nouvellement créé, ne sera pas représenté dans le diff"
  
- #: scripts/dpkg-source.pl:531
+ #: scripts/dpkg-source.pl:536
  #, perl-format
  msgid "executable mode %04o of '%s' will not be represented in diff"
 -msgstr "le mode exécutable %04o de « %si » ne sera pas représenté dans le diff"
 +msgstr "le mode exécutable %04o de « %s » ne sera pas représenté dans le diff"
  
- #: scripts/dpkg-source.pl:535
+ #: scripts/dpkg-source.pl:540
  #, perl-format
  msgid "special mode %04o of '%s' will not be represented in diff"
  msgstr "le mode spécial %04o de « %s » ne sera pas représenté dans le diff"