[debian-edu-commits] [SCM] Debian package debian-edu-doc branch, master, updated. 1.4_20120925_6.0.6-55-gf9fa3b8

David Prévot taffit at debian.org
Sat Feb 16 03:06:33 UTC 2013


The following commit has been merged in the master branch:
commit 5543f7d2dd17dd52527d3928ac25326307689c98
Author: David Prévot <taffit at debian.org>
Date:   Wed Feb 13 12:46:28 2013 -0400

    Initial Wheezy material imported from Squeeze

diff --git a/documentation/debian-edu-squeeze/Makefile b/documentation/debian-edu-wheezy/Makefile
similarity index 50%
copy from documentation/debian-edu-squeeze/Makefile
copy to documentation/debian-edu-wheezy/Makefile
index adac7cc..88e4c37 100644
--- a/documentation/debian-edu-squeeze/Makefile
+++ b/documentation/debian-edu-wheezy/Makefile
@@ -1,11 +1,11 @@
 #
 # configuration here:
 #
-url=http://wiki.debian.org/DebianEdu/Documentation/Squeeze/
-name=debian-edu-squeeze-manual
+url=http://wiki.debian.org/DebianEdu/Documentation/Wheezy/
+name=debian-edu-wheezy-manual
 VERSION:=$(shell GET -H User-Agent: $(url)?action=raw |sed -n '1p'|sed -r 's/^([^0-9])*|([^0-9])*$$//g')
-DEBIAN_EDU_DOC_TITLE=Debian\ Edu\ /\ Skolelinux\ Squeeze\ $(VERSION)\ Manual
-path1=DebianEdu/Documentation/Squeeze
+DEBIAN_EDU_DOC_TITLE=Debian\ Edu\ /\ Skolelinux\ Wheezy\ $(VERSION)\ Manual
+path1=DebianEdu/Documentation/Wheezy
 path2='\/DebianEdu\/Documentation\/'
 export 
 
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.da.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
similarity index 99%
copy from documentation/debian-edu-squeeze/debian-edu-squeeze-manual.da.po
copy to documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
index b2df8d3..ff63882 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.da.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-squeeze-manual\n"
-"POT-Creation-Date: 2013-02-13 21:11-0400\n"
+"POT-Creation-Date: 2013-01-21 19:41-0400\n"
 "PO-Revision-Date: 2013-01-23 11:20+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -8659,15 +8659,15 @@ msgid ""
 "Correct Kerberos user policy: don't expire password after 2 days. Closes: "
 "#664596"
 msgstr ""
-"Korrektion af Kerberos' brugerpolitik: Adgangskoder udløber ikke efter 2 "
-"dage. Lukker: #664596"
+"Korrektion af Kerberos' brugerpolitik: Adgangskoder udløber ikke efter 2 dage. "
+"Lukker: #664596"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Handle '#' characters in the root or first users password. Closes: #664976"
 msgstr ""
-"Håndterer »#«-tegn i administrators (root) eller første brugers adgangskode. "
-"Lukker #664976"
+"Håndterer »#«-tegn i administrators (root) eller første brugers adgangskode. Lukker "
+"#664976"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Fixes for gosa-sync:"
@@ -8698,8 +8698,8 @@ msgid ""
 "gosa-netgroups plugin: don't erase entries of attribute type "
 "\"memberNisNetgroup\". Closes: #687256"
 msgstr ""
-"Udvidelsesmodul for gosa-netgroups: slet ikke poster med attributype "
-"»memberNisNetgroup«. Lukker: #687256"
+"Udvidelsesmodul for gosa-netgroups: slet ikke poster med "
+"attributype »memberNisNetgroup«. Lukker: #687256"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "First user now uses the same Kerberos policy as all other users"
@@ -9514,8 +9514,7 @@ msgstr ""
 #. type: Content of: <article><section><para>
 msgid ""
 "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013) and is released under the GPL2 or any later "
