[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#612996: apt-doc: Please convert SGML to DocBook XML



Hi!

On Sat, 2014-07-05 at 01:33:48 +0200, Guillem Jover wrote:
> While adding the LFS support, I found I needed to install
> debiandoc-sgml, which bothered me a bit, so I embarked myself into a
> yak shaving session, to convert the docs to docbook-xml, and while
> doing so and when needing to check and unfuzzy the po files, ended up
> cleaning them up and fixing various issues, found with «i18nspector»
> and «msgfmt --check --statistics».

Thanks for applying this (it seems the changelog missed a bug closure
though), but I noticed two of the po related patches were only
partially applied. Here's an update for those.

Thanks,
Guillem
From 8539f03c9245dda66533e7cb540c5559f012f971 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Fri, 4 Jul 2014 08:03:31 +0200
Subject: [PATCH 1/2] po: Fill Project-Id-Version with correct project id and
 version

---
 doc/po/es.po    | 2 +-
 doc/po/fr.po    | 2 +-
 doc/po/it.po    | 2 +-
 doc/po/ja.po    | 2 +-
 doc/po/pl.po    | 2 +-
 doc/po/pt.po    | 2 +-
 doc/po/pt_BR.po | 2 +-
 po/ar.po        | 2 +-
 po/cs.po        | 2 +-
 po/cy.po        | 2 +-
 po/dz.po        | 2 +-
 po/el.po        | 2 +-
 po/eu.po        | 2 +-
 po/fr.po        | 2 +-
 po/gl.po        | 2 +-
 po/hu.po        | 2 +-
 po/it.po        | 2 +-
 po/km.po        | 2 +-
 po/ko.po        | 2 +-
 po/ku.po        | 2 +-
 po/lt.po        | 2 +-
 po/mr.po        | 2 +-
 po/ne.po        | 2 +-
 po/nn.po        | 2 +-
 po/pt.po        | 2 +-
 po/pt_BR.po     | 2 +-
 po/ro.po        | 2 +-
 po/sk.po        | 2 +-
 po/sv.po        | 2 +-
 po/th.po        | 2 +-
 po/tl.po        | 2 +-
 po/tr.po        | 2 +-
 po/uk.po        | 2 +-
 po/zh_TW.po     | 2 +-
 34 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/doc/po/es.po b/doc/po/es.po
index 2460231..e6fc51d 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -36,7 +36,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 0.9.7.1\n"
+"Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-08-28 00:20+0000\n"
 "PO-Revision-Date: 2014-07-04 01:31+0200\n"
diff --git a/doc/po/fr.po b/doc/po/fr.po
index f94f0e0..485b0fe 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -8,7 +8,7 @@
 # Christian Perrier <bubulle@debian.org>, 2009, 2010, 2011, 2012, 2013.
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
+"Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-08-28 00:20+0000\n"
 "PO-Revision-Date: 2014-07-04 01:28+0200\n"
diff --git a/doc/po/it.po b/doc/po/it.po
index 76d4282..2e5f689 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -8,7 +8,7 @@
 # Beatrice Torracca <beatricet@libero.it>, 2012, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
+"Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-08-28 00:20+0000\n"
 "PO-Revision-Date: 2014-07-04 00:45+0200\n"
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 0a2984d..87ddc0e 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -6,7 +6,7 @@
 # KURASAWA Nozomu, 2003-2006, 2009-2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 1.0.6\n"
+"Project-Id-Version: apt-doc 1.0.6\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-08-28 00:20+0000\n"
 "PO-Revision-Date: 2014-07-10 19:52+0900\n"
diff --git a/doc/po/pl.po b/doc/po/pl.po
index b0a6514..0d4436e 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -9,7 +9,7 @@
 # Robert Luberda <robert@debian.org> 2000-2004, 2010, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 0.9.7.3\n"
+"Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-08-28 00:20+0000\n"
 "PO-Revision-Date: 2014-07-04 02:13+0200\n"
diff --git a/doc/po/pt.po b/doc/po/pt.po
index c92a201..1034585 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -5,7 +5,7 @@
 # Américo Monteiro <a_monteiro@gmx.com>, 2009 - 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 1.0.7\n"
+"Project-Id-Version: apt-doc 1.0.7\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-08-29 11:04+0200\n"
 "PO-Revision-Date: 2014-08-29 00:34+0100\n"
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index d28c1e6..391532f 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt\n"
+"Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-08-28 00:20+0000\n"
 "PO-Revision-Date: 2004-09-20 17:02+0000\n"
diff --git a/po/ar.po b/po/ar.po
index c406914..7bd3527 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -4,7 +4,7 @@
 # Ossama M. Khayat <okhayat@yahoo.com>, 2005, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt_po\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2006-10-20 21:28+0300\n"
diff --git a/po/cs.po b/po/cs.po
index 5bb6a79..8f48099 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2014-08-15 13:30+0200\n"
diff --git a/po/cy.po b/po/cy.po
index dbf4bfb..5d391ee 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: APT\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2005-06-06 13:46+0100\n"
diff --git a/po/dz.po b/po/dz.po
index 3ed665f..2f1b01e 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt_po.pot\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2006-09-19 09:49+0530\n"
diff --git a/po/el.po b/po/el.po
index 92f178b..e610008 100644
--- a/po/el.po
+++ b/po/el.po
@@ -14,7 +14,7 @@
 # Θανάσης Νάτσης <natsisthanasis@gmail.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt_po_el\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2008-08-26 18:25+0300\n"
diff --git a/po/eu.po b/po/eu.po
index 9379aba..87b4533 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -5,7 +5,7 @@
 # Piarres Beobide <pi@beobide.net>, 2005, 2006, 2007, 2008, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt_po_eu\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2009-05-17 00:41+0200\n"
diff --git a/po/fr.po b/po/fr.po
index f3b69a8..6ddcb9e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 # Christian Perrier <bubulle@debian.org>, 2004-2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013.
 msgid ""
 msgstr ""
-"Project-Id-Version: fr\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2013-08-17 07:57+0200\n"
diff --git a/po/gl.po b/po/gl.po
index e7aa787..558159f 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -8,7 +8,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt_po_gl\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2011-05-12 15:28+0100\n"
diff --git a/po/hu.po b/po/hu.po
index 9457b38..1740937 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,7 +5,7 @@
 # Gabor Kelemen <kelemeng at gnome dot hu>, 2004, 2005, 2011, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt trunk\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2012-06-25 17:09+0200\n"
diff --git a/po/it.po b/po/it.po
index 5348110..ceae04d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2014-05-31 17:04+0100\n"
diff --git a/po/km.po b/po/km.po
index 9202b60..b8f3e7e 100644
--- a/po/km.po
+++ b/po/km.po
@@ -8,7 +8,7 @@
 # Khoem Sokhem <khoemsokhem@khmeros.info>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt_po_km\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2006-10-10 09:48+0700\n"
diff --git a/po/ko.po b/po/ko.po
index c1b756c..c3f01fd 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -3,7 +3,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2010-08-30 02:31+0900\n"
diff --git a/po/ku.po b/po/ku.po
index 5f55120..5426ad6 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -6,7 +6,7 @@
 # Erdal Ronahi <erdal dot ronahi at gmail dot com>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-ku\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2008-05-08 12:48+0200\n"
diff --git a/po/lt.po b/po/lt.po
index 2f6d713..d87e582 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2008-08-02 01:47-0400\n"
diff --git a/po/mr.po b/po/mr.po
index 25134d6..349e9ab 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2008-11-20 23:27+0530\n"
diff --git a/po/ne.po b/po/ne.po
index 08de0f8..1d419cc 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -4,7 +4,7 @@
 # Shiva Pokharel <pokharelshiva@hotmail.com>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt_po\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2006-06-12 14:35+0545\n"
diff --git a/po/nn.po b/po/nn.po
index 7c5f777..97cbbaf 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt_nn\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2005-02-14 23:30+0100\n"
diff --git a/po/pt.po b/po/pt.po
index 5dcd74b..36bb586 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,7 +5,7 @@
 # Miguel Figueiredo <elmig@debianpt.org>, 2005-2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2012-06-29 15:45+0100\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c23a422..413f631 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
 # Felipe Augusto van de Wiel (faw) <faw@debian.org>, 2006-2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2008-11-17 02:33-0200\n"
diff --git a/po/ro.po b/po/ro.po
index 2e556ef..7045707 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@
 # Eddy Petrișor <eddy.petrisor@gmail.com>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: ro\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2008-11-15 02:21+0200\n"
diff --git a/po/sk.po b/po/sk.po
index acfd4cf..25fa3b3 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2012-06-28 20:49+0100\n"
diff --git a/po/sv.po b/po/sv.po
index 5d11f06..9c031b4 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2010-08-24 21:18+0100\n"
diff --git a/po/th.po b/po/th.po
index 5d04c5c..c6f902a 100644
--- a/po/th.po
+++ b/po/th.po
@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2014-04-20 09:38+0700\n"
diff --git a/po/tl.po b/po/tl.po
index 49a96a2..7f4ea1b 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -8,7 +8,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2007-03-29 21:36+0800\n"
diff --git a/po/tr.po b/po/tr.po
index a3cd707..366644d 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 # Rosetta Contributors, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2014-09-11 02:47+0200\n"
diff --git a/po/uk.po b/po/uk.po
index 4f7b34a..ec94727 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@
 # binary = двійковий
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-all\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2012-09-25 20:19+0300\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 59a8dca..44d5fad 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@
 # $Id: zh_TW.po,v 1.11 2004/04/30 04:50:38 mdz Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: 0.5.4\n"
+"Project-Id-Version: apt 0.5.4\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-09-09 20:35+0200\n"
 "PO-Revision-Date: 2009-01-28 10:41+0800\n"
-- 
2.1.1.391.g7a54a76

From 1f315f1e9201bf60b34a4ae2a705b8cd8447c9b1 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Fri, 4 Jul 2014 08:14:07 +0200
Subject: [PATCH 2/2] po: Fix encoding issues

Fix Content-Transfer-Encoding field value.
---
 po/ja.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/ja.po b/po/ja.po
index c79bfbf..6105aa6 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -15,7 +15,7 @@ msgstr ""
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8 bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: cmdline/apt-cache.cc:149
-- 
2.1.1.391.g7a54a76


Reply to: