This time we brought the militars, the changelog police was not enough...

debian/changelog

@@ -11,6 +11,11 @@ dpkg (1.13.23~) UNRELEASED; urgency=low
   * Add a new line at the end of m4/compiler.m4 file, to cope with an
     autoreconf failure due to the new m4 1.4.7.
 
+  [ Nicolas François ]
+  * Specify --null before the -T tar's option to avoid the "tar: -: file name
+    read contains nul character" warning.
+    Closes: #376351, #375749, #376724, #377279
+
   [ Added dpkg Translations ]
   * Dzongkha (Kinley Tshering)
 
@@ -20,10 +25,10 @@ dpkg (1.13.23~) UNRELEASED; urgency=low
   * Dutch (Bart Cornelis).
   * Galician (Jacobo Tarrio).
   * Hungarian (SZERVÁC Attila).
-  * Romanian (Eddy Petri?or).
+  * Romanian (Eddy Petrişor).
   * French (Frédéric Bothamy).
   * Vietnamese (Clytie Siddall). Closes: #383588
-  * Dansk (Claus Hindsgaul).
+  * Danish (Claus Hindsgaul).
   * Khmer (Khoem Sokhem). Closes: #375099
   * Basque (Piarres Beobide). Closes: #375118
   * Russian (Yuri Kozlov). Closes: #376746
@@ -33,69 +38,32 @@ dpkg (1.13.23~) UNRELEASED; urgency=low
   * Japanese (Kenshi Muto). Closes: #386963
   * Slovak (Peter Mann). Closes: #387282
   * Spanish (Javier Fernandez-Sanguino). Closes: #386759
-  * Italian (Typo) (Davide Viti). Closes: #387821
+  * Italian (Stefano Canepa, Davide Viti). Closes: #387821
   * Dzongkha (Tenzin Dendup). Closes: #388192
-  * Khmer (Khoem Sokhem). Closes: #375099
+
+  [ Added dpkg-dev Translations ]
+  * French (Philippe Batailler).
 
   [ Updated dselect Translations ]
   * Catalan (Robert Millan).
   * German (Sven Joachim). Closes: #384843
-    (Sven is now the new German translation maintainer for dpkg and dselect.)
+    (Sven is now the new German translation maintainer for dpkg and dselect).
   * Danish (Claus Hindsgaul).
   * Hungarian (SZERVÁC Attila).
-=======
   * Spanish (Javier Fernández-Sanguino Peña).
   * Slovak (Peter Mann).
 
   [ Updated man pages translations ]
+  * French (Philippe Batailler).
   * German (Helge Kreutzmann). Closes: #379030
-    - start-stop-daemon.8.
-    - update-alternatives.8.
 
   [ Added man pages translations ]
-  * German (Helge Kreutzmann):
-    - dpkg.cfg.5. Closes: #379286
-    - dselect.cfg.5. Closes: #379298
-    - 822-date.1. Closes: #379417
-    - deb-old.5. Closes: #379433
-    - deb.5: Closes: #379661
-    - dpkg-checkbuilddeps.1: Closes: #379798
-    - dpkg-scanpackages.1: Closes: #379825
-    - dpkg-scansources.1: Closes: #379985
-    - cleanup-info.8: Closes: #380130
-    - dpkg-name.1: Closes: #380239
-    - dpkg-statoverride.8: Closes: #380365
-    - dpkg.1. Closes: #381047
-    - dpkg-divert.8. CLoses: #380660
-    - deb-control.5. Closes: #380443
-    - dpkg-architecture.1. CLoses: #381349
-    - initialisation of the dselect.1, dpkg-source.1, dpkg-query.1,
-      install-info.8, dpkg-deb.1, and dpkg-split.1 translations.
-      Closes: #381488
+  * German (Helge Kreutzmann).
+    Closes: #379286, #379298, #379417, #379433, #379661, #379798, #379825
+    Closes: #379985, #380130, #380239, #380365, #381047, #380660, #380443
+    Closes: #381349, #381488
   * Japanese (KISE Hiroshi).
-    Closes: 381141, #381865, #384768, #385675, #386965, #388837
-    - 822-date.1
-    - deb.5
-    - deb-old.5
-    - dpkg-checkbuilddeps.1
-    - cleanup-info.8
-    - dpkg-name.1
-    - dpkg-scanpackages.1
-    - dpkg-statoverride.8
-    - dpkg-divert.8
-    - dpkg-query.1
-    - deb-control.5
-    - dpkg-deb.1
-    - install-info.8
-    - start-stop-daemon.8
-    - dpkg.1
-    - dselect.1
-    - update-alternatives.8
-
-  [ Nicolas François ]
-  * Specify --null before the -T tar's option to avoid the "tar: -: file name
-    read contains nul character" warning.
-    Closes: #376351, #375749, #376724, #377279
+    Closes: #381141, #381865, #384768, #385675, #386965, #388837
 
  -- Christian Perrier <bubulle@debian.org>  Thu,  5 Oct 2006 22:29:12 +0200
 
@@ -313,7 +281,7 @@ dpkg (1.13.19) unstable; urgency=low
 
   [ Nicolas Francois ]
   * Generate the Russian man pages in the KOI8-R charset. Closes: #361987
-  * Document the shlibs.local format in dpkg-source(1). CLoses: #316485
+  * Document the shlibs.local format in dpkg-source(1). Closes: #316485
   * Fix a typo in an error message. Thanks to Justin Pryzby. Closes: #364539
 
   [ Guillem Jover ]

dselect/po/ChangeLog

@@ -6,11 +6,10 @@
 
 	* sk.po: Updated to 289t.
 
-2006-10-05  Javier Fernandez-Sanguino <jfs@debian.org>
+2006-10-05  Javier Fernandez-Sanguino  <jfs@debian.org>
 
 	* es.po: Updated to 289t.
 
->>>>>>> .r544
 2006-09-02  Claus Hindsgaul  <claus.hindsgaul@gmail.com>
 
 	* da.po: Updated to 289t.

man/ChangeLog

@@ -42,11 +42,10 @@
 	* po4a/add_ja/dselect.1.ja.add: Likewise.
 	* po4a/add_ja/update-alternatives.8.ja.add: Likewise.
 	* po4a/add_ja/dpkg-deb.1.ja.add: Updated.
-	* po4a/dpkg.1/dpkg.1.cfg: Specify the po4a options for the
-	Japanese translation.
+	* po4a/dpkg.1/dpkg.1.cfg: Specify the po4a options for the Japanese
+	translation.
 	* po4a/dselect.1/dselect.1.cfg: Likewise.
-	* po4a/update-alternatives.8/update-alternatives.8.cfg:
-	Likewise.
+	* po4a/update-alternatives.8/update-alternatives.8.cfg: Likewise.
 	* po4a/dpkg.1/po/ja.po: Updated translation.
 	* po4a/dselect.1/po/ja.po: Likewise.
 	* po4a/update-alternatives.8/po/ja.po: Likewise.
@@ -89,15 +88,15 @@
 	* po4a/deb.5/po/ja.po: Likewise.
 
 2006-08-17  Philippe Batailler  <philippe.batailler@free.fr>
-	
-	* po4a/dpkg-statoverride.8/po/fr.po: updated translation.
-	* po4a/dpkg-name.1/po/fr.po: likewise.
-	* po4a/update-alternatives.8/po/fr.po: likewise.
-	* po4a/start-stop-daemon.8/po/fr.po: likewise.
-	* po4a/dpkg-source.1/po/fr.po: likewise.
-	* po4a/dpkg-divert.8/po/fr.po: likewise.
-	* po4a/deb-control.5/po/fr.po: likewise.
-	* po4a/dpkg.1/po/fr.po: likewise.
+
+	* po4a/dpkg-statoverride.8/po/fr.po: Updated translation.
+	* po4a/dpkg-name.1/po/fr.po: Likewise.
+	* po4a/update-alternatives.8/po/fr.po: Likewise.
+	* po4a/start-stop-daemon.8/po/fr.po: Likewise.
+	* po4a/dpkg-source.1/po/fr.po: Likewise.
+	* po4a/dpkg-divert.8/po/fr.po: Likewise.
+	* po4a/deb-control.5/po/fr.po: Likewise.
+	* po4a/dpkg.1/po/fr.po: Likewise.
 
 2006-08-07  KISE Hiroshi  <kise@fuyuneko.jp>
 