-"version."
+"2009, 2010, 2011, 2012, 2013) and is released under the GPL2 or any later version."
 msgstr ""
 "Den italiensk oversættelse Claudio Carboncini (2007, 2008, 2009, 2010, 2011, "
 "2012, 2013) og er udgivet under GPL2 eller en senere version."
@@ -9543,11 +9542,11 @@ msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
-"released under the GPL2 or any later version."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is released "
+"under the GPL2 or any later version."
 msgstr ""
-"Den danske oversættelse er underlagt ophavsretten af Joe Hansen (2012, 2013) "
-"og er udgivet under GPL2 eller enhver senere version."
+"Den danske oversættelse er underlagt ophavsretten af Joe Hansen (2012, 2013) og er "
+"udgivet under GPL2 eller enhver senere version."
 
 #. type: Content of: <article><section><title>
 msgid "Translations of this document"
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.de.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
similarity index 99%
copy from documentation/debian-edu-squeeze/debian-edu-squeeze-manual.de.po
copy to documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
index b82343f..3aa1349 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.de.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-squeeze-manual.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-13 21:11-0400\n"
+"POT-Creation-Date: 2013-01-21 19:41-0400\n"
 "PO-Revision-Date: 2013-01-22 00:12+0100\n"
 "Last-Translator: Wolfgang Schweer <schweer at cityweb.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -9757,12 +9757,11 @@ msgstr ""
 #. type: Content of: <article><section><para>
 msgid ""
 "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013) and is released under the GPL2 or any later "
-"version."
+"2009, 2010, 2011, 2012, 2013) and is released under the GPL2 or any later version."
 msgstr ""
 "Die italienische Übersetzung wurde erstellt und ist Copyright von Claudio "
-"Carboncini (2007, 2008, 2009, 2010, 2011, 2012, 2013). Sie ist unter der "
-"GPL2 oder späteren Versionen lizenziert."
+"Carboncini (2007, 2008, 2009, 2010, 2011, 2012, 2013). Sie ist unter der GPL2 oder "
+"späteren Versionen lizenziert."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -9786,11 +9785,11 @@ msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
-"released under the GPL2 or any later version."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is released "
+"under the GPL2 or any later version."
 msgstr ""
-"Die dänische Übersetzung wurde verfasst von Joe Hansen (2012, 2013) und ist "
-"unter der GPL2 oder später lizenziert."
+"Die dänische Übersetzung wurde verfasst von Joe Hansen (2012, 2013) und ist unter "
+"der GPL2 oder später lizenziert."
 
 #. type: Content of: <article><section><title>
 msgid "Translations of this document"
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.es.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
similarity index 99%
copy from documentation/debian-edu-squeeze/debian-edu-squeeze-manual.es.po
copy to documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
index 0e8641c..997bf31 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.es.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: release-manual\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-13 21:11-0400\n"
+"POT-Creation-Date: 2013-01-23 15:07-0400\n"
 "PO-Revision-Date: 2012-06-16 18:34-0600\n"
 "Last-Translator: Norman Garcia Aguilar <norman at riseup.net>\n"
 "Language-Team: Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -8961,9 +8961,9 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The Debian Edu Squeeze Manual is fully translated to German, French, Italian "
-"and Danish (new). Partly translated versions exist for Norwegian Bokmal and "
-"Spanish."
+"The Debian Edu Squeeze Manual is fully translated to German, French and "
+"Italian. Partly translated versions exist for Danish (new), Norwegian Bokmal "
+"and Spanish."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9359,8 +9359,8 @@ msgstr ""
 #. type: Content of: <article><section><para>
 #, fuzzy
 msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
