Hi,
On Sun, Mar 10, 2019 at 03:57:15PM +0100, Holger Wansing wrote:
> Hi,
>
> some months ago, there has been the conversion to Docbook 4.5.
> Now I notice that translations are in a very bad shape. :-(((
>
> Looking at German for example, that was 100% translated before the conversion,
> and now I have 274 translated, 1 fuzzy, and 52 untranslated. While many of
> the untranslated strings are rather long.
That's because English content was updated but German wasn't updated.
> Additionally to that, I noticed that copyright hints from the old files were
> completely wiped out.
>
> This all is very bad!!!
>
> Why not do this better?
> When I take the German po file from just before the conversion, insert it into
> the current project and run "make po", I get a file with status
> 184 translated, 134 fuzzy, and 9 untranslated.
> So many fuzzies, but the changings are simply one of the following four cases:
>
> <em> -> <emphasis>
> <prg> -> <command>
>
> <ulink url="http://www.debian.org/social_contract";>Debian Social
> Contract</ulink>
> ->
> <url id="http://www.debian.org/social_contract"; name="Debian Social
> Contract">
>
> insert of additional spaces
>
> Many of this can be done by simple find-and-replace.
Did you look into the git changelog? I recorded what I did there.
SGML to XML conversion isn't as simple as you describe to do it all
automatically for all languages.
If you had uncommitted changes, let"s discuss.
> So that does not justify to wipe away so much translated content IMHO!
That's a side effect of the use of conversion script. It can be
re-added manually.
> Maybe I'm missing something, but if noone objects shortly, I will do the above
> for all translations and commit the result into git.
Please don't.
> Will see how it goes, maybe I will also do some unfuzzying, to get
> translations
> back to as good as possible.
Post-xml conversion diff attached:
Osamu
diff --git a/project-history.en.dbk b/project-history.en.dbk
index c72e01a..18d9c1b 100644
--- a/project-history.en.dbk
+++ b/project-history.en.dbk
@@ -2,8 +2,7 @@
<!-- -*- DocBook -*- -->
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
-<!-- Include entity definition file by uncommenting the following -->
-<!-- <!ENTITY % versiondata SYSTEM "version.ent"> %versiondata; -->
+<!ENTITY % versiondata SYSTEM "version.ent"> %versiondata;
]>
<book lang="en">
@@ -12,14 +11,7 @@
<bookinfo>
-<authorgroup>
-<author><personname>Debian Documentation Team</personname><email>[email protected]</email></author>
-
-</authorgroup>
-<releaseinfo>2.22 (last revised 17th June 2017)</releaseinfo>
-
-<pubdate><!-- put date --></pubdate>
-
+<releaseinfo>version: &pubversion; (&pubdate;)</releaseinfo>
<abstract>
<para>
@@ -27,8 +19,23 @@ This document describes the history and goals of the Debian project.
</para>
</abstract>
-<copyright><year></year><holder>This document may be freely redistributed or modified in any form provided your changes are clearly documented.</holder></copyright>
<legalnotice>
+
+<copyright>
+<year>1999-2018</year>
+<holder>
+<personname>Debian Documentation Team</personname>
+<email>[email protected]</email>
+</holder>
+</copyright>
+
+<authorgroup>
+<author><personname>Debian Documentation Team</personname><email>[email protected]</email></author>
+</authorgroup>
+
+<para>
+This document may be freely redistributed or modified in any form provided your changes are clearly documented.
+</para>
<para>
This document may be redistributed for fee or free, and may be modified
(including translation from one type of media or file format to another or from
@@ -119,7 +126,7 @@ associated Debian Free Software Guidelines, or the <ulink
url="http://www.debian.org/intro/free";>Debian What Does Free Mean?</ulink>
page.
</para>
-<section id="s1.1"><title>In the Beginning</title>
+<section id="begining"><title>In the Beginning</title>
<para>
The Debian Project was officially founded by Ian Murdock on <ulink
url="https://groups.google.com/forum/message/raw?msg=comp.os.linux.development/Md3Modzg5TU/xty88y5OLaMJ";>August
@@ -155,7 +162,7 @@ implementing all of Debian's key elements in an open and visible way.
</para>
</section>
-<section id="s1.2"><title>Pronouncing Debian</title>
+<section id="pronouncing-debian"><title>Pronouncing Debian</title>
<para>
The official pronunciation of Debian is 'deb ee n'. The name comes from the
names of the creator of Debian, Ian Murdock, and his wife, Debra.
@@ -474,7 +481,7 @@ Woody's wooden toyhorse that appeared in Toy Story 2.
</chapter>
<chapter id="detailed"><title>A Detailed History</title>
-<section id="s4.1"><title>The 0.x Releases</title>
+<section id="rel-0"><title>The 0.x Releases</title>
<para>
Debian was begun in August 1993 by Ian Murdock, then an undergraduate at Purdue
University. Debian was sponsored by the GNU Project of <ulink
@@ -562,7 +569,7 @@ which would be required to put together the core of a distribution: the kernel,
a shell, update, getty, various other programs and support files needed to init
the system, and a set of core utilities."
</para>
-<section id="s4.1.1"><title>The Early Debian Packaging System</title>
+<section id="early-packaging"><title>The Early Debian Packaging System</title>
<para>
At the very early stages of the Project, members considered distributing
source-only packages. Each package would consist of the upstream source code
@@ -600,7 +607,7 @@ the contents.
</section>
-<section id="s4.2"><title>The 1.x Releases</title>
+<section id="rel-1"><title>The 1.x Releases</title>
<para>
When Ian Murdock left Debian, he appointed Bruce Perens as the next leader of
the project. Bruce first became interested in Debian while he was attempting
@@ -668,7 +675,7 @@ the preparation for the 2.0 release.
</para>
</section>
-<section id="s4.3"><title>The 2.x Releases</title>
+<section id="rel-2"><title>The 2.x Releases</title>
<para>
Ian Jackson became the Leader of the Debian Project at the beginning of 1998,
and was shortly thereafter added to the board of Software in the Public
@@ -757,7 +764,7 @@ etc.)"</emphasis>
</para>
</section>
-<section id="s4.4"><title>The 3.x Releases</title>
+<section id="rel-3"><title>The 3.x Releases</title>
<para>
Before woody could even begin to be prepared for release, a change to the
archive system on ftp-master had to be made. Package pools, which enabled
@@ -878,7 +885,7 @@ this conference are available online.
</para>
</section>
-<section id="s4.5"><title>The 4.x Releases</title>
+<section id="rel-4"><title>The 4.x Releases</title>
<para>
Debian 4.0 (<emphasis>etch</emphasis>) was <ulink
url="http://www.debian.org/News/2007/20070408";>released</ulink> April 8th, 2007
@@ -890,7 +897,7 @@ and thirty Debian developers.
</para>
</section>
-<section id="s4.6"><title>The 5.x Releases</title>
+<section id="rel-5"><title>The 5.x Releases</title>
<para>
Debian 5.0 (<emphasis>lenny</emphasis>) was <ulink
url="http://www.debian.org/News/2009/20090214";>released</ulink> February 14th,
@@ -901,6 +908,15 @@ support for the m68k architecture was still available in
from over 12,000 source packages) maintained by more than one thousand and ten
Debian developers.
</para>
+<para>
+With the release of Debian lenny, the naming scheme for point releases was
+<ulink
+url="https://lists.debian.org/debian-devel-announce/2009/02/msg00003.html";>changed</ulink>:
+point releases will use a true micro version number, so the first point release
+of Debian lenny will be 5.0.1. In the past point releases were named by an
+<emphasis>r</emphasis> plus the number appended to major and minor number, e.g. 4.0r1.
+</para>
+
<para>
The eighth <emphasis>DebConf</emphasis> was held in Edinburgh, Scotland, from
June 17th to 23th, 2007 with over four hundred participants. <ulink
@@ -939,7 +955,7 @@ this conference are available online.
</para>
</section>
-<section id="s4.7"><title>The 6.x Releases</title>
+<section id="rel-6"><title>The 6.x Releases</title>
<para>
Debian 6.0 (<emphasis>squeeze</emphasis>) was released February 6th, 2011.
</para>
@@ -1088,7 +1104,7 @@ Debian Day on 7 July.
</para>
</section>
-<section id="s4.8"><title>The 7.x Releases</title>
+<section id="rel-7"><title>The 7.x Releases</title>
<para>
Debian 7.0 (<emphasis>wheezy</emphasis>) was released May 4th, 2013. This new
version of Debian included various interesting features such as <ulink
@@ -1099,6 +1115,14 @@ multimedia codecs and front-ends which removed the need for third-party
repositories.
</para>
<para>
+After the release of Debian wheezy, the naming scheme for point releases was
+<ulink
+url="https://lists.debian.org/debian-release/2013/05/msg01020.html";>changed
+once again</ulink>: point releases will be named by the minor version number,
+e.g. 7.1. In the past point releases were named by the micro number appended
+to major and minor number, e.g. 6.0.1.
+</para>
+<para>
During the Debian Conference DebConf11, in July 2011, the "multiarch support"
was introduced. This feature was a release goal for this release. Multiarch
is a radical rethinking of the filesystem hierarchy with respect to library and
@@ -1234,7 +1258,7 @@ Debian Day on 11 August.
</para>
</section>
-<section id="s4.9"><title>The 8.x Releases</title>
+<section id="rel-8"><title>The 8.x Releases</title>
<para>
Debian 8.0 (<emphasis>Jessie</emphasis>) was released April 25th, 2015.
</para>
@@ -1373,7 +1397,7 @@ url="http://www.debian.org/releases/jessie/releasenotes";>Release Notes</ulink>.
</para>
</section>
-<section id="s4.10"><title>The 9.x Releases</title>
+<section id="rel-9"><title>The 9.x Releases</title>
<para>
Debian 9.0 (<emphasis>Stretch</emphasis>) was released June 17th, 2017.
</para>
@@ -1507,8 +1531,8 @@ Notes</ulink>.
</para>
</section>
-<section id="s4.11"><title>Important Events</title>
-<section id="s4.11.1"><title>July 2000: Joel Klecker died</title>
+<section id="events"><title>Important Events</title>
+<section id="2000-07"><title>July 2000: Joel Klecker died</title>
<para>
On July 11th, 2000, Joel Klecker, who was also known as Espy, passed away at 21
years of age. No one who saw 'Espy' in #mklinux, the Debian lists or channels
@@ -1523,7 +1547,7 @@ Joel Klecker (also known as Espy) will be missed.
</para>
</section>
-<section id="s4.11.2"><title>October 2000: Implementation of Package Pools</title>
+<section id="2000-10"><title>October 2000: Implementation of Package Pools</title>
<para>
James Troup <ulink
url="http://lists.debian.org/debian-devel-announce-0010/msg00007.html";>reported</ulink>
@@ -1543,7 +1567,7 @@ email</ulink> to the debian-devel list in May of 1998.
</para>
</section>
-<section id="s4.11.3"><title>March 2001: Christopher Rutter died</title>
+<section id="2001-03-cr"><title>March 2001: Christopher Rutter died</title>
<para>
On March 1st, 2001, Christopher Matthew Rutter (also known as cmr) was killed
after he was struck by a car at the age of 19. Christopher was a young and
@@ -1555,7 +1579,7 @@ Chris Rutter will be missed.
</para>
</section>
-<section id="s4.11.4"><title>March 2001: Fabrizio Polacco died</title>
+<section id="2001-03-fp"><title>March 2001: Fabrizio Polacco died</title>
<para>
On March 28th, 2001, Fabrizio Polacco passed away after a long illness. The
Debian Project honors his good work and strong dedication to Debian and Free
@@ -1567,7 +1591,7 @@ Fabrizio Polacco will be missed.
</para>
</section>
-<section id="s4.11.5"><title>July 2002: Martin Butterweck died</title>
+<section id="2002-07"><title>July 2002: Martin Butterweck died</title>
<para>
On July 21st, 2002, Martin Butterweck (also known as blendi) died after
battling leukemia. Martin was a young member of the Debian project who
@@ -1578,7 +1602,7 @@ Martin Butterweck will be missed.
</para>
</section>
-<section id="s4.11.6"><title>November 2002: Fire burnt Debian server</title>
+<section id="2002-11"><title>November 2002: Fire burnt Debian server</title>
<para>
Around 08:00 CET on November 20th, 2002, the University of Twente Network
Operations Center (NOC) caught fire. The building burnt to the ground. The
@@ -1590,7 +1614,20 @@ recently moved from the U.S.A. to the Netherlands.
</para>
</section>
-<section id="s4.11.7"><title>May 2004: Manuel Estrada Sainz and Andrés García Solier died</title>
+
+<section id="2003-11"><title>November 2003: Several Debian server hacked</title>
+<para>
+Starting 17:00 UTC on November 19th, 2003, four of the project's main
+Web servers for bug tracking, mailing lists, security and Web searches
+<ulink url="https://www.debian.org/News/2003/20031202";>have been
+compromised</ulink>. The services were taken down for inspection and
+fortunately it could be confirmed, that the package archive was not
+affected by this compromise. On November 25th, all services were
+recovered and back online.
+</para>
+</section>
+
+<section id="2004-05"><title>May 2004: Manuel Estrada Sainz and Andrés García Solier died</title>
<para>
On May 9th Manuel Estrada Sainz (ranty) and Andrés García Solier (ErConde)
were killed in a tragic car accident while returning from the Free Software
@@ -1601,7 +1638,7 @@ Manuel Estrada Sainz and Andrés García Solier will be missed.
</para>
</section>
-<section id="s4.11.8"><title>July 2005: Jens Schmalzing died</title>
+<section id="2005-06"><title>July 2005: Jens Schmalzing died</title>
<para>
On July 30th Jens Schmalzing (jensen) died in a tragic accident at his
workplace in Munich, Germany. He was involved in Debian as a maintainer of
@@ -1615,7 +1652,7 @@ Jens Schmalzing will be missed.
</para>
</section>
-<section id="s4.11.9"><title>December 2008: Thiemo Seufer died</title>
+<section id="2008-12"><title>December 2008: Thiemo Seufer died</title>
<para>
On December 26th Thiemo Seufer (ths) died in a car accident. He was the lead
maintainer of the MIPS and MIPSEL port and he had also contributed at length in
@@ -1629,7 +1666,7 @@ Thiemo Seufer will be missed.
</para>
</section>
-<section id="s4.11.10"><title>August 2010: Frans Pop died</title>
+<section id="2010-08"><title>August 2010: Frans Pop died</title>
<para>
Frans Pop (fjp) died on August 20th. Frans was involved in Debian as a
maintainer of several packages, a supporter of the S/390 port, and one of the
@@ -1642,7 +1679,7 @@ Frans Pop will be missed.
</para>
</section>
-<section id="s4.11.11"><title>April 2011: Adrian von Bidder died</title>
+<section id="2011-04"><title>April 2011: Adrian von Bidder died</title>
<para>
Adrian von Bidder (cmot) died on April 17th. Adrian was one of the founding
members and secretary of debian.ch, he sparked many ideas that made Debian
@@ -1654,7 +1691,7 @@ Adrian von Bidder will be missed.
</para>
</section>
-<section id="s4.11.12"><title>May 2013: Ray Dassen died</title>
+<section id="2003-05"><title>May 2013: Ray Dassen died</title>
<para>
Ray Dassen (jdassen) died on May 18th. Ray was a Debian Developer for
incredible 19 years. He joined the project in 1994, and continued to be an
@@ -1669,7 +1706,7 @@ Ray Dassen will be missed.
</para>
</section>
-<section id="s4.11.13"><title>July 2014: Peter Miller died</title>
+<section id="2014-07"><title>July 2014: Peter Miller died</title>
<para>
Peter Miller died on July 27th. Peter was a relative newcomer to the Debian
project, but his contributions to Free and Open Source Software go back to the
@@ -1683,7 +1720,7 @@ Peter Miller will be missed.
</para>
</section>
-<section id="s4.11.14"><title>February 2015: Clytie Siddall died</title>
+<section id="2015-02"><title>February 2015: Clytie Siddall died</title>
<para>
Clytie Siddall died in February 2015. Clytie was a contributor of Vietnamese
translations to Debian and other projects for many years. Within Debian she
@@ -1696,7 +1733,7 @@ Clytie Siddall will be missed.
</para>
</section>
-<section id="s4.11.15"><title>December 2015: Ian Murdock died</title>
+<section id="2015-12"><title>December 2015: Ian Murdock died</title>
<para>
Ian Murdock, the founder of the Debian Project and its community, died in
December 2015. Ian was introduced to computers early in his life, he started
@@ -1720,7 +1757,7 @@ Ian Murdock will be missed.
</para>
</section>
-<section id="s4.11.16"><title>September 2016: Kristoffer H. Rose died</title>
+<section id="2016-09"><title>September 2016: Kristoffer H. Rose died</title>
<para>
Kristoffer H. Rose died on September 17th 2016 after a long battle with
myelofibrosis. Kristoffer was a Debian contributor from the very early days of
@@ -1736,7 +1773,7 @@ Kristoffer H. Rose will be missed.
</section>
-<section id="s4.12"><title>What's Next?</title>
+<section id="next"><title>What's Next?</title>
<para>
The Debian Project continues to work on the <emphasis>unstable</emphasis>
distribution (codenamed <emphasis>sid</emphasis>, after the evil and "unstable"
@@ -1757,7 +1794,7 @@ release and is currently codenamed <emphasis>buster</emphasis>.
<para>
Written by Ian A. Murdock, Revised 01/06/94
</para>
-<section id="sA.1"><title>What is Debian Linux?</title>
+<section id="what-is-debian"><title>What is Debian Linux?</title>
<para>
Debian Linux is a brand-new kind of Linux distribution. Rather than being
developed by one isolated individual or group, as other distributions of Linux
@@ -1781,7 +1818,7 @@ advance and advocate free software without the pressure of profits or returns.
</para>
</section>
-<section id="sA.2"><title>Why is Debian being constructed?</title>
+<section id="why-is-debian"><title>Why is Debian being constructed?</title>
<para>
Distributions are essential to the future of Linux. Essentially, they
eliminate the need for the user to locate, download, compile, install and
@@ -1830,7 +1867,7 @@ remedy the situation.
</para>
</section>
-<section id="sA.3"><title>How will Debian attempt to put an end to these problems?</title>
+<section id="how-will-debian"><title>How will Debian attempt to put an end to these problems?</title>
<para>
The Debian design process is open to ensure that the system is of the highest
quality and that it reflects the needs of the user community. By involving
