[debian-edu-commits] debian-edu/debian-edu-doc.git (#426) - wheezy (branch) updated: 1.0_20080515-6-g698073b
David Prévot
taffit at alioth.debian.org
Sat Oct 5 12:17:49 UTC 2013
The branch, wheezy has been updated
via 698073b1eb294ee86784f37ec999f4ec70b72d33 (commit)
from a97eb7f56d468597363d454082cd34ee45ac6446 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 5 ++-
debian/control | 9 ++++
debian/rules | 2 +-
documentation/release-manual/Makefile | 3 +-
documentation/release-manual/release-manual.fr.po | 49 +++++++++------------
documentation/release-manual/release-manual.pot | 2 +-
documentation/release-manual/update_translations | 2 -
7 files changed, 37 insertions(+), 35 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index a7cde7b..202f209 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-debian-edu-doc (1.0~20080706) terra; urgency=low
+debian-edu-doc (1.1~20080706) terra; urgency=low
* release-manual:
- .xml source updated from the wiki
- updated Italian translation thanks to Claudio Carboncini
- include new French translation by Christophe Masson, merci bien!
(Closes: #487297)
+ - update_translations doesn't call get_release-manual anymore.
* Bumped standards-version to 3.8.0, split README into README and
REAME.source.
* Split into language specific binary packages. A debian-edu-doc binary
@@ -13,7 +14,7 @@ debian-edu-doc (1.0~20080706) terra; urgency=low
because no language has translated versions of all images.
* Use xmllint in the get-orig-source target to get cleaner xml.
- -- Holger Levsen <holger at debian.org> Sun, 06 Jul 2008 09:26:12 +0000
+ -- Holger Levsen <holger at debian.org> Sun, 06 Jul 2008 13:26:16 +0000
debian-edu-doc (1.0~20080515) terra; urgency=low
diff --git a/debian/control b/debian/control
index 1dc81d9..5e2bf93 100644
--- a/debian/control
+++ b/debian/control
@@ -66,3 +66,12 @@ Description: Italian documentation from the Debian Edu project
All Italian documentation for the Debian Edu / Skolelinux project is supposed
to be included in this package.
+Package: debian-edu-doc-fr
+Section: doc
+Priority: optional
+Depends: debian-edu-doc-en
+Architecture: all
+Description: French documentation from the Debian Edu project
+ All French documentation for the Debian Edu / Skolelinux project is supposed
+ to be included in this package.
+
diff --git a/debian/rules b/debian/rules
index bae69cf..5871119 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,7 @@ binary-indep: install
dh_testdir
dh_testroot
dh_installdocs
- dh_installdocs -A documentation/release-manual/README.release-manual-translations
+ dh_installdocs -A documentation/release-manual/README.release-manual-translations debian/README
dh_installchangelogs
dh_link
dh_compress -X.pdf -X.html
diff --git a/documentation/release-manual/Makefile b/documentation/release-manual/Makefile
index 2806ed6..d1df7da 100644
--- a/documentation/release-manual/Makefile
+++ b/documentation/release-manual/Makefile
@@ -5,7 +5,8 @@ LANGUAGES = `find . -name "release-manual.*.po" | sed -e "s/.\/release-manual.//
all: build
update:
- ./update_translations # calls ./get_release-manual
+ ./get_release-manual
+ ./update_translations
status:
@for f in *.po ; do \
diff --git a/documentation/release-manual/release-manual.fr.po b/documentation/release-manual/release-manual.fr.po
index 37397cb..6c1243f 100644
--- a/documentation/release-manual/release-manual.fr.po
+++ b/documentation/release-manual/release-manual.fr.po
@@ -1094,7 +1094,7 @@ msgid ""
"to install swi-prolog on etch."
msgstr ""
"Regression : swi-prolog ne fait pas partie d'Etch, mais était fourni par "
-"Sarge. Le chapitre <link linkend=\\\"TeachAndLearn\\\">manuel « Enseigner et "
+"Sarge. Le chapitre <link linkend=\"TeachAndLearn\">manuel « Enseigner et "
"apprendre »</link> décrit comment installer swi-prolog sur Etch."
# type: Content of: <article><section><section><title>
@@ -1304,8 +1304,9 @@ msgid ""
"org/DebianEdu/Hardware/\">http://wiki.debian.org/DebianEdu/Hardware/ </"
"ulink> . This list is not nearly complete <inlinemediaobject>"
msgstr ""
-"Une liste du matériel testé est fourni sur <ulink url='http://wiki.debian."
-"org/DebianEdu/Hardware/'>http://wiki.debian.org/DebianEdu/Hardware/</ulink>."
+"Une liste du matériel testé est fourni sur <ulink url=\"http://wiki.debian."
+"org/DebianEdu/Hardware/\">http://wiki.debian.org/DebianEdu/Hardware/</ulink>."
+"This list is not nearly complete <inlinemediaobject>"
# type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject>
#: release-manual.xml:334 release-manual.xml:478 release-manual.xml:562
@@ -1410,7 +1411,7 @@ msgstr ""
"décrit <ulink url='http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet'>la "
"procédure</ulink> pour faire cela. Si vous n'y êtes pas obligés par une "
"infrastructure réseau existante, nous vous le déconseillons et vous "
-"recommandons de conserver l'<link linkend=\\\"Architecture\\\">architecture "
+"recommandons de conserver l'<link linkend=\"Architecture\">architecture "
"réseau</link> par défaut."
# type: Content of: <article><section><section><title>
@@ -1454,9 +1455,8 @@ msgstr ""
# type: Content of: <article><section><section><title>
#: release-manual.xml:397
-#, fuzzy
msgid "Download an installation media for Debian Edu Etch 3.0r1"
-msgstr "Téléchargement d'un média d'installation pour Debian Edu Etch 3.0r0"
+msgstr "Téléchargement d'un média d'installation pour Debian Edu Etch 3.0r1"
# type: Content of: <article><section><section><section><title>
#: release-manual.xml:401
@@ -1494,13 +1494,12 @@ msgstr ""
# type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#: release-manual.xml:411
-#, fuzzy
msgid ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-etch-"
"amd64-i386-powerpc-DVD-3.0r1.iso </computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-etch-"
-"amd64-i386-powerpc-DVD-3.0r0.iso </computeroutput>"
+"amd64-i386-powerpc-DVD-3.0r1.iso </computeroutput>"
# type: Content of: <article><section><section><section><para>
#: release-manual.xml:416
@@ -1510,33 +1509,30 @@ msgstr ""
# type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#: release-manual.xml:418
-#, fuzzy
msgid ""
"<computeroutput>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-i386-"
"netinst-3.0r1.iso </computeroutput>"
msgstr ""
"<computeroutput>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-i386-"
-"netinst-3.0r0.iso </computeroutput>"
+"netinst-3.0r1.iso </computeroutput>"
# type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#: release-manual.xml:421
-#, fuzzy
msgid ""
"<computeroutput>http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-i386-"
"netinst-3.0r1.iso </computeroutput>"
msgstr ""
"<computeroutput>http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-i386-"
-"netinst-3.0r0.iso </computeroutput>"
+"netinst-3.0r1.iso </computeroutput>"
# type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#: release-manual.xml:424
-#, fuzzy
msgid ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-etch-i386-"
"netinst-3.0r1.iso </computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-etch-i386-"
-"netinst-3.0r0.iso </computeroutput>"
+"netinst-3.0r1.iso </computeroutput>"
# type: Content of: <article><section><section><section><para>
#: release-manual.xml:429
@@ -1629,7 +1625,6 @@ msgstr "Le code source de cette version est disponible sur une image DVD"
# type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#: release-manual.xml:459
-#, fuzzy
msgid ""
"<computeroutput>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-"
"source-DVD-3.0r1.iso </computeroutput>"
@@ -1639,7 +1634,6 @@ msgstr ""
# type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#: release-manual.xml:462
-#, fuzzy
msgid ""
"<computeroutput>http://ftp.skolelinux.org/skolelinux-cd/debian-edu-etch-"
"source-DVD-3.0r1.iso </computeroutput>"
@@ -1649,7 +1643,6 @@ msgstr ""
# type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#: release-manual.xml:465
-#, fuzzy
msgid ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-etch-"
"source-DVD-3.0r1.iso </computeroutput>"
@@ -2250,7 +2243,7 @@ msgid ""
"tricks and frequently asked questions, while this chapter describes the "
"stuff everybody needs to do."
msgstr ""
-"Le chapitre <link linkend=\\\"HowTo\\\">Manuels (How To)</link> fournit "
+"Le chapitre <link linkend=\"HowTo\">Manuels (How To)</link> fournit "
"davantage d'astuces et de réponses à des questions courantes, tandis que ce "
"chapitre présente ce qui est incontournable."
@@ -2659,8 +2652,8 @@ msgstr ""
"machines ajoutées au répertoire LDAP à l'aide de lwat disposent d'un nom "
"d'hôte, d'une adresse IP, d'une adresse MAC et d'un nom de domaine qui est "
"habituellement « interne ». Pour une description plus approfondie de "
-"l'architecture de Debian Edu, consulter le chapitre <link linkend=\\"
-"\"Architecture\\\">Architecture</link> de ce manuel."
+"l'architecture de Debian Edu, consulter le chapitre"
+"<link linkend=\"Architecture\">Architecture</link> de ce manuel."
# type: Content of: <article><section><section><section><para>
#: release-manual.xml:886
@@ -3059,7 +3052,7 @@ msgstr ""
"peuvent être trop remplies après l'installation. Pour étendre une partition "
"pleine, exécutez <computeroutput>debian-edu-fsautoresize -n</computeroutput> "
"en tant que root. Voir le manuel « Redimensionnement de partition » dans le "
-"chaptitre <link linkend=\\\"Administration\\\">Manuel d'administration </"
+"chaptitre <link linkend=\"Administration\">Manuel d'administration </"
"link> pour plus d'informations."
# type: Content of: <article><section><title>
@@ -3188,7 +3181,7 @@ msgid ""
"</inlinemediaobject> Be aware that this backup doesn't protect you from "
"failing harddrives."
msgstr ""
-"Soyez conscient que cette sauvegarde ne protège pas d'une panne de disque "
+"</inlinemediaobject> Soyez conscient que cette sauvegarde ne protège pas d'une panne de disque "
"dur."
# type: Content of: <article><section><section><para>
@@ -3457,7 +3450,7 @@ msgid ""
msgstr ""
"En cas de problème, vous pouvez aussi lire les <ulink url='http://www.debian."
"org/releases/stable/releasenotes'>notes de sortie de Debian Etch</ulink>. "
-"(Debian Edu/Skolelinux \\\"2.0 Terra\\\" installait un noyau 2.6 par défaut, "
+"(Debian Edu/Skolelinux \"2.0 Terra\" installait un noyau 2.6 par défaut, "
"mais si vous fonctionnez sous un noyau 2.4, vous <emphasis>devez</emphasis> "
"lire les <ulink url='http://www.debian.org/releases/stable/i386/release-"
"notes/ch-information.en.html#s-upgrade-to-2.6'>notes concernant la migration "
@@ -4132,8 +4125,8 @@ msgid ""
"maintainance work. The howtos in this chapter are already \"advanced\" tipps "
"and tricks."
msgstr ""
-"Les chapitres <link linkend=\\\"GettingStarted\\\">Démarrage rapide</link> "
-"et <link linkend=\\\"Maintainance\\\">Maintainance</link> décrivent comment "
+"Les chapitres <link linkend=\"GettingStarted\">Démarrage rapide</link> "
+"et <link linkend=\"Maintainance\">Maintainance</link> décrivent comment "
"prendre en main Debian Edu et comment effectuer le travail de maintenance de "
"base. Les manuels de ce chapitre décrivent des astuces avancées."
@@ -4202,8 +4195,8 @@ msgid ""
msgstr ""
"Cette fonctionnalité est activée automatiquement dans la version de Debian "
"Edu basée sur Etch et tous les changements effectués durant l'installation "
-"sont enregistrés. Les changements dans <computeroutput>/etc/</"
-"computeroutput> sont livrés sur le dépôt svk toutes les heures."
+"sont enregistrés. Les changements dans <computeroutput>/etc/</computeroutput>"
+"sont livrés sur le dépôt svk toutes les heures."
# type: Content of: <article><section><section><para>
#: release-manual.xml:1461
@@ -4331,7 +4324,7 @@ msgid ""
"ignore it. But this is rarely useful <inlinemediaobject>"
msgstr ""
"Si vous ne souhaitez pas qu'un fichier spécifique soit suivi par svk, vous "
-"pouvez indiquer de l'ignorer. Mais cela est rarement utile."
+"pouvez indiquer de l'ignorer. Mais cela est rarement utile <inlinemediaobject>"
# type: CDATA
#: release-manual.xml:1512
diff --git a/documentation/release-manual/release-manual.pot b/documentation/release-manual/release-manual.pot
index ed39b0a..6a36c54 100644
--- a/documentation/release-manual/release-manual.pot
+++ b/documentation/release-manual/release-manual.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-07-06 11:09+0200\n"
+"POT-Creation-Date: 2008-07-06 15:06+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
diff --git a/documentation/release-manual/update_translations b/documentation/release-manual/update_translations
index d5e2155..40ec4b6 100755
--- a/documentation/release-manual/update_translations
+++ b/documentation/release-manual/update_translations
@@ -5,8 +5,6 @@
# Author: Holger Levsen
# Date: 2006-07-06
-./get_release-manual
-
name=release-manual
# Update the pot file
hooks/post-receive
--
debian-edu-doc.git (Debian package debian-edu-doc)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "debian-edu-doc.git" (Debian package debian-edu-doc).
More information about the debian-edu-commits
mailing list