-"released under the GPL2 or any later version."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is released "
+"under the GPL2 or any later version."
 msgstr ""
 "La traducción a español es copyright 2007 de José L. Redrejo Rodríguez y "
 "está bajo la licencia GPL2 o versiones posteriores."
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.fr.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
similarity index 99%
copy from documentation/debian-edu-squeeze/debian-edu-squeeze-manual.fr.po
copy to documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
index 7257218..3910807 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.fr.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.9.20071124\n"
-"POT-Creation-Date: 2013-02-13 21:11-0400\n"
+"POT-Creation-Date: 2013-01-21 19:41-0400\n"
 "PO-Revision-Date: 2013-01-20 22:51+0100\n"
 "Last-Translator: Cédric Boutillier <cedric.boutillier at gmail.com>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -9016,7 +9016,7 @@ msgid ""
 msgstr ""
 "Remplacement de LWAT par GOsa² en tant qu'interface d'administration LDAP. "
 "Voir plus loin et le chapitre <link linkend=\"GettingStarted\">Démarrage "
-"rapide</link> du manuel pour plus d'informations sur GOsa²."
+"Rapide</link> du manuel pour plus d'informations sur GOsa²."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "See below for a list of updated software."
@@ -9100,7 +9100,7 @@ msgid ""
 "www.debian.org/releases/squeeze/installmanual\">installation manual</ulink> "
 "for more details."
 msgstr ""
-"Nouvelle version de l'installateur Debian de Squeeze. Consultez le <ulink "
+"Nouvelle version de debian-installer de Debian Squeeze. Consultez le <ulink "
 "url=\"http://www.debian.org/releases/squeeze/installmanual\">manuel "
 "d'installation</ulink> pour plus de détails."
 
@@ -9800,12 +9800,11 @@ msgstr ""
 #. type: Content of: <article><section><para>
 msgid ""
 "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013) and is released under the GPL2 or any later "
-"version."
+"2009, 2010, 2011, 2012, 2013) and is released under the GPL2 or any later version."
 msgstr ""
 "La traduction italienne, dont les droits d'auteur appartiennent à Claudio "
-"Carboncini (2007, 2008, 2009, 2010, 2011, 2012, 2013), est distribuée sous "
-"GPL2 ou toute version ultérieure."
+"Carboncini (2007, 2008, 2009, 2010, 2011, 2012, 2013), est distribuée sous GPL2 ou "
+"toute version ultérieure."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -9830,8 +9829,8 @@ msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
-"released under the GPL2 or any later version."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is released "
+"under the GPL2 or any later version."
 msgstr ""
 "La traduction danoise, dont les droits d'auteur appartiennent à Joe Hansen "
 "(2012, 2013), est distribuée sous GPL2 ou toute version ultérieure."
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.it.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
similarity index 99%
copy from documentation/debian-edu-squeeze/debian-edu-squeeze-manual.it.po
copy to documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
index e359e23..5487d66 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.it.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-lenny-manual\n"
-"POT-Creation-Date: 2013-02-13 21:11-0400\n"
+"POT-Creation-Date: 2013-01-23 15:07-0400\n"
 "PO-Revision-Date: 2013-01-23 19:02+0100\n"
 "Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <>\n"
@@ -9592,11 +9592,11 @@ msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
-"released under the GPL2 or any later version."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is released "
+"under the GPL2 or any later version."
 msgstr ""
-"La traduzione in Danese  è protetta da copyright da Joe Hansen (2012, 2013) "
-"e rilasciata sotto licenza GPL2 o successiva."
+"La traduzione in Danese  è protetta da copyright da Joe Hansen (2012, 2013) e "
+"rilasciata sotto licenza GPL2 o successiva."
 
 #. type: Content of: <article><section><title>
 msgid "Translations of this document"
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.nb.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
similarity index 99%
copy from documentation/debian-edu-squeeze/debian-edu-squeeze-manual.nb.po
copy to documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
index 40a1560..e3f6f4e 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.nb.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: release-manual.nb\n"
-"POT-Creation-Date: 2013-02-13 21:11-0400\n"
+"POT-Creation-Date: 2013-01-23 15:07-0400\n"
 "PO-Revision-Date: 2012-03-10 18:32+0100\n"
 "Last-Translator: Petter Reinholdtsen <pere at hungry.com>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -9908,9 +9908,9 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The Debian Edu Squeeze Manual is fully translated to German, French, Italian "