@@ -250,7 +249,7 @@
 
 2006-07-27  Nicolas Francois  <nicolas.francois@centraliens.net>
 
-	* po4a/add_de/dpkg-scanpackages.1.de.add: install the addendum
+	* po4a/add_de/dpkg-scanpackages.1.de.add: Install the addendum
 	before the SEE ALSO section, not at the end.
 	* po4a/add_de/deb-old.5.de.add: Likewise.
 	* po4a/add_de/deb.5.de.add: Likewise.
@@ -391,16 +390,16 @@
 
 2006-06-16  Robert Luberda  <robert@debian.org>
 
-	* dpkg-deb.1/po/pl.po: Update to 78t.
+	* pl/dpkg-deb.1/po/pl.po: Update to 78t.
 
 2006-06-11  Peter Karlsson  <peterk@debian.org>
 
-	* dselect.1/po/sv.po: Updated translation.
-	* dpkg-query.1/po/sv.po: Updated translation.
+	* sv/dselect.1/po/sv.po: Updated translation.
+	* sv/dpkg-query.1/po/sv.po: Updated translation.
 
 2006-06-09  Peter Karlsson  <peterk@debian.org>
 
-	* dselect.1/po/sv.po: Updated translation.
+	* sv/dselect.1/po/sv.po: Updated translation.
 
 2006-05-14  sas-guest  <sas@321.hu>
 
@@ -450,12 +449,18 @@
 
 2006-05-14  Peter Karlsson  <peterk@debian.org>
 
-	* sv/822-date.1.sv.po, sv/deb.5.sv.po, sv/deb-control.5.sv.po,
-	sv/deb-old.5.sv.po, sv/dpkg.1.sv.po, sv/dpkg.cfg.5.sv.po,
-	sv/dpkg-deb.1.sv.po, sv/dpkg-query.1.sv.po, sv/dpkg-split.1.sv.po,
-	sv/dselect.1.sv.po, sv/dselect.cfg.5.sv.po,
-	sv/start-stop-daemon.8.sv.po: Began updating the Swedish
-	translation.
+	* sv/822-date.1.sv.po: Began updating the Swedish translation.
+	* sv/deb.5.sv.po: Likewise.
+	* sv/deb-control.5.sv.po: Likewise.
+	* sv/deb-old.5.sv.po: Likewise.
+	* sv/dpkg.1.sv.po: Likewise.
+	* sv/dpkg.cfg.5.sv.po: Likewise.
+	* sv/dpkg-deb.1.sv.po: Likewise.
+	* sv/dpkg-query.1.sv.po: Likewise.
+	* sv/dpkg-split.1.sv.po: Likewise.
+	* sv/dselect.1.sv.po: Likewise.
+	* sv/dselect.cfg.5.sv.po: Likewise.
+	* sv/start-stop-daemon.8.sv.po: Likewise.
 
 2006-05-14  Philippe Batailler  <philippe.batailler@free.fr>
 
@@ -574,11 +579,11 @@
 
 2006-03-04  Christian Perrier  <bubulle@debian.org>
 