-"and Danish (new). Partly translated versions exist for Norwegian Bokmal and "
-"Spanish."
+"The Debian Edu Squeeze Manual is fully translated to German, French and "
+"Italian. Partly translated versions exist for Danish (new), Norwegian Bokmal "
+"and Spanish."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -10276,8 +10276,8 @@ msgstr ""
 #. type: Content of: <article><section><para>
 #, fuzzy
 msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
-"released under the GPL2 or any later version."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is released "
+"under the GPL2 or any later version."
 msgstr ""
 "Den spanske oversettelsen er gjort av José L. Redrejo Rodríguez med "
 "opphavsrett 2007 og er utgitt under GPL2 eller senere versjoner."
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
similarity index 99%
copy from documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
copy to documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
index 767b027..04e0543 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-02-13 21:11-0400\n"
+"POT-Creation-Date: 2013-01-23 15:13-0400\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"
@@ -6818,9 +6818,9 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The Debian Edu Squeeze Manual is fully translated to German, French, Italian "
-"and Danish (new). Partly translated versions exist for Norwegian Bokmal and "
-"Spanish."
+"The Debian Edu Squeeze Manual is fully translated to German, French and "
+"Italian. Partly translated versions exist for Danish (new), Norwegian Bokmal "
+"and Spanish."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
diff --git a/documentation/debian-edu-squeeze/images/de/Debian_Edu_Network_Squeeze.png b/documentation/debian-edu-wheezy/images/de/Debian_Edu_Network_Wheezy.png
similarity index 100%
copy from documentation/debian-edu-squeeze/images/de/Debian_Edu_Network_Squeeze.png
copy to documentation/debian-edu-wheezy/images/de/Debian_Edu_Network_Wheezy.png
diff --git a/documentation/debian-edu-squeeze/images/fr/Debian_Edu_Network_Squeeze.png b/documentation/debian-edu-wheezy/images/fr/Debian_Edu_Network_Wheezy.png
similarity index 100%
copy from documentation/debian-edu-squeeze/images/fr/Debian_Edu_Network_Squeeze.png
copy to documentation/debian-edu-wheezy/images/fr/Debian_Edu_Network_Wheezy.png
diff --git a/documentation/debian-edu-squeeze/images/source/Debian Edu Netzwerk_Squeeze_l10n.odg b/documentation/debian-edu-wheezy/images/source/Debian_Edu_Network_Wheezy.odg
similarity index 100%
copy from documentation/debian-edu-squeeze/images/source/Debian Edu Netzwerk_Squeeze_l10n.odg
copy to documentation/debian-edu-wheezy/images/source/Debian_Edu_Network_Wheezy.odg
diff --git a/documentation/debian-edu-squeeze/po4a.cfg b/documentation/debian-edu-wheezy/po4a.cfg
similarity index 77%
copy from documentation/debian-edu-squeeze/po4a.cfg
copy to documentation/debian-edu-wheezy/po4a.cfg
index af5d007..edb3673 100644
--- a/documentation/debian-edu-squeeze/po4a.cfg
+++ b/documentation/debian-edu-wheezy/po4a.cfg
@@ -1,5 +1,5 @@
 [po_directory] .
 
-[type: docbook] debian-edu-squeeze-manual.xml \
+[type: docbook] debian-edu-wheezy-manual.xml \
 	$lang:$lang.xml \
 	opt:"-o nodefault='<inlinemediaobject> <imagedata>' -o untranslated='<listitem> <inlinemediaobject> <imagedata>' -M UTF-8 -k 5"

-- 
Debian package debian-edu-doc



More information about the debian-edu-commits mailing list