-	* dpkg-architecture.1: Typos corrections.
-	* dpkg-checkbuilddeps.1: Likewise.
-	* dpkg-name.1: Likewise.
-	* dpkg-source.1: Likewise.
-	* deb-control.5: Likewise.
+	* C/dpkg-architecture.1: Typos corrections.
+	* C/dpkg-checkbuilddeps.1: Likewise.
+	* C/dpkg-name.1: Likewise.
+	* C/dpkg-source.1: Likewise.
+	* C/deb-control.5: Likewise.
 
 2006-03-04  Philippe Batailler  <philippe.batailler@free.fr>
 

po/ChangeLog

@@ -13,7 +13,7 @@
 2006-09-19  Tenzin Dendup  <tdendup@dit.gov.bt>
 
 	* LINGUAS: Change the Dzongkha translation maintainer to
-	norbu <nor_den@hotmail.com>
+	norbu <nor_den@hotmail.com>.
 
 2006-09-19  Tenzin Dendup  <tdendup@dit.gov.bt>
 
@@ -49,11 +49,11 @@
 
 2006-08-30  Miguel Figueiredo  <elmig@debianpt.org>
 
-	* pt.po: fixed extra space
+	* pt.po: Fixed extra space.
 
 2006-08-29  Bart Cornelis  <cobaco@skolelinux.no>
 	
-	* nl.po: Updated translation
+	* nl.po: Updated translation.
 
 2006-08-29  Sven Joachim  <svenjoac@gmx.de>
 
@@ -77,15 +77,15 @@
 
 2006-08-18  Jacobo Tarrio  <jtarrio@debian.org>
 
-	* gl.po: Updated to 920t
+	* gl.po: Updated to 920t.
 
 2006-08-18  Robert Millan  <rmh@aybabtu.com>
 
 	* ca.po: Fixed spelling errors.
 
-2006-08-18  Eddy Petri?or  <eddy.petrisor@gmail.com>
+2006-08-18  Eddy Petrişor  <eddy.petrisor@gmail.com>
 
-	* ro.po: updated to 920t
+	* ro.po: Updated to 920t.
 
 2006-08-17  Nicolas Francois  <nicolas.francois@centraliens.net>
 
@@ -103,11 +103,11 @@
 
 2006-07-28  Eddy Petrişor  <eddy.petrisor@gmail.com>
 
-	* ro.po: Wording improvements
+	* ro.po: Wording improvements.
 
 2006-07-26  Christian Perrier  <bubulle@debian.org>
 
-	* fr.po: Typo correction "ceoendant"
+	* fr.po: Typo correction "ceoendant".
 
 2006-07-11  Miguel Figueiredo  <elmig@debianpt.org>
 	    Rui Branco  <ruipb@debianpt.org>
@@ -125,7 +125,7 @@
 2006-07-01  Kinley Tshering  <gasepkuenden2k3@hotmail.com>
 
 	* dz.po: Added with 916t.
-	* LINGUAS: New language: Dzongkha
+	* LINGUAS: New language: Dzongkha.
 
 2006-06-24  Miroslav Kure  <kurem@debian.cz>
 
@@ -144,6 +144,10 @@
 	* LINGUAS: New language: Khmer.
 	* km.po: New translation: 894t22f.
 
+2006-06-23  Claus Hindsgaul  <claus.hindsgaul@gmail.com>
+
+	* da.po: Updated to 916t.
+
 2006-06-23  Clytie Siddall  <clytie@riverland.net.au>
 
 	* vi.po: Updated to 916t.
@@ -154,15 +158,15 @@
 
 2006-06-22  Eddy Petrişor  <eddy.petrisor@gmail.com>
 
-	* ro.po: Updated to 916t;
+	* ro.po: Updated to 916t.
 
-2006-05-27  SZERVÁC Attila  <sas@321.hu>
+2006-06-22  SZERVÁC Attila  <sas@321.hu>
 
 	* hu.po: Updated to 716t.
 
 2006-06-22  Bart Cornelis  <cobaco@skolelinux.no>
 
-	* nl.po: Updated Dutch translation
+	* nl.po: Updated translation.
 
 2006-06-21  Jacobo Tarrio  <jtarrio@debian.org>